aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Stubbs <ams@codesourcery.com>2022-03-10 21:38:54 +0000
committerHafiz Abid Qadeer <abidh@codesourcery.com>2022-03-11 23:03:58 +0000
commit8126f3f00f8037b366569301ed354f0e495d8a6a (patch)
tree9af7dbbb3cd39da395e1af002ac092f290aab872
parenta17e41ca17ae8182986ac4117c93e1423ae8d37a (diff)
downloadgcc-8126f3f00f8037b366569301ed354f0e495d8a6a.zip
gcc-8126f3f00f8037b366569301ed354f0e495d8a6a.tar.gz
gcc-8126f3f00f8037b366569301ed354f0e495d8a6a.tar.bz2
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.c (c_parser_omp_requires): Check compatibility of -foffload-memory option with requires directive. gcc/cp/ChangeLog: * parser.c (cp_parser_omp_requires): Check compatibility of -foffload-memory option with requires directive. gcc/fortran/ChangeLog: * openmp.c (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.
Diffstat
-rw-r--r--gcc/c/ChangeLog.omp8
-rw-r--r--gcc/c/c-parser.c9
-rw-r--r--gcc/cp/ChangeLog.omp8
-rw-r--r--gcc/cp/parser.c9
-rw-r--r--gcc/fortran/ChangeLog.omp8
-rw-r--r--gcc/fortran/openmp.c7
-rw-r--r--gcc/testsuite/ChangeLog.omp8
-rw-r--r--gcc/testsuite/c-c++-common/gomp/usm-1.c4
-rw-r--r--gcc/testsuite/gfortran.dg/gomp/usm-1.f906
9 files changed, 67 insertions, 0 deletions
diff --git a/gcc/c/ChangeLog.omp b/gcc/c/ChangeLog.omp
index 3838d18..7109823 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.c (c_parser_omp_requires): Check compatibility of
+ -foffload-memory option with requires directive.
+
2022-02-27 Tobias Burnus <tobias@codesourcery.com>
Backported from master:
diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c
index 1dab35b..1240877 100644
--- a/gcc/c/c-parser.c
+++ b/gcc/c/c-parser.c
@@ -22533,7 +22533,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 79221b0..58ebce0 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.c (cp_parser_omp_requires): Check compatibility of
+ -foffload-memory option with requires directive.
+
2022-02-27 Tobias Burnus <tobias@codesourcery.com>
Backported from master:
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 15aa72e..fd9f62f 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -46408,7 +46408,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 f1c0257..bbf6c8e 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.c (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.c b/gcc/fortran/openmp.c
index 7be015f..ac4126b 100644
--- a/gcc/fortran/openmp.c
+++ b/gcc/fortran/openmp.c
@@ -30,6 +30,7 @@ along with GCC; see the file COPYING3. If not see
#include "gomp-constants.h"
#include "options.h"
#include "target-memory.h" /* For gfc_encode_character. */
+#include "options.h"
/* Match an end of OpenMP directive. End of OpenMP directive is optional
whitespace, followed by '\n' or comment '!'. In the special case where a
@@ -5552,6 +5553,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 23b5adc..eefd1cb 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 0000000..619c21a
--- /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 0000000..340f6bb
--- /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
generated by cgit v1.1 at 2024-08-16 02:12:11 +0000