Author: Matt Arsenault
Date: 2026-07-25T09:30:57+02:00
New Revision: 3055342ef9534f2ad4a047b222533dc676ce627b

URL: 
https://github.com/llvm/llvm-project/commit/3055342ef9534f2ad4a047b222533dc676ce627b
DIFF: 
https://github.com/llvm/llvm-project/commit/3055342ef9534f2ad4a047b222533dc676ce627b.diff

LOG: clang/AMDGPU: Migrate cc1 tests to subarch triples (9) (#211954)

Added: 
    

Modified: 
    clang/test/SemaOpenCL/amdgpu-ds-atomic-fadd-err.cl
    clang/test/SemaOpenCL/builtins-amdgcn-cmp-deprecated.cl
    clang/test/SemaOpenCL/builtins-amdgcn-error-ci.cl
    clang/test/SemaOpenCL/builtins-amdgcn-error-flat-address-space.cl
    clang/test/SemaOpenCL/builtins-amdgcn-error-gfx10-param.cl
    clang/test/SemaOpenCL/builtins-amdgcn-error-gfx10.cl
    clang/test/SemaOpenCL/builtins-amdgcn-error-gfx12-param.cl
    clang/test/SemaOpenCL/builtins-amdgcn-error-gfx12.cl
    clang/test/SemaOpenCL/builtins-amdgcn-error-gfx1250-cooperative-atomics.cl
    clang/test/SemaOpenCL/builtins-amdgcn-error-gfx1250-param.cl
    clang/test/SemaOpenCL/builtins-amdgcn-error-gfx1250-wmma-w32-param.cl
    clang/test/SemaOpenCL/builtins-amdgcn-error-gfx1250.cl
    clang/test/SemaOpenCL/builtins-amdgcn-error-gfx1251-wmma-w32-param.cl
    clang/test/SemaOpenCL/builtins-amdgcn-error-gfx9.cl
    clang/test/SemaOpenCL/builtins-amdgcn-error-gfx908-param.cl
    clang/test/SemaOpenCL/builtins-amdgcn-error-gfx90a-param.cl
    clang/test/SemaOpenCL/builtins-amdgcn-error-gfx942-param.cl
    clang/test/SemaOpenCL/builtins-amdgcn-error-gfx950-param.cl
    clang/test/SemaOpenCL/builtins-amdgcn-error-gfx950.cl
    clang/test/SemaOpenCL/builtins-amdgcn-error-vi.cl
    clang/test/SemaOpenCL/builtins-amdgcn-error-wave32.cl
    clang/test/SemaOpenCL/builtins-amdgcn-error-wave64.cl
    clang/test/SemaOpenCL/builtins-amdgcn-error.cl
    clang/test/SemaOpenCL/builtins-amdgcn-gfx11.cl
    clang/test/SemaOpenCL/builtins-amdgcn-global-load-lds-err.cl
    clang/test/SemaOpenCL/builtins-amdgcn-global-load-store-error.cl
    clang/test/SemaOpenCL/builtins-amdgcn-global-load-store-target-error.cl
    clang/test/SemaOpenCL/builtins-amdgcn-load-to-lds-err.cl
    clang/test/SemaOpenCL/builtins-amdgcn-raw-buffer-atomic-add-err.cl
    clang/test/SemaOpenCL/builtins-amdgcn-raw-buffer-atomic-add-target-err.cl
    clang/test/SemaOpenCL/builtins-amdgcn-raw-buffer-atomic-fmin-fmax-err.cl
    clang/test/SemaOpenCL/builtins-amdgcn-raw-buffer-format-error.cl
    clang/test/SemaOpenCL/builtins-amdgcn-raw-buffer-load-error.cl
    clang/test/SemaOpenCL/builtins-amdgcn-raw-buffer-store-error.cl
    clang/test/SemaOpenCL/builtins-amdgcn-raw-ptr-buffer-load-lds-error.cl
    
clang/test/SemaOpenCL/builtins-amdgcn-raw-ptr-buffer-load-lds-target-error.cl
    clang/test/SemaOpenCL/builtins-amdgcn-s-buffer-load-error.cl
    clang/test/SemaOpenCL/builtins-amdgcn-s-wait-event.cl
    clang/test/SemaOpenCL/builtins-amdgcn-struct-buffer-format-error.cl
    clang/test/SemaOpenCL/builtins-amdgcn-wave32-func-attr.cl
    clang/test/SemaOpenCL/builtins-extended-image-param-gfx1100-err.cl
    clang/test/SemaOpenCL/builtins-extended-image-param-gfx942-err.cl
    clang/test/SemaOpenCL/builtins-image-load-param-gfx1100-err.cl
    clang/test/SemaOpenCL/builtins-image-load-param-gfx942-err.cl
    clang/test/SemaOpenCL/builtins-image-store-param-gfx1100-err.cl
    clang/test/SemaOpenCL/builtins-image-store-param-gfx942-err.cl
    clang/test/SemaOpenCL/half-float16-vector-compatibility.cl
    clang/test/SemaOpenCL/incorrect-atomic-scope.cl

Removed: 
    


################################################################################
diff  --git a/clang/test/SemaOpenCL/amdgpu-ds-atomic-fadd-err.cl 
b/clang/test/SemaOpenCL/amdgpu-ds-atomic-fadd-err.cl
index 65f6c01d283ae..f47ff6913da04 100644
--- a/clang/test/SemaOpenCL/amdgpu-ds-atomic-fadd-err.cl
+++ b/clang/test/SemaOpenCL/amdgpu-ds-atomic-fadd-err.cl
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fsyntax-only -cl-std=CL2.0 -triple amdgcn -target-cpu 
gfx90a -verify %s
+// RUN: %clang_cc1 -fsyntax-only -cl-std=CL2.0 -triple amdgpu9.0a -verify %s
 
 kernel void test_ds_atomic_fadd_f32_valid(__local float *lds_ptr, float val) {
   float result;

diff  --git a/clang/test/SemaOpenCL/builtins-amdgcn-cmp-deprecated.cl 
b/clang/test/SemaOpenCL/builtins-amdgcn-cmp-deprecated.cl
index 6ceeb4e2c500b..d383a9dae61cc 100644
--- a/clang/test/SemaOpenCL/builtins-amdgcn-cmp-deprecated.cl
+++ b/clang/test/SemaOpenCL/builtins-amdgcn-cmp-deprecated.cl
@@ -1,10 +1,10 @@
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu gfx900 -verify=expected,wave64 
-fsyntax-only %s
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu gfx1010 -target-feature 
+wavefrontsize64 -verify=expected,wave64 -fsyntax-only %s
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu gfx1010 -target-feature 
+wavefrontsize32 -verify=expected,wave32 -fsyntax-only %s
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu gfx1100 
-verify=expected,wave32 -fsyntax-only %s
+// RUN: %clang_cc1 -triple amdgpu9.00-- -verify=expected,wave64 -fsyntax-only 
%s
+// RUN: %clang_cc1 -triple amdgpu10.10-- -target-feature +wavefrontsize64 
-verify=expected,wave64 -fsyntax-only %s
+// RUN: %clang_cc1 -triple amdgpu10.10-- -target-feature +wavefrontsize32 
-verify=expected,wave32 -fsyntax-only %s
+// RUN: %clang_cc1 -triple amdgpu11.00-- -verify=expected,wave32 -fsyntax-only 
%s
 
 // Check that -Wno-deprecated-builtins silences the warnings.
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu gfx900 
-Wno-deprecated-builtins -verify=silenced -fsyntax-only %s
+// RUN: %clang_cc1 -triple amdgpu9.00-- -Wno-deprecated-builtins 
-verify=silenced -fsyntax-only %s
 
 // REQUIRES: amdgpu-registered-target
 

diff  --git a/clang/test/SemaOpenCL/builtins-amdgcn-error-ci.cl 
b/clang/test/SemaOpenCL/builtins-amdgcn-error-ci.cl
index d8ebeeacab9d8..556ff6e1cdb22 100644
--- a/clang/test/SemaOpenCL/builtins-amdgcn-error-ci.cl
+++ b/clang/test/SemaOpenCL/builtins-amdgcn-error-ci.cl
@@ -1,5 +1,5 @@
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu tahiti -verify -S -o - %s
+// RUN: %clang_cc1 -triple amdgpu6.00-- -verify -S -o - %s
 
 void test_ci_builtins()
 {

diff  --git a/clang/test/SemaOpenCL/builtins-amdgcn-error-flat-address-space.cl 
b/clang/test/SemaOpenCL/builtins-amdgcn-error-flat-address-space.cl
index 86ee55a646de8..99e3ea75ac030 100644
--- a/clang/test/SemaOpenCL/builtins-amdgcn-error-flat-address-space.cl
+++ b/clang/test/SemaOpenCL/builtins-amdgcn-error-flat-address-space.cl
@@ -1,5 +1,5 @@
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu tahiti -verify -S -o - %s
+// RUN: %clang_cc1 -triple amdgpu6.00-- -verify -S -o - %s
 
 // expected-no-diagnostics
 

diff  --git a/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx10-param.cl 
b/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx10-param.cl
index 75d9cd3831c55..888e31dbd2690 100644
--- a/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx10-param.cl
+++ b/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx10-param.cl
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu gfx1010 -verify -S -o - %s
+// RUN: %clang_cc1 -triple amdgpu10.10-- -verify -S -o - %s
 
 typedef unsigned int uint;
 

diff  --git a/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx10.cl 
b/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx10.cl
index daae017142c79..c2942b350931e 100644
--- a/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx10.cl
+++ b/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx10.cl
@@ -1,9 +1,9 @@
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu tahiti -verify -S -o - %s
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu hawaii -verify -S -o - %s
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu fiji -verify -S -o - %s
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu gfx900 -verify -S -o - %s
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu gfx908 -verify -S -o - %s
+// RUN: %clang_cc1 -triple amdgpu6.00-- -verify -S -o - %s
+// RUN: %clang_cc1 -triple amdgpu7.01-- -verify -S -o - %s
+// RUN: %clang_cc1 -triple amdgpu8.03-- -verify -S -o - %s
+// RUN: %clang_cc1 -triple amdgpu9.00-- -verify -S -o - %s
+// RUN: %clang_cc1 -triple amdgpu9.08-- -verify -S -o - %s
 
 #pragma OPENCL EXTENSION cl_khr_fp16 : enable
 

diff  --git a/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx12-param.cl 
b/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx12-param.cl
index 0e0ea3646a2f1..3ac8755b0b765 100644
--- a/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx12-param.cl
+++ b/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx12-param.cl
@@ -1,5 +1,5 @@
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu gfx1200 -verify -S -o - %s
+// RUN: %clang_cc1 -triple amdgpu12.00-- -verify -S -o - %s
 
 typedef unsigned int uint;
 

diff  --git a/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx12.cl 
b/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx12.cl
index 34887a65021c3..64df7c094d0fc 100644
--- a/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx12.cl
+++ b/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx12.cl
@@ -1,12 +1,12 @@
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu tahiti -verify -S -o - %s
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu hawaii -verify -S -o - %s
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu fiji -verify -S -o - %s
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu gfx900 -verify -S -o - %s
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu gfx908 -verify -S -o - %s
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu gfx1010 -verify -S -o - %s
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu gfx1030 -verify -S -o - %s
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu gfx1100 -verify -S -o - %s
+// RUN: %clang_cc1 -triple amdgpu6.00-- -verify -S -o - %s
+// RUN: %clang_cc1 -triple amdgpu7.01-- -verify -S -o - %s
+// RUN: %clang_cc1 -triple amdgpu8.03-- -verify -S -o - %s
+// RUN: %clang_cc1 -triple amdgpu9.00-- -verify -S -o - %s
+// RUN: %clang_cc1 -triple amdgpu9.08-- -verify -S -o - %s
+// RUN: %clang_cc1 -triple amdgpu10.10-- -verify -S -o - %s
+// RUN: %clang_cc1 -triple amdgpu10.30-- -verify -S -o - %s
+// RUN: %clang_cc1 -triple amdgpu11.00-- -verify -S -o - %s
 
 typedef unsigned int uint;
 

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

diff  --git a/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx1250-param.cl 
b/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx1250-param.cl
index c0d5a946f1e9f..8c60b567ddc21 100644
--- a/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx1250-param.cl
+++ b/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx1250-param.cl
@@ -1,5 +1,5 @@
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -cl-std=CL2.0 -triple amdgcn-- -target-cpu gfx1250 -verify 
-S -o - %s
+// RUN: %clang_cc1 -cl-std=CL2.0 -triple amdgpu12.50-- -verify -S -o - %s
 
 typedef unsigned int uint;
 typedef unsigned short int ushort;

diff  --git 
a/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx1250-wmma-w32-param.cl 
b/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx1250-wmma-w32-param.cl
index 1eed56f4ec9b7..edadb8ed65bb6 100644
--- a/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx1250-wmma-w32-param.cl
+++ b/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx1250-wmma-w32-param.cl
@@ -1,6 +1,6 @@
 // REQUIRES: amdgpu-registered-target
 
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx1250 -verify 
-emit-llvm -o - %s
+// RUN: %clang_cc1 -triple amdgpu12.50-unknown-unknown -verify -emit-llvm -o - 
%s
 
 typedef float  v16f  __attribute__((ext_vector_type(16)));
 typedef float  v8f   __attribute__((ext_vector_type(8)));

diff  --git a/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx1250.cl 
b/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx1250.cl
index e53beae474718..87110d4d977db 100644
--- a/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx1250.cl
+++ b/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx1250.cl
@@ -1,5 +1,5 @@
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu gfx1200 -verify -S -o - %s
+// RUN: %clang_cc1 -triple amdgpu12.00-- -verify -S -o - %s
 
 typedef unsigned int uint;
 typedef unsigned short int ushort;

diff  --git 
a/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx1251-wmma-w32-param.cl 
b/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx1251-wmma-w32-param.cl
index c4d3d4499f8db..c80fba9865727 100644
--- a/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx1251-wmma-w32-param.cl
+++ b/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx1251-wmma-w32-param.cl
@@ -1,6 +1,6 @@
 // REQUIRES: amdgpu-registered-target
 
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx1251 -verify 
-emit-llvm -o - %s
+// RUN: %clang_cc1 -triple amdgpu12.51-unknown-unknown -verify -emit-llvm -o - 
%s
 
 typedef double v8d   __attribute__((ext_vector_type(8)));
 typedef double v2d   __attribute__((ext_vector_type(2)));

diff  --git a/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx9.cl 
b/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx9.cl
index 564de662a2e86..199b61c84e701 100644
--- a/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx9.cl
+++ b/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx9.cl
@@ -1,5 +1,5 @@
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu fiji -verify -S -o - %s
+// RUN: %clang_cc1 -triple amdgpu8.03-- -verify -S -o - %s
 
 #pragma OPENCL EXTENSION cl_khr_fp16 : enable
 

diff  --git a/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx908-param.cl 
b/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx908-param.cl
index 969ff4ba9c920..9d49abbcdcd74 100644
--- a/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx908-param.cl
+++ b/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx908-param.cl
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu gfx908 -verify -S -o - %s
+// RUN: %clang_cc1 -triple amdgpu9.08-- -verify -S -o - %s
 // RUN: %clang_cc1 -triple spirv64-amd-amdhsa -verify -S -o - %s
 
 #pragma OPENCL EXTENSION cl_khr_fp64:enable

diff  --git a/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx90a-param.cl 
b/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx90a-param.cl
index 235fa82631402..c816f7e5f7ddc 100644
--- a/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx90a-param.cl
+++ b/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx90a-param.cl
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu gfx90a -verify -S -o - %s
+// RUN: %clang_cc1 -triple amdgpu9.0a-- -verify -S -o - %s
 // RUN: %clang_cc1 -triple spirv64-amd-amdhsa -verify -S -o - %s
 
 #pragma OPENCL EXTENSION cl_khr_fp64:enable

diff  --git a/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx942-param.cl 
b/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx942-param.cl
index db0387e9878f2..00af5a22947c9 100644
--- a/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx942-param.cl
+++ b/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx942-param.cl
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu gfx942 -verify -S -o - %s
+// RUN: %clang_cc1 -triple amdgpu9.42-- -verify -S -o - %s
 // RUN: %clang_cc1 -triple spirv64-amd-amdhsa -verify -S -o - %s
 
 typedef float  v2f   __attribute__((ext_vector_type(2)));

diff  --git a/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx950-param.cl 
b/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx950-param.cl
index ce4f6ba8f407f..6b8dcddd4cebe 100644
--- a/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx950-param.cl
+++ b/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx950-param.cl
@@ -1,5 +1,5 @@
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu gfx950 -verify -S -o - %s
+// RUN: %clang_cc1 -triple amdgpu9.50-- -verify -S -o - %s
 
 typedef float float4 __attribute__((ext_vector_type(4)));
 typedef float float16 __attribute__((ext_vector_type(16)));

diff  --git a/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx950.cl 
b/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx950.cl
index b40b1c841b453..a62aed826aaec 100644
--- a/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx950.cl
+++ b/clang/test/SemaOpenCL/builtins-amdgcn-error-gfx950.cl
@@ -1,5 +1,5 @@
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu gfx942 -verify -S -o - %s
+// RUN: %clang_cc1 -triple amdgpu9.42-- -verify -S -o - %s
 
 typedef float float4 __attribute__((ext_vector_type(4)));
 typedef float float16 __attribute__((ext_vector_type(16)));

diff  --git a/clang/test/SemaOpenCL/builtins-amdgcn-error-vi.cl 
b/clang/test/SemaOpenCL/builtins-amdgcn-error-vi.cl
index c23f4a452d83e..4623b7123c331 100644
--- a/clang/test/SemaOpenCL/builtins-amdgcn-error-vi.cl
+++ b/clang/test/SemaOpenCL/builtins-amdgcn-error-vi.cl
@@ -1,6 +1,6 @@
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu tahiti -verify -S -o - %s
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu hawaii -verify -S -o - %s
+// RUN: %clang_cc1 -triple amdgpu6.00-- -verify -S -o - %s
+// RUN: %clang_cc1 -triple amdgpu7.01-- -verify -S -o - %s
 
 void test_vi_builtins()
 {

diff  --git a/clang/test/SemaOpenCL/builtins-amdgcn-error-wave32.cl 
b/clang/test/SemaOpenCL/builtins-amdgcn-error-wave32.cl
index 34c4ae42391d3..ae726a20a92b6 100644
--- a/clang/test/SemaOpenCL/builtins-amdgcn-error-wave32.cl
+++ b/clang/test/SemaOpenCL/builtins-amdgcn-error-wave32.cl
@@ -1,8 +1,8 @@
 // RUN: %clang_cc1 -triple amdgcn-- -verify -S -o - %s
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu gfx900 -verify=expected,gfx9 
-S -o - %s
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu gfx900 -target-feature 
+wavefrontsize64 -verify=expected,wavefront64 -S -o - %s
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu gfx1010 -target-feature 
+wavefrontsize64 -verify=expected,wavefront64 -S -o - %s
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu gfx1010 -target-feature 
-wavefrontsize32 -verify -S -o - %s
+// RUN: %clang_cc1 -triple amdgpu9.00-- -verify=expected,gfx9 -S -o - %s
+// RUN: %clang_cc1 -triple amdgpu9.00-- -target-feature +wavefrontsize64 
-verify=expected,wavefront64 -S -o - %s
+// RUN: %clang_cc1 -triple amdgpu10.10-- -target-feature +wavefrontsize64 
-verify=expected,wavefront64 -S -o - %s
+// RUN: %clang_cc1 -triple amdgpu10.10-- -target-feature -wavefrontsize32 
-verify -S -o - %s
 
 // REQUIRES: amdgpu-registered-target
 

diff  --git a/clang/test/SemaOpenCL/builtins-amdgcn-error-wave64.cl 
b/clang/test/SemaOpenCL/builtins-amdgcn-error-wave64.cl
index 51fa3ade2e190..8354866f44442 100644
--- a/clang/test/SemaOpenCL/builtins-amdgcn-error-wave64.cl
+++ b/clang/test/SemaOpenCL/builtins-amdgcn-error-wave64.cl
@@ -1,6 +1,6 @@
 // RUN: %clang_cc1 -triple amdgcn-- -verify -S -o - %s
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu gfx1010 -target-feature 
-wavefrontsize64 -verify -S -o - %s
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu gfx1010 -verify -S -o - %s
+// RUN: %clang_cc1 -triple amdgpu10.10-- -target-feature -wavefrontsize64 
-verify -S -o - %s
+// RUN: %clang_cc1 -triple amdgpu10.10-- -verify -S -o - %s
 
 // REQUIRES: amdgpu-registered-target
 

diff  --git a/clang/test/SemaOpenCL/builtins-amdgcn-error.cl 
b/clang/test/SemaOpenCL/builtins-amdgcn-error.cl
index eb1a86bdcdeb0..10f00dd7da5f9 100644
--- a/clang/test/SemaOpenCL/builtins-amdgcn-error.cl
+++ b/clang/test/SemaOpenCL/builtins-amdgcn-error.cl
@@ -1,5 +1,5 @@
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu tahiti -verify -S -o - %s
+// RUN: %clang_cc1 -triple amdgpu6.00-- -verify -S -o - %s
 
 #pragma OPENCL EXTENSION cl_khr_fp64 : enable
 typedef unsigned long ulong;

diff  --git a/clang/test/SemaOpenCL/builtins-amdgcn-gfx11.cl 
b/clang/test/SemaOpenCL/builtins-amdgcn-gfx11.cl
index 823d30262c648..b89862503f913 100644
--- a/clang/test/SemaOpenCL/builtins-amdgcn-gfx11.cl
+++ b/clang/test/SemaOpenCL/builtins-amdgcn-gfx11.cl
@@ -1,5 +1,7 @@
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu gfx1030 -verify=GFX10 -S -o - 
%s
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu gfx1100 -verify=GFX11 -S -o - 
%s
+// The subarch alone drives the target-feature and __has_builtin checks, with 
no
+// -target-cpu.
+// RUN: %clang_cc1 -triple amdgpu10.30-- -verify=GFX10 -S -o - %s
+// RUN: %clang_cc1 -triple amdgpu11.00-- -verify=GFX11 -S -o - %s
 
 typedef unsigned int uint;
 typedef unsigned long ulong;

diff  --git a/clang/test/SemaOpenCL/builtins-amdgcn-global-load-lds-err.cl 
b/clang/test/SemaOpenCL/builtins-amdgcn-global-load-lds-err.cl
index d5185a069b5c4..a234def0a41b3 100644
--- a/clang/test/SemaOpenCL/builtins-amdgcn-global-load-lds-err.cl
+++ b/clang/test/SemaOpenCL/builtins-amdgcn-global-load-lds-err.cl
@@ -1,7 +1,7 @@
-// RUN: %clang_cc1 -cl-std=CL2.0 -O0 -triple amdgcn-unknown-unknown 
-target-cpu gfx900 -S -verify=gfx,expected -o - %s
-// RUN: %clang_cc1 -cl-std=CL2.0 -O0 -triple amdgcn-unknown-unknown 
-target-cpu gfx942 -S -verify=gfx,expected -o - %s
-// RUN: %clang_cc1 -cl-std=CL2.0 -O0 -triple amdgcn-unknown-unknown 
-target-cpu gfx1010 -S -verify=gfx,expected -o - %s
-// RUN: %clang_cc1 -cl-std=CL2.0 -O0 -triple amdgcn-unknown-unknown 
-target-cpu gfx950 -S -verify=gfx950,expected -o - %s
+// RUN: %clang_cc1 -cl-std=CL2.0 -O0 -triple amdgpu9.00-unknown-unknown -S 
-verify=gfx,expected -o - %s
+// RUN: %clang_cc1 -cl-std=CL2.0 -O0 -triple amdgpu9.42-unknown-unknown -S 
-verify=gfx,expected -o - %s
+// RUN: %clang_cc1 -cl-std=CL2.0 -O0 -triple amdgpu10.10-unknown-unknown -S 
-verify=gfx,expected -o - %s
+// RUN: %clang_cc1 -cl-std=CL2.0 -O0 -triple amdgpu9.50-unknown-unknown -S 
-verify=gfx950,expected -o - %s
 // REQUIRES: amdgpu-registered-target
 
 typedef unsigned int u32;

diff  --git a/clang/test/SemaOpenCL/builtins-amdgcn-global-load-store-error.cl 
b/clang/test/SemaOpenCL/builtins-amdgcn-global-load-store-error.cl
index b2f7b46547632..fea156cccd89f 100644
--- a/clang/test/SemaOpenCL/builtins-amdgcn-global-load-store-error.cl
+++ b/clang/test/SemaOpenCL/builtins-amdgcn-global-load-store-error.cl
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -cl-std=CL2.0 -triple amdgcn-unknown-unknown -target-cpu 
gfx950         -S -verify -o - %s
+// RUN: %clang_cc1 -cl-std=CL2.0 -triple amdgpu9.50-unknown-unknown         -S 
-verify -o - %s
 // REQUIRES: amdgpu-registered-target
 
 typedef __attribute__((__vector_size__(4 * sizeof(unsigned int)))) unsigned 
int v4u32;

diff  --git 
a/clang/test/SemaOpenCL/builtins-amdgcn-global-load-store-target-error.cl 
b/clang/test/SemaOpenCL/builtins-amdgcn-global-load-store-target-error.cl
index 9a61513cdc05b..35f8e6d41ebb6 100644
--- a/clang/test/SemaOpenCL/builtins-amdgcn-global-load-store-target-error.cl
+++ b/clang/test/SemaOpenCL/builtins-amdgcn-global-load-store-target-error.cl
@@ -1,10 +1,10 @@
 // RUN: split-file %s %t
-// RUN: %clang_cc1 -cl-std=CL2.0 -triple amdgcn-unknown-unknown -target-cpu 
gfx602 -S -verify -o - %t/load.cl
-// RUN: %clang_cc1 -cl-std=CL2.0 -triple amdgcn-unknown-unknown -target-cpu 
gfx705 -S -verify -o - %t/load.cl
-// RUN: %clang_cc1 -cl-std=CL2.0 -triple amdgcn-unknown-unknown -target-cpu 
gfx810 -S -verify -o - %t/load.cl
-// RUN: %clang_cc1 -cl-std=CL2.0 -triple amdgcn-unknown-unknown -target-cpu 
gfx602 -S -verify -o - %t/store.cl
-// RUN: %clang_cc1 -cl-std=CL2.0 -triple amdgcn-unknown-unknown -target-cpu 
gfx705 -S -verify -o - %t/store.cl
-// RUN: %clang_cc1 -cl-std=CL2.0 -triple amdgcn-unknown-unknown -target-cpu 
gfx810 -S -verify -o - %t/store.cl
+// RUN: %clang_cc1 -cl-std=CL2.0 -triple amdgpu6.02-unknown-unknown -S -verify 
-o - %t/load.cl
+// RUN: %clang_cc1 -cl-std=CL2.0 -triple amdgpu7.05-unknown-unknown -S -verify 
-o - %t/load.cl
+// RUN: %clang_cc1 -cl-std=CL2.0 -triple amdgpu8.10-unknown-unknown -S -verify 
-o - %t/load.cl
+// RUN: %clang_cc1 -cl-std=CL2.0 -triple amdgpu6.02-unknown-unknown -S -verify 
-o - %t/store.cl
+// RUN: %clang_cc1 -cl-std=CL2.0 -triple amdgpu7.05-unknown-unknown -S -verify 
-o - %t/store.cl
+// RUN: %clang_cc1 -cl-std=CL2.0 -triple amdgpu8.10-unknown-unknown -S -verify 
-o - %t/store.cl
 // REQUIRES: amdgpu-registered-target
 
 //--- load.cl

diff  --git a/clang/test/SemaOpenCL/builtins-amdgcn-load-to-lds-err.cl 
b/clang/test/SemaOpenCL/builtins-amdgcn-load-to-lds-err.cl
index d93d724212077..2e9851b43531a 100644
--- a/clang/test/SemaOpenCL/builtins-amdgcn-load-to-lds-err.cl
+++ b/clang/test/SemaOpenCL/builtins-amdgcn-load-to-lds-err.cl
@@ -1,7 +1,7 @@
-// RUN: %clang_cc1 -cl-std=CL2.0 -O0 -triple amdgcn-unknown-unknown 
-target-cpu gfx900 -S -verify=gfx,expected -o - %s
-// RUN: %clang_cc1 -cl-std=CL2.0 -O0 -triple amdgcn-unknown-unknown 
-target-cpu gfx942 -S -verify=gfx,expected -o - %s
-// RUN: %clang_cc1 -cl-std=CL2.0 -O0 -triple amdgcn-unknown-unknown 
-target-cpu gfx1010 -S -verify=gfx,expected -o - %s
-// RUN: %clang_cc1 -cl-std=CL2.0 -O0 -triple amdgcn-unknown-unknown 
-target-cpu gfx950 -S -verify=gfx950,expected -o - %s
+// RUN: %clang_cc1 -cl-std=CL2.0 -O0 -triple amdgpu9.00-unknown-unknown -S 
-verify=gfx,expected -o - %s
+// RUN: %clang_cc1 -cl-std=CL2.0 -O0 -triple amdgpu9.42-unknown-unknown -S 
-verify=gfx,expected -o - %s
+// RUN: %clang_cc1 -cl-std=CL2.0 -O0 -triple amdgpu10.10-unknown-unknown -S 
-verify=gfx,expected -o - %s
+// RUN: %clang_cc1 -cl-std=CL2.0 -O0 -triple amdgpu9.50-unknown-unknown -S 
-verify=gfx950,expected -o - %s
 // REQUIRES: amdgpu-registered-target
 
 typedef unsigned int u32;

diff  --git 
a/clang/test/SemaOpenCL/builtins-amdgcn-raw-buffer-atomic-add-err.cl 
b/clang/test/SemaOpenCL/builtins-amdgcn-raw-buffer-atomic-add-err.cl
index 5c5ae937797e8..1fc23e75ceafb 100644
--- a/clang/test/SemaOpenCL/builtins-amdgcn-raw-buffer-atomic-add-err.cl
+++ b/clang/test/SemaOpenCL/builtins-amdgcn-raw-buffer-atomic-add-err.cl
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx90a -S 
-verify=gfx90a,expected -o - %s
+// RUN: %clang_cc1 -triple amdgpu9.0a-unknown-unknown -S 
-verify=gfx90a,expected -o - %s
 // REQUIRES: amdgpu-registered-target
 
 typedef half __attribute__((ext_vector_type(2))) float16x2_t;

diff  --git 
a/clang/test/SemaOpenCL/builtins-amdgcn-raw-buffer-atomic-add-target-err.cl 
b/clang/test/SemaOpenCL/builtins-amdgcn-raw-buffer-atomic-add-target-err.cl
index 509a498af5efa..6e5b9754fccbe 100644
--- a/clang/test/SemaOpenCL/builtins-amdgcn-raw-buffer-atomic-add-target-err.cl
+++ b/clang/test/SemaOpenCL/builtins-amdgcn-raw-buffer-atomic-add-target-err.cl
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx908 -S 
-verify=gfx908,expected -o - %s
+// RUN: %clang_cc1 -triple amdgpu9.08-unknown-unknown -S 
-verify=gfx908,expected -o - %s
 // REQUIRES: amdgpu-registered-target
 
 typedef half __attribute__((ext_vector_type(2))) float16x2_t;

diff  --git 
a/clang/test/SemaOpenCL/builtins-amdgcn-raw-buffer-atomic-fmin-fmax-err.cl 
b/clang/test/SemaOpenCL/builtins-amdgcn-raw-buffer-atomic-fmin-fmax-err.cl
index 6442bd559d95f..55c5fc08a56b4 100644
--- a/clang/test/SemaOpenCL/builtins-amdgcn-raw-buffer-atomic-fmin-fmax-err.cl
+++ b/clang/test/SemaOpenCL/builtins-amdgcn-raw-buffer-atomic-fmin-fmax-err.cl
@@ -1,6 +1,6 @@
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx10-1-generic 
-S -verify=expected -o - %s
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx10-3-generic 
-S -verify=expected -o - %s
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx1250 -S 
-verify=expected -o - %s
+// RUN: %clang_cc1 -triple amdgpu10.1-unknown-unknown -S -verify=expected -o - 
%s
+// RUN: %clang_cc1 -triple amdgpu10.3-unknown-unknown -S -verify=expected -o - 
%s
+// RUN: %clang_cc1 -triple amdgpu12.50-unknown-unknown -S -verify=expected -o 
- %s
 
 // REQUIRES: amdgpu-registered-target
 

diff  --git a/clang/test/SemaOpenCL/builtins-amdgcn-raw-buffer-format-error.cl 
b/clang/test/SemaOpenCL/builtins-amdgcn-raw-buffer-format-error.cl
index 74f855c8b0067..ca705bade4377 100644
--- a/clang/test/SemaOpenCL/builtins-amdgcn-raw-buffer-format-error.cl
+++ b/clang/test/SemaOpenCL/builtins-amdgcn-raw-buffer-format-error.cl
@@ -1,5 +1,5 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py 
UTC_ARGS: --version 6
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu verde -S -verify 
-o - %s
+// RUN: %clang_cc1 -triple amdgpu6.01-unknown-unknown -S -verify -o - %s
 // REQUIRES: amdgpu-registered-target
 
 #pragma OPENCL EXTENSION cl_khr_fp16 : enable

diff  --git a/clang/test/SemaOpenCL/builtins-amdgcn-raw-buffer-load-error.cl 
b/clang/test/SemaOpenCL/builtins-amdgcn-raw-buffer-load-error.cl
index 5d123c8e81d87..6fbe5872d6797 100644
--- a/clang/test/SemaOpenCL/builtins-amdgcn-raw-buffer-load-error.cl
+++ b/clang/test/SemaOpenCL/builtins-amdgcn-raw-buffer-load-error.cl
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu verde -S -verify 
-o - %s
+// RUN: %clang_cc1 -triple amdgpu6.01-unknown-unknown -S -verify -o - %s
 // REQUIRES: amdgpu-registered-target
 
 typedef unsigned char u8;

diff  --git a/clang/test/SemaOpenCL/builtins-amdgcn-raw-buffer-store-error.cl 
b/clang/test/SemaOpenCL/builtins-amdgcn-raw-buffer-store-error.cl
index 119adcd6b4e63..ba6ab25e0f685 100644
--- a/clang/test/SemaOpenCL/builtins-amdgcn-raw-buffer-store-error.cl
+++ b/clang/test/SemaOpenCL/builtins-amdgcn-raw-buffer-store-error.cl
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu verde -S -verify 
-o - %s
+// RUN: %clang_cc1 -triple amdgpu6.01-unknown-unknown -S -verify -o - %s
 // REQUIRES: amdgpu-registered-target
 
 #pragma OPENCL EXTENSION cl_khr_fp16 : enable

diff  --git 
a/clang/test/SemaOpenCL/builtins-amdgcn-raw-ptr-buffer-load-lds-error.cl 
b/clang/test/SemaOpenCL/builtins-amdgcn-raw-ptr-buffer-load-lds-error.cl
index 8fbffbeea0531..6e0dc1bcd1fde 100644
--- a/clang/test/SemaOpenCL/builtins-amdgcn-raw-ptr-buffer-load-lds-error.cl
+++ b/clang/test/SemaOpenCL/builtins-amdgcn-raw-ptr-buffer-load-lds-error.cl
@@ -1,5 +1,5 @@
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx90a -S 
-verify=gfx90a,expected -o - %s
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx950 -S 
-verify=gfx950,expected  -o - %s
+// RUN: %clang_cc1 -triple amdgpu9.0a-unknown-unknown -S 
-verify=gfx90a,expected -o - %s
+// RUN: %clang_cc1 -triple amdgpu9.50-unknown-unknown -S 
-verify=gfx950,expected  -o - %s
 // REQUIRES: amdgpu-registered-target
 
 void test_amdgcn_raw_ptr_buffer_load_lds(__amdgpu_buffer_rsrc_t rsrc, __local 
void* lds, int offset, int soffset, int x) {

diff  --git 
a/clang/test/SemaOpenCL/builtins-amdgcn-raw-ptr-buffer-load-lds-target-error.cl 
b/clang/test/SemaOpenCL/builtins-amdgcn-raw-ptr-buffer-load-lds-target-error.cl
index cb832b9aa4845..316b0be19bc4c 100644
--- 
a/clang/test/SemaOpenCL/builtins-amdgcn-raw-ptr-buffer-load-lds-target-error.cl
+++ 
b/clang/test/SemaOpenCL/builtins-amdgcn-raw-ptr-buffer-load-lds-target-error.cl
@@ -1,8 +1,8 @@
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu tahiti -S 
-verify -o - %s
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu bonaire -S 
-verify -o - %s
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu carrizo -S 
-verify -o - %s
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx1100 -S 
-verify -o - %s
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx1200 -S 
-verify -o - %s
+// RUN: %clang_cc1 -triple amdgpu6.00-unknown-unknown -S -verify -o - %s
+// RUN: %clang_cc1 -triple amdgpu7.04-unknown-unknown -S -verify -o - %s
+// RUN: %clang_cc1 -triple amdgpu8.01-unknown-unknown -S -verify -o - %s
+// RUN: %clang_cc1 -triple amdgpu11.00-unknown-unknown -S -verify -o - %s
+// RUN: %clang_cc1 -triple amdgpu12.00-unknown-unknown -S -verify -o - %s
 // REQUIRES: amdgpu-registered-target
 
 void test_amdgcn_raw_ptr_buffer_load_lds(__amdgpu_buffer_rsrc_t rsrc, __local 
void* lds, int vindex, int offset, int soffset) {

diff  --git a/clang/test/SemaOpenCL/builtins-amdgcn-s-buffer-load-error.cl 
b/clang/test/SemaOpenCL/builtins-amdgcn-s-buffer-load-error.cl
index 3c1694aa54500..8006d6923c37e 100644
--- a/clang/test/SemaOpenCL/builtins-amdgcn-s-buffer-load-error.cl
+++ b/clang/test/SemaOpenCL/builtins-amdgcn-s-buffer-load-error.cl
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu verde -S -verify 
-o - %s
+// RUN: %clang_cc1 -triple amdgpu6.01-unknown-unknown -S -verify -o - %s
 // REQUIRES: amdgpu-registered-target
 
 #pragma OPENCL EXTENSION cl_khr_fp16 : enable

diff  --git a/clang/test/SemaOpenCL/builtins-amdgcn-s-wait-event.cl 
b/clang/test/SemaOpenCL/builtins-amdgcn-s-wait-event.cl
index 1a9d40cf90cbe..e150f296379dc 100644
--- a/clang/test/SemaOpenCL/builtins-amdgcn-s-wait-event.cl
+++ b/clang/test/SemaOpenCL/builtins-amdgcn-s-wait-event.cl
@@ -1,5 +1,5 @@
 // xUN: %clang_cc1 -fsyntax-only -triple amdgcn-- -target-cpu gfx1100 
-verify=ALL,GFX11 %s
-// RUN: %clang_cc1 -fsyntax-only -triple amdgcn-- -target-cpu gfx1200 
-verify=ALL,GFX12 %s
+// RUN: %clang_cc1 -fsyntax-only -triple amdgpu12.00-- -verify=ALL,GFX12 %s
 
 void test(int x) {
   // ALL-error@+1 {{argument to '__builtin_amdgcn_s_wait_event' must be a 
constant integer}}

diff  --git 
a/clang/test/SemaOpenCL/builtins-amdgcn-struct-buffer-format-error.cl 
b/clang/test/SemaOpenCL/builtins-amdgcn-struct-buffer-format-error.cl
index 0e858a576b1c2..0debfea2a6aef 100644
--- a/clang/test/SemaOpenCL/builtins-amdgcn-struct-buffer-format-error.cl
+++ b/clang/test/SemaOpenCL/builtins-amdgcn-struct-buffer-format-error.cl
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu verde -S -verify 
-o - %s
+// RUN: %clang_cc1 -triple amdgpu6.01-unknown-unknown -S -verify -o - %s
 // REQUIRES: amdgpu-registered-target
 
 #pragma OPENCL EXTENSION cl_khr_fp16 : enable

diff  --git a/clang/test/SemaOpenCL/builtins-amdgcn-wave32-func-attr.cl 
b/clang/test/SemaOpenCL/builtins-amdgcn-wave32-func-attr.cl
index 6ef872e6add3a..e885e0ade6076 100644
--- a/clang/test/SemaOpenCL/builtins-amdgcn-wave32-func-attr.cl
+++ b/clang/test/SemaOpenCL/builtins-amdgcn-wave32-func-attr.cl
@@ -1,8 +1,8 @@
 // RUN: %clang_cc1 -triple amdgcn-- -verify=default -S -o - %s
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu gfx900 -verify=gfx9 -S -o - %s
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu gfx1010 -verify=gfx10 -S -o - 
%s
-// RUN: not %clang_cc1 -triple amdgcn-- -target-cpu gfx900 -target-feature 
-wavefrontsize32 -S -o - %s 2>&1 | FileCheck --check-prefix=GFX9 %s
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu gfx1010 -target-feature 
-wavefrontsize32 -verify=gfx10 -S -o - %s
+// RUN: %clang_cc1 -triple amdgpu9.00-- -verify=gfx9 -S -o - %s
+// RUN: %clang_cc1 -triple amdgpu10.10-- -verify=gfx10 -S -o - %s
+// RUN: not %clang_cc1 -triple amdgpu9.00-- -target-feature -wavefrontsize32 
-S -o - %s 2>&1 | FileCheck --check-prefix=GFX9 %s
+// RUN: %clang_cc1 -triple amdgpu10.10-- -target-feature -wavefrontsize32 
-verify=gfx10 -S -o - %s
 
 // REQUIRES: amdgpu-registered-target
 

diff  --git 
a/clang/test/SemaOpenCL/builtins-extended-image-param-gfx1100-err.cl 
b/clang/test/SemaOpenCL/builtins-extended-image-param-gfx1100-err.cl
index cd3976bf874ec..062f1c7e9c492 100644
--- a/clang/test/SemaOpenCL/builtins-extended-image-param-gfx1100-err.cl
+++ b/clang/test/SemaOpenCL/builtins-extended-image-param-gfx1100-err.cl
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu gfx1100 -target-feature 
+extended-image-insts -S -verify=expected -o - %s
+// RUN: %clang_cc1 -triple amdgpu11.00-- -target-feature +extended-image-insts 
-S -verify=expected -o - %s
 // REQUIRES: amdgpu-registered-target
 
 #pragma OPENCL EXTENSION cl_khr_fp16 : enable

diff  --git a/clang/test/SemaOpenCL/builtins-extended-image-param-gfx942-err.cl 
b/clang/test/SemaOpenCL/builtins-extended-image-param-gfx942-err.cl
index e60f8c70dc7c4..aae5ca070e416 100644
--- a/clang/test/SemaOpenCL/builtins-extended-image-param-gfx942-err.cl
+++ b/clang/test/SemaOpenCL/builtins-extended-image-param-gfx942-err.cl
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu gfx942 -verify=GFX94 -S -o - %s
+// RUN: %clang_cc1 -triple amdgpu9.42-- -verify=GFX94 -S -o - %s
 // REQUIRES: amdgpu-registered-target
 
 #pragma OPENCL EXTENSION cl_khr_fp16 : enable

diff  --git a/clang/test/SemaOpenCL/builtins-image-load-param-gfx1100-err.cl 
b/clang/test/SemaOpenCL/builtins-image-load-param-gfx1100-err.cl
index ae0224b6d0b54..0710c822eb223 100644
--- a/clang/test/SemaOpenCL/builtins-image-load-param-gfx1100-err.cl
+++ b/clang/test/SemaOpenCL/builtins-image-load-param-gfx1100-err.cl
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu gfx1100 -S -verify=expected -o 
- %s
+// RUN: %clang_cc1 -triple amdgpu11.00-- -S -verify=expected -o - %s
 // REQUIRES: amdgpu-registered-target
 
 typedef int int4 __attribute__((ext_vector_type(4)));

diff  --git a/clang/test/SemaOpenCL/builtins-image-load-param-gfx942-err.cl 
b/clang/test/SemaOpenCL/builtins-image-load-param-gfx942-err.cl
index b8780024f1076..b85470123c030 100644
--- a/clang/test/SemaOpenCL/builtins-image-load-param-gfx942-err.cl
+++ b/clang/test/SemaOpenCL/builtins-image-load-param-gfx942-err.cl
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu gfx942 -verify -S -o - %s
+// RUN: %clang_cc1 -triple amdgpu9.42-- -verify -S -o - %s
 // REQUIRES: amdgpu-registered-target
 
 typedef int int4 __attribute__((ext_vector_type(4)));

diff  --git a/clang/test/SemaOpenCL/builtins-image-store-param-gfx1100-err.cl 
b/clang/test/SemaOpenCL/builtins-image-store-param-gfx1100-err.cl
index 949c780432e90..132a10204de22 100644
--- a/clang/test/SemaOpenCL/builtins-image-store-param-gfx1100-err.cl
+++ b/clang/test/SemaOpenCL/builtins-image-store-param-gfx1100-err.cl
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu gfx1100 -S -verify=expected -o 
- %s
+// RUN: %clang_cc1 -triple amdgpu11.00-- -S -verify=expected -o - %s
 // REQUIRES: amdgpu-registered-target
 
 typedef float float4 __attribute__((ext_vector_type(4)));

diff  --git a/clang/test/SemaOpenCL/builtins-image-store-param-gfx942-err.cl 
b/clang/test/SemaOpenCL/builtins-image-store-param-gfx942-err.cl
index d0085e5403b5f..b62aac74347f0 100644
--- a/clang/test/SemaOpenCL/builtins-image-store-param-gfx942-err.cl
+++ b/clang/test/SemaOpenCL/builtins-image-store-param-gfx942-err.cl
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu gfx942 -S -verify -o - %s
+// RUN: %clang_cc1 -triple amdgpu9.42-- -S -verify -o - %s
 // REQUIRES: amdgpu-registered-target
 
 typedef float float4 __attribute__((ext_vector_type(4)));

diff  --git a/clang/test/SemaOpenCL/half-float16-vector-compatibility.cl 
b/clang/test/SemaOpenCL/half-float16-vector-compatibility.cl
index c65891e9c4433..ae2ca9f5f98c4 100644
--- a/clang/test/SemaOpenCL/half-float16-vector-compatibility.cl
+++ b/clang/test/SemaOpenCL/half-float16-vector-compatibility.cl
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -triple amdgcn-- -target-cpu gfx1100 -verify -S -o - %s
+// RUN: %clang_cc1 -triple amdgpu11.00-- -verify -S -o - %s
 // REQUIRES: amdgpu-registered-target
 
 #pragma OPENCL EXTENSION cl_khr_fp16 : enable

diff  --git a/clang/test/SemaOpenCL/incorrect-atomic-scope.cl 
b/clang/test/SemaOpenCL/incorrect-atomic-scope.cl
index add9309f4be30..c6375365f5ec7 100644
--- a/clang/test/SemaOpenCL/incorrect-atomic-scope.cl
+++ b/clang/test/SemaOpenCL/incorrect-atomic-scope.cl
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx1250 
-emit-llvm -o - %s | FileCheck --check-prefixes=CHECK,AMDGCN %s
+// RUN: %clang_cc1 -triple amdgpu12.50-unknown-unknown -emit-llvm -o - %s | 
FileCheck --check-prefixes=CHECK,AMDGCN %s
 // RUN: %clang_cc1 -triple spirv64-amd-amdhsa -emit-llvm -o - %s | FileCheck 
--check-prefixes=CHECK %s
 
 // Both atomics produce the wrong scope in LLVM IR because a HIP scope was


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

Reply via email to