Use a different way to remove the "FAIL" cases for gfx908. It really isn't
working with fall-back, as intended, so XFAIL is appropriate.
libgomp/ChangeLog:
* testsuite/libgomp.c-c++-common/requires-4.c: Change dg-excess-errors
to dg-xfail-if.
* testsuite/libgomp.c-c++-common/requires-4a.c: Likewise.
* testsuite/libgomp.c-c++-common/requires-5.c: Likewise.
---
libgomp/testsuite/libgomp.c-c++-common/requires-4.c | 2 +-
libgomp/testsuite/libgomp.c-c++-common/requires-4a.c | 2 +-
libgomp/testsuite/libgomp.c-c++-common/requires-5.c | 5 ++++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/libgomp/testsuite/libgomp.c-c++-common/requires-4.c
b/libgomp/testsuite/libgomp.c-c++-common/requires-4.c
index 2ebd9c1c8ce..9eae66a89ab 100644
--- a/libgomp/testsuite/libgomp.c-c++-common/requires-4.c
+++ b/libgomp/testsuite/libgomp.c-c++-common/requires-4.c
@@ -5,7 +5,7 @@
/* GCC explicitly disables XNACK for gfx908 (and others) as the hardware
support is limited, which results in a diagnostic. */
-/* { dg-excess-errors "Unified Shared Memory is enabled, but XNACK is
disabled" { target offload_target_amdgcn } } */
+/* { dg-xfail-if "gfx908 xnack broken" { offload_target_amdgcn }
"-foffload=-march=gfx908" } */
/* Check no diagnostic by device-compiler's or host compiler's lto1.
Other file uses: 'requires reverse_offload', but that's inactive as
diff --git a/libgomp/testsuite/libgomp.c-c++-common/requires-4a.c
b/libgomp/testsuite/libgomp.c-c++-common/requires-4a.c
index 85301cf31d9..845d4b31c8f 100644
--- a/libgomp/testsuite/libgomp.c-c++-common/requires-4a.c
+++ b/libgomp/testsuite/libgomp.c-c++-common/requires-4a.c
@@ -5,7 +5,7 @@
/* GCC explicitly disables XNACK for gfx908 (and others) as the hardware
support is limited, which results in a diagnostic. */
-/* { dg-excess-errors "Unified Shared Memory is enabled, but XNACK is
disabled" { target offload_target_amdgcn } } */
+/* { dg-xfail-if "Unified Shared Memory is enabled, but XNACK is disabled" {
offload_target_amdgcn } "-foffload=-march=gfx908" } */
/* Same as requires-4.c, but uses heap memory for 'a'. */
diff --git a/libgomp/testsuite/libgomp.c-c++-common/requires-5.c
b/libgomp/testsuite/libgomp.c-c++-common/requires-5.c
index 4fd7f1c7885..cddd4643a1b 100644
--- a/libgomp/testsuite/libgomp.c-c++-common/requires-5.c
+++ b/libgomp/testsuite/libgomp.c-c++-common/requires-5.c
@@ -1,6 +1,9 @@
/* { dg-additional-options "-foffload-options=nvptx-none=-misa=sm_35" { target
{ offload_target_nvptx } } } */
/* { dg-additional-sources requires-5-aux.c } */
-/* { dg-excess-errors "Unified Shared Memory is enabled, but XNACK is
disabled" { target offload_target_amdgcn } } */
+
+/* GCC explicitly disables XNACK for gfx908 (and others) as the hardware
+ support is limited, which results in a diagnostic. */
+/* { dg-xfail-if "Unified Shared Memory is enabled, but XNACK is disabled" {
offload_target_amdgcn } "-foffload=-march=gfx908" } */
/* Depending on offload device capabilities, it may print something like the
following (only) if GOMP_DEBUG=1:
--
2.51.0
