public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc/devel/omp/gcc-11] Fix references declared in lexically-enclosing OpenACC data region
@ 2021-05-13 16:10 Kwok Yeung
0 siblings, 0 replies; only message in thread
From: Kwok Yeung @ 2021-05-13 16:10 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:16a2db575e3c393f9bfdb5526dc19140738ec0a8
commit 16a2db575e3c393f9bfdb5526dc19140738ec0a8
Author: Julian Brown <julian@codesourcery.com>
Date: Sun May 19 10:42:20 2019 -0700
Fix references declared in lexically-enclosing OpenACC data region
gcc/fortran/
* trans-openmp.c (gfc_omp_finish_clause): Guard addition of clauses for
pointers with DECL_P.
gcc/
* gimplify.c (oacc_array_mapping_info): Add REF field.
(gimplify_scan_omp_clauses): Initialise above field for data blocks
passed by reference.
(gomp_oacc_needs_data_present): Handle references.
(gimplify_adjust_omp_clauses_1): Handle references and optional
arguments for variables declared in lexically-enclosing OpenACC data
region.
Diff:
---
gcc/ChangeLog.omp | 10 ++++++++++
gcc/fortran/ChangeLog.omp | 5 +++++
gcc/fortran/trans-openmp.c | 2 +-
gcc/gimplify.c | 50 ++++++++++++++++++++++++++++++++++++++++------
4 files changed, 60 insertions(+), 7 deletions(-)
diff --git a/gcc/ChangeLog.omp b/gcc/ChangeLog.omp
index 7a3d381b055..eabcfb9e44b 100644
--- a/gcc/ChangeLog.omp
+++ b/gcc/ChangeLog.omp
@@ -1,3 +1,13 @@
+2019-05-19 Julian Brown <julian@codesourcery.com>
+
+ * gimplify.c (oacc_array_mapping_info): Add REF field.
+ (gimplify_scan_omp_clauses): Initialise above field for data blocks
+ passed by reference.
+ (gomp_oacc_needs_data_present): Handle references.
+ (gimplify_adjust_omp_clauses_1): Handle references and optional
+ arguments for variables declared in lexically-enclosing OpenACC data
+ region.
+
2019-05-16 Julian Brown <julian@codesourcery.com>
* omp-oacc-kernels-decompose.cc (find_omp_for_index_vars_1,
diff --git a/gcc/fortran/ChangeLog.omp b/gcc/fortran/ChangeLog.omp
index 8e4763b2f97..3bfa90f496c 100644
--- a/gcc/fortran/ChangeLog.omp
+++ b/gcc/fortran/ChangeLog.omp
@@ -1,3 +1,8 @@
+2019-05-19 Julian Brown <julian@codesourcery.com>
+
+ * trans-openmp.c (gfc_omp_finish_clause): Guard addition of clauses for
+ pointers with DECL_P.
+
2019-01-09 Julian Brown <julian@codesourcery.com>
* cpp.c (cpp_define_builtins): Update _OPENACC define to 201711.
diff --git a/gcc/fortran/trans-openmp.c b/gcc/fortran/trans-openmp.c
index 1a99a453b12..f63207d15aa 100644
--- a/gcc/fortran/trans-openmp.c
+++ b/gcc/fortran/trans-openmp.c
@@ -1316,7 +1316,7 @@ gfc_omp_finish_clause (tree c, gimple_seq *pre_p, bool openacc)
tree c2 = NULL_TREE, c3 = NULL_TREE, c4 = NULL_TREE;
tree present = gfc_omp_check_optional_argument (decl, true);
- if (POINTER_TYPE_P (TREE_TYPE (decl)))
+ if (DECL_P (decl) && POINTER_TYPE_P (TREE_TYPE (decl)))
{
if (!gfc_omp_privatize_by_reference (decl)
&& !GFC_DECL_GET_SCALAR_POINTER (decl)
diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index ce09bdf35d8..5b9e51ea785 100644
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -226,6 +226,7 @@ struct oacc_array_mapping_info
tree mapping;
tree pset;
tree pointer;
+ tree ref;
};
struct gimplify_omp_ctx
@@ -8991,6 +8992,9 @@ gimplify_scan_omp_clauses (tree *list_p, gimple_seq *pre_p,
}
if (base_ptr
&& OMP_CLAUSE_CODE (base_ptr) == OMP_CLAUSE_MAP
+ && !(OMP_CLAUSE_CODE (c) == OMP_CLAUSE_MAP
+ && (OMP_CLAUSE_MAP_KIND (c) == GOMP_MAP_ALLOC
+ || OMP_CLAUSE_MAP_KIND (c) == GOMP_MAP_POINTER))
&& OMP_CLAUSE_MAP_KIND (c) != GOMP_MAP_TO_PSET
&& ((OMP_CLAUSE_MAP_KIND (base_ptr)
== GOMP_MAP_FIRSTPRIVATE_POINTER)
@@ -9009,6 +9013,19 @@ gimplify_scan_omp_clauses (tree *list_p, gimple_seq *pre_p,
ai.mapping = unshare_expr (c);
ai.pset = pset ? unshare_expr (pset) : NULL;
ai.pointer = unshare_expr (base_ptr);
+ ai.ref = NULL_TREE;
+ if (TREE_CODE (base_addr) == INDIRECT_REF
+ && (TREE_CODE (TREE_TYPE (TREE_OPERAND (base_addr, 0)))
+ == REFERENCE_TYPE))
+ {
+ base_addr = TREE_OPERAND (base_addr, 0);
+ tree ref_clause = OMP_CLAUSE_CHAIN (base_ptr);
+ gcc_assert ((OMP_CLAUSE_CODE (ref_clause)
+ == OMP_CLAUSE_MAP)
+ && (OMP_CLAUSE_MAP_KIND (ref_clause)
+ == GOMP_MAP_POINTER));
+ ai.ref = unshare_expr (ref_clause);
+ }
ctx->decl_data_clause->put (base_addr, ai);
}
if (TREE_CODE (TREE_TYPE (decl)) != ARRAY_TYPE)
@@ -10262,16 +10279,21 @@ static oacc_array_mapping_info *
gomp_oacc_needs_data_present (tree decl)
{
gimplify_omp_ctx *ctx = NULL;
+ bool ref_p = TREE_CODE (TREE_TYPE (decl)) == REFERENCE_TYPE;
if (gimplify_omp_ctxp->region_type != ORT_ACC_PARALLEL
&& gimplify_omp_ctxp->region_type != ORT_ACC_KERNELS)
return NULL;
- if (TREE_CODE (TREE_TYPE (decl)) != ARRAY_TYPE
- && TREE_CODE (TREE_TYPE (decl)) != POINTER_TYPE
- && TREE_CODE (TREE_TYPE (decl)) != RECORD_TYPE
- && (TREE_CODE (TREE_TYPE (decl)) != POINTER_TYPE
- || TREE_CODE (TREE_TYPE (TREE_TYPE (decl))) != ARRAY_TYPE))
+ tree type = TREE_TYPE (decl);
+ if (TREE_CODE (type) == REFERENCE_TYPE)
+ type = TREE_TYPE (type);
+
+ if (TREE_CODE (type) != ARRAY_TYPE
+ && TREE_CODE (type) != POINTER_TYPE
+ && TREE_CODE (type) != RECORD_TYPE
+ && (TREE_CODE (type) != POINTER_TYPE
+ || TREE_CODE (TREE_TYPE (type)) != ARRAY_TYPE))
return NULL;
decl = get_base_address (decl);
@@ -10427,6 +10449,9 @@ gimplify_adjust_omp_clauses_1 (splay_tree_node n, void *data)
{
tree mapping = array_info->mapping;
tree pointer = array_info->pointer;
+ const gomp_map_kind presence_kind
+ = omp_check_optional_argument (decl, false) ? GOMP_MAP_IF_PRESENT
+ : GOMP_MAP_FORCE_PRESENT;
if (code == OMP_CLAUSE_FIRSTPRIVATE)
/* Oops, we have the wrong type of clause. Rebuild it. */
@@ -10434,7 +10459,7 @@ gimplify_adjust_omp_clauses_1 (splay_tree_node n, void *data)
OMP_CLAUSE_MAP);
OMP_CLAUSE_DECL (clause) = unshare_expr (OMP_CLAUSE_DECL (mapping));
- OMP_CLAUSE_SET_MAP_KIND (clause, GOMP_MAP_FORCE_PRESENT);
+ OMP_CLAUSE_SET_MAP_KIND (clause, presence_kind);
OMP_CLAUSE_SIZE (clause) = unshare_expr (OMP_CLAUSE_SIZE (mapping));
/* Create a new data clause for the firstprivate pointer. */
@@ -10471,6 +10496,19 @@ gimplify_adjust_omp_clauses_1 (splay_tree_node n, void *data)
OMP_CLAUSE_CHAIN (nc) = OMP_CLAUSE_CHAIN (clause);
OMP_CLAUSE_CHAIN (clause) = psetc ? psetc : nc;
+
+ if (array_info->ref)
+ {
+ tree refc = build_omp_clause (OMP_CLAUSE_LOCATION (clause),
+ OMP_CLAUSE_MAP);
+ OMP_CLAUSE_DECL (refc)
+ = unshare_expr (OMP_CLAUSE_DECL (array_info->ref));
+ OMP_CLAUSE_SIZE (refc)
+ = unshare_expr (OMP_CLAUSE_SIZE (array_info->ref));
+ OMP_CLAUSE_SET_MAP_KIND (refc, GOMP_MAP_POINTER);
+ OMP_CLAUSE_CHAIN (refc) = OMP_CLAUSE_CHAIN (nc);
+ OMP_CLAUSE_CHAIN (nc) = refc;
+ }
}
else if (code == OMP_CLAUSE_FIRSTPRIVATE && (flags & GOVD_EXPLICIT) == 0)
OMP_CLAUSE_FIRSTPRIVATE_IMPLICIT (clause) = 1;
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-05-13 16:10 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-13 16:10 [gcc/devel/omp/gcc-11] Fix references declared in lexically-enclosing OpenACC data region Kwok Yeung
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).