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 14190386EC3E; Wed, 2 Jun 2021 10:45:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 14190386EC3E 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: dCgg//dj+Ja85MZ+23IRRB6C8fMymv+HWvs4SxrFDtfGRMoWGpbpDwta8VrPEPc/Tcm844pbx5 nZwzBhZTdVEd4SyoeCGLnaLqmugPc04taz6np28mH2VaLSsDESyRuhn8LEQSed4v7lvVQdVNdp 7xbl/urRmKlsMWEG6pF7uM8OY/Nn+bNmKpJYSBtBAr74E22HPi8Fg25i90LotWAAG1vei5N5K4 k0eNR/TqwEXriPhvPkVeSnHmOtl2ayfHq1HgjXjIYO+guKSMsBrT60Igwetzr/WLdTLRLdpznn ddk= X-IronPort-AV: E=Sophos;i="5.83,242,1616486400"; d="scan'208";a="61902746" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa2.mentor.iphmx.com with ESMTP; 02 Jun 2021 02:45:41 -0800 IronPort-SDR: QlR6AA2o2ANNHw1Zn74lM5eS+PdN5BzBBgR73KUEpg734No1wU1jURiJq03hVsTp/Etf7NloyJ 2862y9vBl2fZsXGfS0DlGaL9kqs8b4ZP/NNvKVRnOqcALrBQoUhW7DZi00Hiol605/9NYAsvto iWLzM5OM1UfP4pCM7/+o6mU4OTosiINVTinXJXwLrQeisxrV+Qrqp3HFXuKuBfc3vJ9tQczC84 KnRtCbWwtjW4nrT/wfCN9kJUARGCtXaqWUTRBV0macmDutVr7tnlaUEdNy/1vsV+bESA4O6QB3 JyY= From: Julian Brown To: CC: , Chung-Lin Tang , Jakub Jelinek , Tobias Burnus , Thomas Schwinge Subject: [PATCH 1/4] [og11] Rewrite GOMP_MAP_ATTACH_DETACH mappings unconditionally Date: Wed, 2 Jun 2021 03:45:23 -0700 Message-ID: <9aa75428f8b7d1e362ff5588c4bc35a50ae1b598.1622630252.git.julian@codesourcery.com> 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=-12.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, RCVD_IN_DNSWL_LOW, 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, 02 Jun 2021 10:45:52 -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. 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 5b481b99953..a38cd502aa5 100644 --- a/gcc/gimplify.c +++ b/gcc/gimplify.c @@ -9871,15 +9871,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