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 12A30383A22C; Tue, 13 Sep 2022 21:03:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 12A30383A22C 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="5.93,313,1654588800"; d="scan'208";a="82933007" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 13 Sep 2022 13:03:31 -0800 IronPort-SDR: 21+13hJszIu3IpD53urbvgtTIHkFbBioziHA+ePdPkVrTRq+AJf6pn+YtUymfLeRRZ8TWWqFPo xA4kJJI3usSGEUlqw3Dyxy3Y2TD6x5HdXFUod1ZBG7Tx4NAx3XSpfn4XUU4YKdF0UwOlnbKm/0 5KVKJg4J6DbsOfNnkEWTEQU10TtZvNTlXmO1N+6NE6pUOHxPlMNgLdwxXuFkjsTPfPLZkeIFN5 Y5fbjtJEzhJn/K3ArZ3ozOMDAtLgBViP5j994dRbgkPNgRT8QplFo5JF2qULN/4hyfeq/lRhEi 83E= From: Julian Brown To: CC: , Jakub Jelinek , , Subject: [PATCH v3 05/11] OpenMP: push attaches to end of clause list in "target" regions Date: Tue, 13 Sep 2022 14:03:15 -0700 Message-ID: <479bff9d51ee4db1ff46e0edaaf24d2a601f7a0d.1663101299.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-13.mgc.mentorg.com (139.181.222.13) 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 patch moves GOMP_MAP_ATTACH{_ZERO_LENGTH_ARRAY_SECTION} nodes to the end of the clause list, for offload regions. This ensures that when we do the attach operation, both the "attachment point" and the target region have both already been mapped on the target. This avoids a pathological case that can otherwise happen with struct sibling-list handling. 2022-09-13 Julian Brown gcc/ * gimplify.cc (omp_segregate_mapping_groups): Update comment. (omp_push_attaches_to_end): New function. (gimplify_scan_omp_clauses): Use omp_push_attaches_to_end for offloaded regions. --- gcc/gimplify.cc | 66 ++++++++++++++++++++- gcc/testsuite/g++.dg/gomp/target-lambda-1.C | 2 +- 2 files changed, 65 insertions(+), 3 deletions(-) diff --git a/gcc/gimplify.cc b/gcc/gimplify.cc index c7998c2ccbd..bc7848843b3 100644 --- a/gcc/gimplify.cc +++ b/gcc/gimplify.cc @@ -9641,7 +9641,9 @@ omp_tsort_mapping_groups (vec *groups, /* Split INLIST into two parts, moving groups corresponding to ALLOC/RELEASE/DELETE mappings to one list, and other mappings to another. The former list is then appended to the latter. Each sub-list retains the - order of the original list. */ + order of the original list. + See also omp_push_attaches_to_end below -- we call that later after scanning + omp clauses. */ static omp_mapping_group * omp_segregate_mapping_groups (omp_mapping_group *inlist) @@ -9681,6 +9683,55 @@ omp_segregate_mapping_groups (omp_mapping_group *inlist) return tf_groups; } +/* This function moves GOMP_MAP_ATTACH{_ZERO_LENGTH_ARRAY_SECTION} nodes to the + end of the clause list, for offload regions. This ensures that when we do + the attach, both the "attachment point" and the target region have both + already been mapped on the target. This avoids a pathological case that can + otherwise happen with struct sibling-list handling. + + Do not call this for non-offload regions, e.g. for "enter data" or + "exit data" directives. + + The order of attach nodes and of non-attach nodes is otherwise retained. */ + +static tree +omp_push_attaches_to_end (tree list) +{ + tree nonattach_list = NULL_TREE, attach_list = NULL_TREE; + tree *nonattach_tail = &nonattach_list, *attach_tail = &attach_list; + + for (tree w = list; w;) + { + tree next = OMP_CLAUSE_CHAIN (w); + + if (OMP_CLAUSE_CODE (w) != OMP_CLAUSE_MAP) + goto nonattach; + + switch (OMP_CLAUSE_MAP_KIND (w)) + { + case GOMP_MAP_ATTACH: + case GOMP_MAP_ATTACH_ZERO_LENGTH_ARRAY_SECTION: + *attach_tail = w; + OMP_CLAUSE_CHAIN (w) = NULL_TREE; + attach_tail = &OMP_CLAUSE_CHAIN (w); + break; + + default: + nonattach: + *nonattach_tail = w; + OMP_CLAUSE_CHAIN (w) = NULL_TREE; + nonattach_tail = &OMP_CLAUSE_CHAIN (w); + } + + w = next; + } + + /* Splice lists together. */ + *nonattach_tail = attach_list; + + return nonattach_list; +} + /* Given a list LIST_P containing groups of mappings given by GROUPS, reorder those groups based on the output list of omp_tsort_mapping_groups -- singly-linked, threaded through each element's NEXT pointer starting at @@ -11950,7 +12001,18 @@ gimplify_scan_omp_clauses (tree *list_p, gimple_seq *pre_p, list_p = &OMP_CLAUSE_CHAIN (c); } - ctx->clauses = *orig_list_p; + if ((region_type & ORT_TARGET) != 0) + /* If we have a target region, we can push all the attaches to the end of + the list (we may have standalone "attach" operations synthesized for + GOMP_MAP_STRUCT nodes that must be processed after the attachment point + AND the pointed-to block have been mapped). */ + ctx->clauses = omp_push_attaches_to_end (*orig_list_p); + else + /* ...but if we have something else, e.g. "enter data", we need to keep + "attach" nodes together with the previous node they attach to so that + separate "exit data" operations work properly (see libgomp/target.c). */ + ctx->clauses = *orig_list_p; + gimplify_omp_ctxp = ctx; } diff --git a/gcc/testsuite/g++.dg/gomp/target-lambda-1.C b/gcc/testsuite/g++.dg/gomp/target-lambda-1.C index bff7fa7c669..5ce8ceadb19 100644 --- a/gcc/testsuite/g++.dg/gomp/target-lambda-1.C +++ b/gcc/testsuite/g++.dg/gomp/target-lambda-1.C @@ -87,7 +87,7 @@ int main (void) return 0; } -/* { dg-final { scan-tree-dump {#pragma omp target num_teams.* firstprivate\(b\) map\(alloc:MEM.* \[len: 0\]\) map\(firstprivate:iptr \[pointer assign, bias: 0\]\) map\(alloc:MEM.* \[len: 0\]\) map\(firstprivate:this \[pointer assign, bias: 0\]\) map\(to:\*__closure \[len: [0-9]+\]\) map\(firstprivate:__closure \[pointer assign, bias: 0\]\) map\(tofrom:\*_[0-9]+ \[len: [0-9]+\]\) map\(always_pointer:__closure->__this \[pointer assign, bias: 0\]\) map\(from:mapped \[len: [0-9]+\]\) map\(alloc:\*_[0-9]+ \[len: 0\]\) map\(attach_zero_length_array_section:__closure->__iptr \[bias: 0\]\) map\(alloc:\*_[0-9]+ \[len: 0\]\) map\(attach_zero_length_array_section:_[0-9]+->ptr \[bias: 0\]\)} "gimple" } } */ +/* { dg-final { scan-tree-dump {#pragma omp target num_teams.* firstprivate\(b\) map\(alloc:MEM.* \[len: 0\]\) map\(firstprivate:iptr \[pointer assign, bias: 0\]\) map\(alloc:MEM.* \[len: 0\]\) map\(firstprivate:this \[pointer assign, bias: 0\]\) map\(to:\*__closure \[len: [0-9]+\]\) map\(firstprivate:__closure \[pointer assign, bias: 0\]\) map\(tofrom:\*_[0-9]+ \[len: [0-9]+\]\) map\(always_pointer:__closure->__this \[pointer assign, bias: 0\]\) map\(from:mapped \[len: [0-9]+\]\) map\(alloc:\*_[0-9]+ \[len: 0\]\) map\(alloc:\*_[0-9]+ \[len: 0\]\) map\(attach_zero_length_array_section:__closure->__iptr \[bias: 0\]\) map\(attach_zero_length_array_section:_[0-9]+->ptr \[bias: 0\]\)} "gimple" } } */ /* { dg-final { scan-tree-dump {#pragma omp target num_teams.* firstprivate\(end\) firstprivate\(begin\) map\(to:loop \[len: [0-9]+\]\) map\(alloc:\*_[0-9]+ \[len: 0\]\) map\(attach_zero_length_array_section:loop\.__data1 \[bias: 0\]\)} "gimple" } } */ -- 2.29.2