Author: Matt Arsenault Date: 2026-07-25T00:52:10+02:00 New Revision: 3f69551f6bf06a8c4e44a9d86c3ed0153c20694e
URL: https://github.com/llvm/llvm-project/commit/3f69551f6bf06a8c4e44a9d86c3ed0153c20694e DIFF: https://github.com/llvm/llvm-project/commit/3f69551f6bf06a8c4e44a9d86c3ed0153c20694e.diff LOG: clang/AMDGPU: Migrate cc1 tests to subarch triples (7) (#211869) Rewrite the remaining small test directories (CodeGenCXX, Misc, Sema, SemaCUDA, SemaCXX) cc1 RUN lines to the new subarch triple form, dropping the redundant -target-cpu. Co-authored-by: Claude (Opus 4.8) <[email protected]> Added: Modified: clang/test/CodeGenCXX/amdgpu-float16.cpp clang/test/CodeGenCXX/sret_cast_with_nonzero_alloca_as.cpp clang/test/Misc/amdgcn.languageOptsOpenCL.cl clang/test/Misc/amdgcn.unsupported_core_3.1.cl clang/test/Misc/backend-resource-limit-diagnostics.hip clang/test/Sema/sizeof-struct-non-zero-as-member.cl clang/test/SemaCUDA/builtins-unsafe-atomics-gfx90a.cu clang/test/SemaCUDA/cluster_dims.cu clang/test/SemaCUDA/lambda.cu clang/test/SemaCUDA/openmp-target.cu clang/test/SemaCXX/ms-layout_version.cpp Removed: ################################################################################ diff --git a/clang/test/CodeGenCXX/amdgpu-float16.cpp b/clang/test/CodeGenCXX/amdgpu-float16.cpp index cbd1e1dee60e6..64cabc098f964 100644 --- a/clang/test/CodeGenCXX/amdgpu-float16.cpp +++ b/clang/test/CodeGenCXX/amdgpu-float16.cpp @@ -1,8 +1,8 @@ // REQUIRES: amdgpu-registered-target -// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa -target-cpu gfx701 -S -o - %s | FileCheck %s -check-prefix=NOF16 -// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa -target-cpu gfx803 -S -o - %s | FileCheck %s -// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa -target-cpu gfx900 -S -o - %s | FileCheck %s -// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa -target-cpu gfx906 -S -o - %s | FileCheck %s +// RUN: %clang_cc1 -triple amdgpu7.01-amd-amdhsa -S -o - %s | FileCheck %s -check-prefix=NOF16 +// RUN: %clang_cc1 -triple amdgpu8.03-amd-amdhsa -S -o - %s | FileCheck %s +// RUN: %clang_cc1 -triple amdgpu9.00-amd-amdhsa -S -o - %s | FileCheck %s +// RUN: %clang_cc1 -triple amdgpu9.06-amd-amdhsa -S -o - %s | FileCheck %s void f() { _Float16 x, y, z; // CHECK: v_add_f16_e64 diff --git a/clang/test/CodeGenCXX/sret_cast_with_nonzero_alloca_as.cpp b/clang/test/CodeGenCXX/sret_cast_with_nonzero_alloca_as.cpp index a1a6ada4f3fd6..a899a02691bfa 100644 --- a/clang/test/CodeGenCXX/sret_cast_with_nonzero_alloca_as.cpp +++ b/clang/test/CodeGenCXX/sret_cast_with_nonzero_alloca_as.cpp @@ -1,5 +1,5 @@ // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --version 5 -// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa-gnu -target-cpu gfx900 -emit-llvm -o - %s | FileCheck %s +// RUN: %clang_cc1 -triple amdgpu9.00-amd-amdhsa-gnu -emit-llvm -o - %s | FileCheck %s struct X { int z[17]; }; diff --git a/clang/test/Misc/amdgcn.languageOptsOpenCL.cl b/clang/test/Misc/amdgcn.languageOptsOpenCL.cl index 5e611329b518d..0fdc9ddab5bd5 100644 --- a/clang/test/Misc/amdgcn.languageOptsOpenCL.cl +++ b/clang/test/Misc/amdgcn.languageOptsOpenCL.cl @@ -9,7 +9,7 @@ // RUN: %clang_cc1 -x cl -cl-std=CL2.0 %s -verify -triple amdgcn-unknown-amdhsa -Wpedantic-core-features -DTEST_CORE_FEATURES -DFLAT_SUPPORT // RUN: %clang_cc1 -x cl -cl-std=CL3.0 %s -verify -triple amdgcn-unknown-unknown -Wpedantic-core-features -DTEST_CORE_FEATURES -// RUN: %clang_cc1 -x cl -cl-std=CL3.0 %s -verify -triple amdgcn-unknown-unknown -target-cpu gfx700 -Wpedantic-core-features -DTEST_CORE_FEATURES -DFLAT_SUPPORT +// RUN: %clang_cc1 -x cl -cl-std=CL3.0 %s -verify -triple amdgpu7.00-unknown-unknown -Wpedantic-core-features -DTEST_CORE_FEATURES -DFLAT_SUPPORT // Test none target with amdhsa triple, which implies >= gfx700 // RUN: %clang_cc1 -x cl -cl-std=CL3.0 %s -verify -triple amdgcn-unknown-amdhsa -Wpedantic-core-features -DTEST_CORE_FEATURES -DFLAT_SUPPORT diff --git a/clang/test/Misc/amdgcn.unsupported_core_3.1.cl b/clang/test/Misc/amdgcn.unsupported_core_3.1.cl index 5a406670777ae..250541a2a0cdf 100644 --- a/clang/test/Misc/amdgcn.unsupported_core_3.1.cl +++ b/clang/test/Misc/amdgcn.unsupported_core_3.1.cl @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -cl-std=CL3.1 -triple amdgcn-amd-amdhsa -Wpedantic-core-features %s 2>&1 | FileCheck %s +// RUN: %clang_cc1 -cl-std=CL3.1 -triple amdgpu-amd-amdhsa -Wpedantic-core-features %s 2>&1 | FileCheck %s // CHECK: cl_khr_extended_bit_ops is a core feature in OpenCL C version 3.1 but not supported on this target // CHECK: cl_khr_integer_dot_product is a core feature in OpenCL C version 3.1 but not supported on this target diff --git a/clang/test/Misc/backend-resource-limit-diagnostics.hip b/clang/test/Misc/backend-resource-limit-diagnostics.hip index 4479f067be3c3..a45d192ebb67f 100644 --- a/clang/test/Misc/backend-resource-limit-diagnostics.hip +++ b/clang/test/Misc/backend-resource-limit-diagnostics.hip @@ -1,5 +1,5 @@ // REQUIRES: amdgpu-registered-target -// RUN: not %clang_cc1 -triple amdgcn-amd-amdhsa -target-cpu gfx906 -debug-info-kind=standalone -x hip -fcuda-is-device -emit-codegen-only < %s 2>&1 | FileCheck -DFILE=%s %s +// RUN: not %clang_cc1 -triple amdgpu9.06-amd-amdhsa -debug-info-kind=standalone -x hip -fcuda-is-device -emit-codegen-only < %s 2>&1 | FileCheck -DFILE=%s %s #define __global__ __attribute__((global)) #define __shared__ __attribute__((shared)) diff --git a/clang/test/Sema/sizeof-struct-non-zero-as-member.cl b/clang/test/Sema/sizeof-struct-non-zero-as-member.cl index 2fa7d1f109a44..a46ffb59539b9 100644 --- a/clang/test/Sema/sizeof-struct-non-zero-as-member.cl +++ b/clang/test/Sema/sizeof-struct-non-zero-as-member.cl @@ -1,5 +1,5 @@ -// RUN: %clang_cc1 -verify -triple amdgcn -target-cpu verde -emit-llvm -o - %s -// RUN: %clang_cc1 -verify -triple amdgcn--opencl -target-cpu verde -emit-llvm -o - %s +// RUN: %clang_cc1 -verify -triple amdgpu6.01 -emit-llvm -o - %s +// RUN: %clang_cc1 -verify -triple amdgpu6.01--opencl -emit-llvm -o - %s // expected-no-diagnostics // Record lowering was crashing on SI and newer targets, because it diff --git a/clang/test/SemaCUDA/builtins-unsafe-atomics-gfx90a.cu b/clang/test/SemaCUDA/builtins-unsafe-atomics-gfx90a.cu index 6f1484c68ec71..2c6e02a7da6be 100644 --- a/clang/test/SemaCUDA/builtins-unsafe-atomics-gfx90a.cu +++ b/clang/test/SemaCUDA/builtins-unsafe-atomics-gfx90a.cu @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa -target-cpu gfx90a -x hip \ +// RUN: %clang_cc1 -triple amdgpu9.0a-amd-amdhsa -x hip \ // RUN: -aux-triple x86_64-unknown-linux-gnu -fcuda-is-device %s \ // RUN: -fsyntax-only -verify // expected-no-diagnostics diff --git a/clang/test/SemaCUDA/cluster_dims.cu b/clang/test/SemaCUDA/cluster_dims.cu index dcb8737a51006..1fcc4d6fe0a8a 100644 --- a/clang/test/SemaCUDA/cluster_dims.cu +++ b/clang/test/SemaCUDA/cluster_dims.cu @@ -1,6 +1,6 @@ // RUN: %clang_cc1 -triple amdgcn-amd-amdhsa -fcuda-is-device -ast-print -x hip -verify=NS,all %s // RUN: %clang_cc1 -triple nvptx-nvidia-cuda -fcuda-is-device -ast-print -x hip -verify=NS,all %s -// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa -target-cpu gfx1250 -fcuda-is-device -ast-print -x hip -verify=amd,common,all %s | FileCheck -check-prefixes=CHECK %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 diff --git a/clang/test/SemaCUDA/lambda.cu b/clang/test/SemaCUDA/lambda.cu index 524cdd429bf53..284e68681e444 100644 --- a/clang/test/SemaCUDA/lambda.cu +++ b/clang/test/SemaCUDA/lambda.cu @@ -1,7 +1,7 @@ // RUN: %clang_cc1 -std=c++17 -fsyntax-only -verify=com %s // RUN: %clang_cc1 -std=c++17 -fsyntax-only -fcuda-is-device -verify=com,dev,warn %s // RUN: %clang_cc1 -std=c++17 -fsyntax-only -fcuda-is-device -verify=com,dev,warn \ -// RUN: -triple amdgcn-amd-amdhsa -target-cpu gfx906 -x hip %s +// RUN: -triple amdgpu9.06-amd-amdhsa -x hip %s // RUN: %clang_cc1 -std=c++17 -fsyntax-only -fcuda-is-device -verify=com,dev \ // RUN: -Wno-gpu-maybe-wrong-side %s diff --git a/clang/test/SemaCUDA/openmp-target.cu b/clang/test/SemaCUDA/openmp-target.cu index 8966f209f8829..7463abce399df 100644 --- a/clang/test/SemaCUDA/openmp-target.cu +++ b/clang/test/SemaCUDA/openmp-target.cu @@ -1,8 +1,8 @@ // RUN: %clang_cc1 -triple x86_64 -verify=expected,dev \ // RUN: -verify-ignore-unexpected=note \ -// RUN: -fopenmp -fopenmp-targets=amdgcn-amd-amdhsa -o - %s +// RUN: -fopenmp -fopenmp-targets=amdgpu-amd-amdhsa -o - %s // RUN: %clang_cc1 -triple x86_64 -verify -verify-ignore-unexpected=note\ -// RUN: -fopenmp -fopenmp-targets=amdgcn-amd-amdhsa -o - -x c++ %s +// RUN: -fopenmp -fopenmp-targets=amdgpu-amd-amdhsa -o - -x c++ %s // RUN: %clang_cc1 -triple x86_64 -verify=dev -verify-ignore-unexpected=note\ // RUN: -fcuda-is-device -o - %s diff --git a/clang/test/SemaCXX/ms-layout_version.cpp b/clang/test/SemaCXX/ms-layout_version.cpp index e3a59f813c57f..113ef0e047936 100644 --- a/clang/test/SemaCXX/ms-layout_version.cpp +++ b/clang/test/SemaCXX/ms-layout_version.cpp @@ -1,7 +1,7 @@ // RUN: %clang_cc1 -triple i386-pc-win32 %s -fsyntax-only -verify -fms-extensions -Wno-microsoft -std=c++11 // RUN: %clang_cc1 %s -fsyntax-only -verify -fms-extensions -Wno-microsoft \ // RUN: -std=c++11 -aux-triple x86_64-pc-win32 -fcuda-is-device -xhip \ -// RUN: -triple amdgcn-amd-amdhsa -target-cpu gfx1200 +// RUN: -triple amdgpu12.00-amd-amdhsa // RUN: %clang_cc1 %s -fsyntax-only -verify -fms-extensions -Wno-microsoft \ // RUN: -std=c++11 -aux-triple x86_64-pc-win32 -fcuda-is-device -xhip \ // RUN: -triple spirv64-amd-amdhsa _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
