public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r10-10658] openmp: Fix up handling of kind(host) and kind(nohost) in ACCEL_COMPILERs [PR103384]
@ 2022-05-10 8:22 Jakub Jelinek
0 siblings, 0 replies; only message in thread
From: Jakub Jelinek @ 2022-05-10 8:22 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:279e48e9d8e8d99a73d5ca69f829b83638419c56
commit r10-10658-g279e48e9d8e8d99a73d5ca69f829b83638419c56
Author: Jakub Jelinek <jakub@redhat.com>
Date: Wed Nov 24 10:30:32 2021 +0100
openmp: Fix up handling of kind(host) and kind(nohost) in ACCEL_COMPILERs [PR103384]
As the testcase shows, we weren't handling kind(host) and kind(nohost) properly
in the ACCEL_COMPILERs, the code written in there is valid for the host
compiler only, where if we are maybe offloaded, we defer resolution after IPA,
otherwise return 0 for kind(nohost) and accept it for kind(host). Note,
omp_maybe_offloaded is false after IPA. If ACCEL_COMPILER is defined, it is
the other way around, but also we know we are after IPA.
2021-11-24 Jakub Jelinek <jakub@redhat.com>
PR middle-end/103384
gcc/
* omp-general.c (omp_context_selector_matches): For ACCEL_COMPILER,
return 0 for kind(host) and continue for kind(nohost).
libgomp/
* testsuite/libgomp.c/declare-variant-2.c: New test.
(cherry picked from commit 5bca26742cf3357bf4e20ec97eee4c7f7de17ce0)
Diff:
---
gcc/omp-general.c | 6 ++++
libgomp/testsuite/libgomp.c/declare-variant-2.c | 45 +++++++++++++++++++++++++
2 files changed, 51 insertions(+)
diff --git a/gcc/omp-general.c b/gcc/omp-general.c
index aed0e4efd60..670da7bc03e 100644
--- a/gcc/omp-general.c
+++ b/gcc/omp-general.c
@@ -932,16 +932,22 @@ omp_context_selector_matches (tree ctx)
continue;
if (!strcmp (prop, "host"))
{
+#ifdef ACCEL_COMPILER
+ return 0;
+#else
if (omp_maybe_offloaded ())
ret = -1;
continue;
+#endif
}
if (!strcmp (prop, "nohost"))
{
+#ifndef ACCEL_COMPILER
if (omp_maybe_offloaded ())
ret = -1;
else
return 0;
+#endif
continue;
}
int r = 0;
diff --git a/libgomp/testsuite/libgomp.c/declare-variant-2.c b/libgomp/testsuite/libgomp.c/declare-variant-2.c
new file mode 100644
index 00000000000..666ab20ea5f
--- /dev/null
+++ b/libgomp/testsuite/libgomp.c/declare-variant-2.c
@@ -0,0 +1,45 @@
+/* { dg-do run } */
+
+#include <omp.h>
+#include <stdlib.h>
+
+void
+foo_host (void)
+{
+ if (!omp_is_initial_device ())
+ abort ();
+}
+
+#pragma omp declare variant (foo_host) match (device={kind(host)})
+void
+foo (void)
+{
+ if (omp_is_initial_device ())
+ abort ();
+}
+
+void
+bar_nohost (void)
+{
+ if (omp_is_initial_device ())
+ abort ();
+}
+
+#pragma omp declare variant (bar_nohost) match (device={kind(nohost)})
+void
+bar (void)
+{
+ if (!omp_is_initial_device ())
+ abort ();
+}
+
+int
+main ()
+{
+ #pragma omp target
+ {
+ foo ();
+ bar ();
+ }
+ return 0;
+}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-05-10 8:22 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-10 8:22 [gcc r10-10658] openmp: Fix up handling of kind(host) and kind(nohost) in ACCEL_COMPILERs [PR103384] Jakub Jelinek
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).