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 E26753858D38; Mon, 19 Jun 2023 21:17:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E26753858D38 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mentor.com X-IronPort-AV: E=Sophos;i="6.00,255,1681200000"; d="scan'208";a="9264336" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa4.mentor.iphmx.com with ESMTP; 19 Jun 2023 13:17:54 -0800 IronPort-SDR: LcFyFe/Hu9aCAjUR5ZQiQK1rUVGLy2BogbbwQF2b7cHmWJ0E4Ucg0c8ROJR6xx+cEvtlYyNIcE ltDEvJY4vWByXnWB49XYzYYiN0k7jXsVmHRSLHcg01zMHiAbpFFd68IDD/Sc8IsjYjHdVGQqB3 rcoF+u/c/Ons3ha/C3wtmK3Rg1JcAz57X9nM8B9hpqrP8MUh/iwO4O3x5w4Lww8r33XPB026WA 9fKi3mU2O4xWhvpMB7SS4s0rBDDiHh8XCZDlpdOMvRYVYvjhMZBClWtkcV7I2xKxYucYXC3CnA Y3c= From: Julian Brown To: CC: , , Subject: [PATCH 01/14] Revert "Assumed-size arrays with non-lexical data mappings" Date: Mon, 19 Jun 2023 21:17:25 +0000 Message-ID: <6d5055a3ff4c70e5d9f312aca7e1c25363ba3d01.1687201315.git.julian@codesourcery.com> X-Mailer: git-send-email 2.25.1 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-15.mgc.mentorg.com (139.181.222.15) To svr-ies-mbx-11.mgc.mentorg.com (139.181.222.11) X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00,GIT_PATCH_0,HEADER_FROM_DIFFERENT_DOMAINS,KAM_DMARC_STATUS,SPF_HELO_PASS,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: This reverts commit 72733f6e6f6ec1bb9884fea8bfbebd3de03d9374. 2023-06-16 Julian Brown gcc/ Revert: * gimplify.cc (gimplify_adjust_omp_clauses_1): Raise error for assumed-size arrays in map clauses for Fortran/OpenMP. * omp-low.cc (lower_omp_target): Set the size of assumed-size Fortran arrays to one to allow use of data already mapped on the offload device. gcc/fortran/ Revert: * trans-openmp.cc (gfc_omp_finish_clause): Change clauses mapping assumed-size arrays to use the GOMP_MAP_FORCE_PRESENT map type. --- gcc/fortran/trans-openmp.cc | 22 +++++++++------------- gcc/gimplify.cc | 14 -------------- gcc/omp-low.cc | 5 ----- 3 files changed, 9 insertions(+), 32 deletions(-) diff --git a/gcc/fortran/trans-openmp.cc b/gcc/fortran/trans-openmp.cc index e8f3b24e5f8..e55c8292d05 100644 --- a/gcc/fortran/trans-openmp.cc +++ b/gcc/fortran/trans-openmp.cc @@ -1588,18 +1588,10 @@ gfc_omp_finish_clause (tree c, gimple_seq *pre_p, bool openacc) tree decl = OMP_CLAUSE_DECL (c); /* Assumed-size arrays can't be mapped implicitly, they have to be mapped - explicitly using array sections. For OpenACC this restriction is lifted - if the array has already been mapped: - - - Using a lexically-enclosing data region: in that case we see the - GOMP_MAP_FORCE_PRESENT mapping kind here. - - - Using a non-lexical data mapping ("acc enter data"). - - In the latter case we change the mapping type to GOMP_MAP_FORCE_PRESENT. - This raises an error for OpenMP in the caller - (gimplify.c:gimplify_adjust_omp_clauses_1). OpenACC will raise a runtime - error if the implicitly-referenced assumed-size array is not mapped. */ + explicitly using array sections. An exception is if the array is + mapped explicitly in an enclosing data construct for OpenACC, in which + case we see GOMP_MAP_FORCE_PRESENT here and do not need to raise an + error. */ if (OMP_CLAUSE_MAP_KIND (c) != GOMP_MAP_FORCE_PRESENT && TREE_CODE (decl) == PARM_DECL && GFC_ARRAY_TYPE_P (TREE_TYPE (decl)) @@ -1607,7 +1599,11 @@ gfc_omp_finish_clause (tree c, gimple_seq *pre_p, bool openacc) && GFC_TYPE_ARRAY_UBOUND (TREE_TYPE (decl), GFC_TYPE_ARRAY_RANK (TREE_TYPE (decl)) - 1) == NULL) - OMP_CLAUSE_SET_MAP_KIND (c, GOMP_MAP_FORCE_PRESENT); + { + error_at (OMP_CLAUSE_LOCATION (c), + "implicit mapping of assumed size array %qD", decl); + return; + } if (OMP_CLAUSE_MAP_KIND (c) == GOMP_MAP_FORCE_DEVICEPTR) return; diff --git a/gcc/gimplify.cc b/gcc/gimplify.cc index 09c596f026e..3729b986801 100644 --- a/gcc/gimplify.cc +++ b/gcc/gimplify.cc @@ -12828,26 +12828,12 @@ gimplify_adjust_omp_clauses_1 (splay_tree_node n, void *data) *list_p = clause; struct gimplify_omp_ctx *ctx = gimplify_omp_ctxp; gimplify_omp_ctxp = ctx->outer_context; - gomp_map_kind kind = (code == OMP_CLAUSE_MAP) ? OMP_CLAUSE_MAP_KIND (clause) - : (gomp_map_kind) GOMP_MAP_LAST; /* Don't call omp_finish_clause on implicitly added OMP_CLAUSE_PRIVATE in simd. Those are only added for the local vars inside of simd body and they don't need to be e.g. default constructible. */ if (code != OMP_CLAUSE_PRIVATE || ctx->region_type != ORT_SIMD) lang_hooks.decls.omp_finish_clause (clause, pre_p, (ctx->region_type & ORT_ACC) != 0); - /* Allow OpenACC to have implicit assumed-size arrays via FORCE_PRESENT, - which should work as long as the array has previously been mapped - explicitly on the target (e.g. by "enter data"). Raise an error for - OpenMP. */ - if (lang_GNU_Fortran () - && code == OMP_CLAUSE_MAP - && (ctx->region_type & ORT_ACC) == 0 - && kind == GOMP_MAP_TOFROM - && OMP_CLAUSE_MAP_KIND (clause) == GOMP_MAP_FORCE_PRESENT) - error_at (OMP_CLAUSE_LOCATION (clause), - "implicit mapping of assumed size array %qD", - OMP_CLAUSE_DECL (clause)); if (gimplify_omp_ctxp) for (; clause != chain; clause = OMP_CLAUSE_CHAIN (clause)) if (OMP_CLAUSE_CODE (clause) == OMP_CLAUSE_MAP diff --git a/gcc/omp-low.cc b/gcc/omp-low.cc index 3424eba2217..59143d8efe5 100644 --- a/gcc/omp-low.cc +++ b/gcc/omp-low.cc @@ -14353,11 +14353,6 @@ lower_omp_target (gimple_stmt_iterator *gsi_p, omp_context *ctx) s = OMP_CLAUSE_SIZE (c); if (s == NULL_TREE) s = TYPE_SIZE_UNIT (TREE_TYPE (ovar)); - /* Fortran assumed-size arrays have zero size because the type is - incomplete. Set the size to one to allow the runtime to remap - any existing data that is already present on the accelerator. */ - if (s == NULL_TREE && is_gimple_omp_oacc (ctx->stmt)) - s = integer_one_node; s = fold_convert (size_type_node, s); purpose = size_int (map_idx++); CONSTRUCTOR_APPEND_ELT (vsize, purpose, s); -- 2.31.1