From patchwork Thu Nov 25 14:07:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julian Brown X-Patchwork-Id: 48139 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E511E3858437 for ; Thu, 25 Nov 2021 14:08:22 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from esa2.mentor.iphmx.com (esa2.mentor.iphmx.com [68.232.141.98]) by sourceware.org (Postfix) with ESMTPS id EB2B33858D3C for ; Thu, 25 Nov 2021 14:07:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org EB2B33858D3C Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mentor.com IronPort-SDR: i/9nk6h+91t4zlzPuxISusZ1ctOSc9XtV1K9ACRZ0gBY1DRfrrCzNUd+mD4ljjBCuw0ReD2Vfi bx96+71ESpWdbJ7D9cJ3zcx7HeOz0j9O6+rvAyX8kbz/V6gmfg9R9DXD0Q7ZPH+Q6n/PjhEnSZ n9m8W3zLnY0fKnuo0J53wf80LH6Ehwf2Bn5+ExSi54ejLcj39vpJwC87PQ+EVwbeD42X1pfxBd l7HQg1y9Vl32OPPOhLnI7+COgozGUv0ACg94NQIG2tIgM4ecwZweZf0w3x+LulURneyQxNBG0K RZoRnrBxM2bstHBOaK18TwjF X-IronPort-AV: E=Sophos;i="5.87,263,1631606400"; d="scan'208";a="68920765" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa2.mentor.iphmx.com with ESMTP; 25 Nov 2021 06:07:36 -0800 IronPort-SDR: 8sBnKCVUtQ4Iku52ZBTN2uHaVD9Zgi5n8x7iK/nyYEA2SgGK5xgLXNf927RfStS2vRxFRTcZxR ghzUqKzvzB0Pf0F3NIAuSHz21SwV5a6nNN8zUKzNKAkpCLMSj54nfAT4QepJ4OT6nDqU7jAW4O 7fpYmmoJWPasl6dRmUB93yQT31OM/Qe5z1+RVGQ1xp2a6tLKrxn/qT1ub8/vNNqTd1izyYSLWu 6aTLdJ8WRqDhlanUBOlga3/3JcZhypX6u0pRch9+/dVdAhRNS7slAlyMkFfFMqOJsVXqpaBLvP BMQ= From: Julian Brown To: Subject: [PATCH 01/16] Rewrite GOMP_MAP_ATTACH_DETACH mappings unconditionally Date: Thu, 25 Nov 2021 06:07:17 -0800 Message-ID: <20211125140720.108885-2-julian@codesourcery.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20211125140720.108885-1-julian@codesourcery.com> References: <20211125140720.108885-1-julian@codesourcery.com> MIME-Version: 1.0 X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-12.mgc.mentorg.com (139.181.222.12) To SVR-IES-MBX-04.mgc.mentorg.com (139.181.222.4) X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, KAM_SHORT, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jakub Jelinek , Thomas Schwinge Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" 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. Previously posted here: https://gcc.gnu.org/pipermail/gcc-patches/2021-May/570399.html https://gcc.gnu.org/pipermail/gcc-patches/2021-June/571711.html (og11) OK? Thanks, Julian 2021-06-02 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 4cd62270a10..8d8735ae4c1 100644 --- a/gcc/gimplify.c +++ b/gcc/gimplify.c @@ -9965,15 +9965,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)