Author: Matt Arsenault
Date: 2026-07-25T18:24:21Z
New Revision: 197cf54ac854f475b7ab2e1d23f02dff16ded5ca

URL: 
https://github.com/llvm/llvm-project/commit/197cf54ac854f475b7ab2e1d23f02dff16ded5ca
DIFF: 
https://github.com/llvm/llvm-project/commit/197cf54ac854f475b7ab2e1d23f02dff16ded5ca.diff

LOG: clang/AMDGPU: Migrate cc1 tests to subarch triples (10) (#211955)

Rewrite the first half of CodeGenOpenCL cc1 test RUN lines to the new
subarch triple form, dropping the redundant -target-cpu.

Co-authored-by: Claude (Opus 4.8) <[email protected]>

Added: 
    

Modified: 
    clang/test/CodeGenOpenCL/amdgpu-attrs.cl
    clang/test/CodeGenOpenCL/amdgpu-enqueue-kernel.cl
    clang/test/CodeGenOpenCL/amdgpu-features-illegal.cl
    clang/test/CodeGenOpenCL/amdgpu-features-readonly.cl
    clang/test/CodeGenOpenCL/builtins-amdgcn-asyncmark-errs.cl
    clang/test/CodeGenOpenCL/builtins-amdgcn-dl-insts-err-clamp.cl
    clang/test/CodeGenOpenCL/builtins-amdgcn-dl-insts-gfx11.cl
    clang/test/CodeGenOpenCL/builtins-amdgcn-dl-insts.cl
    clang/test/CodeGenOpenCL/builtins-amdgcn-fp-atomics-gfx7-err.cl
    clang/test/CodeGenOpenCL/builtins-amdgcn-fp-atomics-gfx908-err.cl
    clang/test/CodeGenOpenCL/builtins-amdgcn-gfx10.cl
    clang/test/CodeGenOpenCL/builtins-amdgcn-gfx11-err.cl
    clang/test/CodeGenOpenCL/builtins-amdgcn-gfx11.cl
    clang/test/CodeGenOpenCL/builtins-amdgcn-gfx1250-async-load-store-lds.cl
    clang/test/CodeGenOpenCL/builtins-amdgcn-gfx1250-cluster-load.cl
    clang/test/CodeGenOpenCL/builtins-amdgcn-gfx1250-cooperative-atomics.cl
    clang/test/CodeGenOpenCL/builtins-amdgcn-gfx1250-load-tr.cl
    clang/test/CodeGenOpenCL/builtins-amdgcn-gfx1250-tensor-load-store.cl
    clang/test/CodeGenOpenCL/builtins-amdgcn-gfx1250-wmma-w32.cl
    clang/test/CodeGenOpenCL/builtins-amdgcn-gfx1250.cl
    clang/test/CodeGenOpenCL/builtins-amdgcn-gfx9-4-generic-err.cl
    clang/test/CodeGenOpenCL/builtins-amdgcn-gfx950-err.cl
    clang/test/CodeGenOpenCL/builtins-amdgcn-gfx950-read-tr.cl
    clang/test/CodeGenOpenCL/builtins-amdgcn-gfx950.cl
    clang/test/CodeGenOpenCL/builtins-amdgcn-global-load-lds.cl
    clang/test/CodeGenOpenCL/builtins-amdgcn-global-load-tr-gfx11-err.cl
    clang/test/CodeGenOpenCL/builtins-amdgcn-global-load-tr-w32.cl
    clang/test/CodeGenOpenCL/builtins-amdgcn-global-load-tr-w64.cl
    clang/test/CodeGenOpenCL/builtins-amdgcn-gws-insts.cl
    clang/test/CodeGenOpenCL/builtins-amdgcn-load-to-lds.cl
    clang/test/CodeGenOpenCL/builtins-amdgcn-mfma-gfx908-err.cl
    clang/test/CodeGenOpenCL/builtins-amdgcn-mfma.cl
    clang/test/CodeGenOpenCL/builtins-amdgcn-raw-buffer-atomic-add.cl
    clang/test/CodeGenOpenCL/builtins-amdgcn-raw-buffer-load-format.cl
    clang/test/CodeGenOpenCL/builtins-amdgcn-raw-buffer-load-lds.cl
    clang/test/CodeGenOpenCL/builtins-amdgcn-raw-buffer-store.cl
    clang/test/CodeGenOpenCL/builtins-amdgcn-struct-buffer-load-format.cl
    clang/test/CodeGenOpenCL/builtins-amdgcn-struct-buffer-store-format.cl
    clang/test/CodeGenOpenCL/builtins-amdgcn-swmmac-gfx1250-err.cl
    clang/test/CodeGenOpenCL/builtins-amdgcn-swmmac-w32.cl
    clang/test/CodeGenOpenCL/builtins-amdgcn-vi.cl
    clang/test/CodeGenOpenCL/builtins-amdgcn-wave32.cl
    clang/test/CodeGenOpenCL/builtins-amdgcn-wmma-w32-param-err.cl
    clang/test/CodeGenOpenCL/builtins-amdgcn-wmma-w32.cl
    clang/test/CodeGenOpenCL/builtins-amdgcn-wmma-w64-gfx10-err.cl
    clang/test/CodeGenOpenCL/builtins-amdgcn-wmma-w64-param-err.cl
    clang/test/CodeGenOpenCL/builtins-amdgcn-workgroup-size.cl
    clang/test/CodeGenOpenCL/builtins-amdgcn.cl
    clang/test/CodeGenOpenCL/builtins-fp-atomics-gfx942.cl
    clang/test/CodeGenOpenCL/numbered-address-space.cl

Removed: 
    


################################################################################
diff  --git a/clang/test/CodeGenOpenCL/amdgpu-attrs.cl 
b/clang/test/CodeGenOpenCL/amdgpu-attrs.cl
index 8251658edb631..7b22f00084735 100644
--- a/clang/test/CodeGenOpenCL/amdgpu-attrs.cl
+++ b/clang/test/CodeGenOpenCL/amdgpu-attrs.cl
@@ -1,5 +1,5 @@
-// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa -target-cpu tahiti -O0 -emit-llvm 
-o - %s | FileCheck %s
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu tahiti -O0 -emit-llvm -o - %s 
| FileCheck %s
+// RUN: %clang_cc1 -triple amdgpu6.00-amd-amdhsa -O0 -emit-llvm -o - %s | 
FileCheck %s
+// RUN: %clang_cc1 -triple amdgpu6.00-- -O0 -emit-llvm -o - %s | FileCheck %s
 // RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -O0 -emit-llvm -verify 
-Wno-deprecated-declarations -o - %s | FileCheck -check-prefix=X86 %s
 
 __attribute__((amdgpu_flat_work_group_size(0, 0))) // expected-no-diagnostics

diff  --git a/clang/test/CodeGenOpenCL/amdgpu-enqueue-kernel.cl 
b/clang/test/CodeGenOpenCL/amdgpu-enqueue-kernel.cl
index 304d5522dbdc0..fc58048302dd5 100644
--- a/clang/test/CodeGenOpenCL/amdgpu-enqueue-kernel.cl
+++ b/clang/test/CodeGenOpenCL/amdgpu-enqueue-kernel.cl
@@ -2,7 +2,7 @@
 // RUN: %clang_cc1 -cl-std=CL2.0 -O0 -disable-llvm-passes -fno-ident 
-emit-llvm -o - -triple amdgcn-amd-amdhsa %s 
-fdenormal-fp-math-f32=preserve-sign | FileCheck %s --check-prefixes=CHECK,NOCPU
 
 // // Check no-optnone and target-cpu behavior
-// RUN: %clang_cc1 -cl-std=CL2.0 -O1 -disable-llvm-passes -fno-ident 
-emit-llvm -o - -triple amdgcn-amd-amdhsa -target-cpu gfx900 -target-feature 
-sram-ecc -fdenormal-fp-math-f32=preserve-sign %s | FileCheck %s 
--check-prefixes=CHECK,GFX900
+// RUN: %clang_cc1 -cl-std=CL2.0 -O1 -disable-llvm-passes -fno-ident 
-emit-llvm -o - -triple amdgpu9.00-amd-amdhsa -target-feature -sram-ecc 
-fdenormal-fp-math-f32=preserve-sign %s | FileCheck %s 
--check-prefixes=CHECK,GFX900
 
 
 typedef struct {int a;} ndrange_t;
@@ -61,13 +61,21 @@ kernel void test_target_features_kernel(global int *i) {
 }
 
 //.
-// CHECK: @__test_block_invoke_kernel.runtime.handle = internal addrspace(1) 
externally_initialized constant %block.runtime.handle.t zeroinitializer, 
section ".amdgpu.kernel.runtime.handle"
-// CHECK: @__test_block_invoke_2_kernel.runtime.handle = internal addrspace(1) 
externally_initialized constant %block.runtime.handle.t.0 zeroinitializer, 
section ".amdgpu.kernel.runtime.handle"
-// CHECK: @__test_block_invoke_3_kernel.runtime.handle = internal addrspace(1) 
externally_initialized constant %block.runtime.handle.t.1 zeroinitializer, 
section ".amdgpu.kernel.runtime.handle"
-// CHECK: @__test_block_invoke_4_kernel.runtime.handle = internal addrspace(1) 
externally_initialized constant %block.runtime.handle.t.2 zeroinitializer, 
section ".amdgpu.kernel.runtime.handle"
-// CHECK: @__block_literal_global = internal addrspace(1) constant { i32, i32, 
ptr } { i32 16, i32 8, ptr @__test_target_features_kernel_block_invoke }, align 
8 #0
-// CHECK: @__test_target_features_kernel_block_invoke_kernel.runtime.handle = 
internal addrspace(1) externally_initialized constant %block.runtime.handle.t.3 
zeroinitializer, section ".amdgpu.kernel.runtime.handle"
-// CHECK: @llvm.used = appending addrspace(1) global [10 x ptr] [ptr 
@__test_block_invoke_kernel, ptr addrspacecast (ptr addrspace(1) 
@__test_block_invoke_kernel.runtime.handle to ptr), ptr 
@__test_block_invoke_2_kernel, ptr addrspacecast (ptr addrspace(1) 
@__test_block_invoke_2_kernel.runtime.handle to ptr), ptr 
@__test_block_invoke_3_kernel, ptr addrspacecast (ptr addrspace(1) 
@__test_block_invoke_3_kernel.runtime.handle to ptr), ptr 
@__test_block_invoke_4_kernel, ptr addrspacecast (ptr addrspace(1) 
@__test_block_invoke_4_kernel.runtime.handle to ptr), ptr 
@__test_target_features_kernel_block_invoke_kernel, ptr addrspacecast (ptr 
addrspace(1) @__test_target_features_kernel_block_invoke_kernel.runtime.handle 
to ptr)], section "llvm.metadata"
+// NOCPU: @__test_block_invoke_kernel.runtime.handle = internal addrspace(1) 
externally_initialized constant %block.runtime.handle.t zeroinitializer, 
section ".amdgpu.kernel.runtime.handle"
+// NOCPU: @__test_block_invoke_2_kernel.runtime.handle = internal addrspace(1) 
externally_initialized constant %block.runtime.handle.t.0 zeroinitializer, 
section ".amdgpu.kernel.runtime.handle"
+// NOCPU: @__test_block_invoke_3_kernel.runtime.handle = internal addrspace(1) 
externally_initialized constant %block.runtime.handle.t.1 zeroinitializer, 
section ".amdgpu.kernel.runtime.handle"
+// NOCPU: @__test_block_invoke_4_kernel.runtime.handle = internal addrspace(1) 
externally_initialized constant %block.runtime.handle.t.2 zeroinitializer, 
section ".amdgpu.kernel.runtime.handle"
+// NOCPU: @__block_literal_global = internal addrspace(1) constant { i32, i32, 
ptr } { i32 16, i32 8, ptr @__test_target_features_kernel_block_invoke }, align 
8 #0
+// NOCPU: @__test_target_features_kernel_block_invoke_kernel.runtime.handle = 
internal addrspace(1) externally_initialized constant %block.runtime.handle.t.3 
zeroinitializer, section ".amdgpu.kernel.runtime.handle"
+// NOCPU: @llvm.used = appending addrspace(1) global [10 x ptr] [ptr 
@__test_block_invoke_kernel, ptr addrspacecast (ptr addrspace(1) 
@__test_block_invoke_kernel.runtime.handle to ptr), ptr 
@__test_block_invoke_2_kernel, ptr addrspacecast (ptr addrspace(1) 
@__test_block_invoke_2_kernel.runtime.handle to ptr), ptr 
@__test_block_invoke_3_kernel, ptr addrspacecast (ptr addrspace(1) 
@__test_block_invoke_3_kernel.runtime.handle to ptr), ptr 
@__test_block_invoke_4_kernel, ptr addrspacecast (ptr addrspace(1) 
@__test_block_invoke_4_kernel.runtime.handle to ptr), ptr 
@__test_target_features_kernel_block_invoke_kernel, ptr addrspacecast (ptr 
addrspace(1) @__test_target_features_kernel_block_invoke_kernel.runtime.handle 
to ptr)], section "llvm.metadata"
+//.
+// GFX900: @__test_block_invoke_kernel.runtime.handle = internal addrspace(1) 
externally_initialized constant %block.runtime.handle.t zeroinitializer, 
section ".amdgpu.kernel.runtime.handle"
+// GFX900: @__test_block_invoke_2_kernel.runtime.handle = internal 
addrspace(1) externally_initialized constant %block.runtime.handle.t.0 
zeroinitializer, section ".amdgpu.kernel.runtime.handle"
+// GFX900: @__test_block_invoke_3_kernel.runtime.handle = internal 
addrspace(1) externally_initialized constant %block.runtime.handle.t.1 
zeroinitializer, section ".amdgpu.kernel.runtime.handle"
+// GFX900: @__test_block_invoke_4_kernel.runtime.handle = internal 
addrspace(1) externally_initialized constant %block.runtime.handle.t.2 
zeroinitializer, section ".amdgpu.kernel.runtime.handle"
+// GFX900: @__block_literal_global = internal addrspace(1) constant { i32, 
i32, ptr } { i32 16, i32 8, ptr @__test_target_features_kernel_block_invoke }, 
align 8 #0
+// GFX900: @__test_target_features_kernel_block_invoke_kernel.runtime.handle = 
internal addrspace(1) externally_initialized constant %block.runtime.handle.t.3 
zeroinitializer, section ".amdgpu.kernel.runtime.handle"
+// GFX900: @llvm.used = appending addrspace(1) global [10 x ptr] [ptr 
@__test_block_invoke_kernel, ptr addrspacecast (ptr addrspace(1) 
@__test_block_invoke_kernel.runtime.handle to ptr), ptr 
@__test_block_invoke_2_kernel, ptr addrspacecast (ptr addrspace(1) 
@__test_block_invoke_2_kernel.runtime.handle to ptr), ptr 
@__test_block_invoke_3_kernel, ptr addrspacecast (ptr addrspace(1) 
@__test_block_invoke_3_kernel.runtime.handle to ptr), ptr 
@__test_block_invoke_4_kernel, ptr addrspacecast (ptr addrspace(1) 
@__test_block_invoke_4_kernel.runtime.handle to ptr), ptr 
@__test_target_features_kernel_block_invoke_kernel, ptr addrspacecast (ptr 
addrspace(1) @__test_target_features_kernel_block_invoke_kernel.runtime.handle 
to ptr)], section "llvm.metadata"
 //.
 // NOCPU: Function Attrs: convergent noinline norecurse nounwind optnone 
denormal_fpenv(float: preservesign)
 // NOCPU-LABEL: define dso_local void @callee(
@@ -766,11 +774,11 @@ kernel void test_target_features_kernel(global int *i) {
 // NOCPU: attributes #[[ATTR8]] = { convergent nounwind }
 //.
 // GFX900: attributes #[[ATTR0:[0-9]+]] = { "objc_arc_inert" }
-// GFX900: attributes #[[ATTR1]] = { convergent norecurse nounwind 
denormal_fpenv(float: preservesign) "no-trapping-math"="true" 
"stack-protector-buffer-size"="8" "target-cpu"="gfx900" 
"target-features"="-sram-ecc" }
-// GFX900: attributes #[[ATTR2]] = { convergent norecurse nounwind 
denormal_fpenv(float: preservesign) "amdgpu-flat-work-group-size"="1,256" 
"no-trapping-math"="true" "stack-protector-buffer-size"="8" 
"target-cpu"="gfx900" "target-features"="-sram-ecc" }
-// GFX900: attributes #[[ATTR3]] = { alwaysinline convergent norecurse 
nounwind denormal_fpenv(float: preservesign) 
"amdgpu-flat-work-group-size"="1,256" "no-trapping-math"="true" 
"stack-protector-buffer-size"="8" "target-cpu"="gfx900" 
"target-features"="-sram-ecc" }
+// GFX900: attributes #[[ATTR1]] = { convergent norecurse nounwind 
denormal_fpenv(float: preservesign) "no-trapping-math"="true" 
"stack-protector-buffer-size"="8" "target-features"="-sram-ecc" }
+// GFX900: attributes #[[ATTR2]] = { convergent norecurse nounwind 
denormal_fpenv(float: preservesign) "amdgpu-flat-work-group-size"="1,256" 
"no-trapping-math"="true" "stack-protector-buffer-size"="8" 
"target-features"="-sram-ecc" }
+// GFX900: attributes #[[ATTR3]] = { alwaysinline convergent norecurse 
nounwind denormal_fpenv(float: preservesign) 
"amdgpu-flat-work-group-size"="1,256" "no-trapping-math"="true" 
"stack-protector-buffer-size"="8" "target-features"="-sram-ecc" }
 // GFX900: attributes #[[ATTR4:[0-9]+]] = { nocallback nofree nosync nounwind 
willreturn memory(argmem: readwrite) }
-// GFX900: attributes #[[ATTR5]] = { convergent nounwind denormal_fpenv(float: 
preservesign) "no-trapping-math"="true" "stack-protector-buffer-size"="8" 
"target-cpu"="gfx900" "target-features"="-sram-ecc" }
+// GFX900: attributes #[[ATTR5]] = { convergent nounwind denormal_fpenv(float: 
preservesign) "no-trapping-math"="true" "stack-protector-buffer-size"="8" 
"target-features"="-sram-ecc" }
 // GFX900: attributes #[[ATTR6:[0-9]+]] = { nocallback nofree nosync nounwind 
willreturn }
 // GFX900: attributes #[[ATTR7]] = { convergent nounwind }
 // GFX900: attributes #[[ATTR8]] = { nounwind }

diff  --git a/clang/test/CodeGenOpenCL/amdgpu-features-illegal.cl 
b/clang/test/CodeGenOpenCL/amdgpu-features-illegal.cl
index f3857178d928e..9a72955532b8e 100644
--- a/clang/test/CodeGenOpenCL/amdgpu-features-illegal.cl
+++ b/clang/test/CodeGenOpenCL/amdgpu-features-illegal.cl
@@ -1,11 +1,11 @@
 // RUN: not %clang_cc1 -triple amdgcn -target-feature +wavefrontsize32 
-target-feature +wavefrontsize64 -o /dev/null %s 2>&1 | FileCheck 
--check-prefix=INVALID-PLUS %s
 // RUN: not %clang_cc1 -triple amdgcn -target-feature -wavefrontsize32 
-target-feature -wavefrontsize64 -o /dev/null %s 2>&1 | FileCheck 
--check-prefix=INVALID-MINUS %s
-// RUN: not %clang_cc1 -triple amdgcn -target-cpu gfx1103 -target-feature 
+wavefrontsize32 -target-feature +wavefrontsize64 -o /dev/null %s 2>&1 | 
FileCheck --check-prefix=INVALID-PLUS %s
-// RUN: not %clang_cc1 -triple amdgcn -target-cpu gfx1103 -target-feature 
-wavefrontsize32 -target-feature -wavefrontsize64 -o /dev/null %s 2>&1 | 
FileCheck --check-prefix=INVALID-MINUS %s
-// RUN: not %clang_cc1 -triple amdgcn -target-cpu gfx900 -target-feature 
+wavefrontsize32 -target-feature -wavefrontsize64 -o /dev/null %s 2>&1 | 
FileCheck %s --check-prefix=GFX9-WAVE32
-// RUN: not %clang_cc1 -triple amdgcn -target-cpu gfx900 -target-feature 
-wavefrontsize64 -o /dev/null %s 2>&1 | FileCheck %s --check-prefix=GFX9-WAVE64
-// RUN: not %clang_cc1 -triple amdgcn -target-cpu gfx1250 -target-feature 
+wavefrontsize64 -o /dev/null %s 2>&1 | FileCheck %s 
--check-prefix=GFX1250-WAVE64
-// RUN: not %clang_cc1 -triple amdgcn -target-cpu gfx1250 -target-feature 
-wavefrontsize32 -o /dev/null %s 2>&1 | FileCheck %s 
--check-prefix=GFX1250-WAVE32
+// RUN: not %clang_cc1 -triple amdgpu11.03 -target-feature +wavefrontsize32 
-target-feature +wavefrontsize64 -o /dev/null %s 2>&1 | FileCheck 
--check-prefix=INVALID-PLUS %s
+// RUN: not %clang_cc1 -triple amdgpu11.03 -target-feature -wavefrontsize32 
-target-feature -wavefrontsize64 -o /dev/null %s 2>&1 | FileCheck 
--check-prefix=INVALID-MINUS %s
+// RUN: not %clang_cc1 -triple amdgpu9.00 -target-feature +wavefrontsize32 
-target-feature -wavefrontsize64 -o /dev/null %s 2>&1 | FileCheck %s 
--check-prefix=GFX9-WAVE32
+// RUN: not %clang_cc1 -triple amdgpu9.00 -target-feature -wavefrontsize64 -o 
/dev/null %s 2>&1 | FileCheck %s --check-prefix=GFX9-WAVE64
+// RUN: not %clang_cc1 -triple amdgpu12.50 -target-feature +wavefrontsize64 -o 
/dev/null %s 2>&1 | FileCheck %s --check-prefix=GFX1250-WAVE64
+// RUN: not %clang_cc1 -triple amdgpu12.50 -target-feature -wavefrontsize32 -o 
/dev/null %s 2>&1 | FileCheck %s --check-prefix=GFX1250-WAVE32
 
 // INVALID-PLUS: error: invalid feature combination: '+wavefrontsize32' and 
'+wavefrontsize64' are mutually exclusive
 // INVALID-MINUS: error: invalid feature combination: '-wavefrontsize32' and 
'-wavefrontsize64' are mutually exclusive

diff  --git a/clang/test/CodeGenOpenCL/amdgpu-features-readonly.cl 
b/clang/test/CodeGenOpenCL/amdgpu-features-readonly.cl
index 5b76cfff4f63b..f55988085ad74 100644
--- a/clang/test/CodeGenOpenCL/amdgpu-features-readonly.cl
+++ b/clang/test/CodeGenOpenCL/amdgpu-features-readonly.cl
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -triple amdgcn -target-cpu gfx942 -target-feature +gws -o 
/dev/null %s 2>&1 \
+// RUN: %clang_cc1 -triple amdgpu9.42 -target-feature +gws -o /dev/null %s 
2>&1 \
 // RUN:   | FileCheck --check-prefix=GWS %s
 
 // GWS: warning: feature flag '+gws' is ignored since the feature is read only 
[-Winvalid-command-line-argument]

diff  --git a/clang/test/CodeGenOpenCL/builtins-amdgcn-asyncmark-errs.cl 
b/clang/test/CodeGenOpenCL/builtins-amdgcn-asyncmark-errs.cl
index e8759f6578279..63d68a7c30433 100644
--- a/clang/test/CodeGenOpenCL/builtins-amdgcn-asyncmark-errs.cl
+++ b/clang/test/CodeGenOpenCL/builtins-amdgcn-asyncmark-errs.cl
@@ -1,6 +1,6 @@
 // REQUIRES: amdgpu-registered-target
 // gfx1200 has neither vmem-to-lds-load-insts nor asynccnt, so asyncmark is 
unavailable.
-// RUN: %clang_cc1 -O0 -cl-std=CL2.0 -triple amdgcn-amd-amdhsa -target-cpu 
gfx1200 -verify -S -o - %s
+// RUN: %clang_cc1 -O0 -cl-std=CL2.0 -triple amdgpu12.00-amd-amdhsa -verify -S 
-o - %s
 
 void test_feature() {
   __builtin_amdgcn_asyncmark(); // 
expected-error{{'__builtin_amdgcn_asyncmark' needs target feature 
vmem-to-lds-load-insts|asynccnt}}

diff  --git a/clang/test/CodeGenOpenCL/builtins-amdgcn-dl-insts-err-clamp.cl 
b/clang/test/CodeGenOpenCL/builtins-amdgcn-dl-insts-err-clamp.cl
index e051701f16980..50673d3e3216b 100644
--- a/clang/test/CodeGenOpenCL/builtins-amdgcn-dl-insts-err-clamp.cl
+++ b/clang/test/CodeGenOpenCL/builtins-amdgcn-dl-insts-err-clamp.cl
@@ -1,7 +1,7 @@
 // REQUIRES: amdgpu-registered-target
 
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx906 -verify 
-emit-llvm -o - %s
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx1010 -verify 
-emit-llvm -o - %s
+// RUN: %clang_cc1 -triple amdgpu9.06-unknown-unknown -verify -emit-llvm -o - 
%s
+// RUN: %clang_cc1 -triple amdgpu10.10-unknown-unknown -verify -emit-llvm -o - 
%s
 
 typedef unsigned int uint;
 typedef half __attribute__((ext_vector_type(2))) half2;

diff  --git a/clang/test/CodeGenOpenCL/builtins-amdgcn-dl-insts-gfx11.cl 
b/clang/test/CodeGenOpenCL/builtins-amdgcn-dl-insts-gfx11.cl
index 66a5e07925c6b..d226106cba0fe 100644
--- a/clang/test/CodeGenOpenCL/builtins-amdgcn-dl-insts-gfx11.cl
+++ b/clang/test/CodeGenOpenCL/builtins-amdgcn-dl-insts-gfx11.cl
@@ -1,7 +1,7 @@
 // REQUIRES: amdgpu-registered-target
 
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx1100 
-emit-llvm -o - %s | FileCheck %s
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx1200 
-emit-llvm -o - %s | FileCheck %s
+// RUN: %clang_cc1 -triple amdgpu11.00-unknown-unknown -emit-llvm -o - %s | 
FileCheck %s
+// RUN: %clang_cc1 -triple amdgpu12.00-unknown-unknown -emit-llvm -o - %s | 
FileCheck %s
 
 typedef unsigned int uint;
 typedef half __attribute__((ext_vector_type(2))) half2;

diff  --git a/clang/test/CodeGenOpenCL/builtins-amdgcn-dl-insts.cl 
b/clang/test/CodeGenOpenCL/builtins-amdgcn-dl-insts.cl
index d5478609851b0..d47c4fc3d9541 100644
--- a/clang/test/CodeGenOpenCL/builtins-amdgcn-dl-insts.cl
+++ b/clang/test/CodeGenOpenCL/builtins-amdgcn-dl-insts.cl
@@ -1,8 +1,8 @@
 // REQUIRES: amdgpu-registered-target
 
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx906 
-emit-llvm -o - %s | FileCheck %s
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx1011 
-emit-llvm -o - %s | FileCheck %s
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx1012 
-emit-llvm -o - %s | FileCheck %s
+// RUN: %clang_cc1 -triple amdgpu9.06-unknown-unknown -emit-llvm -o - %s | 
FileCheck %s
+// RUN: %clang_cc1 -triple amdgpu10.11-unknown-unknown -emit-llvm -o - %s | 
FileCheck %s
+// RUN: %clang_cc1 -triple amdgpu10.12-unknown-unknown -emit-llvm -o - %s | 
FileCheck %s
 
 typedef unsigned int uint;
 typedef half __attribute__((ext_vector_type(2))) half2;

diff  --git a/clang/test/CodeGenOpenCL/builtins-amdgcn-fp-atomics-gfx7-err.cl 
b/clang/test/CodeGenOpenCL/builtins-amdgcn-fp-atomics-gfx7-err.cl
index f15666a34811e..a93bb7e41dbcf 100644
--- a/clang/test/CodeGenOpenCL/builtins-amdgcn-fp-atomics-gfx7-err.cl
+++ b/clang/test/CodeGenOpenCL/builtins-amdgcn-fp-atomics-gfx7-err.cl
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -O0 -cl-std=CL2.0 -triple amdgcn-amd-amdhsa -target-cpu 
gfx700 \
+// RUN: %clang_cc1 -O0 -cl-std=CL2.0 -triple amdgpu7.00-amd-amdhsa \
 // RUN:   %s -verify -S -o -
 
 kernel void test_fadd_local(__local float *ptr, float val){

diff  --git a/clang/test/CodeGenOpenCL/builtins-amdgcn-fp-atomics-gfx908-err.cl 
b/clang/test/CodeGenOpenCL/builtins-amdgcn-fp-atomics-gfx908-err.cl
index 1cd51e7754e36..9592f1fe1a448 100644
--- a/clang/test/CodeGenOpenCL/builtins-amdgcn-fp-atomics-gfx908-err.cl
+++ b/clang/test/CodeGenOpenCL/builtins-amdgcn-fp-atomics-gfx908-err.cl
@@ -1,5 +1,5 @@
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -O0 -cl-std=CL2.0 -triple amdgcn-amd-amdhsa -target-cpu 
gfx908 \
+// RUN: %clang_cc1 -O0 -cl-std=CL2.0 -triple amdgpu9.08-amd-amdhsa \
 // RUN:   -verify -S -o - %s
 
 typedef half __attribute__((ext_vector_type(2))) half2;

diff  --git a/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx10.cl 
b/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx10.cl
index 91c367fa4a425..1b68d5dc6ed38 100644
--- a/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx10.cl
+++ b/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx10.cl
@@ -1,7 +1,7 @@
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx1010 
-emit-llvm -o - %s | FileCheck %s
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx1011 
-emit-llvm -o - %s | FileCheck %s
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx1012 
-emit-llvm -o - %s | FileCheck %s
+// RUN: %clang_cc1 -triple amdgpu10.10-unknown-unknown -emit-llvm -o - %s | 
FileCheck %s
+// RUN: %clang_cc1 -triple amdgpu10.11-unknown-unknown -emit-llvm -o - %s | 
FileCheck %s
+// RUN: %clang_cc1 -triple amdgpu10.12-unknown-unknown -emit-llvm -o - %s | 
FileCheck %s
 // RUN: %clang_cc1 -triple spirv64-amd-amdhsa -emit-llvm -o - %s | FileCheck %s
 
 #pragma OPENCL EXTENSION cl_khr_fp16 : enable

diff  --git a/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx11-err.cl 
b/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx11-err.cl
index d518fe3a11a81..d25ef6bc5700a 100644
--- a/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx11-err.cl
+++ b/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx11-err.cl
@@ -1,6 +1,6 @@
 // REQUIRES: amdgpu-registered-target
 
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx1100 -verify 
-emit-llvm -o - %s
+// RUN: %clang_cc1 -triple amdgpu11.00-unknown-unknown -verify -emit-llvm -o - 
%s
 
 void builtin_test_unsupported(int a, int b) {
   __builtin_amdgcn_s_sleep_var(a); // expected-error 
{{'__builtin_amdgcn_s_sleep_var' needs target feature gfx12-insts}}

diff  --git a/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx11.cl 
b/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx11.cl
index a436090dc4557..b6531297b859d 100644
--- a/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx11.cl
+++ b/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx11.cl
@@ -1,16 +1,16 @@
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx1100 
-emit-llvm -o - %s | FileCheck --check-prefixes=CHECK,GCN %s
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx1101 
-emit-llvm -o - %s | FileCheck --check-prefixes=CHECK,GCN %s
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx1102 
-emit-llvm -o - %s | FileCheck --check-prefixes=CHECK,GCN %s
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx1103 
-emit-llvm -o - %s | FileCheck --check-prefixes=CHECK,GCN %s
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx1150 
-emit-llvm -o - %s | FileCheck --check-prefixes=CHECK,GCN %s
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx1151 
-emit-llvm -o - %s | FileCheck --check-prefixes=CHECK,GCN %s
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx1152 
-emit-llvm -o - %s | FileCheck --check-prefixes=CHECK,GCN %s
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx1153 
-emit-llvm -o - %s | FileCheck --check-prefixes=CHECK,GCN %s
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx1154 
-emit-llvm -o - %s | FileCheck --check-prefixes=CHECK,GCN %s
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx1170 
-emit-llvm -o - %s | FileCheck --check-prefixes=CHECK,GCN %s
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx1171 
-emit-llvm -o - %s | FileCheck --check-prefixes=CHECK,GCN %s
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx1172 
-emit-llvm -o - %s | FileCheck --check-prefixes=CHECK,GCN %s
+// RUN: %clang_cc1 -triple amdgpu11.00-unknown-unknown -emit-llvm -o - %s | 
FileCheck --check-prefixes=CHECK,GCN %s
+// RUN: %clang_cc1 -triple amdgpu11.01-unknown-unknown -emit-llvm -o - %s | 
FileCheck --check-prefixes=CHECK,GCN %s
+// RUN: %clang_cc1 -triple amdgpu11.02-unknown-unknown -emit-llvm -o - %s | 
FileCheck --check-prefixes=CHECK,GCN %s
+// RUN: %clang_cc1 -triple amdgpu11.03-unknown-unknown -emit-llvm -o - %s | 
FileCheck --check-prefixes=CHECK,GCN %s
+// RUN: %clang_cc1 -triple amdgpu11.50-unknown-unknown -emit-llvm -o - %s | 
FileCheck --check-prefixes=CHECK,GCN %s
+// RUN: %clang_cc1 -triple amdgpu11.51-unknown-unknown -emit-llvm -o - %s | 
FileCheck --check-prefixes=CHECK,GCN %s
+// RUN: %clang_cc1 -triple amdgpu11.52-unknown-unknown -emit-llvm -o - %s | 
FileCheck --check-prefixes=CHECK,GCN %s
+// RUN: %clang_cc1 -triple amdgpu11.53-unknown-unknown -emit-llvm -o - %s | 
FileCheck --check-prefixes=CHECK,GCN %s
+// RUN: %clang_cc1 -triple amdgpu11.54-unknown-unknown -emit-llvm -o - %s | 
FileCheck --check-prefixes=CHECK,GCN %s
+// RUN: %clang_cc1 -triple amdgpu11.70-unknown-unknown -emit-llvm -o - %s | 
FileCheck --check-prefixes=CHECK,GCN %s
+// RUN: %clang_cc1 -triple amdgpu11.71-unknown-unknown -emit-llvm -o - %s | 
FileCheck --check-prefixes=CHECK,GCN %s
+// RUN: %clang_cc1 -triple amdgpu11.72-unknown-unknown -emit-llvm -o - %s | 
FileCheck --check-prefixes=CHECK,GCN %s
 // RUN: %clang_cc1 -triple spirv64-amd-amdhsa -emit-llvm -o - %s | FileCheck 
--check-prefixes=CHECK,AMDGCNSPIRV %s
 
 typedef unsigned int uint;

diff  --git 
a/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx1250-async-load-store-lds.cl 
b/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx1250-async-load-store-lds.cl
index e32808c181981..34c17a5e204fe 100644
--- a/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx1250-async-load-store-lds.cl
+++ b/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx1250-async-load-store-lds.cl
@@ -1,6 +1,6 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py 
UTC_ARGS: --version 6
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -cl-std=CL2.0 -triple amdgcn-unknown-unknown -target-cpu 
gfx1250 -emit-llvm -o - %s | FileCheck %s --check-prefix=CHECK-GFX1250
+// RUN: %clang_cc1 -cl-std=CL2.0 -triple amdgpu12.50-unknown-unknown 
-emit-llvm -o - %s | FileCheck %s --check-prefix=CHECK-GFX1250
 
 typedef int    v2i   __attribute__((ext_vector_type(2)));
 typedef int    v4i   __attribute__((ext_vector_type(4)));

diff  --git a/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx1250-cluster-load.cl 
b/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx1250-cluster-load.cl
index 4c6e8badf1bce..340e8b3c59f34 100644
--- a/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx1250-cluster-load.cl
+++ b/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx1250-cluster-load.cl
@@ -1,6 +1,6 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -cl-std=CL2.0 -triple amdgcn-unknown-unknown -target-cpu 
gfx1250 -emit-llvm -o - %s | FileCheck %s --check-prefix=CHECK-GFX1250
+// RUN: %clang_cc1 -cl-std=CL2.0 -triple amdgpu12.50-unknown-unknown 
-emit-llvm -o - %s | FileCheck %s --check-prefix=CHECK-GFX1250
 
 typedef int    v2i   __attribute__((ext_vector_type(2)));
 typedef int    v4i   __attribute__((ext_vector_type(4)));

diff  --git 
a/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx1250-cooperative-atomics.cl 
b/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx1250-cooperative-atomics.cl
index e1a4565bd7b93..e86d2a25ba972 100644
--- a/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx1250-cooperative-atomics.cl
+++ b/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx1250-cooperative-atomics.cl
@@ -1,8 +1,8 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py 
UTC_ARGS: --version 5
 
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -cl-std=CL2.0 -triple amdgcn-unknown-unknown -target-cpu 
gfx1250 -emit-llvm -o - %s | FileCheck %s
-// RUN: %clang_cc1 -cl-std=CL2.0 -triple amdgcn-unknown-unknown -target-cpu 
gfx1251 -emit-llvm -o - %s | FileCheck %s
+// RUN: %clang_cc1 -cl-std=CL2.0 -triple amdgpu12.50-unknown-unknown 
-emit-llvm -o - %s | FileCheck %s
+// RUN: %clang_cc1 -cl-std=CL2.0 -triple amdgpu12.51-unknown-unknown 
-emit-llvm -o - %s | FileCheck %s
 
 typedef int    v2i   __attribute__((ext_vector_type(2)));
 typedef int    v4i   __attribute__((ext_vector_type(4)));

diff  --git a/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx1250-load-tr.cl 
b/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx1250-load-tr.cl
index 1e3a88a41f90e..ddc55de467a7d 100644
--- a/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx1250-load-tr.cl
+++ b/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx1250-load-tr.cl
@@ -1,6 +1,6 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx1250 
-target-feature +wavefrontsize32 -emit-llvm -o - %s | FileCheck %s 
--check-prefix=CHECK-GFX1250
+// RUN: %clang_cc1 -triple amdgpu12.50-unknown-unknown -target-feature 
+wavefrontsize32 -emit-llvm -o - %s | FileCheck %s --check-prefix=CHECK-GFX1250
 
 typedef int    v2i   __attribute__((ext_vector_type(2)));
 typedef int    v3i   __attribute__((ext_vector_type(3)));

diff  --git 
a/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx1250-tensor-load-store.cl 
b/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx1250-tensor-load-store.cl
index 71b06e890ab9b..23fa72e353297 100644
--- a/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx1250-tensor-load-store.cl
+++ b/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx1250-tensor-load-store.cl
@@ -1,6 +1,6 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -cl-std=CL2.0 -triple amdgcn-unknown-unknown -target-cpu 
gfx1250 -emit-llvm -o - %s | FileCheck %s --check-prefix=CHECK-GFX1250
+// RUN: %clang_cc1 -cl-std=CL2.0 -triple amdgpu12.50-unknown-unknown 
-emit-llvm -o - %s | FileCheck %s --check-prefix=CHECK-GFX1250
 
 typedef int    v4i   __attribute__((ext_vector_type(4)));
 typedef int    v8i   __attribute__((ext_vector_type(8)));

diff  --git a/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx1250-wmma-w32.cl 
b/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx1250-wmma-w32.cl
index 96bab61fb2ce9..06e191bf6ff4d 100644
--- a/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx1250-wmma-w32.cl
+++ b/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx1250-wmma-w32.cl
@@ -1,6 +1,6 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx1250 
-target-feature +wavefrontsize32 -emit-llvm -o - %s | FileCheck %s 
--check-prefix=CHECK-GFX1250
+// RUN: %clang_cc1 -triple amdgpu12.50-unknown-unknown -target-feature 
+wavefrontsize32 -emit-llvm -o - %s | FileCheck %s --check-prefix=CHECK-GFX1250
 
 typedef float  v16f  __attribute__((ext_vector_type(16)));
 typedef float  v8f   __attribute__((ext_vector_type(8)));

diff  --git a/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx1250.cl 
b/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx1250.cl
index 8b09216057167..5da9dceaad40a 100644
--- a/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx1250.cl
+++ b/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx1250.cl
@@ -1,5 +1,5 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py
-// RUN: %clang_cc1 -cl-std=CL2.0 -O0 -triple amdgcn-unknown-unknown 
-target-cpu gfx1250 -emit-llvm -o - %s | FileCheck %s
+// RUN: %clang_cc1 -cl-std=CL2.0 -O0 -triple amdgpu12.50-unknown-unknown 
-emit-llvm -o - %s | FileCheck %s
 // REQUIRES: amdgpu-registered-target
 
 #pragma OPENCL EXTENSION cl_khr_fp16 : enable

diff  --git a/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx9-4-generic-err.cl 
b/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx9-4-generic-err.cl
index dbeb8a6f2c166..98d96d33ad715 100644
--- a/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx9-4-generic-err.cl
+++ b/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx9-4-generic-err.cl
@@ -1,6 +1,6 @@
 // REQUIRES: amdgpu-registered-target
 
-// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa -target-cpu gfx9-4-generic 
-verify -emit-llvm -o - %s
+// RUN: %clang_cc1 -triple amdgpu9.4-amd-amdhsa -verify -emit-llvm -o - %s
 
 typedef unsigned int uint;
 typedef float  float2   __attribute__((ext_vector_type(2)));

diff  --git a/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx950-err.cl 
b/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx950-err.cl
index c91cf158948b9..84d6a8189290c 100644
--- a/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx950-err.cl
+++ b/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx950-err.cl
@@ -1,10 +1,10 @@
-// RUN: %clang_cc1 -O0 -cl-std=CL2.0 -triple amdgcn-amd-amdhsa -target-cpu 
gfx906 -emit-llvm \
+// RUN: %clang_cc1 -O0 -cl-std=CL2.0 -triple amdgpu9.06-amd-amdhsa -emit-llvm \
 // RUN:   -verify -o - %s
-// RUN: %clang_cc1 -O0 -cl-std=CL2.0 -triple amdgcn-amd-amdhsa -target-cpu 
gfx90a -emit-llvm \
+// RUN: %clang_cc1 -O0 -cl-std=CL2.0 -triple amdgpu9.0a-amd-amdhsa -emit-llvm \
 // RUN:   -verify -o - %s
-// RUN: %clang_cc1 -O0 -cl-std=CL2.0 -triple amdgcn-amd-amdhsa -target-cpu 
gfx942 -emit-llvm \
+// RUN: %clang_cc1 -O0 -cl-std=CL2.0 -triple amdgpu9.42-amd-amdhsa -emit-llvm \
 // RUN:   -verify -o - %s
-// RUN: %clang_cc1 -O0 -cl-std=CL2.0 -triple amdgcn-amd-amdhsa -target-cpu 
gfx1200 -emit-llvm \
+// RUN: %clang_cc1 -O0 -cl-std=CL2.0 -triple amdgpu12.00-amd-amdhsa -emit-llvm 
\
 // RUN:   -verify -o - %s
 
 

diff  --git a/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx950-read-tr.cl 
b/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx950-read-tr.cl
index 2d335a3c7d736..e6e40862a6487 100644
--- a/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx950-read-tr.cl
+++ b/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx950-read-tr.cl
@@ -1,5 +1,5 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py 
UTC_ARGS: --version 4
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx950 
-emit-llvm -o - %s | FileCheck --check-prefix=GFX950 %s
+// RUN: %clang_cc1 -triple amdgpu9.50-unknown-unknown -emit-llvm -o - %s | 
FileCheck --check-prefix=GFX950 %s
 
 typedef int    v2i   __attribute__((ext_vector_type(2)));
 typedef int    v3i   __attribute__((ext_vector_type(3)));

diff  --git a/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx950.cl 
b/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx950.cl
index a907cc923aabd..770a0b8d145e0 100644
--- a/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx950.cl
+++ b/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx950.cl
@@ -1,5 +1,5 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py
-// RUN: %clang_cc1 -cl-std=CL1.2 -O0 -triple amdgcn-unknown-unknown 
-target-cpu gfx950 -emit-llvm -o - %s | FileCheck %s
+// RUN: %clang_cc1 -cl-std=CL1.2 -O0 -triple amdgpu9.50-unknown-unknown 
-emit-llvm -o - %s | FileCheck %s
 // REQUIRES: amdgpu-registered-target
 
 #pragma OPENCL EXTENSION cl_khr_fp16 : enable

diff  --git a/clang/test/CodeGenOpenCL/builtins-amdgcn-global-load-lds.cl 
b/clang/test/CodeGenOpenCL/builtins-amdgcn-global-load-lds.cl
index 7dec7b24d5d28..80e07f9d5e1bd 100644
--- a/clang/test/CodeGenOpenCL/builtins-amdgcn-global-load-lds.cl
+++ b/clang/test/CodeGenOpenCL/builtins-amdgcn-global-load-lds.cl
@@ -1,7 +1,7 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py
-// RUN: %clang_cc1 -cl-std=CL2.0 -O0 -triple amdgcn-unknown-unknown 
-target-cpu gfx900 -emit-llvm -o - %s | FileCheck %s
-// RUN: %clang_cc1 -cl-std=CL2.0 -O0 -triple amdgcn-unknown-unknown 
-target-cpu gfx942 -emit-llvm -o - %s | FileCheck %s
-// RUN: %clang_cc1 -cl-std=CL2.0 -O0 -triple amdgcn-unknown-unknown 
-target-cpu gfx1010 -emit-llvm -o - %s | FileCheck %s
+// RUN: %clang_cc1 -cl-std=CL2.0 -O0 -triple amdgpu9.00-unknown-unknown 
-emit-llvm -o - %s | FileCheck %s
+// RUN: %clang_cc1 -cl-std=CL2.0 -O0 -triple amdgpu9.42-unknown-unknown 
-emit-llvm -o - %s | FileCheck %s
+// RUN: %clang_cc1 -cl-std=CL2.0 -O0 -triple amdgpu10.10-unknown-unknown 
-emit-llvm -o - %s | FileCheck %s
 // REQUIRES: amdgpu-registered-target
 
 typedef unsigned int u32;

diff  --git 
a/clang/test/CodeGenOpenCL/builtins-amdgcn-global-load-tr-gfx11-err.cl 
b/clang/test/CodeGenOpenCL/builtins-amdgcn-global-load-tr-gfx11-err.cl
index 8242ae6a98c40..a57d2aa536d37 100644
--- a/clang/test/CodeGenOpenCL/builtins-amdgcn-global-load-tr-gfx11-err.cl
+++ b/clang/test/CodeGenOpenCL/builtins-amdgcn-global-load-tr-gfx11-err.cl
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -O0 -cl-std=CL2.0 -triple amdgcn-amd-amdhsa -target-cpu 
gfx1100 \
+// RUN: %clang_cc1 -O0 -cl-std=CL2.0 -triple amdgpu11.00-amd-amdhsa \
 // RUN:   -verify -S -o - %s
 
 // REQUIRES: amdgpu-registered-target

diff  --git a/clang/test/CodeGenOpenCL/builtins-amdgcn-global-load-tr-w32.cl 
b/clang/test/CodeGenOpenCL/builtins-amdgcn-global-load-tr-w32.cl
index 186fc4eacfaaf..64301e18a7e7f 100644
--- a/clang/test/CodeGenOpenCL/builtins-amdgcn-global-load-tr-w32.cl
+++ b/clang/test/CodeGenOpenCL/builtins-amdgcn-global-load-tr-w32.cl
@@ -1,6 +1,6 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx1200 
-target-feature +wavefrontsize32 -emit-llvm -o - %s | FileCheck %s 
--check-prefix=CHECK-GFX1200
+// RUN: %clang_cc1 -triple amdgpu12.00-unknown-unknown -target-feature 
+wavefrontsize32 -emit-llvm -o - %s | FileCheck %s --check-prefix=CHECK-GFX1200
 
 typedef int    v2i   __attribute__((ext_vector_type(2)));
 typedef short  v8s   __attribute__((ext_vector_type(8)));

diff  --git a/clang/test/CodeGenOpenCL/builtins-amdgcn-global-load-tr-w64.cl 
b/clang/test/CodeGenOpenCL/builtins-amdgcn-global-load-tr-w64.cl
index b6627f1c8114d..f0af2d9778fcf 100644
--- a/clang/test/CodeGenOpenCL/builtins-amdgcn-global-load-tr-w64.cl
+++ b/clang/test/CodeGenOpenCL/builtins-amdgcn-global-load-tr-w64.cl
@@ -1,6 +1,6 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx1200 
-target-feature +wavefrontsize64 -emit-llvm -o - %s | FileCheck %s 
--check-prefix=CHECK-GFX1200
+// RUN: %clang_cc1 -triple amdgpu12.00-unknown-unknown -target-feature 
+wavefrontsize64 -emit-llvm -o - %s | FileCheck %s --check-prefix=CHECK-GFX1200
 
 typedef short  v4s   __attribute__((ext_vector_type(4)));
 typedef  half  v4h   __attribute__((ext_vector_type(4)));

diff  --git a/clang/test/CodeGenOpenCL/builtins-amdgcn-gws-insts.cl 
b/clang/test/CodeGenOpenCL/builtins-amdgcn-gws-insts.cl
index 127dd82252dbf..e40499380cba3 100644
--- a/clang/test/CodeGenOpenCL/builtins-amdgcn-gws-insts.cl
+++ b/clang/test/CodeGenOpenCL/builtins-amdgcn-gws-insts.cl
@@ -1,14 +1,14 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py 
UTC_ARGS: --version 2
 // REQUIRES: amdgpu-registered-target
 
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx803 
-emit-llvm -o - %s | FileCheck %s
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx906 
-emit-llvm -o - %s | FileCheck %s
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx90a 
-emit-llvm -o - %s | FileCheck %s
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx90c 
-emit-llvm -o - %s | FileCheck %s
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx942 
-emit-llvm -o - %s | FileCheck %s
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx1010 
-emit-llvm -o - %s | FileCheck %s
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx1030 
-emit-llvm -o - %s | FileCheck %s
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx1100 
-emit-llvm -o - %s | FileCheck %s
+// RUN: %clang_cc1 -triple amdgpu8.03-unknown-unknown -emit-llvm -o - %s | 
FileCheck %s
+// RUN: %clang_cc1 -triple amdgpu9.06-unknown-unknown -emit-llvm -o - %s | 
FileCheck %s
+// RUN: %clang_cc1 -triple amdgpu9.0a-unknown-unknown -emit-llvm -o - %s | 
FileCheck %s
+// RUN: %clang_cc1 -triple amdgpu9.0c-unknown-unknown -emit-llvm -o - %s | 
FileCheck %s
+// RUN: %clang_cc1 -triple amdgpu9.42-unknown-unknown -emit-llvm -o - %s | 
FileCheck %s
+// RUN: %clang_cc1 -triple amdgpu10.10-unknown-unknown -emit-llvm -o - %s | 
FileCheck %s
+// RUN: %clang_cc1 -triple amdgpu10.30-unknown-unknown -emit-llvm -o - %s | 
FileCheck %s
+// RUN: %clang_cc1 -triple amdgpu11.00-unknown-unknown -emit-llvm -o - %s | 
FileCheck %s
 
 typedef unsigned int uint;
 

diff  --git a/clang/test/CodeGenOpenCL/builtins-amdgcn-load-to-lds.cl 
b/clang/test/CodeGenOpenCL/builtins-amdgcn-load-to-lds.cl
index d6b79fc2533e1..8c3541d33c67f 100644
--- a/clang/test/CodeGenOpenCL/builtins-amdgcn-load-to-lds.cl
+++ b/clang/test/CodeGenOpenCL/builtins-amdgcn-load-to-lds.cl
@@ -1,7 +1,7 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py
-// RUN: %clang_cc1 -cl-std=CL2.0 -O0 -triple amdgcn-unknown-unknown 
-target-cpu gfx900 -emit-llvm -o - %s | FileCheck %s
-// RUN: %clang_cc1 -cl-std=CL2.0 -O0 -triple amdgcn-unknown-unknown 
-target-cpu gfx942 -emit-llvm -o - %s | FileCheck %s
-// RUN: %clang_cc1 -cl-std=CL2.0 -O0 -triple amdgcn-unknown-unknown 
-target-cpu gfx1010 -emit-llvm -o - %s | FileCheck %s
+// RUN: %clang_cc1 -cl-std=CL2.0 -O0 -triple amdgpu9.00-unknown-unknown 
-emit-llvm -o - %s | FileCheck %s
+// RUN: %clang_cc1 -cl-std=CL2.0 -O0 -triple amdgpu9.42-unknown-unknown 
-emit-llvm -o - %s | FileCheck %s
+// RUN: %clang_cc1 -cl-std=CL2.0 -O0 -triple amdgpu10.10-unknown-unknown 
-emit-llvm -o - %s | FileCheck %s
 // REQUIRES: amdgpu-registered-target
 
 typedef unsigned int u32;

diff  --git a/clang/test/CodeGenOpenCL/builtins-amdgcn-mfma-gfx908-err.cl 
b/clang/test/CodeGenOpenCL/builtins-amdgcn-mfma-gfx908-err.cl
index 4e5baa51b08b8..1e4f554867ada 100644
--- a/clang/test/CodeGenOpenCL/builtins-amdgcn-mfma-gfx908-err.cl
+++ b/clang/test/CodeGenOpenCL/builtins-amdgcn-mfma-gfx908-err.cl
@@ -1,5 +1,5 @@
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -O0 -cl-std=CL2.0 -triple amdgcn-amd-amdhsa -target-cpu 
gfx908 \
+// RUN: %clang_cc1 -O0 -cl-std=CL2.0 -triple amdgpu9.08-amd-amdhsa \
 // RUN:   -verify -S -o - %s
 
 #pragma OPENCL EXTENSION cl_khr_fp64:enable

diff  --git a/clang/test/CodeGenOpenCL/builtins-amdgcn-mfma.cl 
b/clang/test/CodeGenOpenCL/builtins-amdgcn-mfma.cl
index 79083c3c5f0f9..5edeff6a22dc0 100644
--- a/clang/test/CodeGenOpenCL/builtins-amdgcn-mfma.cl
+++ b/clang/test/CodeGenOpenCL/builtins-amdgcn-mfma.cl
@@ -1,8 +1,8 @@
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx908 
-DMFMA_GFX908_TESTS -emit-llvm -o - %s | FileCheck %s 
--check-prefix=CHECK-GFX908
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx90a 
-DMFMA_GFX90A_TESTS -emit-llvm -o - %s | FileCheck %s 
--check-prefix=CHECK-GFX90A
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx942 
-DMFMA_GFX942_TESTS -emit-llvm -o - %s | FileCheck %s 
--check-prefix=CHECK-GFX942
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx950 
-DMFMA_GFX950_TESTS -emit-llvm -o - %s | FileCheck %s 
--check-prefix=CHECK-GFX950
+// RUN: %clang_cc1 -triple amdgpu9.08-unknown-unknown -DMFMA_GFX908_TESTS 
-emit-llvm -o - %s | FileCheck %s --check-prefix=CHECK-GFX908
+// RUN: %clang_cc1 -triple amdgpu9.0a-unknown-unknown -DMFMA_GFX90A_TESTS 
-emit-llvm -o - %s | FileCheck %s --check-prefix=CHECK-GFX90A
+// RUN: %clang_cc1 -triple amdgpu9.42-unknown-unknown -DMFMA_GFX942_TESTS 
-emit-llvm -o - %s | FileCheck %s --check-prefix=CHECK-GFX942
+// RUN: %clang_cc1 -triple amdgpu9.50-unknown-unknown -DMFMA_GFX950_TESTS 
-emit-llvm -o - %s | FileCheck %s --check-prefix=CHECK-GFX950
 
 #pragma OPENCL EXTENSION cl_khr_fp64:enable
 

diff  --git a/clang/test/CodeGenOpenCL/builtins-amdgcn-raw-buffer-atomic-add.cl 
b/clang/test/CodeGenOpenCL/builtins-amdgcn-raw-buffer-atomic-add.cl
index 425d97f37900c..95abeb92e59e7 100644
--- a/clang/test/CodeGenOpenCL/builtins-amdgcn-raw-buffer-atomic-add.cl
+++ b/clang/test/CodeGenOpenCL/builtins-amdgcn-raw-buffer-atomic-add.cl
@@ -1,7 +1,7 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py 
UTC_ARGS: --version 5
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx90a 
-emit-llvm -o - %s | FileCheck %s
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx942 
-emit-llvm -o - %s | FileCheck %s
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx950 
-emit-llvm -o - %s | FileCheck %s
+// RUN: %clang_cc1 -triple amdgpu9.0a-unknown-unknown -emit-llvm -o - %s | 
FileCheck %s
+// RUN: %clang_cc1 -triple amdgpu9.42-unknown-unknown -emit-llvm -o - %s | 
FileCheck %s
+// RUN: %clang_cc1 -triple amdgpu9.50-unknown-unknown -emit-llvm -o - %s | 
FileCheck %s
 
 // REQUIRES: amdgpu-registered-target
 

diff  --git 
a/clang/test/CodeGenOpenCL/builtins-amdgcn-raw-buffer-load-format.cl 
b/clang/test/CodeGenOpenCL/builtins-amdgcn-raw-buffer-load-format.cl
index 5c2e3e1a24862..9f87769c2fd5b 100644
--- a/clang/test/CodeGenOpenCL/builtins-amdgcn-raw-buffer-load-format.cl
+++ b/clang/test/CodeGenOpenCL/builtins-amdgcn-raw-buffer-load-format.cl
@@ -1,6 +1,6 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu verde -emit-llvm 
-o - %s | FileCheck %s
+// RUN: %clang_cc1 -triple amdgpu6.01-unknown-unknown -emit-llvm -o - %s | 
FileCheck %s
 
 #pragma OPENCL EXTENSION cl_khr_fp16 : enable
 

diff  --git a/clang/test/CodeGenOpenCL/builtins-amdgcn-raw-buffer-load-lds.cl 
b/clang/test/CodeGenOpenCL/builtins-amdgcn-raw-buffer-load-lds.cl
index 144cc7599bb5e..8ab83629041f0 100644
--- a/clang/test/CodeGenOpenCL/builtins-amdgcn-raw-buffer-load-lds.cl
+++ b/clang/test/CodeGenOpenCL/builtins-amdgcn-raw-buffer-load-lds.cl
@@ -1,6 +1,6 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx90a 
-emit-llvm -o - %s | FileCheck %s
+// RUN: %clang_cc1 -triple amdgpu9.0a-unknown-unknown -emit-llvm -o - %s | 
FileCheck %s
 
 // CHECK-LABEL: @test_amdgcn_raw_ptr_buffer_load_lds(
 // CHECK-NEXT:  entry:

diff  --git a/clang/test/CodeGenOpenCL/builtins-amdgcn-raw-buffer-store.cl 
b/clang/test/CodeGenOpenCL/builtins-amdgcn-raw-buffer-store.cl
index 097c545917270..e2dfa50ee3a2d 100644
--- a/clang/test/CodeGenOpenCL/builtins-amdgcn-raw-buffer-store.cl
+++ b/clang/test/CodeGenOpenCL/builtins-amdgcn-raw-buffer-store.cl
@@ -1,6 +1,6 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu verde -emit-llvm 
-o - %s | FileCheck %s
+// RUN: %clang_cc1 -triple amdgpu6.01-unknown-unknown -emit-llvm -o - %s | 
FileCheck %s
 
 typedef unsigned char u8;
 typedef unsigned short u16;

diff  --git 
a/clang/test/CodeGenOpenCL/builtins-amdgcn-struct-buffer-load-format.cl 
b/clang/test/CodeGenOpenCL/builtins-amdgcn-struct-buffer-load-format.cl
index c31c6ed82b82f..fac5271f9ae26 100644
--- a/clang/test/CodeGenOpenCL/builtins-amdgcn-struct-buffer-load-format.cl
+++ b/clang/test/CodeGenOpenCL/builtins-amdgcn-struct-buffer-load-format.cl
@@ -1,6 +1,6 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu verde -emit-llvm 
-o - %s | FileCheck %s
+// RUN: %clang_cc1 -triple amdgpu6.01-unknown-unknown -emit-llvm -o - %s | 
FileCheck %s
 
 #pragma OPENCL EXTENSION cl_khr_fp16 : enable
 

diff  --git 
a/clang/test/CodeGenOpenCL/builtins-amdgcn-struct-buffer-store-format.cl 
b/clang/test/CodeGenOpenCL/builtins-amdgcn-struct-buffer-store-format.cl
index b30a46eb78f32..7e04974c5e44c 100644
--- a/clang/test/CodeGenOpenCL/builtins-amdgcn-struct-buffer-store-format.cl
+++ b/clang/test/CodeGenOpenCL/builtins-amdgcn-struct-buffer-store-format.cl
@@ -1,6 +1,6 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu verde -emit-llvm 
-o - %s | FileCheck %s
+// RUN: %clang_cc1 -triple amdgpu6.01-unknown-unknown -emit-llvm -o - %s | 
FileCheck %s
 
 #pragma OPENCL EXTENSION cl_khr_fp16 : enable
 

diff  --git a/clang/test/CodeGenOpenCL/builtins-amdgcn-swmmac-gfx1250-err.cl 
b/clang/test/CodeGenOpenCL/builtins-amdgcn-swmmac-gfx1250-err.cl
index 641a43426efb4..3d93816044253 100644
--- a/clang/test/CodeGenOpenCL/builtins-amdgcn-swmmac-gfx1250-err.cl
+++ b/clang/test/CodeGenOpenCL/builtins-amdgcn-swmmac-gfx1250-err.cl
@@ -1,5 +1,5 @@
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx1030 \
+// RUN: %clang_cc1 -triple amdgpu10.30-unknown-unknown \
 // RUN:   -verify -S -o - %s
 
 typedef float  v8f    __attribute__((ext_vector_type(8)));

diff  --git a/clang/test/CodeGenOpenCL/builtins-amdgcn-swmmac-w32.cl 
b/clang/test/CodeGenOpenCL/builtins-amdgcn-swmmac-w32.cl
index 267e2254b8724..be9ca89a139d9 100644
--- a/clang/test/CodeGenOpenCL/builtins-amdgcn-swmmac-w32.cl
+++ b/clang/test/CodeGenOpenCL/builtins-amdgcn-swmmac-w32.cl
@@ -1,6 +1,6 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py 
UTC_ARGS: --version 6
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx1200 
-target-feature +wavefrontsize32 -emit-llvm -o - %s | FileCheck %s 
--check-prefix=CHECK-GFX1200
+// RUN: %clang_cc1 -triple amdgpu12.00-unknown-unknown -target-feature 
+wavefrontsize32 -emit-llvm -o - %s | FileCheck %s --check-prefix=CHECK-GFX1200
 
 typedef int    v2i   __attribute__((ext_vector_type(2)));
 typedef int    v4i   __attribute__((ext_vector_type(4)));

diff  --git a/clang/test/CodeGenOpenCL/builtins-amdgcn-vi.cl 
b/clang/test/CodeGenOpenCL/builtins-amdgcn-vi.cl
index 34482a6df240e..44f7c8a0a0651 100644
--- a/clang/test/CodeGenOpenCL/builtins-amdgcn-vi.cl
+++ b/clang/test/CodeGenOpenCL/builtins-amdgcn-vi.cl
@@ -1,8 +1,8 @@
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu tonga -emit-llvm 
-o - %s | FileCheck --check-prefixes=CHECK,GCN --enable-var-scope %s
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx900 
-emit-llvm -o - %s | FileCheck --check-prefixes=CHECK,GCN --enable-var-scope %s
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx1010 
-emit-llvm -o - %s | FileCheck --check-prefixes=CHECK,GCN --enable-var-scope %s
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx1012 
-emit-llvm -o - %s | FileCheck --check-prefixes=CHECK,GCN --enable-var-scope %s
+// RUN: %clang_cc1 -triple amdgpu8.02-unknown-unknown -emit-llvm -o - %s | 
FileCheck --check-prefixes=CHECK,GCN --enable-var-scope %s
+// RUN: %clang_cc1 -triple amdgpu9.00-unknown-unknown -emit-llvm -o - %s | 
FileCheck --check-prefixes=CHECK,GCN --enable-var-scope %s
+// RUN: %clang_cc1 -triple amdgpu10.10-unknown-unknown -emit-llvm -o - %s | 
FileCheck --check-prefixes=CHECK,GCN --enable-var-scope %s
+// RUN: %clang_cc1 -triple amdgpu10.12-unknown-unknown -emit-llvm -o - %s | 
FileCheck --check-prefixes=CHECK,GCN --enable-var-scope %s
 // RUN: %clang_cc1 -triple spirv64-amd-amdhsa -emit-llvm -o - %s | FileCheck 
--check-prefixes=CHECK,AMDGCNSPIRV --enable-var-scope %s
 
 #define INVALID_MEMORY_SCOPE (__MEMORY_SCOPE_CLUSTR+1)

diff  --git a/clang/test/CodeGenOpenCL/builtins-amdgcn-wave32.cl 
b/clang/test/CodeGenOpenCL/builtins-amdgcn-wave32.cl
index 31fd0e7bceaf5..17e2154afcd99 100644
--- a/clang/test/CodeGenOpenCL/builtins-amdgcn-wave32.cl
+++ b/clang/test/CodeGenOpenCL/builtins-amdgcn-wave32.cl
@@ -1,8 +1,8 @@
 // REQUIRES: amdgpu-registered-target
 // RUN: %clang_cc1 -cl-std=CL2.0 -triple amdgcn-unknown-unknown 
-target-feature +wavefrontsize32 -emit-llvm -o - %s | FileCheck 
-enable-var-scope %s
-// RUN: %clang_cc1 -cl-std=CL2.0 -triple amdgcn-unknown-unknown -target-cpu 
gfx1010 -emit-llvm -o - %s | FileCheck -enable-var-scope %s
-// RUN: %clang_cc1 -cl-std=CL2.0 -triple amdgcn-unknown-unknown -target-cpu 
gfx1010 -target-feature +wavefrontsize32 -emit-llvm -o - %s | FileCheck 
-enable-var-scope %s
-// RUN: %clang_cc1 -cl-std=CL2.0 -triple amdgcn-unknown-unknown -target-cpu 
gfx1100 -target-feature +wavefrontsize32 -emit-llvm -o - %s | FileCheck 
-enable-var-scope %s
+// RUN: %clang_cc1 -cl-std=CL2.0 -triple amdgpu10.10-unknown-unknown 
-emit-llvm -o - %s | FileCheck -enable-var-scope %s
+// RUN: %clang_cc1 -cl-std=CL2.0 -triple amdgpu10.10-unknown-unknown 
-target-feature +wavefrontsize32 -emit-llvm -o - %s | FileCheck 
-enable-var-scope %s
+// RUN: %clang_cc1 -cl-std=CL2.0 -triple amdgpu11.00-unknown-unknown 
-target-feature +wavefrontsize32 -emit-llvm -o - %s | FileCheck 
-enable-var-scope %s
 
 typedef unsigned int uint;
 

diff  --git a/clang/test/CodeGenOpenCL/builtins-amdgcn-wmma-w32-param-err.cl 
b/clang/test/CodeGenOpenCL/builtins-amdgcn-wmma-w32-param-err.cl
index b821ed0feef62..be0212acf1ad3 100644
--- a/clang/test/CodeGenOpenCL/builtins-amdgcn-wmma-w32-param-err.cl
+++ b/clang/test/CodeGenOpenCL/builtins-amdgcn-wmma-w32-param-err.cl
@@ -1,6 +1,6 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx1100 \
+// RUN: %clang_cc1 -triple amdgpu11.00-unknown-unknown \
 // RUN:   -verify -DWMMA_GFX1100_TESTS -S -o - %s
 
 

diff  --git a/clang/test/CodeGenOpenCL/builtins-amdgcn-wmma-w32.cl 
b/clang/test/CodeGenOpenCL/builtins-amdgcn-wmma-w32.cl
index 1a77760be227e..7d67fd38059e7 100644
--- a/clang/test/CodeGenOpenCL/builtins-amdgcn-wmma-w32.cl
+++ b/clang/test/CodeGenOpenCL/builtins-amdgcn-wmma-w32.cl
@@ -1,6 +1,6 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py 
UTC_ARGS: --version 6
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx1100 
-DWMMA_GFX1100_TESTS -emit-llvm -o - %s | FileCheck %s 
--check-prefix=CHECK-GFX1100
+// RUN: %clang_cc1 -triple amdgpu11.00-unknown-unknown -DWMMA_GFX1100_TESTS 
-emit-llvm -o - %s | FileCheck %s --check-prefix=CHECK-GFX1100
 
 typedef float  v8f   __attribute__((ext_vector_type(8)));
 typedef half   v16h  __attribute__((ext_vector_type(16)));

diff  --git a/clang/test/CodeGenOpenCL/builtins-amdgcn-wmma-w64-gfx10-err.cl 
b/clang/test/CodeGenOpenCL/builtins-amdgcn-wmma-w64-gfx10-err.cl
index 4b1808fe6d6e6..a0fc80df5b887 100644
--- a/clang/test/CodeGenOpenCL/builtins-amdgcn-wmma-w64-gfx10-err.cl
+++ b/clang/test/CodeGenOpenCL/builtins-amdgcn-wmma-w64-gfx10-err.cl
@@ -1,6 +1,6 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx1030 \
+// RUN: %clang_cc1 -triple amdgpu10.30-unknown-unknown \
 // RUN:   -verify -DWMMA_GFX1100_TESTS -S -o - %s
 
 

diff  --git a/clang/test/CodeGenOpenCL/builtins-amdgcn-wmma-w64-param-err.cl 
b/clang/test/CodeGenOpenCL/builtins-amdgcn-wmma-w64-param-err.cl
index a579ac62d3c3f..0fbc8a13b5f0f 100644
--- a/clang/test/CodeGenOpenCL/builtins-amdgcn-wmma-w64-param-err.cl
+++ b/clang/test/CodeGenOpenCL/builtins-amdgcn-wmma-w64-param-err.cl
@@ -1,6 +1,6 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx1100 \
+// RUN: %clang_cc1 -triple amdgpu11.00-unknown-unknown \
 // RUN:   -verify -DWMMA_GFX1100_TESTS -S -o - %s
 
 
@@ -31,4 +31,4 @@ void test_amdgcn_wmma_f32_16x16x16_bf16_w64(v16h a16h, v16h 
b16h, unsigned int i
  *out4i = __builtin_amdgcn_wmma_i32_16x16x16_iu4_w64(true, a2i, i, b2i, c4i, 
false); // expected-error{{argument to 
'__builtin_amdgcn_wmma_i32_16x16x16_iu4_w64' must be a constant integer}}
 }
 
-#endif
\ No newline at end of file
+#endif

diff  --git a/clang/test/CodeGenOpenCL/builtins-amdgcn-workgroup-size.cl 
b/clang/test/CodeGenOpenCL/builtins-amdgcn-workgroup-size.cl
index da80c5385c207..d8a17bf583fcc 100644
--- a/clang/test/CodeGenOpenCL/builtins-amdgcn-workgroup-size.cl
+++ b/clang/test/CodeGenOpenCL/builtins-amdgcn-workgroup-size.cl
@@ -1,9 +1,9 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py 
UTC_ARGS: --version 6
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -cl-std=CL2.0 -triple amdgcn-unknown-unknown 
-mcode-object-version=5 -target-cpu tahiti -emit-llvm -o - %s | FileCheck 
-check-prefixes=NONUNIFORM-V5  %s
-// RUN: %clang_cc1 -cl-std=CL2.0 -cl-uniform-work-group-size -triple 
amdgcn-unknown-unknown -mcode-object-version=5 -target-cpu tahiti -emit-llvm -o 
- %s | FileCheck -check-prefixes=UNIFORM-V5  %s
-// RUN: %clang_cc1 -cl-std=CL2.0 -triple amdgcn-unknown-unknown 
-mcode-object-version=4 -target-cpu tahiti -emit-llvm -o - %s | FileCheck 
-check-prefixes=NONUNIFORM-V4  %s
-// RUN: %clang_cc1 -cl-std=CL2.0 -cl-uniform-work-group-size -triple 
amdgcn-unknown-unknown -mcode-object-version=4 -target-cpu tahiti -emit-llvm -o 
- %s | FileCheck -check-prefixes=UNIFORM-V4  %s
+// RUN: %clang_cc1 -cl-std=CL2.0 -triple amdgpu6.00-unknown-unknown 
-mcode-object-version=5 -emit-llvm -o - %s | FileCheck 
-check-prefixes=NONUNIFORM-V5  %s
+// RUN: %clang_cc1 -cl-std=CL2.0 -cl-uniform-work-group-size -triple 
amdgpu6.00-unknown-unknown -mcode-object-version=5 -emit-llvm -o - %s | 
FileCheck -check-prefixes=UNIFORM-V5  %s
+// RUN: %clang_cc1 -cl-std=CL2.0 -triple amdgpu6.00-unknown-unknown 
-mcode-object-version=4 -emit-llvm -o - %s | FileCheck 
-check-prefixes=NONUNIFORM-V4  %s
+// RUN: %clang_cc1 -cl-std=CL2.0 -cl-uniform-work-group-size -triple 
amdgpu6.00-unknown-unknown -mcode-object-version=4 -emit-llvm -o - %s | 
FileCheck -check-prefixes=UNIFORM-V4  %s
 // RUN: %clang_cc1 -cl-std=CL2.0 -triple amdgcn-unknown-unknown 
-mcode-object-version=none -emit-llvm -o - %s | FileCheck 
-check-prefixes=NONUNIFORM-UNKNOWN  %s
 // RUN: %clang_cc1 -cl-std=CL2.0 -cl-uniform-work-group-size -triple 
amdgcn-unknown-unknown -mcode-object-version=none -emit-llvm -o - %s | 
FileCheck -check-prefixes=UNIFORM-UNKNOWN  %s
 

diff  --git a/clang/test/CodeGenOpenCL/builtins-amdgcn.cl 
b/clang/test/CodeGenOpenCL/builtins-amdgcn.cl
index 0d00994af1d5d..28c420a5760f4 100644
--- a/clang/test/CodeGenOpenCL/builtins-amdgcn.cl
+++ b/clang/test/CodeGenOpenCL/builtins-amdgcn.cl
@@ -1,5 +1,5 @@
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -cl-std=CL2.0 -triple amdgcn-unknown-unknown -target-cpu 
tahiti -emit-llvm -o - %s | FileCheck -enable-var-scope 
--check-prefixes=CHECK-AMDGCN,CHECK %s
+// RUN: %clang_cc1 -cl-std=CL2.0 -triple amdgpu6.00-unknown-unknown -emit-llvm 
-o - %s | FileCheck -enable-var-scope --check-prefixes=CHECK-AMDGCN,CHECK %s
 // RUN: %clang_cc1 -cl-std=CL2.0 -triple spirv64-amd-amdhsa -emit-llvm -o - %s 
| FileCheck -enable-var-scope --check-prefixes=CHECK,CHECK-SPIRV %s
 
 

diff  --git a/clang/test/CodeGenOpenCL/builtins-fp-atomics-gfx942.cl 
b/clang/test/CodeGenOpenCL/builtins-fp-atomics-gfx942.cl
index 24d05fe3a8525..18e876638e7ac 100644
--- a/clang/test/CodeGenOpenCL/builtins-fp-atomics-gfx942.cl
+++ b/clang/test/CodeGenOpenCL/builtins-fp-atomics-gfx942.cl
@@ -1,7 +1,7 @@
-// RUN: %clang_cc1 -O0 -cl-std=CL2.0 -triple amdgcn-amd-amdhsa -target-cpu 
gfx942 \
+// RUN: %clang_cc1 -O0 -cl-std=CL2.0 -triple amdgpu9.42-amd-amdhsa \
 // RUN:   %s -emit-llvm -o - | FileCheck %s
 
-// RUN: %clang_cc1 -O0 -cl-std=CL2.0 -triple amdgcn-amd-amdhsa -target-cpu 
gfx942 \
+// RUN: %clang_cc1 -O0 -cl-std=CL2.0 -triple amdgpu9.42-amd-amdhsa \
 // RUN:   -S -o - %s | FileCheck -check-prefix=GFX942 %s
 
 // REQUIRES: amdgpu-registered-target

diff  --git a/clang/test/CodeGenOpenCL/numbered-address-space.cl 
b/clang/test/CodeGenOpenCL/numbered-address-space.cl
index 2a3a90751bf31..f4ed7b8ee0e7d 100644
--- a/clang/test/CodeGenOpenCL/numbered-address-space.cl
+++ b/clang/test/CodeGenOpenCL/numbered-address-space.cl
@@ -1,5 +1,5 @@
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -cl-std=CL2.0 -Wno-error=incompatible-pointer-types -triple 
amdgcn-unknown-unknown -target-cpu tonga -emit-llvm -O0 -o - %s | FileCheck %s
+// RUN: %clang_cc1 -cl-std=CL2.0 -Wno-error=incompatible-pointer-types -triple 
amdgpu8.02-unknown-unknown -emit-llvm -O0 -o - %s | FileCheck %s
 
 // Make sure using numbered address spaces doesn't trigger crashes when a
 // builtin has an address space parameter.


        
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

Reply via email to