diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2022-05-31 11:41:52 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2022-05-31 11:41:52 +0200 |
| commit | f38b20d68fade5a922b9f68c4c3841e653d1b83c (patch) | |
| tree | 1ca92757665a30a92421a2c3d095e5b6ecd8a25e /gcc/omp-low.cc | |
| parent | 0f4df800b15437df1e00f198f86edc7163f1fc94 (diff) | |
| download | gcc-f38b20d68fade5a922b9f68c4c3841e653d1b83c.zip gcc-f38b20d68fade5a922b9f68c4c3841e653d1b83c.tar.gz gcc-f38b20d68fade5a922b9f68c4c3841e653d1b83c.tar.bz2 | |
openmp: Add support for firstprivate and allocate clauses on scope construct
OpenMP 5.2 adds support for firstprivate and allocate clauses on the scope
construct and this patch adds that support to GCC.
5.2 unfortunately (IMNSHO mistakenly) marked scope construct as worksharing,
which implies that it isn't possible to nest inside of it other scope,
worksharing loop, sections, explicit barriers, single etc. which would
make scope far less useful. I'm not implementing that part, keeping the
5.1 behavior here, and will file an issue to revert that for OpenMP 6.0.
But, for firstprivate it keeps the restriction that is now implied from
worksharing construct that listed var can't be private in outer context,
where for reduction 5.1 had similar restriction explicit even for scope
and 5.2 has it implicitly through worksharing construct.
2022-05-31 Jakub Jelinek <jakub@redhat.com>
gcc/
* omp-low.cc (build_outer_var_ref): For code == OMP_CLAUSE_ALLOCATE
allow var to be private in the outer context.
(lower_private_allocate): Pass OMP_CLAUSE_ALLOCATE as last argument
to build_outer_var_ref.
gcc/c/
* c-parser.cc (OMP_SCOPE_CLAUSE_MASK): Add firstprivate and allocate
clauses.
gcc/cp/
* parser.cc (OMP_SCOPE_CLAUSE_MASK): Add firstprivate and allocate
clauses.
gcc/testsuite/
* c-c++-common/gomp/scope-5.c: New test.
* c-c++-common/gomp/scope-6.c: New test.
* g++.dg/gomp/attrs-1.C (bar): Add firstprivate and allocate clauses
to scope construct.
* g++.dg/gomp/attrs-2.C (bar): Likewise.
libgomp/
* testsuite/libgomp.c-c++-common/allocate-1.c (foo): Add testcase for
scope construct with allocate clause.
* testsuite/libgomp.c-c++-common/allocate-3.c (foo): Likewise.
* testsuite/libgomp.c-c++-common/scope-2.c: New test.
Diffstat (limited to 'gcc/omp-low.cc')
| -rw-r--r-- | gcc/omp-low.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gcc/omp-low.cc b/gcc/omp-low.cc index 16f5965..f976e3a 100644 --- a/gcc/omp-low.cc +++ b/gcc/omp-low.cc @@ -683,6 +683,7 @@ build_outer_var_ref (tree var, omp_context *ctx, else if ((gimple_code (ctx->stmt) == GIMPLE_OMP_FOR && gimple_omp_for_kind (ctx->stmt) == GF_OMP_FOR_KIND_SIMD) || ctx->loop_p + || code == OMP_CLAUSE_ALLOCATE || (code == OMP_CLAUSE_PRIVATE && (gimple_code (ctx->stmt) == GIMPLE_OMP_FOR || gimple_code (ctx->stmt) == GIMPLE_OMP_SECTIONS @@ -4849,7 +4850,7 @@ lower_private_allocate (tree var, tree new_var, tree &allocator, allocator = TREE_PURPOSE (allocator); } if (TREE_CODE (allocator) != INTEGER_CST) - allocator = build_outer_var_ref (allocator, ctx); + allocator = build_outer_var_ref (allocator, ctx, OMP_CLAUSE_ALLOCATE); allocator = fold_convert (pointer_sized_int_node, allocator); if (TREE_CODE (allocator) != INTEGER_CST) { |