From 591f869ad70ba2b5cf1d8a8b57529142cc0d0554 Mon Sep 17 00:00:00 2001 From: Andrew Stubbs Date: Mon, 3 Feb 2020 15:02:22 +0000 Subject: Remove gfx801 "carrizo" support 2020-02-03 Andrew Stubbs gcc/ * config.gcc: Remove "carrizo" support. * config/gcn/gcn-opts.h (processor_type): Likewise. * config/gcn/gcn.c (gcn_omp_device_kind_arch_isa): Likewise. * config/gcn/gcn.opt (gpu_type): Likewise. * config/gcn/t-omp-device: Likewise. libgomp/ * plugin/plugin-gcn.c (EF_AMDGPU_MACH_AMDGCN_GFX801): Remove. (gcn_gfx801_s): Remove. (isa_hsa_name): Remove gfx801. (isa_gcc_name): Remove gfx801/carizzo. (isa_code): Remove gfx801. --- libgomp/ChangeLog | 8 ++++++++ libgomp/plugin/plugin-gcn.c | 9 --------- 2 files changed, 8 insertions(+), 9 deletions(-) (limited to 'libgomp') diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 23d939f..9b20b46 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,11 @@ +2020-02-03 Andrew Stubbs + + * plugin/plugin-gcn.c (EF_AMDGPU_MACH_AMDGCN_GFX801): Remove. + (gcn_gfx801_s): Remove. + (isa_hsa_name): Remove gfx801. + (isa_gcc_name): Remove gfx801/carizzo. + (isa_code): Remove gfx801. + 2020-02-03 Julian Brown Tobias Burnus diff --git a/libgomp/plugin/plugin-gcn.c b/libgomp/plugin/plugin-gcn.c index 25547ef..dc72c90 100644 --- a/libgomp/plugin/plugin-gcn.c +++ b/libgomp/plugin/plugin-gcn.c @@ -403,7 +403,6 @@ struct gcn_image_desc See https://llvm.org/docs/AMDGPUUsage.html#amdgpu-ef-amdgpu-mach-table */ typedef enum { - EF_AMDGPU_MACH_AMDGCN_GFX801 = 0x028, EF_AMDGPU_MACH_AMDGCN_GFX803 = 0x02a, EF_AMDGPU_MACH_AMDGCN_GFX900 = 0x02c, EF_AMDGPU_MACH_AMDGCN_GFX906 = 0x02f, @@ -1629,7 +1628,6 @@ elf_gcn_isa_field (Elf64_Ehdr *image) return image->e_flags & EF_AMDGPU_MACH_MASK; } -const static char *gcn_gfx801_s = "gfx801"; const static char *gcn_gfx803_s = "gfx803"; const static char *gcn_gfx900_s = "gfx900"; const static char *gcn_gfx906_s = "gfx906"; @@ -1642,8 +1640,6 @@ static const char* isa_hsa_name (int isa) { switch(isa) { - case EF_AMDGPU_MACH_AMDGCN_GFX801: - return gcn_gfx801_s; case EF_AMDGPU_MACH_AMDGCN_GFX803: return gcn_gfx803_s; case EF_AMDGPU_MACH_AMDGCN_GFX900: @@ -1662,8 +1658,6 @@ static const char* isa_gcc_name (int isa) { switch(isa) { - case EF_AMDGPU_MACH_AMDGCN_GFX801: - return "carrizo"; case EF_AMDGPU_MACH_AMDGCN_GFX803: return "fiji"; default: @@ -1676,9 +1670,6 @@ isa_gcc_name (int isa) { static gcn_isa isa_code(const char *isa) { - if (!strncmp (isa, gcn_gfx801_s, gcn_isa_name_len)) - return EF_AMDGPU_MACH_AMDGCN_GFX801; - if (!strncmp (isa, gcn_gfx803_s, gcn_isa_name_len)) return EF_AMDGPU_MACH_AMDGCN_GFX803; -- cgit v1.1