From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from esa4.mentor.iphmx.com (esa4.mentor.iphmx.com [68.232.137.252]) by sourceware.org (Postfix) with ESMTPS id 591F13985476 for ; Wed, 11 Aug 2021 16:58:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 591F13985476 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: BH8T9itr4nnPSQtXpP1rUzdfVQSFISr9TXfeZRRpuVeWEdYWAXVzFQEK3GAMQlS3hdzXdsMp7C QAec+M7Y+ep/sEaqAQV/Nw9lh8OBZ3je6grkKJ6bJ1a9NYWzFpIcmdA53yf1bhQ33ClAHL855j mcCyc5LBPMRVb+e0bg5Y1syoFQtxCARNXbstM1h8ILWQxaBIgb+MIVw3z5WRt1CmTKbD9Uvs13 qA6mFQdD1gN7iNHct9lVzUNYe4L0QRT2u56Rq6b3Uq4fno2PaMTj6D6dzkzKm1Bj9vq0fTNQla lOvhpPN6bZ7GgTi6X7p99Bks X-IronPort-AV: E=Sophos;i="5.84,313,1620720000"; d="scan'208";a="64742313" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa4.mentor.iphmx.com with ESMTP; 11 Aug 2021 08:58:51 -0800 IronPort-SDR: lPTGItyUWE1YZRpmeDH6qP5pFHWe9hyI4dZDYYrVJgTyyBqPSol8c11dgvlTLDI1PkItNRyoEw 8pxTL24dpaObnZ11Z3jkd2awTPBld7i1581ztC9BoOeZ2WStOhH9VW+vxODdi3Qj75XSJaMe5J HUqwcBS9ijgyOh9K1uc8Q2t7q1Vl5e5ddq1Uy5Hq7RR4KE/exm1eIkCiMAMzXECmyPa0blRuR7 xdDWmyYS1/hgVvDecjg5/+gEHswNhv9yytUKpcaq5UaoASxZiWhRl1elcfbayXIr+/6hl0Wf9w oo4= From: Julian Brown To: CC: Chung-Lin Tang , Jakub Jelinek Subject: [PATCH 4/8] Rewrite GOMP_MAP_ATTACH_DETACH mappings unconditionally Date: Wed, 11 Aug 2021 09:58:27 -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-04.mgc.mentorg.com (139.181.222.4) 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: , X-List-Received-Date: Wed, 11 Aug 2021 16:58:54 -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. 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) 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 fb35d240b34..141ef6b2b1e 100644 --- a/gcc/gimplify.c +++ b/gcc/gimplify.c @@ -9773,15 +9773,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