From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 91784 invoked by alias); 9 Dec 2018 12:56:07 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 89125 invoked by uid 89); 9 Dec 2018 12:55:29 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,SPF_PASS autolearn=ham version=3.3.2 spammy=1528, 1,10 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; Sun, 09 Dec 2018 12:55:27 +0000 Received: from svr-orw-mbx-05.mgc.mentorg.com ([147.34.90.205]) by relay1.mentorg.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-SHA384:256) id 1gVycH-0001p7-UG from Thomas_Schwinge@mentor.com ; Sun, 09 Dec 2018 04:55:25 -0800 Received: from SVR-ORW-MBX-09.mgc.mentorg.com (147.34.90.209) by SVR-ORW-MBX-05.mgc.mentorg.com (147.34.90.205) with Microsoft SMTP Server (TLS) id 15.0.1320.4; Sun, 9 Dec 2018 04:55:23 -0800 Received: from tftp-cs (147.34.91.1) by SVR-ORW-MBX-09.mgc.mentorg.com (147.34.90.209) with Microsoft SMTP Server id 15.0.1320.4 via Frontend Transport; Sun, 9 Dec 2018 04:55:23 -0800 Received: by tftp-cs (Postfix, from userid 49978) id 32EF1C24AB; Sun, 9 Dec 2018 04:55:23 -0800 (PST) From: Thomas Schwinge To: , Subject: [PR88420] Fortran OpenACC "Clause SEQ conflicts with INDEPENDENT" User-Agent: Notmuch/0.9-125-g4686d11 (http://notmuchmail.org) Emacs/25.2.2 (x86_64-pc-linux-gnu) Date: Sun, 09 Dec 2018 12:56:00 -0000 Message-ID: <87h8fmsvuz.fsf@euler.schwinge.homeip.net> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-SW-Source: 2018-12/txt/msg00535.txt.bz2 Hi! Other release branches probably likewise affected; for now committed to trunk in r266920: commit 7e5550c06d7ce70887a5042d07f1d9a76706b582 Author: tschwinge Date: Sun Dec 9 12:47:35 2018 +0000 [PR88420] Fortran OpenACC "Clause SEQ conflicts with INDEPENDENT" =20=20=20=20 The Fortran front end declares that the OpenACC "Clause SEQ conflicts w= ith INDEPENDENT". While that combination doesn't make too much sense indee= d, it's still valid; these are orthogonal concepts. =20=20=20=20 gcc/fortran/ PR fortran/88420 * openmp.c (resolve_oacc_loop_blocks): Remove "Clause SEQ conflicts with INDEPENDENT" diagnostic. gcc/testsuite/ PR fortran/88420 * gfortran.dg/goacc/loop-1-2.f95: Update. * gfortran.dg/goacc/loop-1.f95: Likewise. =20=20=20=20 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@266920 138bc75d-0d04-04= 10-961f-82ee72b054a4 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/openmp.c | 2 -- gcc/testsuite/ChangeLog | 6 ++++++ gcc/testsuite/gfortran.dg/goacc/loop-1-2.f95 | 3 +-- gcc/testsuite/gfortran.dg/goacc/loop-1.f95 | 3 +-- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git gcc/fortran/ChangeLog gcc/fortran/ChangeLog index 7ae21ac7d808..ae1871ec7f8d 100644 --- gcc/fortran/ChangeLog +++ gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2018-12-09 Thomas Schwinge + + PR fortran/88420 + * openmp.c (resolve_oacc_loop_blocks): Remove "Clause SEQ + conflicts with INDEPENDENT" diagnostic. + 2018-12-08 Steven G. Kargl =20 PR fortran/88048 diff --git gcc/fortran/openmp.c gcc/fortran/openmp.c index fb9c073ff779..d97b8bfbb142 100644 --- gcc/fortran/openmp.c +++ gcc/fortran/openmp.c @@ -5895,8 +5895,6 @@ resolve_oacc_loop_blocks (gfc_code *code) =20 if (code->ext.omp_clauses->seq) { - if (code->ext.omp_clauses->independent) - gfc_error ("Clause SEQ conflicts with INDEPENDENT at %L", &code->loc); if (code->ext.omp_clauses->gang) gfc_error ("Clause SEQ conflicts with GANG at %L", &code->loc); if (code->ext.omp_clauses->worker) diff --git gcc/testsuite/ChangeLog gcc/testsuite/ChangeLog index 0cbe4e26bb2e..5656259cbbad 100644 --- gcc/testsuite/ChangeLog +++ gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2018-12-09 Thomas Schwinge + + PR fortran/88420 + * gfortran.dg/goacc/loop-1-2.f95: Update. + * gfortran.dg/goacc/loop-1.f95: Likewise. + 2018-12-08 Steven G. Kargl =20 PR fortran/88048 diff --git gcc/testsuite/gfortran.dg/goacc/loop-1-2.f95 gcc/testsuite/gfort= ran.dg/goacc/loop-1-2.f95 index f89687aab43b..e048205d2c38 100644 --- gcc/testsuite/gfortran.dg/goacc/loop-1-2.f95 +++ gcc/testsuite/gfortran.dg/goacc/loop-1-2.f95 @@ -152,8 +152,7 @@ subroutine test1 ! { dg-error "ACC LOOP iteration variable must be of type integer"= "" { target *-*-* } 150 } end do =20 - ! Both seq and independent are not allowed - !$acc loop independent seq ! { dg-error "SEQ conflicts with INDEPENDENT"= } + !$acc loop independent seq do i =3D 1,10 enddo =20 diff --git gcc/testsuite/gfortran.dg/goacc/loop-1.f95 gcc/testsuite/gfortra= n.dg/goacc/loop-1.f95 index e51c9a40f923..776fa482af3c 100644 --- gcc/testsuite/gfortran.dg/goacc/loop-1.f95 +++ gcc/testsuite/gfortran.dg/goacc/loop-1.f95 @@ -152,8 +152,7 @@ subroutine test1 ! { dg-error "ACC LOOP iteration variable must be of type integer"= "" { target *-*-* } 150 } end do =20 - ! Both seq and independent are not allowed - !$acc loop independent seq ! { dg-error "SEQ conflicts with INDEPENDENT"= } + !$acc loop independent seq do i =3D 1,10 enddo =20 Gr=C3=BC=C3=9Fe Thomas