public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc/devel/omp/gcc-12] Add a restriction on allocate clause (OpenMP 5.0)
@ 2022-06-29 14:44 Kwok Yeung
0 siblings, 0 replies; only message in thread
From: Kwok Yeung @ 2022-06-29 14:44 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:df47c25110474565f521508a1545232550052a75
commit df47c25110474565f521508a1545232550052a75
Author: Hafiz Abid Qadeer <abidh@codesourcery.com>
Date: Fri Feb 18 21:28:08 2022 +0000
Add a restriction on allocate clause (OpenMP 5.0)
This is backport of a patch posted in
https://gcc.gnu.org/pipermail/gcc-patches/2022-February/590597.html
An allocate clause in target region must specify an allocator
unless the compilation unit has requires construct with
dynamic_allocators clause. Current implementation of the allocate
clause did not check for this restriction. This patch fills that
gap.
gcc/ChangeLog:
* omp-low.cc (omp_maybe_offloaded_ctx): New prototype.
(scan_sharing_clauses): Check a restriction on allocate clause.
gcc/testsuite/ChangeLog:
* c-c++-common/gomp/allocate-2.c: Add tests.
* c-c++-common/gomp/allocate-8.c: New test.
* gfortran.dg/gomp/allocate-3.f90: Add tests.
* gcc.dg/gomp/pr104517.c: Update.
Diff:
---
gcc/ChangeLog.omp | 5 +++++
gcc/omp-low.cc | 10 ++++++++++
gcc/testsuite/ChangeLog.omp | 7 +++++++
gcc/testsuite/c-c++-common/gomp/allocate-2.c | 15 +++++++++++++++
gcc/testsuite/c-c++-common/gomp/allocate-8.c | 18 ++++++++++++++++++
gcc/testsuite/gfortran.dg/gomp/allocate-3.f90 | 14 ++++++++++++++
6 files changed, 69 insertions(+)
diff --git a/gcc/ChangeLog.omp b/gcc/ChangeLog.omp
index 4765deaac24..c9645410b4b 100644
--- a/gcc/ChangeLog.omp
+++ b/gcc/ChangeLog.omp
@@ -1,3 +1,8 @@
+2022-03-08 Abid Qadeer <abidh@codesourcery.com>
+
+ * omp-low.cc (omp_maybe_offloaded_ctx): New prototype.
+ (scan_sharing_clauses): Check a restriction on allocate clause.
+
2022-03-01 Tobias Burnus <tobias@codesourcery.com>
* langhooks-def.h (lhd_omp_deep_mapping_p,
diff --git a/gcc/omp-low.cc b/gcc/omp-low.cc
index 8c2f3c0dd23..4d50d87b1ac 100644
--- a/gcc/omp-low.cc
+++ b/gcc/omp-low.cc
@@ -205,6 +205,7 @@ static vec<gomp_task *> task_cpyfns;
static void scan_omp (gimple_seq *, omp_context *);
static tree scan_omp_1_op (tree *, int *, void *);
+static bool omp_maybe_offloaded_ctx (omp_context *ctx);
#define WALK_SUBSTMTS \
case GIMPLE_BIND: \
@@ -1400,6 +1401,15 @@ scan_sharing_clauses (tree clauses, omp_context *ctx,
|| !integer_onep (OMP_CLAUSE_ALLOCATE_ALLOCATOR (c))
|| OMP_CLAUSE_ALLOCATE_ALIGN (c) != NULL_TREE))
{
+ /* The allocate clauses that appear on a target construct or on
+ constructs in a target region must specify an allocator expression
+ unless a requires directive with the dynamic_allocators clause
+ is present in the same compilation unit. */
+ if (OMP_CLAUSE_ALLOCATE_ALLOCATOR (c) == NULL_TREE
+ && ((omp_requires_mask & OMP_REQUIRES_DYNAMIC_ALLOCATORS) == 0)
+ && omp_maybe_offloaded_ctx (ctx))
+ error_at (OMP_CLAUSE_LOCATION (c), "%<allocate%> clause must"
+ " specify an allocator here");
if (ctx->allocate_map == NULL)
ctx->allocate_map = new hash_map<tree, tree>;
tree val = integer_zero_node;
diff --git a/gcc/testsuite/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp
index d9cbad5236c..978e183a7f4 100644
--- a/gcc/testsuite/ChangeLog.omp
+++ b/gcc/testsuite/ChangeLog.omp
@@ -1,3 +1,10 @@
+2022-03-08 Abid Qadeer <abidh@codesourcery.com>
+
+ * c-c++-common/gomp/allocate-2.c: Add tests.
+ * c-c++-common/gomp/allocate-8.c: New test.
+ * gfortran.dg/gomp/allocate-3.f90: Add tests.
+ * gcc.dg/gomp/pr104517.c: Update.
+
2022-03-01 Tobias Burnus <tobias@codesourcery.com>
* gfortran.dg/c_loc_test_22.f90: Update scan-tree.
diff --git a/gcc/testsuite/c-c++-common/gomp/allocate-2.c b/gcc/testsuite/c-c++-common/gomp/allocate-2.c
index cc77efc8ffe..6bb4a8af2e7 100644
--- a/gcc/testsuite/c-c++-common/gomp/allocate-2.c
+++ b/gcc/testsuite/c-c++-common/gomp/allocate-2.c
@@ -43,3 +43,18 @@ foo (int x, int z)
#pragma omp parallel private (x) allocate (0 : x) /* { dg-error "'allocate' clause allocator expression has type 'int' rather than 'omp_allocator_handle_t'" } */
bar (x, &x, 0);
}
+
+void
+foo1 ()
+{
+ int a = 10;
+#pragma omp target
+ {
+ #pragma omp parallel private (a) allocate(a) // { dg-error "'allocate' clause must specify an allocator here" }
+ a = 20;
+ }
+#pragma omp target private(a) allocate(a) // { dg-error "'allocate' clause must specify an allocator here" }
+ {
+ a = 30;
+ }
+}
diff --git a/gcc/testsuite/c-c++-common/gomp/allocate-8.c b/gcc/testsuite/c-c++-common/gomp/allocate-8.c
new file mode 100644
index 00000000000..bacefafc6fc
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/gomp/allocate-8.c
@@ -0,0 +1,18 @@
+#pragma omp requires dynamic_allocators
+void
+foo ()
+{
+ int a = 10;
+#pragma omp parallel private (a) allocate(a)
+ a = 20;
+#pragma omp target
+ {
+ #pragma omp parallel private (a) allocate(a)
+ a = 30;
+ }
+#pragma omp target private(a) allocate(a)
+ {
+ a = 40;
+ }
+}
+
diff --git a/gcc/testsuite/gfortran.dg/gomp/allocate-3.f90 b/gcc/testsuite/gfortran.dg/gomp/allocate-3.f90
index 7b57be980cb..0bee99d2d0c 100644
--- a/gcc/testsuite/gfortran.dg/gomp/allocate-3.f90
+++ b/gcc/testsuite/gfortran.dg/gomp/allocate-3.f90
@@ -12,3 +12,17 @@ subroutine foo(x)
!$omp end parallel do simd
end subroutine
+
+subroutine bar(a)
+ implicit none
+ integer :: a
+!$omp target
+ !$omp parallel private (a) allocate(a) ! { dg-error "'allocate' clause must specify an allocator here" }
+ a = 20
+ !$omp end parallel
+!$omp end target
+
+!$omp target private(a) allocate(a) ! { dg-error "'allocate' clause must specify an allocator here" }
+ a = 30;
+!$omp end target
+end subroutine
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-06-29 14:44 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-29 14:44 [gcc/devel/omp/gcc-12] Add a restriction on allocate clause (OpenMP 5.0) 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).