diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2019-08-08 08:39:02 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2019-08-08 08:39:02 +0200 |
| commit | 8860d2706d9bd21da3885f980f313733fdc525d1 (patch) | |
| tree | 2420aa40b9b451dd4e3b7251149b6c8a5f7ce9c1 /gcc/gimplify.c | |
| parent | 34f3ec07575f80964c9885874cb186ae3a913fcb (diff) | |
| download | gcc-8860d2706d9bd21da3885f980f313733fdc525d1.zip gcc-8860d2706d9bd21da3885f980f313733fdc525d1.tar.gz gcc-8860d2706d9bd21da3885f980f313733fdc525d1.tar.bz2 | |
gimplify.c (omp_add_variable): Use GOVD_PRIVATE | GOVD_EXPLICIT for VLA helper variables on target data even if...
* gimplify.c (omp_add_variable): Use GOVD_PRIVATE | GOVD_EXPLICIT
for VLA helper variables on target data even if not GOVD_FIRSTPRIVATE.
(gimplify_scan_omp_clauses): For OMP_CLAUSE_USE_DEVICE_* use just
GOVD_EXPLICIT flags.
(gimplify_omp_workshare): For OMP_TARGET_DATA move all
OMP_CLAUSE_USE_DEVICE_* clauses to the end of clauses chain.
* omp-low.c (scan_sharing_clauses): For OMP_CLAUSE_USE_DEVICE_*
call install_var_field with mask 11 instead of 3.
(lower_omp_target): For OMP_CLAUSE_USE_DEVICE_* use pass
(splay_tree_key) &DECL_UID (var) to build_sender_ref instead of var.
gcc/c/
* c-typeck.c (c_finish_omp_clauses): For C_ORT_OMP
OMP_CLAUSE_USE_DEVICE_* clauses use oacc_reduction_head bitmap
instead of generic_head to track duplicates.
gcc/cp/
* semantics.c (finish_omp_clauses): For C_ORT_OMP
OMP_CLAUSE_USE_DEVICE_* clauses use oacc_reduction_head bitmap
instead of generic_head to track duplicates.
libgomp/
* target.c (gomp_map_vars_internal): For GOMP_MAP_USE_DEVICE_PTR
perform the lookup in the first loop only if !not_found_cnt, otherwise
perform lookups for it in the second loop guarded with
if (not_found_cnt || has_firstprivate).
* testsuite/libgomp.c/target-37.c: New test.
* testsuite/libgomp.c++/target-22.C: New test.
From-SVN: r274206
Diffstat (limited to 'gcc/gimplify.c')
| -rw-r--r-- | gcc/gimplify.c | 32 |
1 files changed, 28 insertions, 4 deletions
diff --git a/gcc/gimplify.c b/gcc/gimplify.c index 978df86..daa0b71 100644 --- a/gcc/gimplify.c +++ b/gcc/gimplify.c @@ -6932,8 +6932,10 @@ omp_add_variable (struct gimplify_omp_ctx *ctx, tree decl, unsigned int flags) nflags = GOVD_MAP | GOVD_MAP_TO_ONLY | GOVD_EXPLICIT; else if (flags & GOVD_PRIVATE) nflags = GOVD_PRIVATE; - else if ((ctx->region_type & (ORT_TARGET | ORT_TARGET_DATA)) != 0 - && (flags & GOVD_FIRSTPRIVATE)) + else if (((ctx->region_type & (ORT_TARGET | ORT_TARGET_DATA)) != 0 + && (flags & GOVD_FIRSTPRIVATE)) + || (ctx->region_type == ORT_TARGET_DATA + && (flags & GOVD_DATA_SHARE_CLASS) == 0)) nflags = GOVD_PRIVATE | GOVD_EXPLICIT; else nflags = GOVD_FIRSTPRIVATE; @@ -9016,6 +9018,9 @@ gimplify_scan_omp_clauses (tree *list_p, gimple_seq *pre_p, case OMP_CLAUSE_USE_DEVICE_PTR: case OMP_CLAUSE_USE_DEVICE_ADDR: + flags = GOVD_EXPLICIT; + goto do_add; + case OMP_CLAUSE_IS_DEVICE_PTR: flags = GOVD_FIRSTPRIVATE | GOVD_EXPLICIT; goto do_add; @@ -12404,8 +12409,27 @@ gimplify_omp_workshare (tree *expr_p, gimple_seq *pre_p) OMP_CLAUSES (expr)); break; case OMP_TARGET_DATA: - stmt = gimple_build_omp_target (body, GF_OMP_TARGET_KIND_DATA, - OMP_CLAUSES (expr)); + /* Put use_device_{ptr,addr} clauses last, as map clauses are supposed + to be evaluated before the use_device_{ptr,addr} clauses if they + refer to the same variables. */ + { + tree use_device_clauses; + tree *pc, *uc = &use_device_clauses; + for (pc = &OMP_CLAUSES (expr); *pc; ) + if (OMP_CLAUSE_CODE (*pc) == OMP_CLAUSE_USE_DEVICE_PTR + || OMP_CLAUSE_CODE (*pc) == OMP_CLAUSE_USE_DEVICE_ADDR) + { + *uc = *pc; + *pc = OMP_CLAUSE_CHAIN (*pc); + uc = &OMP_CLAUSE_CHAIN (*uc); + } + else + pc = &OMP_CLAUSE_CHAIN (*pc); + *uc = NULL_TREE; + *pc = use_device_clauses; + stmt = gimple_build_omp_target (body, GF_OMP_TARGET_KIND_DATA, + OMP_CLAUSES (expr)); + } break; case OMP_TEAMS: stmt = gimple_build_omp_teams (body, OMP_CLAUSES (expr)); |