From patchwork Wed May 17 11:39:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 763477 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 3wSXRy3P2Zz9s06 for ; Wed, 17 May 2017 21:40:13 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="FWBnVpVS"; dkim-atps=neutral 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:subject:in-reply-to:references:date:message-id:mime-version :content-type:content-transfer-encoding; q=dns; s=default; b=BA1 twzyYXDxmcRvUpeo1lRgahgMiFh7mO4UilqQuiuEUuLwFFDjTwIHVZjYPWRvNpFV Sl2PXNzC9A2/KT4UTIQ8P/NGJFIqriUjpZ2jjv6dGXHINgo3uXHi2LeyIh2wOPFD c24CHLhVdHqiAPlkwPaj2GH0z5xcN6GzQzH63kWw= 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:subject:in-reply-to:references:date:message-id:mime-version :content-type:content-transfer-encoding; s=default; bh=nhg3ESTxy +RpEFHXkz9/h2DLrg0=; b=FWBnVpVSZA6ZRm+/S/1ggNUAEvyS+IdRlPpnlcU59 8JJ4xIr0FIuBCQVV6n4OtULfs089zA1ddcENux/Mz/MiZCVLEj1bFLEXv0QmbIZq aLS4R4w8d+xkv0CYAcu0NgXY27+0jMre0p2gYJl2VR6TL0w6Nhs78bmQgEWmrj9N 9g= Received: (qmail 4778 invoked by alias); 17 May 2017 11:39:59 -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 4757 invoked by uid 89); 17 May 2017 11:39:58 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS, URIBL_RED autolearn=ham version=3.3.2 spammy=H*F:U*thomas, 4.5, H*Ad:U*cesar, tschwinge 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; Wed, 17 May 2017 11:39:56 +0000 Received: from svr-orw-fem-02x.mgc.mentorg.com ([147.34.96.206] helo=SVR-ORW-FEM-02.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1dAxJ7-00032w-0O from Thomas_Schwinge@mentor.com for gcc-patches@gcc.gnu.org; Wed, 17 May 2017 04:39:57 -0700 Received: from tftp-cs (147.34.91.1) by svr-orw-fem-02.mgc.mentorg.com (147.34.96.168) with Microsoft SMTP Server id 14.3.224.2; Wed, 17 May 2017 04:39:56 -0700 Received: by tftp-cs (Postfix, from userid 49978) id 47CAAC23E1; Wed, 17 May 2017 04:39:56 -0700 (PDT) From: Thomas Schwinge To: Cesar Philippidis , "gcc-patches@gcc.gnu.org" Subject: Re: [gomp4] backport misc OMP 4.5 changes from trunk In-Reply-To: References: User-Agent: Notmuch/0.9-125-g4686d11 (http://notmuchmail.org) Emacs/24.5.1 (x86_64-pc-linux-gnu) Date: Wed, 17 May 2017 13:39:49 +0200 Message-ID: <871srnzp8a.fsf@euler.schwinge.homeip.net> MIME-Version: 1.0 Hi! On Wed, 15 Mar 2017 07:21:26 -0700, Cesar Philippidis wrote: > This patch backports Jakub's Fortran OMP 4.5 changes to gomp-4_0-branch. > The original patch may be found here > . I've applied > it to gomp-4_0-branch. > --- a/gcc/fortran/openmp.c > +++ b/gcc/fortran/openmp.c > @@ -835,6 +1122,19 @@ gfc_match_omp_clauses (gfc_omp_clauses **cp, uint64_t mask, > + if ((mask & OMP_CLAUSE_DELETE) > + && gfc_match ("delete ( ") == MATCH_YES > + && gfc_match_omp_map_clause (&c->lists[OMP_LIST_MAP], > + OMP_MAP_DELETE, openacc, > + allow_derived)) > + continue; I noticed that in that backport, the handling of the OpenACC delete clause (harmlessly) got duplicated. Cleaned up on gomp-4_0-branch in r248146: commit 3463026a7bfd6e704454d3ce8489d3b6b5295ab5 Author: tschwinge Date: Wed May 17 11:37:00 2017 +0000 Clean up handling of Fortran OpenACC delete clause gcc/fortran/ * openmp.c (gfc_match_omp_clauses): Handle "OMP_CLAUSE_DELETE" just once. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_0-branch@248146 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/fortran/ChangeLog.gomp | 5 +++++ gcc/fortran/openmp.c | 7 +------ 2 files changed, 6 insertions(+), 6 deletions(-) Grüße Thomas diff --git gcc/fortran/ChangeLog.gomp gcc/fortran/ChangeLog.gomp index 0f7c5d2..03bc82e 100644 --- gcc/fortran/ChangeLog.gomp +++ gcc/fortran/ChangeLog.gomp @@ -1,3 +1,8 @@ +2017-05-17 Thomas Schwinge + + * openmp.c (gfc_match_omp_clauses): Handle "OMP_CLAUSE_DELETE" + just once. + 2017-05-16 Chung-Lin Tang * gfortran.h (struct gfc_omp_clauses): Add 'finalize:1' bitfield. diff --git gcc/fortran/openmp.c gcc/fortran/openmp.c index 1734b7c..0992f0a 100644 --- gcc/fortran/openmp.c +++ gcc/fortran/openmp.c @@ -1117,11 +1117,6 @@ gfc_match_omp_clauses (gfc_omp_clauses **cp, omp_mask mask, continue; break; case 'd': - if ((mask & OMP_CLAUSE_DELETE) - && gfc_match ("delete ( ") == MATCH_YES - && gfc_match_omp_map_clause (&c->lists[OMP_LIST_MAP], - OMP_MAP_DELETE, true, allow_derived)) - continue; if ((mask & OMP_CLAUSE_DEFAULT) && c->default_sharing == OMP_DEFAULT_UNKNOWN) { @@ -1154,7 +1149,7 @@ gfc_match_omp_clauses (gfc_omp_clauses **cp, omp_mask mask, if ((mask & OMP_CLAUSE_DELETE) && gfc_match ("delete ( ") == MATCH_YES && gfc_match_omp_map_clause (&c->lists[OMP_LIST_MAP], - OMP_MAP_DELETE, openacc, + OMP_MAP_DELETE, true, allow_derived)) continue; if ((mask & OMP_CLAUSE_DEPEND)