[Patch] xfail libgomp.c/declare-variant-4-{fiji,gfx803}.c

[Patch] xfail libgomp.c/declare-variant-4-{fiji,gfx803}.c

[Tobias Burnus]

[-- Attachment #1: Type: text/plain, Size: 617 bytes --]

The problem is as described at 
https://gcc.gnu.org/install/specific.html#amdgcn-x-amdhsa

"Note that support for Fiji devices has been removed in ROCm 4.0 and 
support in LLVM is deprecated and will be removed in LLVM 18."

Therefore, GCC is no longer build with Fiji (gfx803) support by default 
– and the -march=fiji testcases now fails as the -lgomp multilib for 
Fiji is not available. (That is: It fails, unless Fiji support has been 
enabled manually.)

Andrew mentioned that there is a PR about this, but I couldn't find it. 
If someone can, I am happy to add it to the changelog.

OK for mainline?

Tobias

[-- Attachment #2: xfail-fiji.diff --]
[-- Type: text/x-patch, Size: 2097 bytes --]

xfail libgomp.c/declare-variant-4-{fiji,gfx803}.c

Since r14-4734-g56ed1055b2f40ac162ae8d382280ac07a33f789f, GCC no longer
builds the Fiji (alias gfx803) libraries by default as support for it was
removed in ROCm 4.0 and will be removed in LLVM 18.

Thus, unless gfx803 is explicitly enabled, the following testcases will
fail to link as libgomp is not available for Fiji. Hence, this commit
xfails those testcases.

libgomp/ChangeLog:

	* testsuite/libgomp.c/declare-variant-4-fiji.c: Xfail as fiji
	support is no longer enabled by default.
	* testsuite/libgomp.c/declare-variant-4-gfx803.c: Likewise.

Signed-off-by: Tobias Burnus <tburnus@baylibre.com>

 libgomp/testsuite/libgomp.c/declare-variant-4-fiji.c   | 2 ++
 libgomp/testsuite/libgomp.c/declare-variant-4-gfx803.c | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/libgomp/testsuite/libgomp.c/declare-variant-4-fiji.c b/libgomp/testsuite/libgomp.c/declare-variant-4-fiji.c
index a138fb092f8..654f9bc655c 100644
--- a/libgomp/testsuite/libgomp.c/declare-variant-4-fiji.c
+++ b/libgomp/testsuite/libgomp.c/declare-variant-4-fiji.c
@@ -3,6 +3,8 @@
 /* { dg-additional-options -foffload=-march=fiji } */
 /* { dg-additional-options "-foffload=-fdump-tree-optimized" } */
 
+/* { dg-xfail-if "fiji/gfx803 is no longer enabled by default & deprectated in ROCm/LLVM/GCC" { *-*-* } } */
+
 #define USE_FIJI_FOR_GFX803
 #include "declare-variant-4.h"
 
diff --git a/libgomp/testsuite/libgomp.c/declare-variant-4-gfx803.c b/libgomp/testsuite/libgomp.c/declare-variant-4-gfx803.c
index 03dffddac49..b447631e52e 100644
--- a/libgomp/testsuite/libgomp.c/declare-variant-4-gfx803.c
+++ b/libgomp/testsuite/libgomp.c/declare-variant-4-gfx803.c
@@ -3,6 +3,8 @@
 /* { dg-additional-options -foffload=-march=fiji } */
 /* { dg-additional-options "-foffload=-fdump-tree-optimized" } */
 
+/* { dg-xfail-if "fiji/gfx803 is no longer enabled by default & deprectated in ROCm/LLVM/GCC" { *-*-* } } */
+
 #include "declare-variant-4.h"
 
 /* { dg-final { only_for_offload_target amdgcn-amdhsa scan-offload-tree-dump "= gfx803 \\(\\);" "optimized" } } */

Re: [Patch] xfail libgomp.c/declare-variant-4-{fiji,gfx803}.c

[Andrew Stubbs]

[-- Attachment #1: Type: text/plain, Size: 841 bytes --]

On Fri, 19 Jan 2024 at 18:27, Tobias Burnus <tburnus@baylibre.com> wrote:

> The problem is as described at
> https://gcc.gnu.org/install/specific.html#amdgcn-x-amdhsa
>
> "Note that support for Fiji devices has been removed in ROCm 4.0 and
> support in LLVM is deprecated and will be removed in LLVM 18."
>
> Therefore, GCC is no longer build with Fiji (gfx803) support by default
> – and the -march=fiji testcases now fails as the -lgomp multilib for
> Fiji is not available. (That is: It fails, unless Fiji support has been
> enabled manually.)
>
> Andrew mentioned that there is a PR about this, but I couldn't find it.
> If someone can, I am happy to add it to the changelog.
>
> OK for mainline?
>

OK. There's probably a bikeshed to paint here, but the tests are destined
to get deleted, so whatever.

Andrew