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.

diff --git a/gcc/omp-general.c b/gcc/omp-general.c
index 44527552413456ab8df83e73387bf2aa9a2f41c8..8fcca730471fa58aaa28886c04c92a9d8af72bb8 100644 (file)
--- a/gcc/omp-general.c
+++ b/gcc/omp-general.c
@@ -1487,16 +1487,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 (file)
index 0000000..666ab20
--- /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;
+}