summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorChung-Lin Tang <cltang@codesourcery.com>2021-12-08 22:28:03 +0800
committerChung-Lin Tang <cltang@codesourcery.com>2021-12-08 22:29:06 +0800
commit0ab29cf0bb68960c1f87405f14b4fb2109254e2f (patch)
treedc3a692a82f7a3f39c6b7b1f4dbb00c7088a8fa7 /include
parentlibstdc++: Skip atomic instructions in shared_ptr when both counts are 1 (diff)
downloadgcc-0ab29cf0bb68960c1f87405f14b4fb2109254e2f.tar.gz
gcc-0ab29cf0bb68960c1f87405f14b4fb2109254e2f.tar.bz2
gcc-0ab29cf0bb68960c1f87405f14b4fb2109254e2f.tar.xz
openmp: Improve OpenMP target support for C++ (PR92120)
This patch implements several C++ specific mapping capabilities introduced for OpenMP 5.0, including implicit mapping of this[:1] for non-static member functions, zero-length array section mapping of pointer-typed members, lambda captured variable access in target regions, and use of lambda objects inside target regions. Several adjustments to the C/C++ front-ends to allow more member-access syntax as valid is also included. PR middle-end/92120 gcc/cp/ChangeLog: * cp-tree.h (finish_omp_target): New declaration. (finish_omp_target_clauses): Likewise. * parser.c (cp_parser_omp_clause_map): Adjust call to cp_parser_omp_var_list_no_open to set 'allow_deref' argument to true. (cp_parser_omp_target): Factor out code, adjust into calls to new function finish_omp_target. * pt.c (tsubst_expr): Add call to finish_omp_target_clauses for OMP_TARGET case. * semantics.c (handle_omp_array_sections_1): Add handling to create 'this->member' from 'member' FIELD_DECL. Remove case of rejecting 'this' when not in declare simd. (handle_omp_array_sections): Likewise. (finish_omp_clauses): Likewise. Adjust to allow 'this[]' in OpenMP map clauses. Handle 'A->member' case in map clauses. Remove case of rejecting 'this' when not in declare simd. (struct omp_target_walk_data): New struct for walking over target-directive tree body. (finish_omp_target_clauses_r): New function for tree walk. (finish_omp_target_clauses): New function. (finish_omp_target): New function. gcc/c/ChangeLog: * c-parser.c (c_parser_omp_clause_map): Set 'allow_deref' argument in call to c_parser_omp_variable_list to 'true'. * c-typeck.c (handle_omp_array_sections_1): Add strip of MEM_REF in array base handling. (c_finish_omp_clauses): Handle 'A->member' case in map clauses. gcc/ChangeLog: * gimplify.c ("tree-hash-traits.h"): Add include. (gimplify_scan_omp_clauses): Change struct_map_to_clause to type hash_map<tree_operand, tree> *. Adjust struct map handling to handle cases of *A and A->B expressions. Under !DECL_P case of GOMP_CLAUSE_MAP handling, add STRIP_NOPS for indir_p case, add to struct_deref_set for map(*ptr_to_struct) cases. Add MEM_REF case when handling component_ref_p case. Add unshare_expr and gimplification when created GOMP_MAP_STRUCT is not a DECL. Add code to add firstprivate pointer for *pointer-to-struct case. (gimplify_adjust_omp_clauses): Move GOMP_MAP_STRUCT removal code for exit data directives code to earlier position. * omp-low.c (lower_omp_target): Handle GOMP_MAP_ATTACH_ZERO_LENGTH_ARRAY_SECTION, and GOMP_MAP_POINTER_TO_ZERO_LENGTH_ARRAY_SECTION map kinds. * tree-pretty-print.c (dump_omp_clause): Likewise. gcc/testsuite/ChangeLog: * gcc.dg/gomp/target-3.c: New testcase. * g++.dg/gomp/target-3.C: New testcase. * g++.dg/gomp/target-lambda-1.C: New testcase. * g++.dg/gomp/target-lambda-2.C: New testcase. * g++.dg/gomp/target-this-1.C: New testcase. * g++.dg/gomp/target-this-2.C: New testcase. * g++.dg/gomp/target-this-3.C: New testcase. * g++.dg/gomp/target-this-4.C: New testcase. * g++.dg/gomp/target-this-5.C: New testcase. * g++.dg/gomp/this-2.C: Adjust testcase. include/ChangeLog: * gomp-constants.h (enum gomp_map_kind): Add GOMP_MAP_ATTACH_ZERO_LENGTH_ARRAY_SECTION, and GOMP_MAP_POINTER_TO_ZERO_LENGTH_ARRAY_SECTION map kinds. (GOMP_MAP_POINTER_P): Include GOMP_MAP_POINTER_TO_ZERO_LENGTH_ARRAY_SECTION. libgomp/ChangeLog: * libgomp.h (gomp_attach_pointer): Add bool parameter. * oacc-mem.c (acc_attach_async): Update call to gomp_attach_pointer. (goacc_enter_data_internal): Likewise. * target.c (gomp_map_vars_existing): Update assert condition to include GOMP_MAP_ATTACH_ZERO_LENGTH_ARRAY_SECTION. (gomp_map_pointer): Add 'bool allow_zero_length_array_sections' parameter, add support for mapping a pointer with NULL target. (gomp_attach_pointer): Add 'bool allow_zero_length_array_sections' parameter, add support for attaching a pointer with NULL target. (gomp_map_vars_internal): Update calls to gomp_map_pointer and gomp_attach_pointer, add handling for GOMP_MAP_ATTACH_ZERO_LENGTH_ARRAY_SECTION, and GOMP_MAP_POINTER_TO_ZERO_LENGTH_ARRAY_SECTION cases. * testsuite/libgomp.c++/target-23.C: New testcase. * testsuite/libgomp.c++/target-lambda-1.C: New testcase. * testsuite/libgomp.c++/target-lambda-2.C: New testcase. * testsuite/libgomp.c++/target-this-1.C: New testcase. * testsuite/libgomp.c++/target-this-2.C: New testcase. * testsuite/libgomp.c++/target-this-3.C: New testcase. * testsuite/libgomp.c++/target-this-4.C: New testcase. * testsuite/libgomp.c++/target-this-5.C: New testcase.
Diffstat (limited to 'include')
-rw-r--r--include/gomp-constants.h14
1 files changed, 13 insertions, 1 deletions
diff --git a/include/gomp-constants.h b/include/gomp-constants.h
index 3e42d7123ae..9e7db69f082 100644
--- a/include/gomp-constants.h
+++ b/include/gomp-constants.h
@@ -143,6 +143,11 @@ enum gomp_map_kind
143 No refcount is bumped by this, and the store is done unconditionally. */ 143 No refcount is bumped by this, and the store is done unconditionally. */
144 GOMP_MAP_ALWAYS_POINTER = (GOMP_MAP_FLAG_SPECIAL_2 144 GOMP_MAP_ALWAYS_POINTER = (GOMP_MAP_FLAG_SPECIAL_2
145 | GOMP_MAP_FLAG_SPECIAL | 1), 145 | GOMP_MAP_FLAG_SPECIAL | 1),
146 /* Like GOMP_MAP_POINTER, but allow zero-length array section, i.e. set to
147 NULL if target is not mapped. */
148 GOMP_MAP_POINTER_TO_ZERO_LENGTH_ARRAY_SECTION
149 = (GOMP_MAP_FLAG_SPECIAL_2
150 | GOMP_MAP_FLAG_SPECIAL | 2),
146 /* Forced deallocation of zero length array section. */ 151 /* Forced deallocation of zero length array section. */
147 GOMP_MAP_DELETE_ZERO_LEN_ARRAY_SECTION 152 GOMP_MAP_DELETE_ZERO_LEN_ARRAY_SECTION
148 = (GOMP_MAP_FLAG_SPECIAL_2 153 = (GOMP_MAP_FLAG_SPECIAL_2
@@ -163,6 +168,12 @@ enum gomp_map_kind
163 GOMP_MAP_FORCE_DETACH = (GOMP_MAP_DEEP_COPY 168 GOMP_MAP_FORCE_DETACH = (GOMP_MAP_DEEP_COPY
164 | GOMP_MAP_FLAG_FORCE | 1), 169 | GOMP_MAP_FLAG_FORCE | 1),
165 170
171 /* Like GOMP_MAP_ATTACH, but allow attaching to zero-length array sections
172 (i.e. set to NULL when array section is not mapped) Currently only used
173 by OpenMP. */
174 GOMP_MAP_ATTACH_ZERO_LENGTH_ARRAY_SECTION
175 = (GOMP_MAP_DEEP_COPY | 2),
176
166 /* Internal to GCC, not used in libgomp. */ 177 /* Internal to GCC, not used in libgomp. */
167 /* Do not map, but pointer assign a pointer instead. */ 178 /* Do not map, but pointer assign a pointer instead. */
168 GOMP_MAP_FIRSTPRIVATE_POINTER = (GOMP_MAP_LAST | 1), 179 GOMP_MAP_FIRSTPRIVATE_POINTER = (GOMP_MAP_LAST | 1),
@@ -186,7 +197,8 @@ enum gomp_map_kind
186 ((X) == GOMP_MAP_ALWAYS_POINTER) 197 ((X) == GOMP_MAP_ALWAYS_POINTER)
187 198
188#define GOMP_MAP_POINTER_P(X) \ 199#define GOMP_MAP_POINTER_P(X) \
189 ((X) == GOMP_MAP_POINTER) 200 ((X) == GOMP_MAP_POINTER \
201 || (X) == GOMP_MAP_POINTER_TO_ZERO_LENGTH_ARRAY_SECTION)
190 202
191#define GOMP_MAP_ALWAYS_TO_P(X) \ 203#define GOMP_MAP_ALWAYS_TO_P(X) \
192 (((X) == GOMP_MAP_ALWAYS_TO) || ((X) == GOMP_MAP_ALWAYS_TOFROM)) 204 (((X) == GOMP_MAP_ALWAYS_TO) || ((X) == GOMP_MAP_ALWAYS_TOFROM))