From patchwork Tue Jun 17 08:37:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 360378 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 0896A14007C for ; Tue, 17 Jun 2014 18:37:59 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id:mime-version:content-type; q=dns; s=default; b=KxVbNRccboOS4LQ41MIDY9LO+8hE25YnkACZ+LMO178HPw8tLA wuJiQc9V+Ych/kbTMBAjFE6Q/CfnfbDbprXZi8PJxgV7C3s3Uy9F5FGwOBFib6tF cRJ1ML4qFw33WV1Lz2DijyNkXZiuPlOuLC8y2fAx4ht4YzPrkfFJThVu8= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id:mime-version:content-type; s= default; bh=SDMkByjYgbLVtQnGKOwZ0JJsa6k=; b=rLmpPmJw+Q8PoKVoL2EZ 1c9zMiGtZNmUR8w7FLO7EweDvEW9lV7vsffXE7OdgsPBv/j0r37lxQfbPgLOBv4q 1Ev+OszNHnD3at0Zy51pQhZeHiLsPmnoQi1Xs9fbv/qVJEFIfGk7BSWeyHkYWnr5 cW4lHD6OY9eQ1tp3UZNWqAo= Received: (qmail 7382 invoked by alias); 17 Jun 2014 08:37:52 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 7371 invoked by uid 89); 17 Jun 2014 08:37:51 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.0 required=5.0 tests=AWL, BAYES_00 autolearn=ham version=3.3.2 X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 17 Jun 2014 08:37:50 +0000 Received: from svr-orw-fem-01.mgc.mentorg.com ([147.34.98.93]) by relay1.mentorg.com with esmtp id 1Wwotl-0002Ec-Hg from Thomas_Schwinge@mentor.com ; Tue, 17 Jun 2014 01:37:45 -0700 Received: from SVR-IES-FEM-02.mgc.mentorg.com ([137.202.0.106]) by svr-orw-fem-01.mgc.mentorg.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Tue, 17 Jun 2014 01:37:45 -0700 Received: from feldtkeller.schwinge.homeip.net (137.202.0.76) by SVR-IES-FEM-02.mgc.mentorg.com (137.202.0.106) with Microsoft SMTP Server id 14.2.247.3; Tue, 17 Jun 2014 09:37:43 +0100 From: Thomas Schwinge To: CC: Ilya Verbin , Michael Zolotukhin , , , Subject: [gomp4] Merge trunk r211693 (2014-06-16) into gomp-4_0-branch User-Agent: Notmuch/0.9-101-g81dad07 (http://notmuchmail.org) Emacs/24.3.1 (x86_64-pc-linux-gnu) Date: Tue, 17 Jun 2014 10:37:38 +0200 Message-ID: <874mzkvsml.fsf@schwinge.name> MIME-Version: 1.0 Hi! In r211726, I have committed a merge from trunk r211693 (2014-06-16) into gomp-4_0-branch. The LTO regression that appeared with an earlier merge, , remains to be resolved: PASS: gcc.dg/lto/save-temps c_lto_save-temps_0.o assemble, -O -flto -save-temps -PASS: gcc.dg/lto/save-temps c_lto_save-temps_0.o-c_lto_save-temps_0.o link, -O -flto -save-temps +FAIL: gcc.dg/lto/save-temps c_lto_save-temps_0.o-c_lto_save-temps_0.o link, -O -flto -save-temps +UNRESOLVED: gcc.dg/lto/save-temps c_lto_save-temps_0.o-c_lto_save-temps_0.o execute -O -flto -save-temps Executing on host: [...]/build/gcc/xgcc -B[...]/build/gcc/ -fno-diagnostics-show-caret -fdiagnostics-color=never -O -flto -save-temps -c -o c_lto_save-temps_0.o [...]/source/gcc/testsuite/gcc.dg/lto/save-temps_0.c (timeout = 300) spawn [...]/build/gcc/xgcc -B[...]/build/gcc/ -fno-diagnostics-show-caret -fdiagnostics-color=never -O -flto -save-temps -c -o c_lto_save-temps_0.o [...]/source/gcc/testsuite/gcc.dg/lto/save-temps_0.c PASS: gcc.dg/lto/save-temps c_lto_save-temps_0.o assemble, -O -flto -save-temps Executing on host: [...]/build/gcc/xgcc -B[...]/build/gcc/ c_lto_save-temps_0.o -fno-diagnostics-show-caret -fdiagnostics-color=never -O -flto -save-temps -o gcc-dg-lto-save-temps-01.exe (timeout = 300) spawn [...]/build/gcc/xgcc -B[...]/build/gcc/ c_lto_save-temps_0.o -fno-diagnostics-show-caret -fdiagnostics-color=never -O -flto -save-temps -o gcc-dg-lto-save-temps-01.exe [...]/build/gcc/xgcc @/tmp/ccjomvFW [...]/build/gcc/xgcc @/tmp/ccAM0t6j output is: [...]/build/gcc/xgcc @/tmp/ccjomvFW [...]/build/gcc/xgcc @/tmp/ccAM0t6j FAIL: gcc.dg/lto/save-temps c_lto_save-temps_0.o-c_lto_save-temps_0.o link, -O -flto -save-temps UNRESOLVED: gcc.dg/lto/save-temps c_lto_save-temps_0.o-c_lto_save-temps_0.o execute -O -flto -save-temps Owing to the Fortran front end changes for OpenMP 4 User-Defined Reductions, I have adapted the expected error messages for OpenACC as follows. While this is not critical, perhaps someone may want to improve this later on; so noting this here for later reference. Grüße, Thomas --- gcc/testsuite/gfortran.dg/goacc/reduction.f95 +++ gcc/testsuite/gfortran.dg/goacc/reduction.f95 @@ -66,73 +66,73 @@ common /blk/ i1 !$acc end parallel !$acc parallel reduction (*:ia1) ! { dg-error "Assumed size" } !$acc end parallel -!$acc parallel reduction (+:l1) ! { dg-error "must be of numeric type, got LOGICAL" } +!$acc parallel reduction (+:l1) ! { dg-error "OMP DECLARE REDUCTION \\+ not found for type LOGICAL" } !$acc end parallel -!$acc parallel reduction (*:la1) ! { dg-error "must be of numeric type, got LOGICAL" } +!$acc parallel reduction (*:la1) ! { dg-error "OMP DECLARE REDUCTION \\* not found for type LOGICAL" } !$acc end parallel -!$acc parallel reduction (-:a1) ! { dg-error "must be of numeric type, got CHARACTER" } +!$acc parallel reduction (-:a1) ! { dg-error "OMP DECLARE REDUCTION - not found for type CHARACTER" } !$acc end parallel -!$acc parallel reduction (+:t1) ! { dg-error "must be of numeric type, got TYPE" } +!$acc parallel reduction (+:t1) ! { dg-error "OMP DECLARE REDUCTION \\+ not found for type TYPE" } !$acc end parallel -!$acc parallel reduction (*:ta1) ! { dg-error "must be of numeric type, got TYPE" } +!$acc parallel reduction (*:ta1) ! { dg-error "OMP DECLARE REDUCTION \\* not found for type TYPE" } !$acc end parallel -!$acc parallel reduction (.and.:i3) ! { dg-error "must be LOGICAL" } +!$acc parallel reduction (.and.:i3) ! { dg-error "OMP DECLARE REDUCTION \\.and\\. not found for type INTEGER" } !$acc end parallel -!$acc parallel reduction (.or.:ia2) ! { dg-error "must be LOGICAL" } +!$acc parallel reduction (.or.:ia2) ! { dg-error "OMP DECLARE REDUCTION \\.or\\. not found for type INTEGER" } !$acc end parallel -!$acc parallel reduction (.eqv.:r1) ! { dg-error "must be LOGICAL" } +!$acc parallel reduction (.eqv.:r1) ! { dg-error "OMP DECLARE REDUCTION \\.eqv\\. not found for type REAL" } !$acc end parallel -!$acc parallel reduction (.neqv.:ra1) ! { dg-error "must be LOGICAL" } +!$acc parallel reduction (.neqv.:ra1) ! { dg-error "OMP DECLARE REDUCTION \\.neqv\\. not found for type REAL" } !$acc end parallel -!$acc parallel reduction (.and.:d1) ! { dg-error "must be LOGICAL" } +!$acc parallel reduction (.and.:d1) ! { dg-error "OMP DECLARE REDUCTION \\.and\\. not found for type REAL" } !$acc end parallel -!$acc parallel reduction (.or.:da1) ! { dg-error "must be LOGICAL" } +!$acc parallel reduction (.or.:da1) ! { dg-error "OMP DECLARE REDUCTION \\.or\\. not found for type REAL" } !$acc end parallel -!$acc parallel reduction (.eqv.:c1) ! { dg-error "must be LOGICAL" } +!$acc parallel reduction (.eqv.:c1) ! { dg-error "OMP DECLARE REDUCTION \\.eqv\\. not found for type COMPLEX" } !$acc end parallel -!$acc parallel reduction (.neqv.:ca1) ! { dg-error "must be LOGICAL" } +!$acc parallel reduction (.neqv.:ca1) ! { dg-error "OMP DECLARE REDUCTION \\.neqv\\. not found for type COMPLEX" } !$acc end parallel -!$acc parallel reduction (.and.:a1) ! { dg-error "must be LOGICAL" } +!$acc parallel reduction (.and.:a1) ! { dg-error "OMP DECLARE REDUCTION \\.and\\. not found for type CHARACTER" } !$acc end parallel -!$acc parallel reduction (.or.:t1) ! { dg-error "must be LOGICAL" } +!$acc parallel reduction (.or.:t1) ! { dg-error "OMP DECLARE REDUCTION \\.or\\. not found for type TYPE" } !$acc end parallel -!$acc parallel reduction (.eqv.:ta1) ! { dg-error "must be LOGICAL" } +!$acc parallel reduction (.eqv.:ta1) ! { dg-error "OMP DECLARE REDUCTION \\.eqv\\. not found for type TYPE" } !$acc end parallel -!$acc parallel reduction (min:c1) ! { dg-error "must be INTEGER or REAL" } +!$acc parallel reduction (min:c1) ! { dg-error "OMP DECLARE REDUCTION min not found for type COMPLEX" } !$acc end parallel -!$acc parallel reduction (max:ca1) ! { dg-error "must be INTEGER or REAL" } +!$acc parallel reduction (max:ca1) ! { dg-error "OMP DECLARE REDUCTION max not found for type COMPLEX" } !$acc end parallel -!$acc parallel reduction (max:l1) ! { dg-error "must be INTEGER or REAL" } +!$acc parallel reduction (max:l1) ! { dg-error "OMP DECLARE REDUCTION max not found for type LOGICAL" } !$acc end parallel -!$acc parallel reduction (min:la1) ! { dg-error "must be INTEGER or REAL" } +!$acc parallel reduction (min:la1) ! { dg-error "OMP DECLARE REDUCTION min not found for type LOGICAL" } !$acc end parallel -!$acc parallel reduction (max:a1) ! { dg-error "must be INTEGER or REAL" } +!$acc parallel reduction (max:a1) ! { dg-error "OMP DECLARE REDUCTION max not found for type CHARACTER" } !$acc end parallel -!$acc parallel reduction (min:t1) ! { dg-error "must be INTEGER or REAL" } +!$acc parallel reduction (min:t1) ! { dg-error "OMP DECLARE REDUCTION min not found for type TYPE" } !$acc end parallel -!$acc parallel reduction (max:ta1) ! { dg-error "must be INTEGER or REAL" } +!$acc parallel reduction (max:ta1) ! { dg-error "OMP DECLARE REDUCTION max not found for type TYPE" } !$acc end parallel -!$acc parallel reduction (iand:r1) ! { dg-error "must be INTEGER" } +!$acc parallel reduction (iand:r1) ! { dg-error "OMP DECLARE REDUCTION iand not found for type REAL" } !$acc end parallel -!$acc parallel reduction (ior:ra1) ! { dg-error "must be INTEGER" } +!$acc parallel reduction (ior:ra1) ! { dg-error "OMP DECLARE REDUCTION ior not found for type REAL" } !$acc end parallel -!$acc parallel reduction (ieor:d1) ! { dg-error "must be INTEGER" } +!$acc parallel reduction (ieor:d1) ! { dg-error "OMP DECLARE REDUCTION ieor not found for type REAL" } !$acc end parallel -!$acc parallel reduction (ior:da1) ! { dg-error "must be INTEGER" } +!$acc parallel reduction (ior:da1) ! { dg-error "OMP DECLARE REDUCTION ior not found for type REAL" } !$acc end parallel -!$acc parallel reduction (iand:c1) ! { dg-error "must be INTEGER" } +!$acc parallel reduction (iand:c1) ! { dg-error "OMP DECLARE REDUCTION iand not found for type COMPLEX" } !$acc end parallel -!$acc parallel reduction (ior:ca1) ! { dg-error "must be INTEGER" } +!$acc parallel reduction (ior:ca1) ! { dg-error "OMP DECLARE REDUCTION ior not found for type COMPLEX" } !$acc end parallel -!$acc parallel reduction (ieor:l1) ! { dg-error "must be INTEGER" } +!$acc parallel reduction (ieor:l1) ! { dg-error "OMP DECLARE REDUCTION ieor not found for type LOGICAL" } !$acc end parallel -!$acc parallel reduction (iand:la1) ! { dg-error "must be INTEGER" } +!$acc parallel reduction (iand:la1) ! { dg-error "OMP DECLARE REDUCTION iand not found for type LOGICAL" } !$acc end parallel -!$acc parallel reduction (ior:a1) ! { dg-error "must be INTEGER" } +!$acc parallel reduction (ior:a1) ! { dg-error "OMP DECLARE REDUCTION ior not found for type CHARACTER" } !$acc end parallel -!$acc parallel reduction (ieor:t1) ! { dg-error "must be INTEGER" } +!$acc parallel reduction (ieor:t1) ! { dg-error "OMP DECLARE REDUCTION ieor not found for type TYPE" } !$acc end parallel -!$acc parallel reduction (iand:ta1) ! { dg-error "must be INTEGER" } +!$acc parallel reduction (iand:ta1) ! { dg-error "OMP DECLARE REDUCTION iand not found for type TYPE" } !$acc end parallel end subroutine