public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Kwok Yeung <kcy@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc/devel/omp/gcc-12] openmp: allow requires unified_shared_memory
Date: Wed, 29 Jun 2022 14:45:35 +0000 (GMT) [thread overview]
Message-ID: <20220629144535.8F56C3858D3C@sourceware.org> (raw)
https://gcc.gnu.org/g:fa65fc45972d27f2fd79a44eaba1978348177ee9
commit fa65fc45972d27f2fd79a44eaba1978348177ee9
Author: Andrew Stubbs <ams@codesourcery.com>
Date: Thu Mar 10 21:38:54 2022 +0000
openmp: allow requires unified_shared_memory
This is the front-end portion of the Unified Shared Memory implementation.
It checks that -foffload-memory isn't set to an incompatible mode.
Backport of the patch posted at
https://gcc.gnu.org/pipermail/gcc-patches/2022-March/591351.html
gcc/c/ChangeLog:
* c-parser.cc (c_parser_omp_requires): Check compatibility of
-foffload-memory option with requires directive.
gcc/cp/ChangeLog:
* parser.cc (cp_parser_omp_requires): Check compatibility of
-foffload-memory option with requires directive.
gcc/fortran/ChangeLog:
* openmp.cc (gfc_match_omp_requires): Check compatibility of
-foffload-memory option with requires directive.
gcc/testsuite/ChangeLog:
* c-c++-common/gomp/usm-1.c: New test.
* gfortran.dg/gomp/usm-1.f90: New test.
Diff:
---
gcc/c/ChangeLog.omp | 8 ++++++++
gcc/c/c-parser.cc | 9 +++++++++
gcc/cp/ChangeLog.omp | 8 ++++++++
gcc/cp/parser.cc | 9 +++++++++
gcc/fortran/ChangeLog.omp | 8 ++++++++
gcc/fortran/openmp.cc | 6 ++++++
gcc/testsuite/ChangeLog.omp | 8 ++++++++
gcc/testsuite/c-c++-common/gomp/usm-1.c | 4 ++++
gcc/testsuite/gfortran.dg/gomp/usm-1.f90 | 6 ++++++
9 files changed, 66 insertions(+)
diff --git a/gcc/c/ChangeLog.omp b/gcc/c/ChangeLog.omp
index 11d0bbe7818..a918af2a22f 100644
--- a/gcc/c/ChangeLog.omp
+++ b/gcc/c/ChangeLog.omp
@@ -1,3 +1,11 @@
+2022-03-10 Andrew Stubbs <ams@codesourcery.com>
+
+ Backport of the patch posted at
+ https://gcc.gnu.org/pipermail/gcc-patches/2022-March/591351.html
+
+ * c-parser.cc (c_parser_omp_requires): Check compatibility of
+ -foffload-memory option with requires directive.
+
2022-02-24 Chung-Lin Tang <cltang@codesourcery.com>
* c-typeck.cc (handle_omp_array_sections): Add handling for
diff --git a/gcc/c/c-parser.cc b/gcc/c/c-parser.cc
index 60734268f7e..cd04c6902cb 100644
--- a/gcc/c/c-parser.cc
+++ b/gcc/c/c-parser.cc
@@ -22627,7 +22627,16 @@ c_parser_omp_requires (c_parser *parser)
if (!strcmp (p, "unified_address"))
this_req = OMP_REQUIRES_UNIFIED_ADDRESS;
else if (!strcmp (p, "unified_shared_memory"))
+ {
this_req = OMP_REQUIRES_UNIFIED_SHARED_MEMORY;
+
+ if (flag_offload_memory != OFFLOAD_MEMORY_UNIFIED
+ && flag_offload_memory != OFFLOAD_MEMORY_NONE)
+ error_at (cloc,
+ "unified_shared_memory is incompatible with the "
+ "selected -foffload-memory option");
+ flag_offload_memory = OFFLOAD_MEMORY_UNIFIED;
+ }
else if (!strcmp (p, "dynamic_allocators"))
this_req = OMP_REQUIRES_DYNAMIC_ALLOCATORS;
else if (!strcmp (p, "reverse_offload"))
diff --git a/gcc/cp/ChangeLog.omp b/gcc/cp/ChangeLog.omp
index b0f96782d48..0e90645e094 100644
--- a/gcc/cp/ChangeLog.omp
+++ b/gcc/cp/ChangeLog.omp
@@ -1,3 +1,11 @@
+2022-03-10 Andrew Stubbs <ams@codesourcery.com>
+
+ Backport of the patch posted at
+ https://gcc.gnu.org/pipermail/gcc-patches/2022-March/591351.html
+
+ * parser.cc (cp_parser_omp_requires): Check compatibility of
+ -foffload-memory option with requires directive.
+
2022-02-24 Chung-Lin Tang <cltang@codesourcery.com>
* semantics.cc (handle_omp_array_sections): Add handling for
diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc
index 7377849105d..8b76ea740b8 100644
--- a/gcc/cp/parser.cc
+++ b/gcc/cp/parser.cc
@@ -46921,7 +46921,16 @@ cp_parser_omp_requires (cp_parser *parser, cp_token *pragma_tok)
if (!strcmp (p, "unified_address"))
this_req = OMP_REQUIRES_UNIFIED_ADDRESS;
else if (!strcmp (p, "unified_shared_memory"))
+ {
this_req = OMP_REQUIRES_UNIFIED_SHARED_MEMORY;
+
+ if (flag_offload_memory != OFFLOAD_MEMORY_UNIFIED
+ && flag_offload_memory != OFFLOAD_MEMORY_NONE)
+ error_at (cloc,
+ "unified_shared_memory is incompatible with the "
+ "selected -foffload-memory option");
+ flag_offload_memory = OFFLOAD_MEMORY_UNIFIED;
+ }
else if (!strcmp (p, "dynamic_allocators"))
this_req = OMP_REQUIRES_DYNAMIC_ALLOCATORS;
else if (!strcmp (p, "reverse_offload"))
diff --git a/gcc/fortran/ChangeLog.omp b/gcc/fortran/ChangeLog.omp
index 9e2b67850df..d172be95123 100644
--- a/gcc/fortran/ChangeLog.omp
+++ b/gcc/fortran/ChangeLog.omp
@@ -1,3 +1,11 @@
+2022-03-10 Andrew Stubbs <ams@codesourcery.com>
+
+ Backport of the patch posted at
+ https://gcc.gnu.org/pipermail/gcc-patches/2022-March/591351.html
+
+ * openmp.cc (gfc_match_omp_requires): Check compatibility of
+ -foffload-memory option with requires directive.
+
2022-03-09 Abid Qadeer <abidh@codesourcery.com>
Backport of a patch posted at
diff --git a/gcc/fortran/openmp.cc b/gcc/fortran/openmp.cc
index 42423585395..0067415e489 100644
--- a/gcc/fortran/openmp.cc
+++ b/gcc/fortran/openmp.cc
@@ -5564,6 +5564,12 @@ gfc_match_omp_requires (void)
requires_clause = OMP_REQ_UNIFIED_SHARED_MEMORY;
if (requires_clauses & OMP_REQ_UNIFIED_SHARED_MEMORY)
goto duplicate_clause;
+
+ if (flag_offload_memory != OFFLOAD_MEMORY_UNIFIED
+ && flag_offload_memory != OFFLOAD_MEMORY_NONE)
+ gfc_error_now ("unified_shared_memory at %C is incompatible with "
+ "the selected -foffload-memory option");
+ flag_offload_memory = OFFLOAD_MEMORY_UNIFIED;
}
else if (gfc_match (clauses[3]) == MATCH_YES)
{
diff --git a/gcc/testsuite/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp
index 8367e4995f3..552124bda13 100644
--- a/gcc/testsuite/ChangeLog.omp
+++ b/gcc/testsuite/ChangeLog.omp
@@ -1,3 +1,11 @@
+2022-03-10 Andrew Stubbs <ams@codesourcery.com>
+
+ Backport of the patch posted at
+ https://gcc.gnu.org/pipermail/gcc-patches/2022-March/591351.html
+
+ * c-c++-common/gomp/usm-1.c: New test.
+ * gfortran.dg/gomp/usm-1.f90: New test.
+
2022-03-09 Abid Qadeer <abidh@codesourcery.com>
Backport of a patch posted at
diff --git a/gcc/testsuite/c-c++-common/gomp/usm-1.c b/gcc/testsuite/c-c++-common/gomp/usm-1.c
new file mode 100644
index 00000000000..619c21a83f4
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/gomp/usm-1.c
@@ -0,0 +1,4 @@
+/* { dg-do compile } */
+/* { dg-additional-options "-foffload-memory=pinned" } */
+
+#pragma omp requires unified_shared_memory /* { dg-error "unified_shared_memory is incompatible with the selected -foffload-memory option" } */
diff --git a/gcc/testsuite/gfortran.dg/gomp/usm-1.f90 b/gcc/testsuite/gfortran.dg/gomp/usm-1.f90
new file mode 100644
index 00000000000..340f6bb50a5
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/gomp/usm-1.f90
@@ -0,0 +1,6 @@
+! { dg-do compile }
+! { dg-additional-options "-foffload-memory=pinned" }
+
+!$omp requires unified_shared_memory ! { dg-error "unified_shared_memory at .* is incompatible with the selected -foffload-memory option" }
+
+end
reply other threads:[~2022-06-29 14:45 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220629144535.8F56C3858D3C@sourceware.org \
--to=kcy@gcc.gnu.org \
--cc=gcc-cvs@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).