Skip to content

Commit 537e0b6

Browse files
ronliebronlieb
authored
Replace gfx940 and gfx941 with gfx942 downstream (llvm#696)
2 parents c23c460 + d589d47 commit 537e0b6

File tree

9 files changed

+3
-180
lines changed

9 files changed

+3
-180
lines changed

‎amd/comgr/docs/ReleaseNotes.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,6 @@ now-removed Comgr actions, such as \*COMPILE\_SOURCE\_TO\_FATBIN.
218218

219219
New Targets
220220
-----------
221-
- gfx940
222-
- gfx941
223221
- gfx942
224222
- gfx950
225223
- gfx1036

‎amd/comgr/src/comgr-isa-metadata.def

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,6 @@ HANDLE_ISA("amdgcn-amd-amdhsa-", "gfx908", true, true, EF_AMDGPU_MAC
6969
HANDLE_ISA("amdgcn-amd-amdhsa-", "gfx909", false, true, EF_AMDGPU_MACH_AMDGCN_GFX909, true, 65536, 32, 4, 40, 1024, 16, 800, 102, 4, 256, 256)
7070
HANDLE_ISA("amdgcn-amd-amdhsa-", "gfx90a", true, true, EF_AMDGPU_MACH_AMDGCN_GFX90A, true, 65536, 32, 4, 40, 1024, 16, 800, 102, 4, 256, 256)
7171
HANDLE_ISA("amdgcn-amd-amdhsa-", "gfx90c", false, true, EF_AMDGPU_MACH_AMDGCN_GFX90C, true, 65536, 32, 4, 40, 1024, 16, 800, 102, 4, 256, 256)
72-
HANDLE_ISA("amdgcn-amd-amdhsa-", "gfx940", true, true, EF_AMDGPU_MACH_AMDGCN_GFX940, true, 65536, 32, 4, 40, 1024, 16, 800, 102, 4, 256, 256)
73-
HANDLE_ISA("amdgcn-amd-amdhsa-", "gfx941", true, true, EF_AMDGPU_MACH_AMDGCN_GFX941, true, 65536, 32, 4, 40, 1024, 16, 800, 102, 4, 256, 256)
7472
HANDLE_ISA("amdgcn-amd-amdhsa-", "gfx942", true, true, EF_AMDGPU_MACH_AMDGCN_GFX942, true, 65536, 32, 4, 40, 1024, 16, 800, 102, 4, 256, 256)
7573
HANDLE_ISA("amdgcn-amd-amdhsa-", "gfx950", true, true, EF_AMDGPU_MACH_AMDGCN_GFX950, true, 65536, 32, 4, 40, 1024, 16, 800, 102, 4, 256, 256)
7674
HANDLE_ISA("amdgcn-amd-amdhsa-", "gfx1010", false, true, EF_AMDGPU_MACH_AMDGCN_GFX1010, true, 65536, 32, 4, 40, 1024, 106, 800, 106, 8, 256, 256)

‎amd/comgr/test/get_data_isa_name_test.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,6 @@ static isa_features_t IsaFeatures[] = {
8686
{"amdgcn-amd-amdhsa--gfx909", false, false, none, true, none, false},
8787
{"amdgcn-amd-amdhsa--gfx90a", false, true, none, true, none, false},
8888
{"amdgcn-amd-amdhsa--gfx90c", true, false, none, true, off, false},
89-
{"amdgcn-amd-amdhsa--gfx940", false, true, none, true, none, false},
90-
{"amdgcn-amd-amdhsa--gfx941", false, true, none, true, none, false},
9189
{"amdgcn-amd-amdhsa--gfx942", false, true, none, true, none, false},
9290
{"amdgcn-amd-amdhsa--gfx950", false, true, none, true, none, false},
9391
{"amdgcn-amd-amdhsa--gfx1010", false, false, none, true, none, false},

‎amd/device-libs/ockl/src/cg.cl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#define AL(P,S) __opencl_atomic_load((__global atomic_uint *)P, memory_order_relaxed, S)
1212
#define AA(P,V,S) __opencl_atomic_fetch_add((__global atomic_uint *)P, V, memory_order_relaxed, S)
1313

14-
#define AVOID_GWS() (__oclc_ISA_version == 9400 || __oclc_ISA_version == 9401 || __oclc_ISA_version == 9402 || __oclc_ISA_version == 9500 || __oclc_ISA_version >= 11000)
14+
#define AVOID_GWS() (__oclc_ISA_version == 9402 || __oclc_ISA_version == 9500 || __oclc_ISA_version >= 11000)
1515

1616
// XXX do not change these two structs without changing the language runtime
1717
struct mg_sync {

‎amd/device-libs/ockl/src/dm.cl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ typedef struct heap_s {
180180
#define AFO(P, V, O) __opencl_atomic_fetch_or (P, V, O, memory_scope_device)
181181
#define ACE(P, E, V, O) __opencl_atomic_compare_exchange_strong(P, E, V, O, O, memory_scope_device)
182182

183-
#define NEED_RELEASE __oclc_ISA_version >= 9400 && __oclc_ISA_version < 10000
183+
#define NEED_RELEASE __oclc_ISA_version >= 9402 && __oclc_ISA_version < 10000
184184

185185
// get the heap pointer
186186
static __global heap_t *

‎amd/device-libs/oclc/src/isa_version_940.cl

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎amd/device-libs/oclc/src/isa_version_941.cl

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎llvm/test/CodeGen/AMDGPU/force-store-sc0-sc1.ll

Lines changed: 0 additions & 151 deletions
This file was deleted.

‎llvm/test/DebugInfo/AMDGPU/heterogeneous-dwarf.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
; RUN: llc -O0 -mtriple=amdgcn-amd-amdhsa -mcpu=gfx906 -verify-machineinstrs -filetype=obj -emit-heterogeneous-dwarf-as-user-ops < %s | llvm-dwarfdump -v -debug-info - | FileCheck --check-prefixes=COMMON,FLAT-SCR-DIS %s
2-
; RUN: llc -O0 -mtriple=amdgcn-amd-amdhsa -mcpu=gfx940 -verify-machineinstrs -filetype=obj -emit-heterogeneous-dwarf-as-user-ops < %s | llvm-dwarfdump -v -debug-info - | FileCheck --check-prefixes=COMMON,FLAT-SCR-ENA %s
2+
; RUN: llc -O0 -mtriple=amdgcn-amd-amdhsa -mcpu=gfx942 -verify-machineinstrs -filetype=obj -emit-heterogeneous-dwarf-as-user-ops < %s | llvm-dwarfdump -v -debug-info - | FileCheck --check-prefixes=COMMON,FLAT-SCR-ENA %s
33

44
source_filename = "heterogeneous-dwarf.cl"
55
target datalayout = "e-p:64:64-p1:64:64-p2:32:32-p3:32:32-p4:64:64-p5:32:32-p6:32:32-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-v2048:2048-n32:64-S32-A5-G1-ni:7"

0 commit comments

Comments
 (0)