From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from esa2.mentor.iphmx.com (esa2.mentor.iphmx.com [68.232.141.98]) by sourceware.org (Postfix) with ESMTPS id 49BAF3949093; Wed, 19 May 2021 22:50:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 49BAF3949093 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=Julian_Brown@mentor.com IronPort-SDR: lwY1USiJOqRc2I3F7sozIBEweSeFHM/WCwKFZu6x0HQ6QaLmi3E+MutRNgD+RmmV42qFcwvVk3 bvilLLuywm7TeZ/3NEZWb94+V/RkaASBySvsBAfMVI5Nw8Qrlto/7VOA4n2s28QTLIofgxBWGb aiHOUh7FQpDLHxp6eIfG3TN9J/oKaKkPfxuSqEVCYAAFG/E7MSKJtfqnRbKWxH+UbmibKZUSAJ rOM5Q/G/Ds/TZMhWWdK1/EoHh1Rz94TuYP+g+6BT+OIJDMYzUMwGYbQRTrcuCBemTj2VVrUbrb Hl8= X-IronPort-AV: E=Sophos;i="5.82,313,1613462400"; d="scan'208";a="61407418" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa2.mentor.iphmx.com with ESMTP; 19 May 2021 14:50:05 -0800 IronPort-SDR: /UJUzrolSuTolYivLdPhF679Wzlk1815PoujGBeC2eY7eulggiOCjE/eqzsK+ZnyLHijv+K0jU CuUClkiXP7wbDMzQlmyNGJPHbo4wCoavR9Um6x5xK8nnO1bjvo1V2wgLr9UInGsaPn22mzl4v3 n7PEPnyk9YGYQYDiEkb/3EcrCAjc1RpGyqX2TKlQUeEFKzADPRwJKXY0Ld12NSxMd4eL/QaHj7 4+hLrqutE+kauoI7C3ffB3NhuGqiwebS4eGNqA12pyJDUm/eDRxsT7z5mhSOdPbRoN+eUofNg0 ceA= From: Julian Brown To: CC: , Chung-Lin Tang , Jakub Jelinek , Tobias Burnus , Thomas Schwinge Subject: [PATCH v2 1/4] [og10] Rewrite GOMP_MAP_ATTACH_DETACH mappings unconditionally Date: Wed, 19 May 2021 15:49:49 -0700 Message-ID: X-Mailer: git-send-email 2.29.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: SVR-IES-MBX-03.mgc.mentorg.com (139.181.222.3) To SVR-IES-MBX-04.mgc.mentorg.com (139.181.222.4) X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: fortran@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Fortran mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 May 2021 22:50:08 -0000 It never makes sense for a GOMP_MAP_ATTACH_DETACH mapping to survive beyond gimplify.c, so this patch rewrites such mappings to GOMP_MAP_ATTACH or GOMP_MAP_DETACH unconditionally (rather than checking for a list of types of OpenACC or OpenMP constructs), in cases where it hasn't otherwise been done already in the preceding code. I will apply shortly to the og10 branch. Thanks, Julian 2021-05-19 Julian Brown gcc/ * gimplify.c (gimplify_scan_omp_clauses): Simplify condition for changing GOMP_MAP_ATTACH_DETACH to GOMP_MAP_ATTACH or GOMP_MAP_DETACH. --- gcc/gimplify.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/gcc/gimplify.c b/gcc/gimplify.c index e51f0dd7787..b94004dc7b1 100644 --- a/gcc/gimplify.c +++ b/gcc/gimplify.c @@ -9647,15 +9647,7 @@ gimplify_scan_omp_clauses (tree *list_p, gimple_seq *pre_p, skip_map_struct: ; } - else if ((code == OACC_ENTER_DATA - || code == OACC_EXIT_DATA - || code == OACC_DATA - || code == OACC_PARALLEL - || code == OACC_KERNELS - || code == OACC_SERIAL - || code == OMP_TARGET_ENTER_DATA - || code == OMP_TARGET_EXIT_DATA) - && OMP_CLAUSE_MAP_KIND (c) == GOMP_MAP_ATTACH_DETACH) + else if (OMP_CLAUSE_MAP_KIND (c) == GOMP_MAP_ATTACH_DETACH) { gomp_map_kind k = ((code == OACC_EXIT_DATA || code == OMP_TARGET_EXIT_DATA) -- 2.29.2