Author: Matt Arsenault
Date: 2026-07-25T22:54:14+02:00
New Revision: 2f3f97fb72606f51ece7d64d6a7a73c9eaad8978

URL: 
https://github.com/llvm/llvm-project/commit/2f3f97fb72606f51ece7d64d6a7a73c9eaad8978
DIFF: 
https://github.com/llvm/llvm-project/commit/2f3f97fb72606f51ece7d64d6a7a73c9eaad8978.diff

LOG: clang/AMDGPU: Migrate -aux-triple amdgcn in cc1 tests to amdgpu (13) 
(#212052)

Update to the new architecture name.

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

Added: 
    

Modified: 
    clang/test/CodeGenCUDA/anon-ns.cu
    clang/test/CodeGenCUDA/builtin-mangled-name.cu
    clang/test/CodeGenCUDA/cluster_dims.cu
    clang/test/CodeGenCUDA/device-stub.cu
    clang/test/CodeGenCUDA/kernel-stub-name.cu
    clang/test/CodeGenCUDA/struct-mangling-number.cu
    clang/test/CodeGenCUDA/types.cu
    clang/test/CodeGenCUDA/unnamed-types.cu
    clang/test/CodeGenHIP/hip_weak_alias.cpp
    clang/test/Headers/hip-header.hip
    clang/test/Sema/builtin-amdgcn-atomic-inc-dec-failure.cpp
    clang/test/SemaCUDA/builtin-mangled-name.cu
    clang/test/SemaCUDA/cluster_dims.cu
    clang/test/SemaCUDA/float16.cu
    clang/test/SemaCUDA/overloaded-builtin.cu
    clang/test/SemaHIP/amdgpu-av-load-store.hip
    clang/test/SemaHIP/amdgpu-barrier.hip
    clang/test/SemaHIP/amdgpu-buffer-rsrc.hip
    clang/test/SemaHIP/amdgpu-ds-atomic-fadd-err.hip
    clang/test/SemaHIP/amdgpu-feature-builtins-cant-jump.hip
    clang/test/SemaHIP/amdgpu-feature-builtins-return-type-deduction.hip
    clang/test/SemaHIP/amdgpu-feature-predicate.hip
    clang/test/SemaHIP/amdgpu-flat-atomic-fadd-err.hip
    clang/test/SemaHIP/amdgpu-flat-atomic-fmax-err.hip
    clang/test/SemaHIP/amdgpu-flat-atomic-fmin-err.hip
    clang/test/SemaHIP/amdgpu-gfx950-load-to-lds.hip
    clang/test/SemaHIP/amdgpu-global-atomic-fadd-err.hip
    clang/test/SemaHIP/amdgpu-global-atomic-fmax-err.hip
    clang/test/SemaHIP/amdgpu-global-atomic-fmin-err.hip
    clang/test/SemaHIP/amdgpu-is-invocable.hip
    clang/test/SemaHIP/amdgpu-processor-is.hip
    clang/test/SemaHIP/builtins-amdgcn-raw-buffer-atomic-add.hip
    clang/test/SemaHIP/builtins-amdgcn-raw-buffer-atomic-fmin-max.hip

Removed: 
    


################################################################################
diff  --git a/clang/test/CodeGenCUDA/anon-ns.cu 
b/clang/test/CodeGenCUDA/anon-ns.cu
index d931f31d0207c..96f3f0c0fd814 100644
--- a/clang/test/CodeGenCUDA/anon-ns.cu
+++ b/clang/test/CodeGenCUDA/anon-ns.cu
@@ -3,7 +3,7 @@
 // RUN:   -emit-llvm -o - -x hip %s > %t.dev
 
 // RUN: %clang_cc1 -triple x86_64-gnu-linux -cuid=abc \
-// RUN:   -aux-triple amdgcn-amd-amdhsa -std=c++17 -fgpu-rdc \
+// RUN:   -aux-triple amdgpu-amd-amdhsa -std=c++17 -fgpu-rdc \
 // RUN:   -emit-llvm -o - -x hip %s > %t.host
 
 // RUN: cat %t.dev %t.host | FileCheck -check-prefixes=HIP,COMMON %s

diff  --git a/clang/test/CodeGenCUDA/builtin-mangled-name.cu 
b/clang/test/CodeGenCUDA/builtin-mangled-name.cu
index 6a6a2e7f5d65a..7f269d15e4a54 100644
--- a/clang/test/CodeGenCUDA/builtin-mangled-name.cu
+++ b/clang/test/CodeGenCUDA/builtin-mangled-name.cu
@@ -1,6 +1,6 @@
-// RUN: %clang_cc1 -triple x86_64-unknown-gnu-linux -aux-triple 
amdgcn-amd-amdhsa \
+// RUN: %clang_cc1 -triple x86_64-unknown-gnu-linux -aux-triple 
amdgpu-amd-amdhsa \
 // RUN:   -emit-llvm -o - -x hip %s | FileCheck -check-prefixes=CHECK,LNX %s
-// RUN: %clang_cc1 -triple x86_64-unknown-windows-msvc -aux-triple 
amdgcn-amd-amdhsa \
+// RUN: %clang_cc1 -triple x86_64-unknown-windows-msvc -aux-triple 
amdgpu-amd-amdhsa \
 // RUN:   -emit-llvm -o - -x hip %s | FileCheck -check-prefixes=CHECK,MSVC %s
 
 #include "Inputs/cuda.h"

diff  --git a/clang/test/CodeGenCUDA/cluster_dims.cu 
b/clang/test/CodeGenCUDA/cluster_dims.cu
index 68b514c6a5bc3..483d21749cc2a 100644
--- a/clang/test/CodeGenCUDA/cluster_dims.cu
+++ b/clang/test/CodeGenCUDA/cluster_dims.cu
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -triple amdgpu12.50-amd-amdhsa -fcuda-is-device -emit-llvm 
-x hip -o - %s | FileCheck %s
-// RUN: %clang_cc1 -triple x86_64-pc-linux-gnu -aux-triple amdgcn-amd-amdhsa 
-emit-llvm -x hip -o - %s | FileCheck --check-prefix=HOST %s
+// RUN: %clang_cc1 -triple x86_64-pc-linux-gnu -aux-triple amdgpu-amd-amdhsa 
-emit-llvm -x hip -o - %s | FileCheck --check-prefix=HOST %s
 
 #include "Inputs/cuda.h"
 

diff  --git a/clang/test/CodeGenCUDA/device-stub.cu 
b/clang/test/CodeGenCUDA/device-stub.cu
index 307ab190aa5be..7f48f276012f6 100644
--- a/clang/test/CodeGenCUDA/device-stub.cu
+++ b/clang/test/CodeGenCUDA/device-stub.cu
@@ -56,11 +56,11 @@
 // RUN: %clang_cc1 -cuid=123 -triple x86_64-linux-gnu -emit-llvm %s -o - -x 
hip\
 // RUN:   | FileCheck -allow-deprecated-dag-overlap %s 
-check-prefixes=ALL,LNX,NORDC,HIP,HIPNEF
 
-// RUN: %clang_cc1 -triple x86_64-pc-windows-msvc -aux-triple amdgcn 
-emit-llvm %s \
+// RUN: %clang_cc1 -triple x86_64-pc-windows-msvc -aux-triple amdgpu 
-emit-llvm %s \
 // RUN:     -fcuda-include-gpubinary %t -o - -x hip\
 // RUN:   | FileCheck -allow-deprecated-dag-overlap %s --check-prefixes=ALL,WIN
 
-// RUN: %clang_cc1 -cuid=123 -triple x86_64-pc-windows-msvc -aux-triple amdgcn 
-emit-llvm %s \
+// RUN: %clang_cc1 -cuid=123 -triple x86_64-pc-windows-msvc -aux-triple amdgpu 
-emit-llvm %s \
 // RUN:     -o - -x hip\
 // RUN:   | FileCheck -allow-deprecated-dag-overlap %s 
--check-prefixes=ALL,WIN,HIP,HIPNEF
 

diff  --git a/clang/test/CodeGenCUDA/kernel-stub-name.cu 
b/clang/test/CodeGenCUDA/kernel-stub-name.cu
index 0faea75cbbe53..7e3641e83cd7c 100644
--- a/clang/test/CodeGenCUDA/kernel-stub-name.cu
+++ b/clang/test/CodeGenCUDA/kernel-stub-name.cu
@@ -9,7 +9,7 @@
 // RUN:   | FileCheck -check-prefix=NEG %s
 
 // RUN: %clang_cc1 -triple x86_64-pc-windows-msvc -emit-llvm %s \
-// RUN:     -aux-triple amdgcn-amd-amdhsa -fcuda-include-gpubinary \
+// RUN:     -aux-triple amdgpu-amd-amdhsa -fcuda-include-gpubinary \
 // RUN:     %t -o - -x hip\
 // RUN:   | FileCheck -check-prefixes=CHECK,MSVC,MSVC-HIP,HIP %s
 
@@ -19,7 +19,7 @@
 // RUN:   | FileCheck -check-prefixes=CHECK,MSVC,CUDA %s
 
 // RUN: %clang_cc1 -triple x86_64-pc-windows-msvc -emit-llvm %s \
-// RUN:     -aux-triple amdgcn-amd-amdhsa -fcuda-include-gpubinary \
+// RUN:     -aux-triple amdgpu-amd-amdhsa -fcuda-include-gpubinary \
 // RUN:     %t -o - -x hip\
 // RUN:   | FileCheck -check-prefix=NEG %s
 

diff  --git a/clang/test/CodeGenCUDA/struct-mangling-number.cu 
b/clang/test/CodeGenCUDA/struct-mangling-number.cu
index f5d7e3008eb28..5a8099e95995e 100644
--- a/clang/test/CodeGenCUDA/struct-mangling-number.cu
+++ b/clang/test/CodeGenCUDA/struct-mangling-number.cu
@@ -4,13 +4,13 @@
 // RUN:   | FileCheck -check-prefix=DEV %s
 
 // RUN: %clang_cc1 -emit-llvm -o - -triple x86_64-pc-windows-msvc \
-// RUN:   -fms-extensions -aux-triple amdgcn-amd-amdhsa \
-// RUN:   -aux-target-cpu gfx1030 -x hip %s \
+// RUN:   -fms-extensions -aux-triple amdgpu10.30-amd-amdhsa \
+// RUN: -x hip %s \
 // RUN:   | FileCheck -check-prefix=HOST %s
 
 // RUN: %clang_cc1 -emit-llvm -o - -triple x86_64-pc-windows-msvc \
-// RUN:   -fms-extensions -aux-triple amdgcn-amd-amdhsa \
-// RUN:   -aux-target-cpu gfx1030 -x hip %s \
+// RUN:   -fms-extensions -aux-triple amdgpu10.30-amd-amdhsa \
+// RUN: -x hip %s \
 // RUN:   | FileCheck -check-prefix=HOST-NEG %s
 
 // RUN: %clang_cc1 -emit-llvm -o - -triple x86_64-pc-windows-msvc \

diff  --git a/clang/test/CodeGenCUDA/types.cu b/clang/test/CodeGenCUDA/types.cu
index 2d5d1b29d77a7..eda11ca5d7676 100644
--- a/clang/test/CodeGenCUDA/types.cu
+++ b/clang/test/CodeGenCUDA/types.cu
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -triple amdgcn -aux-triple x86_64 -fcuda-is-device 
-emit-llvm %s -o - | FileCheck -check-prefix=DEV %s
-// RUN: %clang_cc1 -triple x86_64 -aux-triple amdgcn -emit-llvm %s -o - | 
FileCheck -check-prefix=HOST %s
+// RUN: %clang_cc1 -triple x86_64 -aux-triple amdgpu -emit-llvm %s -o - | 
FileCheck -check-prefix=HOST %s
 
 #include "Inputs/cuda.h"
 

diff  --git a/clang/test/CodeGenCUDA/unnamed-types.cu 
b/clang/test/CodeGenCUDA/unnamed-types.cu
index 6849df5a184ba..7ddebf03ba592 100644
--- a/clang/test/CodeGenCUDA/unnamed-types.cu
+++ b/clang/test/CodeGenCUDA/unnamed-types.cu
@@ -1,5 +1,5 @@
-// RUN: %clang_cc1 -std=c++11 -x hip -triple x86_64-linux-gnu -aux-triple 
amdgcn-amd-amdhsa -emit-llvm %s -o - | FileCheck %s --check-prefix=HOST
-// RUN: %clang_cc1 -std=c++11 -x hip -triple x86_64-pc-windows-msvc 
-aux-triple amdgcn-amd-amdhsa -emit-llvm %s -o - | FileCheck %s 
--check-prefix=MSVC
+// RUN: %clang_cc1 -std=c++11 -x hip -triple x86_64-linux-gnu -aux-triple 
amdgpu-amd-amdhsa -emit-llvm %s -o - | FileCheck %s --check-prefix=HOST
+// RUN: %clang_cc1 -std=c++11 -x hip -triple x86_64-pc-windows-msvc 
-aux-triple amdgpu-amd-amdhsa -emit-llvm %s -o - | FileCheck %s 
--check-prefix=MSVC
 // RUN: %clang_cc1 -std=c++11 -x hip -triple amdgcn-amd-amdhsa 
-fcuda-is-device -emit-llvm %s -o - | FileCheck %s --check-prefix=DEVICE
 
 #include "Inputs/cuda.h"

diff  --git a/clang/test/CodeGenHIP/hip_weak_alias.cpp 
b/clang/test/CodeGenHIP/hip_weak_alias.cpp
index 33ff74a1cf995..3d9a2066c5ba2 100644
--- a/clang/test/CodeGenHIP/hip_weak_alias.cpp
+++ b/clang/test/CodeGenHIP/hip_weak_alias.cpp
@@ -1,7 +1,7 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py 
UTC_ARGS: --check-globals all --version 6
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -x hip -triple x86_64-unknown-linux-gnu -aux-triple 
amdgcn-amd-amdhsa -emit-llvm-bc %s -o %t-host.bc
-// RUN: %clang_cc1 -x hip -triple x86_64-unknown-linux-gnu -aux-triple 
amdgcn-amd-amdhsa -emit-llvm %s -o - | FileCheck %s --check-prefix=HOST
+// RUN: %clang_cc1 -x hip -triple x86_64-unknown-linux-gnu -aux-triple 
amdgpu-amd-amdhsa -emit-llvm-bc %s -o %t-host.bc
+// RUN: %clang_cc1 -x hip -triple x86_64-unknown-linux-gnu -aux-triple 
amdgpu-amd-amdhsa -emit-llvm %s -o - | FileCheck %s --check-prefix=HOST
 // RUN: %clang_cc1 -x hip -triple amdgcn-amd-amdhsa -aux-triple 
x86_64-unknown-linux-gnu -emit-llvm %s -fcuda-is-device -o - | FileCheck %s 
--check-prefix=DEVICE
 
 #define __device__ __attribute__((device))

diff  --git a/clang/test/Headers/hip-header.hip 
b/clang/test/Headers/hip-header.hip
index dca4b2b1e0bf3..e5693b5c3aa35 100644
--- a/clang/test/Headers/hip-header.hip
+++ b/clang/test/Headers/hip-header.hip
@@ -50,7 +50,7 @@
 // RUN: %clang_cc1 -include __clang_hip_runtime_wrapper.h \
 // RUN:   -internal-isystem %S/../../lib/Headers/cuda_wrappers \
 // RUN:   -internal-isystem %S/Inputs/include \
-// RUN:   -aux-triple amdgcn-amd-amdhsa -triple x86_64-unknown-unknown \
+// RUN:   -aux-triple amdgpu-amd-amdhsa -triple x86_64-unknown-unknown \
 // RUN:   -emit-llvm %s -o - \
 // RUN:   -DHIP_VERSION_MAJOR=4 -DHIP_VERSION_MINOR=5 \
 // RUN:   -disable-llvm-passes | FileCheck -check-prefixes=MALLOC-HOST %s

diff  --git a/clang/test/Sema/builtin-amdgcn-atomic-inc-dec-failure.cpp 
b/clang/test/Sema/builtin-amdgcn-atomic-inc-dec-failure.cpp
index 88fcbd716ef45..0336ce6f403fc 100644
--- a/clang/test/Sema/builtin-amdgcn-atomic-inc-dec-failure.cpp
+++ b/clang/test/Sema/builtin-amdgcn-atomic-inc-dec-failure.cpp
@@ -3,7 +3,7 @@
 // RUN:   -triple=amdgcn-amd-amdhsa -fsyntax-only \
 // RUN:   -verify=dev
 // RUN: %clang_cc1 %s -x hip -triple x86_64 -o - \
-// RUN:   -aux-triple amdgcn-amd-amdhsa -fsyntax-only \
+// RUN:   -aux-triple amdgpu-amd-amdhsa -fsyntax-only \
 // RUN:   -verify=host
 
 // dev-no-diagnostics

diff  --git a/clang/test/SemaCUDA/builtin-mangled-name.cu 
b/clang/test/SemaCUDA/builtin-mangled-name.cu
index 6ca85083d7171..d7f4931e2b3cc 100644
--- a/clang/test/SemaCUDA/builtin-mangled-name.cu
+++ b/clang/test/SemaCUDA/builtin-mangled-name.cu
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -triple x86_64-unknown-gnu-linux -aux-triple 
amdgcn-amd-amdhsa \
+// RUN: %clang_cc1 -triple x86_64-unknown-gnu-linux -aux-triple 
amdgpu-amd-amdhsa \
 // RUN:   -verify -fsyntax-only -x hip %s
 
 #include "Inputs/cuda.h"

diff  --git a/clang/test/SemaCUDA/cluster_dims.cu 
b/clang/test/SemaCUDA/cluster_dims.cu
index 1fcc4d6fe0a8a..6aa34851b8269 100644
--- a/clang/test/SemaCUDA/cluster_dims.cu
+++ b/clang/test/SemaCUDA/cluster_dims.cu
@@ -2,7 +2,7 @@
 // RUN: %clang_cc1 -triple nvptx-nvidia-cuda -fcuda-is-device -ast-print -x 
hip -verify=NS,all %s
 // RUN: %clang_cc1 -triple amdgpu12.50-amd-amdhsa -fcuda-is-device -ast-print 
-x hip -verify=amd,common,all %s | FileCheck -check-prefixes=CHECK %s
 // RUN: %clang_cc1 -triple nvptx-nvidia-cuda -target-cpu sm_90 
-fcuda-is-device -ast-print -x hip -verify=cuda,common,all %s | FileCheck 
-check-prefixes=CHECK %s
-// RUN: %clang_cc1 -triple x86_64-pc-linux-gnu -aux-triple amdgcn-amd-amdhsa 
-ast-print -x hip -verify=amd,common,all %s | FileCheck -check-prefixes=CHECK %s
+// RUN: %clang_cc1 -triple x86_64-pc-linux-gnu -aux-triple amdgpu-amd-amdhsa 
-ast-print -x hip -verify=amd,common,all %s | FileCheck -check-prefixes=CHECK %s
 
 #include "Inputs/cuda.h"
 

diff  --git a/clang/test/SemaCUDA/float16.cu b/clang/test/SemaCUDA/float16.cu
index 9c7faef284fee..8c1d49fd6e290 100644
--- a/clang/test/SemaCUDA/float16.cu
+++ b/clang/test/SemaCUDA/float16.cu
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fsyntax-only -triple x86_64 -aux-triple amdgcn -verify %s
+// RUN: %clang_cc1 -fsyntax-only -triple x86_64 -aux-triple amdgpu -verify %s
 // RUN: %clang_cc1 -fsyntax-only -triple x86_64 -aux-triple spirv64-amd-amdhsa 
-verify %s
 // RUN: %clang_cc1 -fsyntax-only -triple x86_64 -aux-triple nvptx64 -verify %s
 // expected-no-diagnostics

diff  --git a/clang/test/SemaCUDA/overloaded-builtin.cu 
b/clang/test/SemaCUDA/overloaded-builtin.cu
index c60c27e7f8627..13c5b3857f97b 100644
--- a/clang/test/SemaCUDA/overloaded-builtin.cu
+++ b/clang/test/SemaCUDA/overloaded-builtin.cu
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -aux-triple 
amdgcn-amd-amdhsa -fsyntax-only -verify=host -xhip %s
+// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -aux-triple 
amdgpu-amd-amdhsa -fsyntax-only -verify=host -xhip %s
 // RUN: %clang_cc1 -triple amdgcn-amd-amdhsa -fsyntax-only -fcuda-is-device 
-verify=dev -xhip %s
 
 // dev-no-diagnostics

diff  --git a/clang/test/SemaHIP/amdgpu-av-load-store.hip 
b/clang/test/SemaHIP/amdgpu-av-load-store.hip
index 85923ef955779..061a6939cd39b 100644
--- a/clang/test/SemaHIP/amdgpu-av-load-store.hip
+++ b/clang/test/SemaHIP/amdgpu-av-load-store.hip
@@ -1,6 +1,6 @@
 // REQUIRES: amdgpu-registered-target
 // RUN: %clang_cc1 -fsyntax-only -triple amdgpu9.50 -verify %s -fcuda-is-device
-// RUN: %clang_cc1 -fsyntax-only -triple x86_64 -aux-triple amdgcn -verify %s
+// RUN: %clang_cc1 -fsyntax-only -triple x86_64 -aux-triple amdgpu -verify %s
 
 // expected-no-diagnostics
 

diff  --git a/clang/test/SemaHIP/amdgpu-barrier.hip 
b/clang/test/SemaHIP/amdgpu-barrier.hip
index ccd99b1e2c1f2..2a6a228a1caf3 100644
--- a/clang/test/SemaHIP/amdgpu-barrier.hip
+++ b/clang/test/SemaHIP/amdgpu-barrier.hip
@@ -1,6 +1,6 @@
 // REQUIRES: amdgpu-registered-target
 // RUN: %clang_cc1 -fsyntax-only -verify -triple amdgcn -Wno-unused-value %s
-// RUN: %clang_cc1 -fsyntax-only -verify -triple x86_64 -aux-triple amdgcn 
-Wno-unused-value %s
+// RUN: %clang_cc1 -fsyntax-only -verify -triple x86_64 -aux-triple amdgpu 
-Wno-unused-value %s
 
 #define __device__ __attribute__((device))
 

diff  --git a/clang/test/SemaHIP/amdgpu-buffer-rsrc.hip 
b/clang/test/SemaHIP/amdgpu-buffer-rsrc.hip
index 3e5b22dc8963d..9d3b6bb31ec1c 100644
--- a/clang/test/SemaHIP/amdgpu-buffer-rsrc.hip
+++ b/clang/test/SemaHIP/amdgpu-buffer-rsrc.hip
@@ -1,6 +1,6 @@
 // REQUIRES: amdgpu-registered-target
 // RUN: %clang_cc1 -fsyntax-only -verify -triple amdgcn -Wno-unused-value %s
-// RUN: %clang_cc1 -fsyntax-only -verify -triple x86_64 -aux-triple amdgcn 
-Wno-unused-value %s
+// RUN: %clang_cc1 -fsyntax-only -verify -triple x86_64 -aux-triple amdgpu 
-Wno-unused-value %s
 
 #define __device__ __attribute__((device))
 

diff  --git a/clang/test/SemaHIP/amdgpu-ds-atomic-fadd-err.hip 
b/clang/test/SemaHIP/amdgpu-ds-atomic-fadd-err.hip
index 4cd7deedd0e13..acbe2e21f783c 100644
--- a/clang/test/SemaHIP/amdgpu-ds-atomic-fadd-err.hip
+++ b/clang/test/SemaHIP/amdgpu-ds-atomic-fadd-err.hip
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -fsyntax-only -triple amdgpu9.0a -verify=device,both %s 
-fcuda-is-device
-// RUN: %clang_cc1 -fsyntax-only -triple x86_64 -aux-triple amdgcn 
-verify=host,both %s
+// RUN: %clang_cc1 -fsyntax-only -triple x86_64 -aux-triple amdgpu 
-verify=host,both %s
 
 #define __device__ __attribute__((device))
 #define __shared__ __attribute__((shared))

diff  --git a/clang/test/SemaHIP/amdgpu-feature-builtins-cant-jump.hip 
b/clang/test/SemaHIP/amdgpu-feature-builtins-cant-jump.hip
index a7f1abcdcd8fe..6c84270482d23 100644
--- a/clang/test/SemaHIP/amdgpu-feature-builtins-cant-jump.hip
+++ b/clang/test/SemaHIP/amdgpu-feature-builtins-cant-jump.hip
@@ -1,9 +1,9 @@
 // REQUIRES: amdgpu-registered-target
 // REQUIRES: spirv-registered-target
-// RUN: %clang_cc1 -fsyntax-only -verify -triple amdgcn -target-cpu gfx900 
-Wno-unused-value %s
-// RUN: %clang_cc1 -fsyntax-only -verify -triple amdgcn -target-cpu gfx1201 
-Wno-unused-value %s
+// RUN: %clang_cc1 -fsyntax-only -verify -triple amdgpu9.00 -Wno-unused-value 
%s
+// RUN: %clang_cc1 -fsyntax-only -verify -triple amdgpu12.01 -Wno-unused-value 
%s
 // RUN: %clang_cc1 -fsyntax-only -verify -triple spirv64-amd-amdhsa 
-Wno-unused-value %s
-// RUN: %clang_cc1 -fsyntax-only -verify -triple x86_64 -aux-triple amdgcn 
-Wno-unused-value %s
+// RUN: %clang_cc1 -fsyntax-only -verify -triple x86_64 -aux-triple amdgpu 
-Wno-unused-value %s
 // RUN: %clang_cc1 -fsyntax-only -verify -triple x86_64 -aux-triple 
spirv64-amd-amdhsa -Wno-unused-value %s
 
 #define __device__ __attribute__((device))

diff  --git 
a/clang/test/SemaHIP/amdgpu-feature-builtins-return-type-deduction.hip 
b/clang/test/SemaHIP/amdgpu-feature-builtins-return-type-deduction.hip
index 1a0cd892e4bac..e372e657ac243 100644
--- a/clang/test/SemaHIP/amdgpu-feature-builtins-return-type-deduction.hip
+++ b/clang/test/SemaHIP/amdgpu-feature-builtins-return-type-deduction.hip
@@ -3,7 +3,7 @@
 // RUN: %clang_cc1 -triple amdgpu9.00 -ast-dump -ast-dump-decl-types %s | 
FileCheck %s --strict-whitespace
 // RUN: %clang_cc1 -triple amdgpu12.01 -ast-dump -ast-dump-decl-types %s | 
FileCheck %s --strict-whitespace
 // RUN: %clang_cc1 -triple spirv64-amd-amdhsa -ast-dump -ast-dump-decl-types 
%s | FileCheck %s --strict-whitespace
-// RUN: %clang_cc1 -triple x86_64 -aux-triple amdgcn -ast-dump 
-ast-dump-decl-types %s | FileCheck %s --strict-whitespace
+// RUN: %clang_cc1 -triple x86_64 -aux-triple amdgpu -ast-dump 
-ast-dump-decl-types %s | FileCheck %s --strict-whitespace
 // RUN: %clang_cc1 -triple x86_64 -aux-triple spirv64-amd-amdhsa -ast-dump 
-ast-dump-decl-types %s | FileCheck %s --strict-whitespace
 
 __attribute__((device)) auto foo() {

diff  --git a/clang/test/SemaHIP/amdgpu-feature-predicate.hip 
b/clang/test/SemaHIP/amdgpu-feature-predicate.hip
index f3d333d63e51d..382937381d3d4 100644
--- a/clang/test/SemaHIP/amdgpu-feature-predicate.hip
+++ b/clang/test/SemaHIP/amdgpu-feature-predicate.hip
@@ -1,7 +1,7 @@
 // REQUIRES: amdgpu-registered-target
 // REQUIRED: spirv-registered-target
 // RUN: %clang_cc1 -fsyntax-only -verify -triple amdgcn -Wno-unused-value %s
-// RUN: %clang_cc1 -fsyntax-only -verify -triple x86_64 -aux-triple amdgcn 
-Wno-unused-value %s
+// RUN: %clang_cc1 -fsyntax-only -verify -triple x86_64 -aux-triple amdgpu 
-Wno-unused-value %s
 // RUN: %clang_cc1 -fsyntax-only -verify -triple spirv64-amd-amdhsa 
-Wno-unused-value %s
 // RUN: %clang_cc1 -fsyntax-only -verify -triple x86_64 -aux-triple 
spirv64-amd-amdhsa -Wno-unused-value %s
 

diff  --git a/clang/test/SemaHIP/amdgpu-flat-atomic-fadd-err.hip 
b/clang/test/SemaHIP/amdgpu-flat-atomic-fadd-err.hip
index c7e6a1d7bb4a8..e1787a4254089 100644
--- a/clang/test/SemaHIP/amdgpu-flat-atomic-fadd-err.hip
+++ b/clang/test/SemaHIP/amdgpu-flat-atomic-fadd-err.hip
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -fsyntax-only -triple amdgpu9.42 -verify %s -fcuda-is-device
-// RUN: %clang_cc1 -fsyntax-only -triple x86_64 -aux-triple amdgcn -verify %s
+// RUN: %clang_cc1 -fsyntax-only -triple x86_64 -aux-triple amdgpu -verify %s
 
 #define __device__ __attribute__((device))
 #define __shared__ __attribute__((shared))

diff  --git a/clang/test/SemaHIP/amdgpu-flat-atomic-fmax-err.hip 
b/clang/test/SemaHIP/amdgpu-flat-atomic-fmax-err.hip
index 5c45808c175bc..2e43d0acc1ca5 100644
--- a/clang/test/SemaHIP/amdgpu-flat-atomic-fmax-err.hip
+++ b/clang/test/SemaHIP/amdgpu-flat-atomic-fmax-err.hip
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -fsyntax-only -triple amdgpu9.42 -verify %s -fcuda-is-device
-// RUN: %clang_cc1 -fsyntax-only -triple x86_64 -aux-triple amdgcn -verify %s
+// RUN: %clang_cc1 -fsyntax-only -triple x86_64 -aux-triple amdgpu -verify %s
 
 #define __device__ __attribute__((device))
 

diff  --git a/clang/test/SemaHIP/amdgpu-flat-atomic-fmin-err.hip 
b/clang/test/SemaHIP/amdgpu-flat-atomic-fmin-err.hip
index 066295b332885..026a9f12a0b62 100644
--- a/clang/test/SemaHIP/amdgpu-flat-atomic-fmin-err.hip
+++ b/clang/test/SemaHIP/amdgpu-flat-atomic-fmin-err.hip
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -fsyntax-only -triple amdgpu9.42 -verify %s -fcuda-is-device
-// RUN: %clang_cc1 -fsyntax-only -triple x86_64 -aux-triple amdgcn -verify %s
+// RUN: %clang_cc1 -fsyntax-only -triple x86_64 -aux-triple amdgpu -verify %s
 
 #define __device__ __attribute__((device))
 

diff  --git a/clang/test/SemaHIP/amdgpu-gfx950-load-to-lds.hip 
b/clang/test/SemaHIP/amdgpu-gfx950-load-to-lds.hip
index 7b39d633cf864..28f9d2a5e2f7c 100644
--- a/clang/test/SemaHIP/amdgpu-gfx950-load-to-lds.hip
+++ b/clang/test/SemaHIP/amdgpu-gfx950-load-to-lds.hip
@@ -1,6 +1,6 @@
 // REQUIRES: amdgpu-registered-target
 // RUN: %clang_cc1 -fsyntax-only -triple amdgpu9.50 -verify %s -fcuda-is-device
-// RUN: %clang_cc1 -fsyntax-only -triple x86_64 -aux-triple amdgcn -verify %s
+// RUN: %clang_cc1 -fsyntax-only -triple x86_64 -aux-triple amdgpu -verify %s
 
 #define __device__ __attribute__((device))
 #define __global__ __attribute__((global))

diff  --git a/clang/test/SemaHIP/amdgpu-global-atomic-fadd-err.hip 
b/clang/test/SemaHIP/amdgpu-global-atomic-fadd-err.hip
index 7dcdea982d63a..3ba0fc6143497 100644
--- a/clang/test/SemaHIP/amdgpu-global-atomic-fadd-err.hip
+++ b/clang/test/SemaHIP/amdgpu-global-atomic-fadd-err.hip
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -fsyntax-only -triple amdgpu9.42 -verify %s -fcuda-is-device
-// RUN: %clang_cc1 -fsyntax-only -triple x86_64 -aux-triple amdgcn -verify %s
+// RUN: %clang_cc1 -fsyntax-only -triple x86_64 -aux-triple amdgpu -verify %s
 
 #define __device__ __attribute__((device))
 #define __shared__ __attribute__((shared))

diff  --git a/clang/test/SemaHIP/amdgpu-global-atomic-fmax-err.hip 
b/clang/test/SemaHIP/amdgpu-global-atomic-fmax-err.hip
index f342ea01403d1..abb996a58d287 100644
--- a/clang/test/SemaHIP/amdgpu-global-atomic-fmax-err.hip
+++ b/clang/test/SemaHIP/amdgpu-global-atomic-fmax-err.hip
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -fsyntax-only -triple amdgpu9.42 -verify %s -fcuda-is-device
-// RUN: %clang_cc1 -fsyntax-only -triple x86_64 -aux-triple amdgcn -verify %s
+// RUN: %clang_cc1 -fsyntax-only -triple x86_64 -aux-triple amdgpu -verify %s
 
 #define __device__ __attribute__((device))
 #define __shared__ __attribute__((shared))

diff  --git a/clang/test/SemaHIP/amdgpu-global-atomic-fmin-err.hip 
b/clang/test/SemaHIP/amdgpu-global-atomic-fmin-err.hip
index 7b40cd7b08aff..f6f65f7ddc2cd 100644
--- a/clang/test/SemaHIP/amdgpu-global-atomic-fmin-err.hip
+++ b/clang/test/SemaHIP/amdgpu-global-atomic-fmin-err.hip
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -fsyntax-only -triple amdgpu9.42 -verify %s -fcuda-is-device
-// RUN: %clang_cc1 -fsyntax-only -triple x86_64 -aux-triple amdgcn -verify %s
+// RUN: %clang_cc1 -fsyntax-only -triple x86_64 -aux-triple amdgpu -verify %s
 
 #define __device__ __attribute__((device))
 #define __shared__ __attribute__((shared))

diff  --git a/clang/test/SemaHIP/amdgpu-is-invocable.hip 
b/clang/test/SemaHIP/amdgpu-is-invocable.hip
index 214d7769a595f..d7e5950effb8b 100644
--- a/clang/test/SemaHIP/amdgpu-is-invocable.hip
+++ b/clang/test/SemaHIP/amdgpu-is-invocable.hip
@@ -2,7 +2,7 @@
 // REQUIRES: spirv-registered-target
 // RUN: %clang_cc1 -fsyntax-only -verify -triple amdgcn -Wno-unused-value %s
 // RUN: %clang_cc1 -fsyntax-only -verify -triple spirv64-amd-amdhsa 
-Wno-unused-value %s
-// RUN: %clang_cc1 -fsyntax-only -verify -triple x86_64 -aux-triple amdgcn 
-Wno-unused-value %s
+// RUN: %clang_cc1 -fsyntax-only -verify -triple x86_64 -aux-triple amdgpu 
-Wno-unused-value %s
 // RUN: %clang_cc1 -fsyntax-only -verify -triple x86_64 -aux-triple 
spirv64-amd-amdhsa -Wno-unused-value %s
 
 // expected-no-diagnostics

diff  --git a/clang/test/SemaHIP/amdgpu-processor-is.hip 
b/clang/test/SemaHIP/amdgpu-processor-is.hip
index 0f7211fd75d90..5c21374397100 100644
--- a/clang/test/SemaHIP/amdgpu-processor-is.hip
+++ b/clang/test/SemaHIP/amdgpu-processor-is.hip
@@ -2,7 +2,7 @@
 // REQUIRES: spirv-registered-target
 // RUN: %clang_cc1 -fsyntax-only -verify -triple amdgcn -Wno-unused-value %s
 // RUN: %clang_cc1 -fsyntax-only -verify -triple spirv64-amd-amdhsa 
-Wno-unused-value %s
-// RUN: %clang_cc1 -fsyntax-only -verify -triple x86_64 -aux-triple amdgcn 
-Wno-unused-value %s
+// RUN: %clang_cc1 -fsyntax-only -verify -triple x86_64 -aux-triple amdgpu 
-Wno-unused-value %s
 // RUN: %clang_cc1 -fsyntax-only -verify -triple x86_64 -aux-triple 
spirv64-amd-amdhsa -Wno-unused-value %s
 
 // expected-no-diagnostics

diff  --git a/clang/test/SemaHIP/builtins-amdgcn-raw-buffer-atomic-add.hip 
b/clang/test/SemaHIP/builtins-amdgcn-raw-buffer-atomic-add.hip
index ddb68915bc74f..0cde480ddc089 100644
--- a/clang/test/SemaHIP/builtins-amdgcn-raw-buffer-atomic-add.hip
+++ b/clang/test/SemaHIP/builtins-amdgcn-raw-buffer-atomic-add.hip
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -fsyntax-only -triple amdgpu9.0a -verify %s -fcuda-is-device
-// RUN: %clang_cc1 -fsyntax-only -triple x86_64 -aux-triple amdgcn -verify %s
+// RUN: %clang_cc1 -fsyntax-only -triple x86_64 -aux-triple amdgpu -verify %s
 
 typedef _Float16 __attribute__((ext_vector_type(2))) float16x2_t;
 

diff  --git a/clang/test/SemaHIP/builtins-amdgcn-raw-buffer-atomic-fmin-max.hip 
b/clang/test/SemaHIP/builtins-amdgcn-raw-buffer-atomic-fmin-max.hip
index 713a7f1dc92d0..9c6755afe64ee 100644
--- a/clang/test/SemaHIP/builtins-amdgcn-raw-buffer-atomic-fmin-max.hip
+++ b/clang/test/SemaHIP/builtins-amdgcn-raw-buffer-atomic-fmin-max.hip
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -fsyntax-only -triple amdgpu9.0a -verify %s -fcuda-is-device
-// RUN: %clang_cc1 -fsyntax-only -triple x86_64 -aux-triple amdgcn -verify %s
+// RUN: %clang_cc1 -fsyntax-only -triple x86_64 -aux-triple amdgpu -verify %s
 
 #define __device__ __attribute__((device))
 


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

Reply via email to