https://github.com/arsenm created https://github.com/llvm/llvm-project/pull/225391
None >From faba3bd791f5a6b47f7e721da31e40deb8e7b3b4 Mon Sep 17 00:00:00 2001 From: Matt Arsenault <[email protected]> Date: Tue, 22 Sep 2026 14:58:51 +0200 Subject: [PATCH] clang/AMDGPU: Use subarch triples in more cc1 tests --- clang/test/CodeGen/AMDGPU/amdgcn-av-non-atomic.cpp | 3 +-- clang/test/CodeGen/AMDGPU/amdgcn-av-none-amdgpu-atomic.cpp | 3 +-- clang/test/CodeGen/AMDGPU/amdgcn-av-none-attr.cpp | 3 +-- clang/test/CodeGenCUDA/amdgpu-bf16.cu | 2 +- clang/test/CodeGenHIP/hipspv-kernel.cpp | 2 +- .../amdgpu-debug-info-pointer-address-space.cl | 4 ++-- clang/test/CodeGenOpenCL/opencl_types.cl | 2 +- clang/test/CodeGenOpenCL/spir_version.cl | 6 +++--- clang/test/OpenMP/amdgcn_save_temps.c | 6 +++--- clang/test/SemaHIP/atomic-init.hip | 2 +- 10 files changed, 15 insertions(+), 18 deletions(-) diff --git a/clang/test/CodeGen/AMDGPU/amdgcn-av-non-atomic.cpp b/clang/test/CodeGen/AMDGPU/amdgcn-av-non-atomic.cpp index 46fbdec7b7a41..aa803008daf96 100644 --- a/clang/test/CodeGen/AMDGPU/amdgcn-av-non-atomic.cpp +++ b/clang/test/CodeGen/AMDGPU/amdgcn-av-non-atomic.cpp @@ -1,6 +1,5 @@ // REQUIRES: amdgpu-registered-target -// RUN: %clang_cc1 %s -emit-llvm -O0 -verify -o - \ -// RUN: -triple=amdgcn-amd-amdhsa | FileCheck %s +// RUN: %clang_cc1 %s -emit-llvm -O0 -verify -triple=amdgpu7.00-amd-amdhsa -o - | FileCheck %s // Test that [[clang::amdgpu_av("none")]] on non-atomic statements emits a // warning and does NOT produce !mmra metadata. diff --git a/clang/test/CodeGen/AMDGPU/amdgcn-av-none-amdgpu-atomic.cpp b/clang/test/CodeGen/AMDGPU/amdgcn-av-none-amdgpu-atomic.cpp index 4ddd3f38dd896..c4b34e0b5d2aa 100644 --- a/clang/test/CodeGen/AMDGPU/amdgcn-av-none-amdgpu-atomic.cpp +++ b/clang/test/CodeGen/AMDGPU/amdgcn-av-none-amdgpu-atomic.cpp @@ -1,7 +1,6 @@ // REQUIRES: amdgpu-registered-target // RUN: %clang_cc1 %s -verify -emit-llvm -O0 -o - \ -// RUN: -triple=amdgcn-amd-amdhsa \ -// RUN: -target-cpu gfx942 +// RUN: -triple=amdgpu9.42-amd-amdhsa // Test that [[clang::amdgpu_av("none")]] on AMDGPU-specific atomic builtins // is rejected with a warning. diff --git a/clang/test/CodeGen/AMDGPU/amdgcn-av-none-attr.cpp b/clang/test/CodeGen/AMDGPU/amdgcn-av-none-attr.cpp index 38071f466c3a8..cc75acd6aad50 100644 --- a/clang/test/CodeGen/AMDGPU/amdgcn-av-none-attr.cpp +++ b/clang/test/CodeGen/AMDGPU/amdgcn-av-none-attr.cpp @@ -1,7 +1,6 @@ // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --version 4 // REQUIRES: amdgpu-registered-target -// RUN: %clang_cc1 %s -emit-llvm -O0 -o - \ -// RUN: -triple=amdgcn-amd-amdhsa | FileCheck %s +// RUN: %clang_cc1 %s -emit-llvm -O0 -triple=amdgpu7.00-amd-amdhsa -o - | FileCheck %s // Test that [[clang::amdgpu_av("none")]] on atomic builtins emits // !mmra !{!"amdgcn-av", !"none"} metadata on the resulting IR instructions. diff --git a/clang/test/CodeGenCUDA/amdgpu-bf16.cu b/clang/test/CodeGenCUDA/amdgpu-bf16.cu index d146eb6dd9516..9cb3829445165 100644 --- a/clang/test/CodeGenCUDA/amdgpu-bf16.cu +++ b/clang/test/CodeGenCUDA/amdgpu-bf16.cu @@ -2,7 +2,7 @@ // REQUIRES: amdgpu-registered-target // REQUIRES: x86-registered-target -// RUN: %clang_cc1 "-aux-triple" "x86_64-unknown-linux-gnu" "-triple" "amdgcn-amd-amdhsa" \ +// RUN: %clang_cc1 "-aux-triple" "x86_64-unknown-linux-gnu" "-triple" "amdgpu7.00-amd-amdhsa" \ // RUN: -fcuda-is-device "-aux-target-cpu" "x86-64" -emit-llvm -o - %s | FileCheck %s #include "Inputs/cuda.h" diff --git a/clang/test/CodeGenHIP/hipspv-kernel.cpp b/clang/test/CodeGenHIP/hipspv-kernel.cpp index 1ef8a5b19ccfb..812e78ebf8ffe 100644 --- a/clang/test/CodeGenHIP/hipspv-kernel.cpp +++ b/clang/test/CodeGenHIP/hipspv-kernel.cpp @@ -2,7 +2,7 @@ // RUN: -o - %s | FileCheck %s // RUN: %clang_cc1 -triple spirv64-amd-amdhsa -x hip -emit-llvm -fcuda-is-device \ // RUN: -o - %s | FileCheck %s -// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa -x hip -emit-llvm -fcuda-is-device \ +// RUN: %clang_cc1 -triple amdgpu7.00-amd-amdhsa -x hip -emit-llvm -fcuda-is-device \ // RUN: -o - %s | FileCheck %s --check-prefix=AMDGCN #define __global__ __attribute__((global)) diff --git a/clang/test/CodeGenOpenCL/amdgpu-debug-info-pointer-address-space.cl b/clang/test/CodeGenOpenCL/amdgpu-debug-info-pointer-address-space.cl index 6954d5beda344..ba714cf7cd38f 100644 --- a/clang/test/CodeGenOpenCL/amdgpu-debug-info-pointer-address-space.cl +++ b/clang/test/CodeGenOpenCL/amdgpu-debug-info-pointer-address-space.cl @@ -1,6 +1,6 @@ // REQUIRES: amdgpu-registered-target -// RUN: %clang -cl-std=CL2.0 -emit-llvm -g -O0 -S -nogpulib -target amdgcn-amd-amdhsa -mcpu=fiji -o - %s | FileCheck %s -// RUN: %clang -cl-std=CL2.0 -emit-llvm -g -O0 -S -nogpulib -target amdgcn-amd-amdhsa -mcpu=fiji -o - %s | FileCheck %s +// RUN: %clang -cl-std=CL2.0 -emit-llvm -g -O0 -S -nogpulib -target amdgpu8.03-amd-amdhsa -o - %s | FileCheck %s +// RUN: %clang -cl-std=CL2.0 -emit-llvm -g -O0 -S -nogpulib -target amdgpu8.03-amd-amdhsa -o - %s | FileCheck %s // CHECK-DAG: ![[DWARF_ADDRESS_SPACE_GLOBAL:[0-9]+]] = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !{{[0-9]+}}, size: {{[0-9]+}}) // CHECK-DAG: ![[DWARF_ADDRESS_SPACE_LOCAL:[0-9]+]] = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !{{[0-9]+}}, size: {{[0-9]+}}, dwarfAddressSpace: 3) diff --git a/clang/test/CodeGenOpenCL/opencl_types.cl b/clang/test/CodeGenOpenCL/opencl_types.cl index aac3492b7a9e8..6ec4f1e026243 100644 --- a/clang/test/CodeGenOpenCL/opencl_types.cl +++ b/clang/test/CodeGenOpenCL/opencl_types.cl @@ -1,5 +1,5 @@ // RUN: %clang_cc1 -cl-std=CL2.0 %s -triple "spir-unknown-unknown" -emit-llvm -o - -O0 | FileCheck %s --check-prefix=CHECK-SPIR -// RUN: %clang_cc1 -cl-std=CL2.0 %s -triple "amdgcn--amdhsa" -emit-llvm -o - -O0 | FileCheck %s --check-prefix=CHECK-AMDGCN +// RUN: %clang_cc1 -cl-std=CL2.0 %s -triple amdgpu7.00--amdhsa -emit-llvm -o - -O0 | FileCheck %s --check-prefix=CHECK-AMDGCN #define CLK_ADDRESS_CLAMP_TO_EDGE 2 #define CLK_NORMALIZED_COORDS_TRUE 1 diff --git a/clang/test/CodeGenOpenCL/spir_version.cl b/clang/test/CodeGenOpenCL/spir_version.cl index b0fa0c2355af9..b07e7e33e6fd4 100644 --- a/clang/test/CodeGenOpenCL/spir_version.cl +++ b/clang/test/CodeGenOpenCL/spir_version.cl @@ -7,9 +7,9 @@ // RUN: %clang_cc1 %s -triple "spir64-unknown-unknown" -emit-llvm -o - -cl-std=clc++ | FileCheck %s --check-prefix=CHECK-SPIR-CL20 -// RUN: %clang_cc1 %s -triple "amdgcn--amdhsa" -emit-llvm -o - -cl-std=CL1.0 | FileCheck %s --check-prefix=CHECK-AMDGCN-CL10 -// RUN: %clang_cc1 %s -triple "amdgcn--amdhsa" -emit-llvm -o - -cl-std=CL1.2 | FileCheck %s --check-prefix=CHECK-AMDGCN-CL12 -// RUN: %clang_cc1 %s -triple "amdgcn--amdhsa" -emit-llvm -o - -cl-std=CL2.0 | FileCheck %s --check-prefix=CHECK-AMDGCN-CL20 +// RUN: %clang_cc1 %s -triple "amdgpu7.00--amdhsa" -emit-llvm -o - -cl-std=CL1.0 | FileCheck %s --check-prefix=CHECK-AMDGCN-CL10 +// RUN: %clang_cc1 %s -triple "amdgpu7.00--amdhsa" -emit-llvm -o - -cl-std=CL1.2 | FileCheck %s --check-prefix=CHECK-AMDGCN-CL12 +// RUN: %clang_cc1 %s -triple "amdgpu7.00--amdhsa" -emit-llvm -o - -cl-std=CL2.0 | FileCheck %s --check-prefix=CHECK-AMDGCN-CL20 kernel void foo() {} kernel void bar() {} diff --git a/clang/test/OpenMP/amdgcn_save_temps.c b/clang/test/OpenMP/amdgcn_save_temps.c index 32ef81a034c3a..3d8e5a14f9efb 100644 --- a/clang/test/OpenMP/amdgcn_save_temps.c +++ b/clang/test/OpenMP/amdgcn_save_temps.c @@ -1,9 +1,9 @@ // REQUIRES: amdgpu-registered-target -// RUN: %clang_cc1 -E -fopenmp -x c -triple amdgpu-amd-amdhsa -fopenmp-targets=amdgpu-amd-amdhsa -save-temps=cwd %s -o %t-openmp-amdgcn-amd-amdhsa-gfx90a.i -// RUN: %clang_cc1 -fopenmp -x c -triple x86_64-unknown-unknown -fopenmp-targets=amdgpu-amd-amdhsa -save-temps=cwd -emit-llvm-bc %s -o %t-x86_64-unknown-unknown.bc -// RUN: %clang_cc1 -fopenmp -x c -triple amdgpu-amd-amdhsa -fopenmp-targets=amdgpu-amd-amdhsa -save-temps=cwd -emit-llvm -fopenmp-is-target-device -x cpp-output %t-openmp-amdgcn-amd-amdhsa-gfx90a.i -fopenmp-host-ir-file-path %t-x86_64-unknown-unknown.bc -o - | FileCheck %s +// RUN: %clang_cc1 -E -fopenmp -x c -triple amdgpu-amd-amdhsa -fopenmp-targets=amdgpu9.0a-amd-amdhsa -save-temps=cwd %s -o %t-openmp-amdgpu9.0a-amd-amdhsa.i +// RUN: %clang_cc1 -fopenmp -x c -triple x86_64-unknown-unknown -fopenmp-targets=amdgpu9.0a-amd-amdhsa -save-temps=cwd -emit-llvm-bc %s -o %t-x86_64-unknown-unknown.bc +// RUN: %clang_cc1 -fopenmp -x c -triple amdgpu9.0a-amd-amdhsa -fopenmp-targets=amdgpu9.0a-amd-amdhsa -save-temps=cwd -emit-llvm -fopenmp-is-target-device -x cpp-output %t-openmp-amdgpu9.0a-amd-amdhsa.i -fopenmp-host-ir-file-path %t-x86_64-unknown-unknown.bc -o - | FileCheck %s // expected-no-diagnostics #ifndef HEADER #define HEADER diff --git a/clang/test/SemaHIP/atomic-init.hip b/clang/test/SemaHIP/atomic-init.hip index 6bf9026417484..53ea83f149cf2 100644 --- a/clang/test/SemaHIP/atomic-init.hip +++ b/clang/test/SemaHIP/atomic-init.hip @@ -1,5 +1,5 @@ // RUN: %clang_cc1 -triple spirv64-amd-amdhsa -fcuda-is-device -fsyntax-only -verify %s -// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa -fcuda-is-device -fsyntax-only -verify %s +// RUN: %clang_cc1 -triple amdgpu9.00-amd-amdhsa -fcuda-is-device -fsyntax-only -verify %s // expected-no-diagnostics // SPIR-V's OpenCL metadata must not impose OpenCL initialization restrictions. _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
