Author: Matt Arsenault Date: 2026-07-25T08:20:47+02:00 New Revision: 943d6498fabf0143d31a39a87a103146bfc9af69
URL: https://github.com/llvm/llvm-project/commit/943d6498fabf0143d31a39a87a103146bfc9af69 DIFF: https://github.com/llvm/llvm-project/commit/943d6498fabf0143d31a39a87a103146bfc9af69.diff LOG: clang/AMDGPU: Migrate cc1 tests to subarch triples (8) (#211870) Rewrite SemaHIP cc1 test 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/SemaHIP/amdgpu-av-load-store.hip clang/test/SemaHIP/amdgpu-builtin-in-lambda-with-unsupported-attribute.hip clang/test/SemaHIP/amdgpu-builtin-in-lambda.hip clang/test/SemaHIP/amdgpu-ds-atomic-fadd-err.hip clang/test/SemaHIP/amdgpu-feature-builtins-return-type-deduction.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-global-load-lds-template.hip clang/test/SemaHIP/builtins-amdgcn-buffer-format.hip clang/test/SemaHIP/builtins-amdgcn-gfx1250-cooperative-atomics-templated.hip clang/test/SemaHIP/builtins-amdgcn-gfx1250-load-monitor-templated.hip clang/test/SemaHIP/builtins-amdgcn-raw-buffer-atomic-add.hip clang/test/SemaHIP/builtins-amdgcn-raw-buffer-atomic-fmin-max.hip clang/test/SemaHIP/hip-builtin-lvalue-to-rvalue.hip clang/test/SemaHIP/incorrect-atomic-scope.hip clang/test/SemaHIP/shared-variable-too-large.hip Removed: ################################################################################ diff --git a/clang/test/SemaHIP/amdgpu-av-load-store.hip b/clang/test/SemaHIP/amdgpu-av-load-store.hip index 1e9688e891228..85923ef955779 100644 --- a/clang/test/SemaHIP/amdgpu-av-load-store.hip +++ b/clang/test/SemaHIP/amdgpu-av-load-store.hip @@ -1,5 +1,5 @@ // REQUIRES: amdgpu-registered-target -// RUN: %clang_cc1 -fsyntax-only -triple amdgcn -target-cpu gfx950 -verify %s -fcuda-is-device +// 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 // expected-no-diagnostics diff --git a/clang/test/SemaHIP/amdgpu-builtin-in-lambda-with-unsupported-attribute.hip b/clang/test/SemaHIP/amdgpu-builtin-in-lambda-with-unsupported-attribute.hip index 5b9223f2eaa3a..5c7dae41fcfde 100644 --- a/clang/test/SemaHIP/amdgpu-builtin-in-lambda-with-unsupported-attribute.hip +++ b/clang/test/SemaHIP/amdgpu-builtin-in-lambda-with-unsupported-attribute.hip @@ -1,6 +1,6 @@ // REQUIRES: amdgpu-registered-target -// RUN: %clang_cc1 -std=c++20 -triple amdgcn -target-cpu tahiti -emit-llvm -fcuda-is-device -verify=no-memrealtime -o - %s -// RUN: %clang_cc1 -std=c++20 -triple amdgcn -target-cpu gfx950 -emit-llvm -fcuda-is-device -o - %s +// RUN: %clang_cc1 -std=c++20 -triple amdgpu6.00 -emit-llvm -fcuda-is-device -verify=no-memrealtime -o - %s +// RUN: %clang_cc1 -std=c++20 -triple amdgpu9.50 -emit-llvm -fcuda-is-device -o - %s #define __device__ __attribute__((device)) #define __shared__ __attribute__((shared)) diff --git a/clang/test/SemaHIP/amdgpu-builtin-in-lambda.hip b/clang/test/SemaHIP/amdgpu-builtin-in-lambda.hip index f89fc7b971e16..1517a58ca34b5 100644 --- a/clang/test/SemaHIP/amdgpu-builtin-in-lambda.hip +++ b/clang/test/SemaHIP/amdgpu-builtin-in-lambda.hip @@ -1,5 +1,5 @@ -// RUN: %clang_cc1 -std=c++20 -triple amdgcn -target-cpu gfx90a -fsyntax-only -fcuda-is-device -verify=gfx90a -o - %s -// RUN: %clang_cc1 -std=c++20 -triple amdgcn -target-cpu gfx950 -fsyntax-only -fcuda-is-device -o - %s +// RUN: %clang_cc1 -std=c++20 -triple amdgpu9.0a -fsyntax-only -fcuda-is-device -verify=gfx90a -o - %s +// RUN: %clang_cc1 -std=c++20 -triple amdgpu9.50 -fsyntax-only -fcuda-is-device -o - %s #define __device__ __attribute__((device)) #define __shared__ __attribute__((shared)) diff --git a/clang/test/SemaHIP/amdgpu-ds-atomic-fadd-err.hip b/clang/test/SemaHIP/amdgpu-ds-atomic-fadd-err.hip index 840b26e52cc25..4cd7deedd0e13 100644 --- a/clang/test/SemaHIP/amdgpu-ds-atomic-fadd-err.hip +++ b/clang/test/SemaHIP/amdgpu-ds-atomic-fadd-err.hip @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -fsyntax-only -triple amdgcn -target-cpu gfx90a -verify=device,both %s -fcuda-is-device +// 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 #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 27bbb3f2f3d07..1a0cd892e4bac 100644 --- a/clang/test/SemaHIP/amdgpu-feature-builtins-return-type-deduction.hip +++ b/clang/test/SemaHIP/amdgpu-feature-builtins-return-type-deduction.hip @@ -1,7 +1,7 @@ // REQUIRES: amdgpu-registered-target // REQUIRES: spirv-registered-target -// RUN: %clang_cc1 -triple amdgcn -target-cpu gfx900 -ast-dump -ast-dump-decl-types %s | FileCheck %s --strict-whitespace -// RUN: %clang_cc1 -triple amdgcn -target-cpu gfx1201 -ast-dump -ast-dump-decl-types %s | FileCheck %s --strict-whitespace +// 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 spirv64-amd-amdhsa -ast-dump -ast-dump-decl-types %s | FileCheck %s --strict-whitespace diff --git a/clang/test/SemaHIP/amdgpu-flat-atomic-fadd-err.hip b/clang/test/SemaHIP/amdgpu-flat-atomic-fadd-err.hip index 1438b69d82719..c7e6a1d7bb4a8 100644 --- a/clang/test/SemaHIP/amdgpu-flat-atomic-fadd-err.hip +++ b/clang/test/SemaHIP/amdgpu-flat-atomic-fadd-err.hip @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -fsyntax-only -triple amdgcn -target-cpu gfx942 -verify %s -fcuda-is-device +// 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 #define __device__ __attribute__((device)) diff --git a/clang/test/SemaHIP/amdgpu-flat-atomic-fmax-err.hip b/clang/test/SemaHIP/amdgpu-flat-atomic-fmax-err.hip index 1bb39af16c503..5c45808c175bc 100644 --- a/clang/test/SemaHIP/amdgpu-flat-atomic-fmax-err.hip +++ b/clang/test/SemaHIP/amdgpu-flat-atomic-fmax-err.hip @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -fsyntax-only -triple amdgcn -target-cpu gfx942 -verify %s -fcuda-is-device +// 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 #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 b30301d192e9e..066295b332885 100644 --- a/clang/test/SemaHIP/amdgpu-flat-atomic-fmin-err.hip +++ b/clang/test/SemaHIP/amdgpu-flat-atomic-fmin-err.hip @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -fsyntax-only -triple amdgcn -target-cpu gfx942 -verify %s -fcuda-is-device +// 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 #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 509906d8c87a8..7b39d633cf864 100644 --- a/clang/test/SemaHIP/amdgpu-gfx950-load-to-lds.hip +++ b/clang/test/SemaHIP/amdgpu-gfx950-load-to-lds.hip @@ -1,5 +1,5 @@ // REQUIRES: amdgpu-registered-target -// RUN: %clang_cc1 -fsyntax-only -triple amdgcn -target-cpu gfx950 -verify %s -fcuda-is-device +// 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 #define __device__ __attribute__((device)) diff --git a/clang/test/SemaHIP/amdgpu-global-atomic-fadd-err.hip b/clang/test/SemaHIP/amdgpu-global-atomic-fadd-err.hip index dc8697debc9bc..7dcdea982d63a 100644 --- a/clang/test/SemaHIP/amdgpu-global-atomic-fadd-err.hip +++ b/clang/test/SemaHIP/amdgpu-global-atomic-fadd-err.hip @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -fsyntax-only -triple amdgcn -target-cpu gfx942 -verify %s -fcuda-is-device +// 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 #define __device__ __attribute__((device)) diff --git a/clang/test/SemaHIP/amdgpu-global-atomic-fmax-err.hip b/clang/test/SemaHIP/amdgpu-global-atomic-fmax-err.hip index f04c6e3221bcd..f342ea01403d1 100644 --- a/clang/test/SemaHIP/amdgpu-global-atomic-fmax-err.hip +++ b/clang/test/SemaHIP/amdgpu-global-atomic-fmax-err.hip @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -fsyntax-only -triple amdgcn -target-cpu gfx942 -verify %s -fcuda-is-device +// 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 #define __device__ __attribute__((device)) diff --git a/clang/test/SemaHIP/amdgpu-global-atomic-fmin-err.hip b/clang/test/SemaHIP/amdgpu-global-atomic-fmin-err.hip index 3a63d513113b4..7b40cd7b08aff 100644 --- a/clang/test/SemaHIP/amdgpu-global-atomic-fmin-err.hip +++ b/clang/test/SemaHIP/amdgpu-global-atomic-fmin-err.hip @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -fsyntax-only -triple amdgcn -target-cpu gfx942 -verify %s -fcuda-is-device +// 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 #define __device__ __attribute__((device)) diff --git a/clang/test/SemaHIP/amdgpu-global-load-lds-template.hip b/clang/test/SemaHIP/amdgpu-global-load-lds-template.hip index e049edabd1c51..97e80779213df 100644 --- a/clang/test/SemaHIP/amdgpu-global-load-lds-template.hip +++ b/clang/test/SemaHIP/amdgpu-global-load-lds-template.hip @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -std=c++20 -triple amdgcn -target-cpu gfx950 -fsyntax-only -fcuda-is-device -verify %s +// RUN: %clang_cc1 -std=c++20 -triple amdgpu9.50 -fsyntax-only -fcuda-is-device -verify %s // Test that __builtin_amdgcn_global_load_lds and related builtins accept // instantiation-dependent expressions (e.g., template parameters, sizeof(T)) diff --git a/clang/test/SemaHIP/builtins-amdgcn-buffer-format.hip b/clang/test/SemaHIP/builtins-amdgcn-buffer-format.hip index 15f02f821b0ba..04f8581c5ca75 100644 --- a/clang/test/SemaHIP/builtins-amdgcn-buffer-format.hip +++ b/clang/test/SemaHIP/builtins-amdgcn-buffer-format.hip @@ -1,5 +1,5 @@ // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --version 6 -// RUN: %clang_cc1 -fsyntax-only -triple amdgcn -target-cpu verde -verify %s -fcuda-is-device +// RUN: %clang_cc1 -fsyntax-only -triple amdgpu6.01 -verify %s -fcuda-is-device // REQUIRES: amdgpu-registered-target #define __device__ __attribute__((device)) diff --git a/clang/test/SemaHIP/builtins-amdgcn-gfx1250-cooperative-atomics-templated.hip b/clang/test/SemaHIP/builtins-amdgcn-gfx1250-cooperative-atomics-templated.hip index b57d059d7767e..75cea414c1f23 100644 --- a/clang/test/SemaHIP/builtins-amdgcn-gfx1250-cooperative-atomics-templated.hip +++ b/clang/test/SemaHIP/builtins-amdgcn-gfx1250-cooperative-atomics-templated.hip @@ -1,6 +1,6 @@ // REQUIRES: amdgpu-registered-target -// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa -target-cpu gfx1250 -fsyntax-only -fcuda-is-device -verify %s -// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa -target-cpu gfx1251 -fsyntax-only -fcuda-is-device -verify %s +// RUN: %clang_cc1 -triple amdgpu12.50-amd-amdhsa -fsyntax-only -fcuda-is-device -verify %s +// RUN: %clang_cc1 -triple amdgpu12.51-amd-amdhsa -fsyntax-only -fcuda-is-device -verify %s #define __device__ __attribute__((device)) diff --git a/clang/test/SemaHIP/builtins-amdgcn-gfx1250-load-monitor-templated.hip b/clang/test/SemaHIP/builtins-amdgcn-gfx1250-load-monitor-templated.hip index a47e9a7ef2822..5448fbf1c6d28 100644 --- a/clang/test/SemaHIP/builtins-amdgcn-gfx1250-load-monitor-templated.hip +++ b/clang/test/SemaHIP/builtins-amdgcn-gfx1250-load-monitor-templated.hip @@ -1,5 +1,5 @@ // REQUIRES: amdgpu-registered-target -// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa -target-cpu gfx1250 -fsyntax-only -fcuda-is-device -verify %s +// RUN: %clang_cc1 -triple amdgpu12.50-amd-amdhsa -fsyntax-only -fcuda-is-device -verify %s #define __device__ __attribute__((device)) 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 fea86162c801d..ddb68915bc74f 100644 --- a/clang/test/SemaHIP/builtins-amdgcn-raw-buffer-atomic-add.hip +++ b/clang/test/SemaHIP/builtins-amdgcn-raw-buffer-atomic-add.hip @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -fsyntax-only -triple amdgcn -target-cpu gfx90a -verify %s -fcuda-is-device +// 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 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 a2dc02176099d..713a7f1dc92d0 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,4 +1,4 @@ -// RUN: %clang_cc1 -fsyntax-only -triple amdgcn -target-cpu gfx90a -verify %s -fcuda-is-device +// 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 #define __device__ __attribute__((device)) diff --git a/clang/test/SemaHIP/hip-builtin-lvalue-to-rvalue.hip b/clang/test/SemaHIP/hip-builtin-lvalue-to-rvalue.hip index b3238d7b29d3e..4e800c514365e 100644 --- a/clang/test/SemaHIP/hip-builtin-lvalue-to-rvalue.hip +++ b/clang/test/SemaHIP/hip-builtin-lvalue-to-rvalue.hip @@ -1,5 +1,5 @@ // REQUIRES: amdgpu-registered-target -// RUN: %clang_cc1 -std=c++20 -triple amdgcn -target-cpu gfx1200 -fsyntax-only -fcuda-is-device -ast-dump %s 2>&1 | FileCheck %s +// RUN: %clang_cc1 -std=c++20 -triple amdgpu12.00 -fsyntax-only -fcuda-is-device -ast-dump %s 2>&1 | FileCheck %s // expected-no-diagnostics diff --git a/clang/test/SemaHIP/incorrect-atomic-scope.hip b/clang/test/SemaHIP/incorrect-atomic-scope.hip index 1c5aaee710051..eb733b774d3bf 100644 --- a/clang/test/SemaHIP/incorrect-atomic-scope.hip +++ b/clang/test/SemaHIP/incorrect-atomic-scope.hip @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa -target-cpu gfx1250 -x hip -emit-llvm -fcuda-is-device %s -o - | FileCheck %s +// RUN: %clang_cc1 -triple amdgpu12.50-amd-amdhsa -x hip -emit-llvm -fcuda-is-device %s -o - | FileCheck %s #define __device__ __attribute__((device)) diff --git a/clang/test/SemaHIP/shared-variable-too-large.hip b/clang/test/SemaHIP/shared-variable-too-large.hip index eff5f8f6a7900..92c402f7a8502 100644 --- a/clang/test/SemaHIP/shared-variable-too-large.hip +++ b/clang/test/SemaHIP/shared-variable-too-large.hip @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -fsyntax-only -triple amdgcn -target-cpu gfx90a -verify %s -fcuda-is-device +// RUN: %clang_cc1 -fsyntax-only -triple amdgpu9.0a -verify %s -fcuda-is-device #define __global__ __attribute__((global)) #define __device__ __attribute__((device)) _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
