Author: Matt Arsenault
Date: 2026-07-24T18:24:16+02:00
New Revision: 57af943dfefaceb40b0f4deac2895cd4d5e6fd39

URL: 
https://github.com/llvm/llvm-project/commit/57af943dfefaceb40b0f4deac2895cd4d5e6fd39
DIFF: 
https://github.com/llvm/llvm-project/commit/57af943dfefaceb40b0f4deac2895cd4d5e6fd39.diff

LOG: clang/AMDGPU: Migrate cc1 tests to subarch triples (3) (#211825)

Rewrite CodeGenHIP cc1 test RUN lines to the new subarch triple form,
dropping the redundant -target-cpu, and regenerate autogenerated CHECK
lines. Tests whose behavior depends on the implicit wave32 default
(which is not enabled by a bare subarch triple) are left for a later change.

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

Added: 
    

Modified: 
    clang/test/CodeGenHIP/amdgcnspirv-uses-amdgpu-abi.cpp
    clang/test/CodeGenHIP/amdgpu-barrier-type.hip
    clang/test/CodeGenHIP/amdgpu-flat-atomic-fadd.hip
    clang/test/CodeGenHIP/amdgpu-global-atomic-fadd.hip
    clang/test/CodeGenHIP/amdgpu-load-to-lds.hip
    clang/test/CodeGenHIP/ballot.cpp
    clang/test/CodeGenHIP/builtins-amdgcn-buffer-format.hip
    clang/test/CodeGenHIP/builtins-amdgcn-dl-insts.hip
    clang/test/CodeGenHIP/builtins-amdgcn-gfx11-dl-insts.hip
    clang/test/CodeGenHIP/builtins-amdgcn-gfx12-wmma-w32.hip
    clang/test/CodeGenHIP/builtins-amdgcn-gfx12-wmma-w64.hip
    
clang/test/CodeGenHIP/builtins-amdgcn-gfx1250-cooperative-atomics-templated.hip
    clang/test/CodeGenHIP/builtins-amdgcn-gfx1250-cvt-f16.hip
    clang/test/CodeGenHIP/builtins-amdgcn-gfx1250-load-monitor-templated.hip
    clang/test/CodeGenHIP/builtins-amdgcn-gfx1250-wmma-f16.hip
    clang/test/CodeGenHIP/builtins-amdgcn-gfx950-cvt.hip
    clang/test/CodeGenHIP/builtins-amdgcn-mfma-gfx908.hip
    clang/test/CodeGenHIP/builtins-amdgcn-mfma-gfx942.hip
    clang/test/CodeGenHIP/builtins-amdgcn-mfma-gfx950.hip
    clang/test/CodeGenHIP/builtins-amdgcn-raytracing.hip
    clang/test/CodeGenHIP/builtins-amdgcn-vi-f16.hip
    clang/test/CodeGenHIP/builtins-amdgcn-wmma-w32.hip
    clang/test/CodeGenHIP/builtins-amdgcn-wmma-w64.hip
    clang/test/CodeGenHIP/builtins-make-buffer-rsrc.hip
    clang/test/CodeGenHIP/dpp-const-fold.hip
    clang/test/CodeGenHIP/maybe_undef-attr-verify.hip
    clang/test/CodeGenHIP/profile-coverage-mapping.hip

Removed: 
    


################################################################################
diff  --git a/clang/test/CodeGenHIP/amdgcnspirv-uses-amdgpu-abi.cpp 
b/clang/test/CodeGenHIP/amdgcnspirv-uses-amdgpu-abi.cpp
index 9f9af91339622..0a146ce6485d6 100644
--- a/clang/test/CodeGenHIP/amdgcnspirv-uses-amdgpu-abi.cpp
+++ b/clang/test/CodeGenHIP/amdgcnspirv-uses-amdgpu-abi.cpp
@@ -1,7 +1,7 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py 
UTC_ARGS: --version 6
 // RUN: %clang_cc1 -triple spirv64-amd-amdhsa -x hip -emit-llvm 
-fcuda-is-device -O3 \
 // RUN:   -o - %s | FileCheck --check-prefix=AMDGCNSPIRV %s
-// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa -x hip -target-cpu gfx906 
-emit-llvm -fcuda-is-device -O3 \
+// RUN: %clang_cc1 -triple amdgpu9.06-amd-amdhsa -x hip -emit-llvm 
-fcuda-is-device -O3 \
 // RUN:   -o - %s | FileCheck --check-prefix=AMDGPU %s
 
 #define __global__ __attribute__((global))

diff  --git a/clang/test/CodeGenHIP/amdgpu-barrier-type.hip 
b/clang/test/CodeGenHIP/amdgpu-barrier-type.hip
index 947ceb56d279e..b5f75dcf607ba 100644
--- a/clang/test/CodeGenHIP/amdgpu-barrier-type.hip
+++ b/clang/test/CodeGenHIP/amdgpu-barrier-type.hip
@@ -1,6 +1,6 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py 
UTC_ARGS: --function-signature
  // 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
 
 #define __shared__ __attribute__((shared))
 

diff  --git a/clang/test/CodeGenHIP/amdgpu-flat-atomic-fadd.hip 
b/clang/test/CodeGenHIP/amdgpu-flat-atomic-fadd.hip
index 620e7f836e840..67574ae6427f9 100644
--- a/clang/test/CodeGenHIP/amdgpu-flat-atomic-fadd.hip
+++ b/clang/test/CodeGenHIP/amdgpu-flat-atomic-fadd.hip
@@ -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-amd-amdhsa -target-cpu gfx942 -emit-llvm 
-fcuda-is-device %s -o - | FileCheck %s
+// RUN: %clang_cc1 -triple amdgpu9.42-amd-amdhsa -emit-llvm -fcuda-is-device 
%s -o - | FileCheck %s
 // RUN: %clang_cc1 -triple spirv64-amd-amdhsa -emit-llvm -fcuda-is-device %s 
-o - | FileCheck --check-prefix=SPIRV %s
 
 #define __device__ __attribute__((device))

diff  --git a/clang/test/CodeGenHIP/amdgpu-global-atomic-fadd.hip 
b/clang/test/CodeGenHIP/amdgpu-global-atomic-fadd.hip
index 86c4bb205f2c1..cd22614515346 100644
--- a/clang/test/CodeGenHIP/amdgpu-global-atomic-fadd.hip
+++ b/clang/test/CodeGenHIP/amdgpu-global-atomic-fadd.hip
@@ -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-amd-amdhsa -target-cpu gfx942 -emit-llvm 
-fcuda-is-device %s -o - | FileCheck %s
+// RUN: %clang_cc1 -triple amdgpu9.42-amd-amdhsa -emit-llvm -fcuda-is-device 
%s -o - | FileCheck %s
 // RUN: %clang_cc1 -triple spirv64-amd-amdhsa -emit-llvm -fcuda-is-device %s 
-o - | FileCheck --check-prefix=SPIRV %s
 
 #define __device__ __attribute__((device))

diff  --git a/clang/test/CodeGenHIP/amdgpu-load-to-lds.hip 
b/clang/test/CodeGenHIP/amdgpu-load-to-lds.hip
index 095c20268f2ec..ddf4601a2c1e8 100644
--- a/clang/test/CodeGenHIP/amdgpu-load-to-lds.hip
+++ b/clang/test/CodeGenHIP/amdgpu-load-to-lds.hip
@@ -1,6 +1,6 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py 
UTC_ARGS: --version 5
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa -target-cpu gfx950 -emit-llvm 
-fcuda-is-device -o - %s | FileCheck %s
+// RUN: %clang_cc1 -triple amdgpu9.50-amd-amdhsa -emit-llvm -fcuda-is-device 
-o - %s | FileCheck %s
 
 // COM: Most tests are in the OpenCL semastics, this is just a verification 
for HIP
 

diff  --git a/clang/test/CodeGenHIP/ballot.cpp 
b/clang/test/CodeGenHIP/ballot.cpp
index a1c23e2136c71..69480fcf31b2d 100644
--- a/clang/test/CodeGenHIP/ballot.cpp
+++ b/clang/test/CodeGenHIP/ballot.cpp
@@ -1,6 +1,6 @@
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa -aux-triple 
x86_64-pc-windows-msvc -target-cpu gfx900 -x hip -emit-llvm -fcuda-is-device -o 
- %s | FileCheck %s
-// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa -aux-triple 
x86_64-pc-windows-msvc -target-cpu gfx900 -x hip -S -fcuda-is-device -o - %s | 
FileCheck %s --check-prefix=GFX9
+// RUN: %clang_cc1 -triple amdgpu9.00-amd-amdhsa -aux-triple 
x86_64-pc-windows-msvc -x hip -emit-llvm -fcuda-is-device -o - %s | FileCheck %s
+// RUN: %clang_cc1 -triple amdgpu9.00-amd-amdhsa -aux-triple 
x86_64-pc-windows-msvc -x hip -S -fcuda-is-device -o - %s | FileCheck %s 
--check-prefix=GFX9
 
 // Unlike OpenCL, HIP depends on the C++ interpration of "unsigned long", which
 // is 64 bits long on Linux and 32 bits long on Windows. The return type of the

diff  --git a/clang/test/CodeGenHIP/builtins-amdgcn-buffer-format.hip 
b/clang/test/CodeGenHIP/builtins-amdgcn-buffer-format.hip
index 603e6522cd38c..772ea080cf9c5 100644
--- a/clang/test/CodeGenHIP/builtins-amdgcn-buffer-format.hip
+++ b/clang/test/CodeGenHIP/builtins-amdgcn-buffer-format.hip
@@ -1,6 +1,6 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -O1 -triple amdgcn-amd-amdhsa -target-cpu verde -emit-llvm 
-fcuda-is-device -o - %s | FileCheck %s
+// RUN: %clang_cc1 -O1 -triple amdgpu6.01-amd-amdhsa -emit-llvm 
-fcuda-is-device -o - %s | FileCheck %s
 
 #define __device__ __attribute__((device))
 

diff  --git a/clang/test/CodeGenHIP/builtins-amdgcn-dl-insts.hip 
b/clang/test/CodeGenHIP/builtins-amdgcn-dl-insts.hip
index d43022dc9a1bb..b3518fdf20b1d 100644
--- a/clang/test/CodeGenHIP/builtins-amdgcn-dl-insts.hip
+++ b/clang/test/CodeGenHIP/builtins-amdgcn-dl-insts.hip
@@ -1,8 +1,8 @@
 // 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-amd-amdhsa -target-cpu gfx906 -emit-llvm 
-fcuda-is-device -o - %s | FileCheck %s
-// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa -target-cpu gfx1011 -emit-llvm 
-fcuda-is-device -o - %s | FileCheck %s
-// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa -target-cpu gfx1012 -emit-llvm 
-fcuda-is-device -o - %s | FileCheck %s
+// RUN: %clang_cc1 -triple amdgpu9.06-amd-amdhsa -emit-llvm -fcuda-is-device 
-o - %s | FileCheck %s
+// RUN: %clang_cc1 -triple amdgpu10.11-amd-amdhsa -emit-llvm -fcuda-is-device 
-o - %s | FileCheck %s
+// RUN: %clang_cc1 -triple amdgpu10.12-amd-amdhsa -emit-llvm -fcuda-is-device 
-o - %s | FileCheck %s
 
 #define __device__ __attribute__((device))
 

diff  --git a/clang/test/CodeGenHIP/builtins-amdgcn-gfx11-dl-insts.hip 
b/clang/test/CodeGenHIP/builtins-amdgcn-gfx11-dl-insts.hip
index 09988486c8815..063c3ae902ec4 100644
--- a/clang/test/CodeGenHIP/builtins-amdgcn-gfx11-dl-insts.hip
+++ b/clang/test/CodeGenHIP/builtins-amdgcn-gfx11-dl-insts.hip
@@ -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-amd-amdhsa -target-cpu gfx1100 -emit-llvm 
-fcuda-is-device -o - %s | FileCheck %s
+// RUN: %clang_cc1 -triple amdgpu11.00-amd-amdhsa -emit-llvm -fcuda-is-device 
-o - %s | FileCheck %s
 
 #define __device__ __attribute__((device))
 

diff  --git a/clang/test/CodeGenHIP/builtins-amdgcn-gfx12-wmma-w32.hip 
b/clang/test/CodeGenHIP/builtins-amdgcn-gfx12-wmma-w32.hip
index 6e4ec6bf8c107..4d3d0f7719764 100644
--- a/clang/test/CodeGenHIP/builtins-amdgcn-gfx12-wmma-w32.hip
+++ b/clang/test/CodeGenHIP/builtins-amdgcn-gfx12-wmma-w32.hip
@@ -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-amd-amdhsa -target-cpu gfx1200 -emit-llvm 
-fcuda-is-device -o - %s | FileCheck %s --check-prefix=CHECK-GFX1200
+// RUN: %clang_cc1 -triple amdgpu12.00-amd-amdhsa -emit-llvm -fcuda-is-device 
-o - %s | FileCheck %s --check-prefix=CHECK-GFX1200
 
 #define __device__ __attribute__((device))
 

diff  --git a/clang/test/CodeGenHIP/builtins-amdgcn-gfx12-wmma-w64.hip 
b/clang/test/CodeGenHIP/builtins-amdgcn-gfx12-wmma-w64.hip
index 21bae28f85e8a..7847f9a68038a 100644
--- a/clang/test/CodeGenHIP/builtins-amdgcn-gfx12-wmma-w64.hip
+++ b/clang/test/CodeGenHIP/builtins-amdgcn-gfx12-wmma-w64.hip
@@ -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-amd-amdhsa -target-cpu gfx1200 
-target-feature +wavefrontsize64 -emit-llvm -fcuda-is-device -o - %s | 
FileCheck %s --check-prefix=CHECK-GFX1200
+// RUN: %clang_cc1 -triple amdgpu12.00-amd-amdhsa -target-feature 
+wavefrontsize64 -emit-llvm -fcuda-is-device -o - %s | FileCheck %s 
--check-prefix=CHECK-GFX1200
 
 #define __device__ __attribute__((device))
 

diff  --git 
a/clang/test/CodeGenHIP/builtins-amdgcn-gfx1250-cooperative-atomics-templated.hip
 
b/clang/test/CodeGenHIP/builtins-amdgcn-gfx1250-cooperative-atomics-templated.hip
index 68d3ed674a15a..1ba97cee48880 100644
--- 
a/clang/test/CodeGenHIP/builtins-amdgcn-gfx1250-cooperative-atomics-templated.hip
+++ 
b/clang/test/CodeGenHIP/builtins-amdgcn-gfx1250-cooperative-atomics-templated.hip
@@ -1,8 +1,8 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py 
UTC_ARGS: --include-generated-funcs --version 5
 
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx1250 
-fcuda-is-device -emit-llvm -o - %s | FileCheck %s
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx1251 
-fcuda-is-device -emit-llvm -o - %s | FileCheck %s
+// RUN: %clang_cc1 -triple amdgpu12.50-unknown-unknown -fcuda-is-device 
-emit-llvm -o - %s | FileCheck %s
+// RUN: %clang_cc1 -triple amdgpu12.51-unknown-unknown -fcuda-is-device 
-emit-llvm -o - %s | FileCheck %s
 
 #define __device__ __attribute__((device))
 
@@ -55,7 +55,7 @@ __device__ void 
test_amdgcn_cooperative_atomic_load_32x4B(int* addr, int *out)
 // CHECK-NEXT:    store i32 [[VAL]], ptr [[VAL_ADDR_ASCAST]], align 4
 // CHECK-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[GADDR_ADDR_ASCAST]], align 8
 // CHECK-NEXT:    [[TMP1:%.*]] = load i32, ptr [[VAL_ADDR_ASCAST]], align 4
-// CHECK-NEXT:    call void @llvm.amdgcn.cooperative.atomic.store.32x4B.p0(ptr 
[[TMP0]], i32 [[TMP1]], i32 5, metadata [[META4:![0-9]+]])
+// CHECK-NEXT:    call void @llvm.amdgcn.cooperative.atomic.store.32x4B.p0(ptr 
[[TMP0]], i32 [[TMP1]], i32 5, metadata [[META3:![0-9]+]])
 // CHECK-NEXT:    ret void
 //
 //
@@ -82,10 +82,10 @@ __device__ void 
test_amdgcn_cooperative_atomic_load_32x4B(int* addr, int *out)
 // CHECK-NEXT:    [[GADDR_ADDR_ASCAST:%.*]] = addrspacecast ptr addrspace(5) 
[[GADDR_ADDR]] to ptr
 // CHECK-NEXT:    store ptr [[GADDR]], ptr [[GADDR_ADDR_ASCAST]], align 8
 // CHECK-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[GADDR_ADDR_ASCAST]], align 8
-// CHECK-NEXT:    [[TMP1:%.*]] = call i32 
@llvm.amdgcn.cooperative.atomic.load.32x4B.p0(ptr [[TMP0]], i32 5, metadata 
[[META5:![0-9]+]])
+// CHECK-NEXT:    [[TMP1:%.*]] = call i32 
@llvm.amdgcn.cooperative.atomic.load.32x4B.p0(ptr [[TMP0]], i32 5, metadata 
[[META4:![0-9]+]])
 // CHECK-NEXT:    ret i32 [[TMP1]]
 //
 //.
-// CHECK: [[META4]] = !{!"agent"}
-// CHECK: [[META5]] = !{!""}
+// CHECK: [[META3]] = !{!"agent"}
+// CHECK: [[META4]] = !{!""}
 //.

diff  --git a/clang/test/CodeGenHIP/builtins-amdgcn-gfx1250-cvt-f16.hip 
b/clang/test/CodeGenHIP/builtins-amdgcn-gfx1250-cvt-f16.hip
index 3e4911495bfc2..b9386fdbbecff 100644
--- a/clang/test/CodeGenHIP/builtins-amdgcn-gfx1250-cvt-f16.hip
+++ b/clang/test/CodeGenHIP/builtins-amdgcn-gfx1250-cvt-f16.hip
@@ -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-amd-amdhsa -target-cpu gfx1250 -emit-llvm 
-fcuda-is-device -o - %s | FileCheck %s
+// RUN: %clang_cc1 -triple amdgpu12.50-amd-amdhsa -emit-llvm -fcuda-is-device 
-o - %s | FileCheck %s
 
 #define __device__ __attribute__((device))
 

diff  --git 
a/clang/test/CodeGenHIP/builtins-amdgcn-gfx1250-load-monitor-templated.hip 
b/clang/test/CodeGenHIP/builtins-amdgcn-gfx1250-load-monitor-templated.hip
index bc7a0878c9e57..d956e2bafeb9a 100644
--- a/clang/test/CodeGenHIP/builtins-amdgcn-gfx1250-load-monitor-templated.hip
+++ b/clang/test/CodeGenHIP/builtins-amdgcn-gfx1250-load-monitor-templated.hip
@@ -1,6 +1,6 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py 
UTC_ARGS: --include-generated-funcs --version 5
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa -target-cpu gfx1250 -emit-llvm 
-fcuda-is-device -o - %s | FileCheck %s
+// RUN: %clang_cc1 -triple amdgpu12.50-amd-amdhsa -emit-llvm -fcuda-is-device 
-o - %s | FileCheck %s
 
 #define __device__ __attribute__((device))
 
@@ -40,9 +40,9 @@ __device__ void 
test_amdgcn_flat_load_monitor_b128_from_template(v4i* inptr, v4i
 // CHECK-NEXT:    [[INPTR_ADDR_ASCAST:%.*]] = addrspacecast ptr addrspace(5) 
[[INPTR_ADDR]] to ptr
 // CHECK-NEXT:    store ptr [[INPTR]], ptr [[INPTR_ADDR_ASCAST]], align 8
 // CHECK-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[INPTR_ADDR_ASCAST]], align 8
-// CHECK-NEXT:    [[TMP1:%.*]] = call <4 x i32> 
@llvm.amdgcn.flat.load.monitor.b128.v4i32(ptr [[TMP0]], i32 5, metadata 
[[META4:![0-9]+]])
+// CHECK-NEXT:    [[TMP1:%.*]] = call <4 x i32> 
@llvm.amdgcn.flat.load.monitor.b128.v4i32(ptr [[TMP0]], i32 5, metadata 
[[META3:![0-9]+]])
 // CHECK-NEXT:    ret <4 x i32> [[TMP1]]
 //
 //.
-// CHECK: [[META4]] = !{!""}
+// CHECK: [[META3]] = !{!""}
 //.

diff  --git a/clang/test/CodeGenHIP/builtins-amdgcn-gfx1250-wmma-f16.hip 
b/clang/test/CodeGenHIP/builtins-amdgcn-gfx1250-wmma-f16.hip
index fe55c6715e2e3..eb302d4a630d1 100644
--- a/clang/test/CodeGenHIP/builtins-amdgcn-gfx1250-wmma-f16.hip
+++ b/clang/test/CodeGenHIP/builtins-amdgcn-gfx1250-wmma-f16.hip
@@ -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-amd-amdhsa -target-cpu gfx1250 -emit-llvm 
-fcuda-is-device -o - %s | FileCheck %s
+// RUN: %clang_cc1 -triple amdgpu12.50-amd-amdhsa -emit-llvm -fcuda-is-device 
-o - %s | FileCheck %s
 
 #define __device__ __attribute__((device))
 

diff  --git a/clang/test/CodeGenHIP/builtins-amdgcn-gfx950-cvt.hip 
b/clang/test/CodeGenHIP/builtins-amdgcn-gfx950-cvt.hip
index 4158b4633c3d9..dcfed4f20067f 100644
--- a/clang/test/CodeGenHIP/builtins-amdgcn-gfx950-cvt.hip
+++ b/clang/test/CodeGenHIP/builtins-amdgcn-gfx950-cvt.hip
@@ -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-amd-amdhsa -target-cpu gfx950 -emit-llvm 
-fcuda-is-device -o - %s | FileCheck %s
+// RUN: %clang_cc1 -triple amdgpu9.50-amd-amdhsa -emit-llvm -fcuda-is-device 
-o - %s | FileCheck %s
 
 #define __device__ __attribute__((device))
 

diff  --git a/clang/test/CodeGenHIP/builtins-amdgcn-mfma-gfx908.hip 
b/clang/test/CodeGenHIP/builtins-amdgcn-mfma-gfx908.hip
index 0a10fc1865748..2c05d0b5bc4b2 100644
--- a/clang/test/CodeGenHIP/builtins-amdgcn-mfma-gfx908.hip
+++ b/clang/test/CodeGenHIP/builtins-amdgcn-mfma-gfx908.hip
@@ -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-amd-amdhsa -target-cpu gfx908 -emit-llvm 
-fcuda-is-device -o - %s | FileCheck %s --check-prefix=CHECK-GFX908
+// RUN: %clang_cc1 -triple amdgpu9.08-amd-amdhsa -emit-llvm -fcuda-is-device 
-o - %s | FileCheck %s --check-prefix=CHECK-GFX908
 
 #define __device__ __attribute__((device))
 

diff  --git a/clang/test/CodeGenHIP/builtins-amdgcn-mfma-gfx942.hip 
b/clang/test/CodeGenHIP/builtins-amdgcn-mfma-gfx942.hip
index 5227e32ebbb8e..3ae778a546d9c 100644
--- a/clang/test/CodeGenHIP/builtins-amdgcn-mfma-gfx942.hip
+++ b/clang/test/CodeGenHIP/builtins-amdgcn-mfma-gfx942.hip
@@ -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-amd-amdhsa -target-cpu gfx942 -emit-llvm 
-fcuda-is-device -o - %s | FileCheck %s --check-prefix=CHECK-GFX942
+// RUN: %clang_cc1 -triple amdgpu9.42-amd-amdhsa -emit-llvm -fcuda-is-device 
-o - %s | FileCheck %s --check-prefix=CHECK-GFX942
 
 #define __device__ __attribute__((device))
 

diff  --git a/clang/test/CodeGenHIP/builtins-amdgcn-mfma-gfx950.hip 
b/clang/test/CodeGenHIP/builtins-amdgcn-mfma-gfx950.hip
index 11ce4ad1fa9ee..4f1037208e191 100644
--- a/clang/test/CodeGenHIP/builtins-amdgcn-mfma-gfx950.hip
+++ b/clang/test/CodeGenHIP/builtins-amdgcn-mfma-gfx950.hip
@@ -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-amd-amdhsa -target-cpu gfx950 -emit-llvm 
-fcuda-is-device -o - %s | FileCheck %s --check-prefix=CHECK-GFX950
+// RUN: %clang_cc1 -triple amdgpu9.50-amd-amdhsa -emit-llvm -fcuda-is-device 
-o - %s | FileCheck %s --check-prefix=CHECK-GFX950
 
 #define __device__ __attribute__((device))
 

diff  --git a/clang/test/CodeGenHIP/builtins-amdgcn-raytracing.hip 
b/clang/test/CodeGenHIP/builtins-amdgcn-raytracing.hip
index 1f3c65201da30..030eb98faf01d 100644
--- a/clang/test/CodeGenHIP/builtins-amdgcn-raytracing.hip
+++ b/clang/test/CodeGenHIP/builtins-amdgcn-raytracing.hip
@@ -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-amd-amdhsa -target-cpu gfx1030 -emit-llvm 
-fcuda-is-device -o - %s | FileCheck %s --check-prefix=CHECK-GFX1030
+// RUN: %clang_cc1 -triple amdgpu10.30-amd-amdhsa -emit-llvm -fcuda-is-device 
-o - %s | FileCheck %s --check-prefix=CHECK-GFX1030
 
 #define __device__ __attribute__((device))
 

diff  --git a/clang/test/CodeGenHIP/builtins-amdgcn-vi-f16.hip 
b/clang/test/CodeGenHIP/builtins-amdgcn-vi-f16.hip
index 13868a66afeb1..6db77747abab6 100644
--- a/clang/test/CodeGenHIP/builtins-amdgcn-vi-f16.hip
+++ b/clang/test/CodeGenHIP/builtins-amdgcn-vi-f16.hip
@@ -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 -triple amdgcn-amd-amdhsa -target-cpu tonga -emit-llvm 
-fcuda-is-device -o - %s | FileCheck %s
-// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa -target-cpu gfx900 -emit-llvm 
-fcuda-is-device -o - %s | FileCheck %s
-// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa -target-cpu gfx1010 -emit-llvm 
-fcuda-is-device -o - %s | FileCheck %s
-// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa -target-cpu gfx1012 -emit-llvm 
-fcuda-is-device -o - %s | FileCheck %s
+// RUN: %clang_cc1 -triple amdgpu8.02-amd-amdhsa -emit-llvm -fcuda-is-device 
-o - %s | FileCheck %s
+// RUN: %clang_cc1 -triple amdgpu9.00-amd-amdhsa -emit-llvm -fcuda-is-device 
-o - %s | FileCheck %s
+// RUN: %clang_cc1 -triple amdgpu10.10-amd-amdhsa -emit-llvm -fcuda-is-device 
-o - %s | FileCheck %s
+// RUN: %clang_cc1 -triple amdgpu10.12-amd-amdhsa -emit-llvm -fcuda-is-device 
-o - %s | FileCheck %s
 
 #define __device__ __attribute__((device))
 

diff  --git a/clang/test/CodeGenHIP/builtins-amdgcn-wmma-w32.hip 
b/clang/test/CodeGenHIP/builtins-amdgcn-wmma-w32.hip
index 12c3cf14ee395..eb4c9582a7af8 100644
--- a/clang/test/CodeGenHIP/builtins-amdgcn-wmma-w32.hip
+++ b/clang/test/CodeGenHIP/builtins-amdgcn-wmma-w32.hip
@@ -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-amd-amdhsa -target-cpu gfx1100 -emit-llvm 
-fcuda-is-device -o - %s | FileCheck %s --check-prefix=CHECK-GFX1100
+// RUN: %clang_cc1 -triple amdgpu11.00-amd-amdhsa -emit-llvm -fcuda-is-device 
-o - %s | FileCheck %s --check-prefix=CHECK-GFX1100
 
 #define __device__ __attribute__((device))
 

diff  --git a/clang/test/CodeGenHIP/builtins-amdgcn-wmma-w64.hip 
b/clang/test/CodeGenHIP/builtins-amdgcn-wmma-w64.hip
index d4dbe6e975ef0..37fd73ebdf035 100644
--- a/clang/test/CodeGenHIP/builtins-amdgcn-wmma-w64.hip
+++ b/clang/test/CodeGenHIP/builtins-amdgcn-wmma-w64.hip
@@ -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-amd-amdhsa -target-cpu gfx1100 
-target-feature +wavefrontsize64 -emit-llvm -fcuda-is-device -o - %s | 
FileCheck %s --check-prefix=CHECK-GFX1100
+// RUN: %clang_cc1 -triple amdgpu11.00-amd-amdhsa -target-feature 
+wavefrontsize64 -emit-llvm -fcuda-is-device -o - %s | FileCheck %s 
--check-prefix=CHECK-GFX1100
 
 #define __device__ __attribute__((device))
 

diff  --git a/clang/test/CodeGenHIP/builtins-make-buffer-rsrc.hip 
b/clang/test/CodeGenHIP/builtins-make-buffer-rsrc.hip
index 83d5f44b3aeb8..8b96a5525b5c8 100644
--- a/clang/test/CodeGenHIP/builtins-make-buffer-rsrc.hip
+++ b/clang/test/CodeGenHIP/builtins-make-buffer-rsrc.hip
@@ -1,6 +1,6 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py 
UTC_ARGS: --version 5
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa -target-cpu verde -emit-llvm 
-disable-llvm-optzns -fcuda-is-device -o - %s | FileCheck %s
+// RUN: %clang_cc1 -triple amdgpu6.01-amd-amdhsa -emit-llvm 
-disable-llvm-optzns -fcuda-is-device -o - %s | FileCheck %s
 
 #define __device__ __attribute__((device))
 

diff  --git a/clang/test/CodeGenHIP/dpp-const-fold.hip 
b/clang/test/CodeGenHIP/dpp-const-fold.hip
index c5450ec4b8413..570892c937e09 100644
--- a/clang/test/CodeGenHIP/dpp-const-fold.hip
+++ b/clang/test/CodeGenHIP/dpp-const-fold.hip
@@ -1,5 +1,5 @@
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa -target-cpu gfx906 -x hip 
-fcuda-is-device -emit-llvm  %s \
+// RUN: %clang_cc1 -triple amdgpu9.06-amd-amdhsa -x hip -fcuda-is-device 
-emit-llvm  %s \
 // RUN:   -o - | FileCheck %s
 
 constexpr static int OpCtrl()

diff  --git a/clang/test/CodeGenHIP/maybe_undef-attr-verify.hip 
b/clang/test/CodeGenHIP/maybe_undef-attr-verify.hip
index 6dc57c4fcc5fc..193c1d4f01fdf 100644
--- a/clang/test/CodeGenHIP/maybe_undef-attr-verify.hip
+++ b/clang/test/CodeGenHIP/maybe_undef-attr-verify.hip
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa -target-cpu gfx906 -x hip 
-fcuda-is-device -emit-llvm  %s \
+// RUN: %clang_cc1 -triple amdgpu9.06-amd-amdhsa -x hip -fcuda-is-device 
-emit-llvm  %s \
 // RUN:   -o - | FileCheck %s
 
 // CHECK: define dso_local amdgpu_kernel void @_Z13shufflekernelv()

diff  --git a/clang/test/CodeGenHIP/profile-coverage-mapping.hip 
b/clang/test/CodeGenHIP/profile-coverage-mapping.hip
index dcdf539849004..a1fc794b59d9c 100644
--- a/clang/test/CodeGenHIP/profile-coverage-mapping.hip
+++ b/clang/test/CodeGenHIP/profile-coverage-mapping.hip
@@ -3,7 +3,7 @@
 // Device-side compilation must emit coverage mapping sections and call the
 // GPU profile instrumentation runtime.
 
-// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa -target-cpu gfx1100 \
+// RUN: %clang_cc1 -triple amdgpu11.00-amd-amdhsa \
 // RUN:   -fcuda-is-device -emit-llvm -o - %s \
 // RUN:   -fprofile-instrument=clang -fcoverage-mapping | FileCheck %s
 


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

Reply via email to