diff options
author | Andrew Stubbs <ams@baylibre.com> | 2024-08-05 15:14:17 +0000 |
---|---|---|
committer | Andrew Stubbs <ams@baylibre.com> | 2024-09-02 13:08:46 +0000 |
commit | 57af0022073f11bc300709b3717069f6d616c6ac (patch) | |
tree | 4feaee649b3238c1e4bcd0bb15f645b31cc7cec1 /libgomp | |
parent | 78dc2e2575c602c62d50a9522ea976020a5bf7aa (diff) | |
download | gcc-57af0022073f11bc300709b3717069f6d616c6ac.zip gcc-57af0022073f11bc300709b3717069f6d616c6ac.tar.gz gcc-57af0022073f11bc300709b3717069f6d616c6ac.tar.bz2 |
amdgcn: remove gfx803 "Fiji" support
The gfx803 "Fiji" device was deprecated in GCC 14, removed from LLVM 18, and
hasn't worked properly with the drivers since about ROCm 4.
This patch removes the device from GCC options and documentation, and removes
the direct mentions from the internals.
The TARGET_GCN3 support in the back-end is now unused and can be removed (in a
follow-up patch).
gcc/ChangeLog:
* config.gcc (amdgcn-*-*): Remove "fiji" from with_arch checks.
* config/gcn/gcn-hsa.h (ABI_VERSION_SPEC): Remove fiji alternative.
(NO_XNACK): Likewise.
(NO_SRAM_ECC): Likewise.
(ASM_SPEC): Remove "%{}" around ABI_VERSION_SPEC.
* config/gcn/gcn-opts.h (enum processor_type): Remove PROCESSOR_FIJI.
(TARGET_FIJI): Delete.
* config/gcn/gcn.cc (gcn_option_override): Remove Fiji.
(gcn_omp_device_kind_arch_isa): Likewise.
(output_file_start): Likewise.
* config/gcn/gcn.h (TARGET_CPU_CPP_BUILTINS): Likewise.
* config/gcn/gcn.opt (gpu_type): Likewise.
(march, mtune): Change default to PROCESSOR_VEGA10.
* config/gcn/mkoffload.cc (EF_AMDGPU_MACH_AMDGCN_GFX803): Delete.
(copy_early_debug_info): Remove elf_flags_actual.
Use ELFABIVERSION_AMDGPU_HSA_V4 unconditionally.
(get_arch): Remove Fiji.
(main): Remove gfx803.
* config/gcn/t-omp-device
(omp-device-properties-gcn): Remove fiji and gfx803.
* doc/install.texi (amdgcn*-*-*): Remove fiji and special instructions.
* doc/invoke.texi: Remove fiji.
libgomp/ChangeLog:
* libgomp.texi: Remove fiji and gfx803.
* testsuite/libgomp.c/declare-variant-4.h: Remove fiji and gfx803.
* testsuite/libgomp.c/declare-variant-4-fiji.c: Removed.
* testsuite/libgomp.c/declare-variant-4-gfx803.c: Removed.
Diffstat (limited to 'libgomp')
-rw-r--r-- | libgomp/libgomp.texi | 3 | ||||
-rw-r--r-- | libgomp/testsuite/libgomp.c/declare-variant-4-fiji.c | 11 | ||||
-rw-r--r-- | libgomp/testsuite/libgomp.c/declare-variant-4-gfx803.c | 10 | ||||
-rw-r--r-- | libgomp/testsuite/libgomp.c/declare-variant-4.h | 12 |
4 files changed, 1 insertions, 35 deletions
diff --git a/libgomp/libgomp.texi b/libgomp/libgomp.texi index fe25d87..e8003df 100644 --- a/libgomp/libgomp.texi +++ b/libgomp/libgomp.texi @@ -6330,8 +6330,7 @@ on more architectures, GCC currently does not match any @code{arch} or @code{i586}, @code{i686}, @code{ia32} @tab See @code{-m...} flags in ``x86 Options'' (without @code{-m}) @item @code{amdgcn}, @code{gcn} - @tab See @code{-march=} in ``AMD GCN Options''@footnote{Additionally, - @code{gfx803} is supported as an alias for @code{fiji}.} + @tab See @code{-march=} in ``AMD GCN Options'' @item @code{nvptx}, @code{nvptx64} @tab See @code{-march=} in ``Nvidia PTX Options'' @end multitable diff --git a/libgomp/testsuite/libgomp.c/declare-variant-4-fiji.c b/libgomp/testsuite/libgomp.c/declare-variant-4-fiji.c deleted file mode 100644 index 654f9bc..0000000 --- a/libgomp/testsuite/libgomp.c/declare-variant-4-fiji.c +++ /dev/null @@ -1,11 +0,0 @@ -/* { dg-do link { target { offload_target_amdgcn } } } */ -/* { dg-additional-options -foffload=amdgcn-amdhsa } */ -/* { 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" - -/* { dg-final { only_for_offload_target amdgcn-amdhsa scan-offload-tree-dump "= gfx803 \\(\\);" "optimized" } } */ diff --git a/libgomp/testsuite/libgomp.c/declare-variant-4-gfx803.c b/libgomp/testsuite/libgomp.c/declare-variant-4-gfx803.c deleted file mode 100644 index b447631..0000000 --- a/libgomp/testsuite/libgomp.c/declare-variant-4-gfx803.c +++ /dev/null @@ -1,10 +0,0 @@ -/* { dg-do link { target { offload_target_amdgcn } } } */ -/* { dg-additional-options -foffload=amdgcn-amdhsa } */ -/* { 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" } } */ diff --git a/libgomp/testsuite/libgomp.c/declare-variant-4.h b/libgomp/testsuite/libgomp.c/declare-variant-4.h index f244d09..53788d2 100644 --- a/libgomp/testsuite/libgomp.c/declare-variant-4.h +++ b/libgomp/testsuite/libgomp.c/declare-variant-4.h @@ -2,13 +2,6 @@ __attribute__ ((noipa)) int -gfx803 (void) -{ - return 0x803; -} - -__attribute__ ((noipa)) -int gfx900 (void) { return 0x900; @@ -70,11 +63,6 @@ gfx1103 (void) return 0x1103; } -#ifdef USE_FIJI_FOR_GFX803 -#pragma omp declare variant(gfx803) match(device = {isa("fiji")}) -#else -#pragma omp declare variant(gfx803) match(device = {isa("gfx803")}) -#endif #pragma omp declare variant(gfx900) match(device = {isa("gfx900")}) #pragma omp declare variant(gfx906) match(device = {isa("gfx906")}) #pragma omp declare variant(gfx908) match(device = {isa("gfx908")}) |