llvmorg-github-actions[bot] wrote:

<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-backend-amdgpu

Author: Matt Arsenault (arsenm)

<details>
<summary>Changes</summary>

Replace the legacy amdgcn architecture name with amdgpu in various
test triples. This set of updates covers cases that did not have
a set -target-cpu.

Co-authored-by: Claude (Opus 4.8) &lt;noreply@<!-- -->anthropic.com&gt;

---

Patch is 266.19 KiB, truncated to 20.00 KiB below, full version: 
https://github.com/llvm/llvm-project/pull/212053.diff


267 Files Affected:

- (modified) clang/test/AST/ByteCode/amdgpu-nullptr.cl (+2-2) 
- (modified) clang/test/AST/ast-dump-amdgpu-types.c (+5-5) 
- (modified) clang/test/Analysis/addrspace-null.c (+2-2) 
- (modified) clang/test/Analysis/cast-value-notes.cpp (+3-3) 
- (modified) clang/test/Analysis/element-region-address-space.c (+1-1) 
- (modified) clang/test/Analysis/ptr-cmp-const-trunc.cl (+1-1) 
- (modified) clang/test/Analysis/solver-sym-simplification-ptr-bool.cl (+1-1) 
- (modified) clang/test/Analysis/z3/cstring-addrspace.c (+1-1) 
- (modified) clang/test/CIR/CodeGen/amdgpu-address-spaces.cpp (+3-3) 
- (modified) clang/test/CIR/CodeGen/amdgpu-array-addrspace.cpp (+3-3) 
- (modified) clang/test/CIR/CodeGen/amdgpu-call-addrspace-cast.cpp (+3-3) 
- (modified) clang/test/CIR/CodeGen/amdgpu-stack-alloca-array-decay.cpp (+3-3) 
- (modified) clang/test/CIR/CodeGen/amdgpu-target-lowering-as.cpp (+2-2) 
- (modified) clang/test/CIR/CodeGenHIP/amdgpu-attrs.hip (+4-4) 
- (modified) clang/test/CIR/CodeGenHIP/amdgpu-module-flags.hip (+3-3) 
- (modified) clang/test/CIR/CodeGenHIP/hip-cuid.hip (+3-3) 
- (modified) clang/test/CIR/CodeGenHIP/simple.cpp (+2-2) 
- (modified) clang/test/CIR/CodeGenOpenMP/emit-device-functions.cpp (+3-3) 
- (modified) clang/test/CIR/CodeGenOpenMP/omp-module-attrs.c (+3-3) 
- (modified) clang/test/CodeGen/AMDGPU/sanitizer.c (+1-1) 
- (modified) clang/test/CodeGen/address-space.c (+1-1) 
- (modified) clang/test/CodeGen/amdgpu-abi-version.c (+2-2) 
- (modified) clang/test/CodeGen/amdgpu-address-spaces.cpp (+1-1) 
- (modified) clang/test/CodeGen/amdgpu-image-rsrc-type-debug-info.c (+1-1) 
- (modified) clang/test/CodeGen/amdgpu-variadic-call.c (+1-1) 
- (modified) clang/test/CodeGen/annotations-field.c (+1-1) 
- (modified) clang/test/CodeGen/annotations-loc.c (+1-1) 
- (modified) clang/test/CodeGen/bitfield-access-unit.c (+1-1) 
- (modified) clang/test/CodeGen/default-address-space.c (+1-1) 
- (modified) clang/test/CodeGen/dynamic-alloca-with-address-space.c (+3-3) 
- (modified) clang/test/CodeGen/fp-atomic-ops.c (+1-1) 
- (modified) clang/test/CodeGen/link-builtin-bitcode.c (+10-10) 
- (modified) clang/test/CodeGen/linking-bitcode-postopt.cpp (+4-4) 
- (modified) clang/test/CodeGen/logb_scalbn.c (+5-5) 
- (modified) clang/test/CodeGen/pragma-detect_mismatch.c (+1-1) 
- (modified) clang/test/CodeGen/scoped-atomic-ops.c (+2-2) 
- (modified) clang/test/CodeGen/scoped-fence-ops.c (+2-2) 
- (modified) clang/test/CodeGen/sret.c (+1-1) 
- (modified) clang/test/CodeGen/target-addrspace.cpp (+1-1) 
- (modified) clang/test/CodeGen/target-data.c (+1-1) 
- (modified) clang/test/CodeGenCUDA/address-spaces.cu (+1-1) 
- (modified) clang/test/CodeGenCUDA/alias.cu (+1-1) 
- (modified) clang/test/CodeGenCUDA/amdgpu-code-object-version.cu (+6-6) 
- (modified) clang/test/CodeGenCUDA/amdgpu-kernel-arg-pointer-type.cu (+2-2) 
- (modified) clang/test/CodeGenCUDA/amdgpu-kernel-attrs.cu (+4-4) 
- (modified) clang/test/CodeGenCUDA/amdgpu-visibility.cu (+3-3) 
- (modified) clang/test/CodeGenCUDA/amdgpu-workgroup-size.cu (+3-3) 
- (modified) clang/test/CodeGenCUDA/anon-ns.cu (+1-1) 
- (modified) clang/test/CodeGenCUDA/atomic-ops.cu (+1-1) 
- (modified) clang/test/CodeGenCUDA/atomic-options.hip (+2-2) 
- (modified) clang/test/CodeGenCUDA/const-var.cu (+2-2) 
- (modified) clang/test/CodeGenCUDA/dependent-libs.cu (+1-1) 
- (modified) clang/test/CodeGenCUDA/device-const-var-linkage.cu (+4-4) 
- (modified) clang/test/CodeGenCUDA/device-init-fun.cu (+1-1) 
- (modified) clang/test/CodeGenCUDA/device-use-host-var.cu (+2-2) 
- (modified) clang/test/CodeGenCUDA/device-var-init.cu (+1-1) 
- (modified) clang/test/CodeGenCUDA/device-var-linkage.cu (+2-2) 
- (modified) clang/test/CodeGenCUDA/dft-func-attr-skip-intrinsic.hip (+2-2) 
- (modified) clang/test/CodeGenCUDA/host-used-device-var.cu (+2-2) 
- (modified) clang/test/CodeGenCUDA/implicit-hd-dtor-trap-stub-hip.hip (+2-2) 
- (modified) clang/test/CodeGenCUDA/implicit-hd-explicit-inst-hip.hip (+1-1) 
- (modified) clang/test/CodeGenCUDA/implicit-hd-overload-ambig-hip.hip (+1-1) 
- (modified) clang/test/CodeGenCUDA/kernel-amdgcn.cu (+1-1) 
- (modified) clang/test/CodeGenCUDA/kernel-arg-name-metadata.cu (+2-2) 
- (modified) clang/test/CodeGenCUDA/kernel-args.cu (+1-1) 
- (modified) clang/test/CodeGenCUDA/kernel-dbg-info.cu (+3-3) 
- (modified) clang/test/CodeGenCUDA/lambda-constexpr-capture.cu (+1-1) 
- (modified) clang/test/CodeGenCUDA/lambda-noinline.cu (+1-1) 
- (modified) clang/test/CodeGenCUDA/lambda-reference-var.cu (+1-1) 
- (modified) clang/test/CodeGenCUDA/lambda.cu (+1-1) 
- (modified) clang/test/CodeGenCUDA/link-builtin-bitcode-denormal-fp-mode.cu 
(+12-21) 
- (modified) clang/test/CodeGenCUDA/link-builtin-bitcode-gpu-attrs-preserved.cu 
(+6-6) 
- (modified) clang/test/CodeGenCUDA/managed-var.cu (+2-2) 
- (modified) clang/test/CodeGenCUDA/ms-linker-options.cu (+2-2) 
- (modified) clang/test/CodeGenCUDA/noinline.cu (+1-1) 
- (modified) clang/test/CodeGenCUDA/norecurse.cu (+1-1) 
- (modified) clang/test/CodeGenCUDA/nosanitize-cuid.hip (+1-1) 
- (modified) clang/test/CodeGenCUDA/static-device-var-no-rdc.cu (+2-2) 
- (modified) clang/test/CodeGenCUDA/static-device-var-rdc.cu (+4-4) 
- (modified) clang/test/CodeGenCUDA/template-class-static-member.cu (+2-2) 
- (modified) clang/test/CodeGenCUDA/types.cu (+1-1) 
- (modified) clang/test/CodeGenCUDA/unnamed-types.cu (+1-1) 
- (modified) clang/test/CodeGenCXX/address-space-cast-coerce.cpp (+1-1) 
- (modified) clang/test/CodeGenCXX/address-space-cast.cpp (+1-1) 
- (modified) clang/test/CodeGenCXX/amdgcn-automatic-variable.cpp (+1-1) 
- (modified) clang/test/CodeGenCXX/amdgcn-func-arg.cpp (+1-1) 
- (modified) clang/test/CodeGenCXX/amdgcn-string-literal.cpp (+1-1) 
- (modified) clang/test/CodeGenCXX/amdgcn_declspec_get.cpp (+1-1) 
- (modified) clang/test/CodeGenCXX/amdgpu-barrier-typeinfo.cpp (+1-1) 
- (modified) clang/test/CodeGenCXX/amdgpu-buffer-rsrc-typeinfo.cpp (+1-1) 
- (modified) clang/test/CodeGenCXX/amdgpu-image-rsrc-typeinfo.cpp (+1-1) 
- (modified) clang/test/CodeGenCXX/amdgpu-kernel-arg-pointer-type.cpp (+1-1) 
- (modified) clang/test/CodeGenCXX/bitfield-access-empty.cpp (+1-1) 
- (modified) clang/test/CodeGenCXX/bitfield-access-tail.cpp (+1-1) 
- (modified) clang/test/CodeGenCXX/builtin-amdgcn-atomic-inc-dec.cpp (+1-1) 
- (modified) clang/test/CodeGenCXX/builtin-amdgcn-fence.cpp (+1-1) 
- (modified) clang/test/CodeGenCXX/conditional-temporaries.cpp (+1-1) 
- (modified) clang/test/CodeGenCXX/cxx0x-initializer-stdinitializerlist.cpp 
(+1-1) 
- (modified) clang/test/CodeGenCXX/cxx11-extern-constexpr.cpp (+2-2) 
- (modified) clang/test/CodeGenCXX/dynamic-cast-address-space.cpp (+1-1) 
- (modified) clang/test/CodeGenCXX/no-elide-constructors.cpp (+2-2) 
- (modified) clang/test/CodeGenCXX/template-param-objects-address-space.cpp 
(+1-1) 
- (modified) 
clang/test/CodeGenCXX/throw-expression-typeinfo-in-address-space.cpp (+1-1) 
- (modified) clang/test/CodeGenCXX/try-catch-with-address-space.cpp (+1-1) 
- (modified) clang/test/CodeGenCXX/typeid-cxx11-with-address-space.cpp (+1-1) 
- (modified) clang/test/CodeGenCXX/typeid-with-address-space.cpp (+1-1) 
- (modified) clang/test/CodeGenCXX/typeinfo-with-address-space.cpp (+1-1) 
- (modified) clang/test/CodeGenCXX/vla.cpp (+1-1) 
- (modified) clang/test/CodeGenCXX/vtable-align-address-space.cpp (+1-1) 
- (modified) clang/test/CodeGenCXX/vtable-assume-load-address-space.cpp (+1-1) 
- (modified) clang/test/CodeGenCXX/vtable-consteval-address-space.cpp (+1-1) 
- (modified) clang/test/CodeGenCXX/vtable-constexpr-address-space.cpp (+1-1) 
- (modified) clang/test/CodeGenCXX/vtable-key-function-address-space.cpp (+1-1) 
- (modified) clang/test/CodeGenCXX/vtable-layout-extreme-address-space.cpp 
(+1-1) 
- (modified) clang/test/CodeGenCXX/vtable-linkage-address-space.cpp (+4-4) 
- (modified) 
clang/test/CodeGenCXX/vtable-pointer-initialization-address-space.cpp (+1-1) 
- (modified) clang/test/CodeGenCXX/vtt-address-space.cpp (+1-1) 
- (modified) clang/test/CodeGenCXX/vtt-layout-address-space.cpp (+1-1) 
- (modified) clang/test/CodeGenHIP/atomic-deprecated-fixit.hip (+3-3) 
- (modified) clang/test/CodeGenHIP/debug-info-language-hip.hip (+1-1) 
- (modified) clang/test/CodeGenHIP/default-attributes.hip (+1-1) 
- (modified) clang/test/CodeGenHIP/device-function-huge-arg-ret.hip (+1-1) 
- (modified) clang/test/CodeGenHIP/half.hip (+1-1) 
- (modified) clang/test/CodeGenHIP/hip_weak_alias.cpp (+1-1) 
- (modified) clang/test/CodeGenHIP/offload-pgo-sections.hip (+4-4) 
- (modified) clang/test/CodeGenHIP/placement-new-addrspace.hip (+1-1) 
- (modified) clang/test/CodeGenHIP/printf-aggregate.cpp (+1-1) 
- (modified) clang/test/CodeGenHIP/printf-builtin.hip (+2-2) 
- (modified) clang/test/CodeGenHIP/printf-kind-module-flag.hip (+4-4) 
- (modified) clang/test/CodeGenHIP/printf.cpp (+1-1) 
- (modified) clang/test/CodeGenHIP/printf_nonhostcall.cpp (+2-2) 
- (modified) clang/test/CodeGenHIP/sanitize-undefined-null.hip (+1-1) 
- (modified) clang/test/CodeGenHIP/sret-lifetime-markers.cpp (+1-1) 
- (modified) clang/test/CodeGenHIP/sret-nontrivial-copyable.hip (+1-1) 
- (modified) clang/test/CodeGenHIP/store-addr-space.hip (+1-1) 
- (modified) 
clang/test/CodeGenHipStdPar/select-accelerator-code-pass-ordering.cpp (+2-2) 
- (modified) clang/test/CodeGenHipStdPar/unsupported-ASM.cpp (+1-1) 
- (modified) clang/test/CodeGenHipStdPar/unsupported-builtins.cpp (+1-1) 
- (modified) clang/test/CodeGenOpenCL/addr-space-struct-arg.cl (+4-4) 
- (modified) clang/test/CodeGenOpenCL/address-space-constant-initializers.cl 
(+1-1) 
- (modified) clang/test/CodeGenOpenCL/address-spaces.cl (+9-9) 
- (modified) clang/test/CodeGenOpenCL/amdgcn-automatic-variable.cl (+2-2) 
- (modified) clang/test/CodeGenOpenCL/amdgcn-flat-scratch-name.cl (+1-1) 
- (modified) clang/test/CodeGenOpenCL/amdgcn-large-globals.cl (+1-1) 
- (modified) clang/test/CodeGenOpenCL/amdgcn-non-temporal-store.cl (+1-1) 
- (modified) clang/test/CodeGenOpenCL/amdgpu-abi-struct-arg-byref.cl (+1-1) 
- (modified) clang/test/CodeGenOpenCL/amdgpu-abi-struct-coerce.cl (+1-1) 
- (modified) clang/test/CodeGenOpenCL/amdgpu-alignment.cl (+2-2) 
- (modified) clang/test/CodeGenOpenCL/amdgpu-call-kernel.cl (+1-1) 
- (modified) clang/test/CodeGenOpenCL/amdgpu-calling-conv.cl (+1-1) 
- (modified) clang/test/CodeGenOpenCL/amdgpu-enqueue-kernel-linking.cl (+2-2) 
- (modified) clang/test/CodeGenOpenCL/amdgpu-enqueue-kernel.cl (+1-1) 
- (modified) clang/test/CodeGenOpenCL/amdgpu-env-amdgcn.cl (+2-2) 
- (modified) clang/test/CodeGenOpenCL/amdgpu-features-illegal.cl (+2-2) 
- (modified) clang/test/CodeGenOpenCL/amdgpu-ieee.cl (+6-6) 
- (modified) clang/test/CodeGenOpenCL/amdgpu-printf.cl (+1-1) 
- (modified) 
clang/test/CodeGenOpenCL/amdgpu-readonly-features-written-with-no-target.cl 
(+1-1) 
- (modified) clang/test/CodeGenOpenCL/amdgpu-sizeof-alignof.cl (+10-10) 
- (modified) 
clang/test/CodeGenOpenCL/atomic-builtins-default-to-device-scope.cl (+1-1) 
- (modified) clang/test/CodeGenOpenCL/atomic-ops.cl (+3-3) 
- (modified) clang/test/CodeGenOpenCL/backend-unsupported-warning.ll (+1-1) 
- (modified) clang/test/CodeGenOpenCL/blocks.cl (+4-4) 
- (modified) clang/test/CodeGenOpenCL/builtins-alloca.cl (+3-3) 
- (modified) clang/test/CodeGenOpenCL/builtins-amdgcn-cvt-off-f32-i4.cl (+1-1) 
- (modified) clang/test/CodeGenOpenCL/builtins-amdgcn-wave32.cl (+1-1) 
- (modified) clang/test/CodeGenOpenCL/builtins-amdgcn-wave64.cl (+1-1) 
- (modified) clang/test/CodeGenOpenCL/builtins-amdgcn-workgroup-size.cl (+2-2) 
- (modified) clang/test/CodeGenOpenCL/builtins-generic-amdgcn.cl (+1-1) 
- (modified) clang/test/CodeGenOpenCL/byval.cl (+1-1) 
- (modified) clang/test/CodeGenOpenCL/cast_image.cl (+1-1) 
- (modified) clang/test/CodeGenOpenCL/enqueue-kernel-non-entry-block.cl (+2-2) 
- (modified) clang/test/CodeGenOpenCL/func-call-dbg-loc.cl (+1-1) 
- (modified) 
clang/test/CodeGenOpenCL/implicit-addrspacecast-function-parameter.cl (+1-1) 
- (modified) clang/test/CodeGenOpenCL/inline-asm-amdgcn.cl (+1-1) 
- (modified) clang/test/CodeGenOpenCL/kernels-have-spir-cc-by-default.cl (+1-1) 
- (modified) clang/test/CodeGenOpenCL/lifetime.cl (+1-1) 
- (modified) clang/test/CodeGenOpenCL/nullptr.cl (+4-4) 
- (modified) clang/test/CodeGenOpenCL/opencl-kernel-call.cl (+1-1) 
- (modified) clang/test/CodeGenOpenCL/private-array-initialization.cl (+1-1) 
- (modified) clang/test/CodeGenOpenCL/size_t.cl (+2-2) 
- (modified) clang/test/CodeGenOpenCL/sqrt-fpmath.cl (+8-8) 
- (modified) clang/test/CodeGenOpenCL/visibility.cl (+3-3) 
- (modified) clang/test/CodeGenOpenCL/vla.cl (+1-1) 
- (modified) clang/test/CodeGenSYCL/amd-address-space-conversions.cpp (+1-1) 
- (modified) clang/test/CodeGenSYCL/kernel-caller-entry-point.cpp (+3-3) 
- (modified) clang/test/DebugInfo/Generic/amdgpu-barrier-type-debug-info.c 
(+1-1) 
- (modified) clang/test/DebugInfo/Generic/amdgpu-buffer-rsrc-type-debug-info.c 
(+1-1) 
- (modified) clang/test/DebugInfo/Generic/bitfield-0-struct.c (+1-1) 
- (modified) clang/test/Frontend/opencl.cl (+1-1) 
- (modified) clang/test/Headers/__clang_hip_libdevice_declares.cpp (+7-7) 
- (modified) clang/test/Headers/amdgcn-openmp-device-math-complex.c (+2-2) 
- (modified) clang/test/Headers/amdgcn-openmp-device-math-complex.cpp (+2-2) 
- (modified) clang/test/Headers/amdgcn_openmp_device_math.c (+4-4) 
- (modified) clang/test/Headers/amdgcn_openmp_device_math_c.c (+2-2) 
- (modified) clang/test/Headers/amdgcn_openmp_device_math_constexpr.cpp (+2-2) 
- (modified) clang/test/Headers/amdhsa_abi.cl (+1-1) 
- (modified) clang/test/Headers/gpuintrin.c (+1-1) 
- (modified) clang/test/Headers/gpuintrin_lang.c (+5-6) 
- (modified) clang/test/Headers/openmp-device-functions-bool.c (+1-1) 
- (modified) clang/test/Headers/openmp_device_math_isnan.cpp (+8-8) 
- (modified) clang/test/Headers/openmp_new_nothrow.cpp (+2-2) 
- (modified) clang/test/Index/pipe-size.cl (+1-1) 
- (modified) clang/test/Misc/amdgcn.languageOptsOpenCL.cl (+12-12) 
- (modified) clang/test/Misc/backend-resource-limit-diagnostics.cl (+1-1) 
- (modified) clang/test/PCH/aarch64-sve-types.c (+1-1) 
- (modified) clang/test/Preprocessor/builtin_aux_info.cpp (+1-1) 
- (modified) clang/test/Preprocessor/init.c (+1-1) 
- (modified) clang/test/Preprocessor/predefined-macros-no-warnings.c (+1-1) 
- (modified) clang/test/Preprocessor/predefined-macros.c (+6-6) 
- (modified) clang/test/Sema/amdgcn-address-spaces.c (+1-1) 
- (modified) clang/test/Sema/amdgcn-va-list-type.c (+1-1) 
- (modified) clang/test/Sema/attr-model.cpp (+1-1) 
- (modified) clang/test/Sema/builtin-amdgcn-atomic-inc-dec-failure.cpp (+1-1) 
- (modified) clang/test/Sema/builtin-amdgcn-fence-failure.cpp (+1-1) 
- (modified) clang/test/Sema/callingconv-devicekernel.cpp (+1-1) 
- (modified) clang/test/Sema/inline-asm-validate-amdgpu.cl (+1-1) 
- (modified) clang/test/Sema/scoped-atomic-ops.c (+1-1) 
- (modified) clang/test/Sema/wave-reduce-builtins-validate-amdgpu.cl (+1-1) 
- (modified) clang/test/SemaCUDA/addr-of-overloaded-fn.cu (+1-1) 
- (modified) clang/test/SemaCUDA/addr-of-overloaded-template-fn.cu (+1-1) 
- (modified) clang/test/SemaCUDA/allow-int128.cu (+1-1) 
- (modified) clang/test/SemaCUDA/amdgpu-builtins-pointer-args.cu (+1-1) 
- (modified) clang/test/SemaCUDA/amdgpu-f128.cu (+1-1) 
- (modified) clang/test/SemaCUDA/amdgpu-size_t.cu (+1-1) 
- (modified) clang/test/SemaCUDA/amdgpu-windows-vectorcall.cu (+1-1) 
- (modified) clang/test/SemaCUDA/atomic-ops.cu (+1-1) 
- (modified) clang/test/SemaCUDA/cluster_dims.cu (+1-1) 
- (modified) clang/test/SemaCUDA/const-var.cu (+1-1) 
- (modified) clang/test/SemaCUDA/constexpr-var.cu (+1-1) 
- (modified) clang/test/SemaCUDA/deferred-diags-dedup.cu (+1-1) 
- (modified) clang/test/SemaCUDA/fp16-arg-return.cu (+1-1) 
- (modified) clang/test/SemaCUDA/implicit-hd-dtor-explicit-instantiation.cu 
(+1-1) 
- (modified) clang/test/SemaCUDA/implicit-hd-explicit-inst-organic-caller.cu 
(+1-1) 
- (modified) clang/test/SemaCUDA/implicit-hd-overload-ambig-organic-caller.cu 
(+1-1) 
- (modified) clang/test/SemaCUDA/overloaded-builtin.cu (+1-1) 
- (modified) clang/test/SemaCUDA/windows-calling-conv.cu (+1-1) 
- (modified) clang/test/SemaCXX/amdgpu-barrier.cpp (+1-1) 
- (modified) clang/test/SemaCXX/amdgpu-buffer-rsrc.cpp (+1-1) 
- (modified) clang/test/SemaCXX/amdgpu-image-rsrc.cpp (+1-1) 
- (modified) clang/test/SemaCXX/amdgpu-sizeof-alignof.cpp (+1-1) 
- (modified) clang/test/SemaHIP/amdgpu-barrier.hip (+1-1) 
- (modified) clang/test/SemaHIP/amdgpu-buffer-rsrc.hip (+1-1) 
- (modified) clang/test/SemaHIP/amdgpu-feature-predicate.hip (+1-1) 
- (modified) clang/test/SemaHIP/amdgpu-is-invocable.hip (+1-1) 
- (modified) clang/test/SemaHIP/amdgpu-processor-is.hip (+1-1) 
- (modified) clang/test/SemaHIP/atomic-deprecated.hip (+2-2) 
- (modified) clang/test/SemaHIP/zero-sized-device-array.hip (+1-1) 
- (modified) clang/test/SemaHipStdPar/device-can-call-host.cpp (+1-1) 
- (modified) clang/test/SemaOpenCL/amd-media-ops.cl (+6-6) 
- (modified) clang/test/SemaOpenCL/amdgpu-attrs.cl (+1-1) 
- (modified) clang/test/SemaOpenCL/amdgpu-barrier.cl (+2-2) 
- (modified) clang/test/SemaOpenCL/amdgpu-buffer-rsrc.cl (+2-2) 
- (modified) clang/test/SemaOpenCL/amdgpu-image-rsrc.cl (+2-2) 
- (modified) clang/test/SemaOpenCL/amdgpu-num-sgpr-vgpr-deprecated.cl (+2-2) 
- (modified) 
clang/test/SemaOpenCL/amdgpu-variables-too-large-for-address-space.cl (+1-1) 
- (modified) clang/test/SemaOpenCL/atomic-ops.cl (+1-1) 
- (modified) clang/test/SemaOpenCL/builtins-amdgcn-cvt-off-f32-i4-err.cl (+1-1) 
- (modified) clang/test/SemaOpenCL/builtins-amdgcn-error-f16.cl (+1-1) 
- (modified) clang/test/SemaOpenCL/builtins-amdgcn-error-wave32.cl (+1-1) 
- (modified) clang/test/SemaOpenCL/builtins-amdgcn-error-wave64.cl (+1-1) 
- (modified) 
clang/test/SemaOpenCL/builtins-amdgcn-raw-buffer-atomic-fmin-fmax-target-err.cl 
(+1-1) 
- (modified) clang/test/SemaOpenCL/builtins-amdgcn-wave32-func-attr.cl (+1-1) 
- (modified) clang/test/SemaOpenCL/fp64-fp16-options.cl (+1-1) 
- (modified) clang/test/SemaOpenCL/numbered-address-space.cl (+1-1) 
- (modified) clang/test/SemaOpenCL/sampler_t.cl (+2-2) 
- (modified) clang/test/SemaOpenCLCXX/amdgpu-nullptr.clcpp (+1-1) 
- (modified) clang/test/SemaSYCL/sycl-cconv-win.cpp (+1-1) 


``````````diff
diff --git a/clang/test/AST/ByteCode/amdgpu-nullptr.cl 
b/clang/test/AST/ByteCode/amdgpu-nullptr.cl
index d79f1cd4a237b..ad4f6a1db6909 100644
--- a/clang/test/AST/ByteCode/amdgpu-nullptr.cl
+++ b/clang/test/AST/ByteCode/amdgpu-nullptr.cl
@@ -1,6 +1,6 @@
-// RUN: %clang_cc1 -no-enable-noundef-analysis %s -cl-std=CL2.0 -triple amdgcn 
-emit-llvm -o - | FileCheck %s
+// RUN: %clang_cc1 -no-enable-noundef-analysis %s -cl-std=CL2.0 -triple amdgpu 
-emit-llvm -o - | FileCheck %s
 
-// RUN: %clang_cc1 -no-enable-noundef-analysis %s -cl-std=CL2.0 -triple amdgcn 
-emit-llvm -fexperimental-new-constant-interpreter -o - | FileCheck %s
+// RUN: %clang_cc1 -no-enable-noundef-analysis %s -cl-std=CL2.0 -triple amdgpu 
-emit-llvm -fexperimental-new-constant-interpreter -o - | FileCheck %s
 
 
 // CHECK: @fold_priv ={{.*}} local_unnamed_addr addrspace(1) global ptr 
addrspace(5) addrspacecast (ptr addrspace(1) null to ptr addrspace(5)), align 4
diff --git a/clang/test/AST/ast-dump-amdgpu-types.c 
b/clang/test/AST/ast-dump-amdgpu-types.c
index f01461cdba237..be8383a41b648 100644
--- a/clang/test/AST/ast-dump-amdgpu-types.c
+++ b/clang/test/AST/ast-dump-amdgpu-types.c
@@ -1,12 +1,12 @@
 // REQUIRES: amdgpu-registered-target
 // Test without serialization:
-// RUN: %clang_cc1 -triple amdgcn -ast-dump -ast-dump-filter 
__amdgpu_buffer_rsrc_t %s | FileCheck %s -check-prefix=BUFFER-RSRC
-// RUN: %clang_cc1 -triple amdgcn -ast-dump -ast-dump-filter 
__amdgpu_named_workgroup_barrier %s | FileCheck %s 
-check-prefix=WORKGROUP-BARRIER
+// RUN: %clang_cc1 -triple amdgpu -ast-dump -ast-dump-filter 
__amdgpu_buffer_rsrc_t %s | FileCheck %s -check-prefix=BUFFER-RSRC
+// RUN: %clang_cc1 -triple amdgpu -ast-dump -ast-dump-filter 
__amdgpu_named_workgroup_barrier %s | FileCheck %s 
-check-prefix=WORKGROUP-BARRIER
 //
 // Test with serialization:
-// RUN: %clang_cc1 -triple amdgcn -emit-pch -o %t %s
-// RUN: %clang_cc1 -x c -triple amdgcn -include-pch %t -ast-dump-all 
-ast-dump-filter __amdgpu_buffer_rsrc_t /dev/null | sed -e "s/ <undeserialized 
declarations>//" -e "s/ imported//" | FileCheck %s -check-prefix=BUFFER-RSRC
-// RUN: %clang_cc1 -x c -triple amdgcn -include-pch %t -ast-dump-all 
-ast-dump-filter __amdgpu_named_workgroup_barrier /dev/null | sed -e "s/ 
<undeserialized declarations>//" -e "s/ imported//" | FileCheck %s 
-check-prefix=WORKGROUP-BARRIER
+// RUN: %clang_cc1 -triple amdgpu -emit-pch -o %t %s
+// RUN: %clang_cc1 -x c -triple amdgpu -include-pch %t -ast-dump-all 
-ast-dump-filter __amdgpu_buffer_rsrc_t /dev/null | sed -e "s/ <undeserialized 
declarations>//" -e "s/ imported//" | FileCheck %s -check-prefix=BUFFER-RSRC
+// RUN: %clang_cc1 -x c -triple amdgpu -include-pch %t -ast-dump-all 
-ast-dump-filter __amdgpu_named_workgroup_barrier /dev/null | sed -e "s/ 
<undeserialized declarations>//" -e "s/ imported//" | FileCheck %s 
-check-prefix=WORKGROUP-BARRIER
 
 // BUFFER-RSRC: TypedefDecl {{.*}} implicit __amdgpu_buffer_rsrc_t
 // BUFFER-RSRC-NEXT: -BuiltinType {{.*}} '__amdgpu_buffer_rsrc_t'
diff --git a/clang/test/Analysis/addrspace-null.c 
b/clang/test/Analysis/addrspace-null.c
index 259d1e2898723..163018aabad75 100644
--- a/clang/test/Analysis/addrspace-null.c
+++ b/clang/test/Analysis/addrspace-null.c
@@ -1,9 +1,9 @@
-// RUN: %clang_analyze_cc1 -triple amdgcn-unknown-unknown \
+// RUN: %clang_analyze_cc1 -triple amdgpu-unknown-unknown \
 // RUN:   -analyzer-checker=core -DAMDGCN_TRIPLE \
 // RUN:   -analyzer-checker=debug.ExprInspection \
 // RUN:   -Wno-implicit-int -Wno-int-conversion -verify %s
 //
-// RUN: %clang_analyze_cc1 -triple amdgcn-unknown-unknown \
+// RUN: %clang_analyze_cc1 -triple amdgpu-unknown-unknown \
 // RUN:   -analyzer-checker=core -DDEFAULT_TRIPLE \
 // RUN:   -analyzer-checker=debug.ExprInspection \
 // RUN:   -Wno-implicit-int -Wno-int-conversion -verify %s
diff --git a/clang/test/Analysis/cast-value-notes.cpp 
b/clang/test/Analysis/cast-value-notes.cpp
index acd33e704d13a..ae6666ca994f0 100644
--- a/clang/test/Analysis/cast-value-notes.cpp
+++ b/clang/test/Analysis/cast-value-notes.cpp
@@ -1,13 +1,13 @@
-// RUN: %clang_analyze_cc1 -std=c++14 -triple amdgcn-unknown-unknown \
+// RUN: %clang_analyze_cc1 -std=c++14 -triple amdgpu-unknown-unknown \
 // RUN: -analyzer-checker=core,apiModeling.llvm.CastValue,debug.ExprInspection\
 // RUN: -analyzer-output=text -verify -DX86 -DSUPPRESSED %s 2>&1 | FileCheck 
%s -check-prefix=X86-CHECK
 //
-// RUN: %clang_analyze_cc1 -std=c++14 -triple amdgcn-unknown-unknown \
+// RUN: %clang_analyze_cc1 -std=c++14 -triple amdgpu-unknown-unknown \
 // RUN: -analyzer-checker=core,apiModeling.llvm.CastValue,debug.ExprInspection\
 // RUN:  -analyzer-config suppress-dereferences-from-any-address-space=false\
 // RUN:  -analyzer-output=text -verify -DX86 -DNOT_SUPPRESSED %s 2>&1 | 
FileCheck %s -check-prefix=X86-CHECK
 //
-// RUN: %clang_analyze_cc1 -std=c++14 -triple amdgcn-unknown-unknown \
+// RUN: %clang_analyze_cc1 -std=c++14 -triple amdgpu-unknown-unknown \
 // RUN: -analyzer-checker=core,apiModeling.llvm.CastValue,debug.ExprInspection\
 // RUN:  -analyzer-config suppress-dereferences-from-any-address-space=true\
 // RUN:  -analyzer-output=text -verify -DX86 -DSUPPRESSED %s 2>&1 | FileCheck 
%s -check-prefix=X86-CHECK
diff --git a/clang/test/Analysis/element-region-address-space.c 
b/clang/test/Analysis/element-region-address-space.c
index da590556848b9..f14faf5c91f6e 100644
--- a/clang/test/Analysis/element-region-address-space.c
+++ b/clang/test/Analysis/element-region-address-space.c
@@ -1,4 +1,4 @@
-// RUN: %clang_analyze_cc1 -triple amdgcn-unknown-unknown \
+// RUN: %clang_analyze_cc1 -triple amdgpu-unknown-unknown \
 // RUN:   -Wno-incompatible-library-redeclaration \
 // RUN:   -analyzer-checker=core,unix -verify %s
 
diff --git a/clang/test/Analysis/ptr-cmp-const-trunc.cl 
b/clang/test/Analysis/ptr-cmp-const-trunc.cl
index f70eeb7388345..c0553116ae96a 100644
--- a/clang/test/Analysis/ptr-cmp-const-trunc.cl
+++ b/clang/test/Analysis/ptr-cmp-const-trunc.cl
@@ -1,4 +1,4 @@
-//RUN: %clang_analyze_cc1 -triple amdgcn-unknown-unknown 
-analyzer-checker=core -verify %s
+//RUN: %clang_analyze_cc1 -triple amdgpu-unknown-unknown 
-analyzer-checker=core -verify %s
 // expected-no-diagnostics
 
 #include <stdint.h>
diff --git a/clang/test/Analysis/solver-sym-simplification-ptr-bool.cl 
b/clang/test/Analysis/solver-sym-simplification-ptr-bool.cl
index f9c1c3a064dce..9ab94273f8179 100644
--- a/clang/test/Analysis/solver-sym-simplification-ptr-bool.cl
+++ b/clang/test/Analysis/solver-sym-simplification-ptr-bool.cl
@@ -1,4 +1,4 @@
-// RUN: %clang_analyze_cc1 -triple amdgcn-unknown-unknown 
-analyzer-checker=core %s
+// RUN: %clang_analyze_cc1 -triple amdgpu-unknown-unknown 
-analyzer-checker=core %s
 
 // expected-no-diagnostics
 
diff --git a/clang/test/Analysis/z3/cstring-addrspace.c 
b/clang/test/Analysis/z3/cstring-addrspace.c
index fc00a78026573..86c8d75b6501e 100644
--- a/clang/test/Analysis/z3/cstring-addrspace.c
+++ b/clang/test/Analysis/z3/cstring-addrspace.c
@@ -1,4 +1,4 @@
-// RUN: %clang_analyze_cc1 -triple amdgcn-unknown-unknown \
+// RUN: %clang_analyze_cc1 -triple amdgpu-unknown-unknown \
 // RUN: -analyzer-checker=core,alpha.unix.cstring,debug.ExprInspection \
 // RUN: -analyzer-config crosscheck-with-z3=true -verify %s \
 // RUN: -Wno-incompatible-library-redeclaration
diff --git a/clang/test/CIR/CodeGen/amdgpu-address-spaces.cpp 
b/clang/test/CIR/CodeGen/amdgpu-address-spaces.cpp
index 185dea3a8b265..4521815909e07 100644
--- a/clang/test/CIR/CodeGen/amdgpu-address-spaces.cpp
+++ b/clang/test/CIR/CodeGen/amdgpu-address-spaces.cpp
@@ -1,13 +1,13 @@
-// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa -fclangir -emit-cir \
+// RUN: %clang_cc1 -triple amdgpu-amd-amdhsa -fclangir -emit-cir \
 // RUN:   -mmlir -mlir-print-ir-before=cir-target-lowering %s -o %t.cir 2> 
%t-pre.cir
 // RUN: FileCheck --check-prefix=CIR-PRE --input-file=%t-pre.cir %s
 
 // RUN: FileCheck --check-prefix=CIR --input-file=%t.cir %s
 
-// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa -fclangir -emit-llvm %s -o %t.ll
+// RUN: %clang_cc1 -triple amdgpu-amd-amdhsa -fclangir -emit-llvm %s -o %t.ll
 // RUN: FileCheck --check-prefix=LLVM --input-file=%t.ll %s
 
-// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa -emit-llvm %s -o %t.ll
+// RUN: %clang_cc1 -triple amdgpu-amd-amdhsa -emit-llvm %s -o %t.ll
 // RUN: FileCheck --check-prefix=OGCG --input-file=%t.ll %s
 
 // Test address space handling for AMDGPU target in C++ mode (non-OpenCL/HIP).
diff --git a/clang/test/CIR/CodeGen/amdgpu-array-addrspace.cpp 
b/clang/test/CIR/CodeGen/amdgpu-array-addrspace.cpp
index 78ad8bccb9704..2ff665edf2dc1 100644
--- a/clang/test/CIR/CodeGen/amdgpu-array-addrspace.cpp
+++ b/clang/test/CIR/CodeGen/amdgpu-array-addrspace.cpp
@@ -1,8 +1,8 @@
-// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa -fclangir -emit-cir %s -o %t.cir
+// RUN: %clang_cc1 -triple amdgpu-amd-amdhsa -fclangir -emit-cir %s -o %t.cir
 // RUN: FileCheck --input-file=%t.cir %s -check-prefix=CIR
-// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa -fclangir -emit-llvm %s -o %t.ll
+// RUN: %clang_cc1 -triple amdgpu-amd-amdhsa -fclangir -emit-llvm %s -o %t.ll
 // RUN: FileCheck --input-file=%t.ll %s -check-prefix=LLVM
-// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa -emit-llvm %s -o %t.ll
+// RUN: %clang_cc1 -triple amdgpu-amd-amdhsa -emit-llvm %s -o %t.ll
 // RUN: FileCheck --input-file=%t.ll %s -check-prefix=OGCG
 
 // Test that address spaces are preserved through array-to-pointer decay
diff --git a/clang/test/CIR/CodeGen/amdgpu-call-addrspace-cast.cpp 
b/clang/test/CIR/CodeGen/amdgpu-call-addrspace-cast.cpp
index 617c7ea59d084..6efaa57494ab0 100644
--- a/clang/test/CIR/CodeGen/amdgpu-call-addrspace-cast.cpp
+++ b/clang/test/CIR/CodeGen/amdgpu-call-addrspace-cast.cpp
@@ -1,8 +1,8 @@
-// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa -fclangir -emit-cir %s -o %t.cir
+// RUN: %clang_cc1 -triple amdgpu-amd-amdhsa -fclangir -emit-cir %s -o %t.cir
 // RUN: FileCheck --input-file=%t.cir %s -check-prefix=CIR
-// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa -fclangir -emit-llvm %s -o %t.ll
+// RUN: %clang_cc1 -triple amdgpu-amd-amdhsa -fclangir -emit-llvm %s -o %t.ll
 // RUN: FileCheck --input-file=%t.ll %s -check-prefix=LLVM
-// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa -emit-llvm %s -o %t.ll
+// RUN: %clang_cc1 -triple amdgpu-amd-amdhsa -emit-llvm %s -o %t.ll
 // RUN: FileCheck --input-file=%t.ll %s -check-prefix=OGCG
 
 // Test that address space casts are inserted when passing pointers in
diff --git a/clang/test/CIR/CodeGen/amdgpu-stack-alloca-array-decay.cpp 
b/clang/test/CIR/CodeGen/amdgpu-stack-alloca-array-decay.cpp
index 9ddeb56a5b717..8abf253488d8d 100644
--- a/clang/test/CIR/CodeGen/amdgpu-stack-alloca-array-decay.cpp
+++ b/clang/test/CIR/CodeGen/amdgpu-stack-alloca-array-decay.cpp
@@ -1,12 +1,12 @@
-// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa \
+// RUN: %clang_cc1 -triple amdgpu-amd-amdhsa \
 // RUN:   -fclangir -emit-cir %s -o %t.cir
 // RUN: FileCheck --input-file=%t.cir %s --check-prefix=CIR
 
-// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa \
+// RUN: %clang_cc1 -triple amdgpu-amd-amdhsa \
 // RUN:   -fclangir -emit-llvm %s -o %t.ll
 // RUN: FileCheck --input-file=%t.ll %s --check-prefix=LLVM
 
-// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa \
+// RUN: %clang_cc1 -triple amdgpu-amd-amdhsa \
 // RUN:   -emit-llvm %s -o %t.ll
 // RUN: FileCheck --input-file=%t.ll %s --check-prefix=OGCG
 
diff --git a/clang/test/CIR/CodeGen/amdgpu-target-lowering-as.cpp 
b/clang/test/CIR/CodeGen/amdgpu-target-lowering-as.cpp
index 848fa54286a3e..631cd2819c3bd 100644
--- a/clang/test/CIR/CodeGen/amdgpu-target-lowering-as.cpp
+++ b/clang/test/CIR/CodeGen/amdgpu-target-lowering-as.cpp
@@ -10,11 +10,11 @@
 //   offload_constant -> 4  (CONSTANT_ADDRESS)
 //   offload_private  -> 5  (PRIVATE_ADDRESS)
 
-// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa -fclangir -emit-cir \
+// RUN: %clang_cc1 -triple amdgpu-amd-amdhsa -fclangir -emit-cir \
 // RUN:   -mmlir -mlir-print-ir-before=cir-target-lowering %s -o %t.cir 2> 
%t.pre.cir
 // RUN: FileCheck --check-prefix=PRE --input-file=%t.pre.cir %s
 
-// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa -fclangir -emit-cir %s -o %t.cir
+// RUN: %clang_cc1 -triple amdgpu-amd-amdhsa -fclangir -emit-cir %s -o %t.cir
 // RUN: FileCheck --check-prefix=POST --input-file=%t.cir %s
 
 // ---- GlobalOp: lang AS emitted before target lowering, target AS after ----
diff --git a/clang/test/CIR/CodeGenHIP/amdgpu-attrs.hip 
b/clang/test/CIR/CodeGenHIP/amdgpu-attrs.hip
index 636cb529cafb7..34d4c57874503 100644
--- a/clang/test/CIR/CodeGenHIP/amdgpu-attrs.hip
+++ b/clang/test/CIR/CodeGenHIP/amdgpu-attrs.hip
@@ -1,22 +1,22 @@
 #include "../CodeGenCUDA/Inputs/cuda.h"
 
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -triple=amdgcn-amd-amdhsa -x hip -fclangir \
+// RUN: %clang_cc1 -triple=amdgpu-amd-amdhsa -x hip -fclangir \
 // RUN:            -Wno-deprecated-declarations \
 // RUN:            -fcuda-is-device -emit-cir %s -o %t.cir
 // RUN: FileCheck --check-prefix=CIR %s --input-file=%t.cir
 
-// RUN: %clang_cc1 -triple=amdgcn-amd-amdhsa -x hip -fclangir \
+// RUN: %clang_cc1 -triple=amdgpu-amd-amdhsa -x hip -fclangir \
 // RUN:            -Wno-deprecated-declarations \
 // RUN:            -fcuda-is-device -emit-llvm %s -o %t.ll
 // RUN: FileCheck --check-prefix=LLVM %s --input-file=%t.ll
 
-// RUN: %clang_cc1 -triple=amdgcn-amd-amdhsa -x hip \
+// RUN: %clang_cc1 -triple=amdgpu-amd-amdhsa -x hip \
 // RUN:            -Wno-deprecated-declarations \
 // RUN:            -fcuda-is-device -emit-llvm %s -o %t.ogcg.ll
 // RUN: FileCheck --check-prefix=LLVM %s --input-file=%t.ogcg.ll
 
-// RUN: %clang_cc1 -triple=amdgcn-amd-amdhsa -x hip -fclangir \
+// RUN: %clang_cc1 -triple=amdgpu-amd-amdhsa -x hip -fclangir \
 // RUN:            -Wno-deprecated-declarations \
 // RUN:            -fcuda-is-device -mamdgpu-expand-waitcnt-profiling \
 // RUN:            -emit-cir %s -o %t.prof.cir
diff --git a/clang/test/CIR/CodeGenHIP/amdgpu-module-flags.hip 
b/clang/test/CIR/CodeGenHIP/amdgpu-module-flags.hip
index 7a597bca64bb9..cdf9d13e45001 100644
--- a/clang/test/CIR/CodeGenHIP/amdgpu-module-flags.hip
+++ b/clang/test/CIR/CodeGenHIP/amdgpu-module-flags.hip
@@ -1,15 +1,15 @@
 #include "../CodeGenCUDA/Inputs/cuda.h"
 
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -triple=amdgcn-amd-amdhsa -x hip -fclangir \
+// RUN: %clang_cc1 -triple=amdgpu-amd-amdhsa -x hip -fclangir \
 // RUN:            -fcuda-is-device -emit-cir %s -o %t.cir
 // RUN: FileCheck --check-prefix=CIR %s --input-file=%t.cir
 
-// RUN: %clang_cc1 -triple=amdgcn-amd-amdhsa -x hip -fclangir \
+// RUN: %clang_cc1 -triple=amdgpu-amd-amdhsa -x hip -fclangir \
 // RUN:            -fcuda-is-device -emit-llvm %s -o %t.cir.ll
 // RUN: FileCheck --check-prefix=LLVM %s --input-file=%t.cir.ll
 
-// RUN: %clang_cc1 -triple=amdgcn-amd-amdhsa -x hip \
+// RUN: %clang_cc1 -triple=amdgpu-amd-amdhsa -x hip \
 // RUN:            -fcuda-is-device -emit-llvm %s -o %t.ogcg.ll
 // RUN: FileCheck --check-prefix=LLVM %s --input-file=%t.ogcg.ll
 
diff --git a/clang/test/CIR/CodeGenHIP/hip-cuid.hip 
b/clang/test/CIR/CodeGenHIP/hip-cuid.hip
index 950654a58d34f..663026016a6b5 100644
--- a/clang/test/CIR/CodeGenHIP/hip-cuid.hip
+++ b/clang/test/CIR/CodeGenHIP/hip-cuid.hip
@@ -1,15 +1,15 @@
 #include "../CodeGenCUDA/Inputs/cuda.h"
 
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -triple=amdgcn-amd-amdhsa -x hip -fclangir \
+// RUN: %clang_cc1 -triple=amdgpu-amd-amdhsa -x hip -fclangir \
 // RUN:            -fcuda-is-device -emit-cir %s -o %t.cir
 // RUN: FileCheck --check-prefix=CIR %s --input-file=%t.cir
 
-// RUN: %clang_cc1 -triple=amdgcn-amd-amdhsa -x hip -fclangir \
+// RUN: %clang_cc1 -triple=amdgpu-amd-amdhsa -x hip -fclangir \
 // RUN:            -fcuda-is-device -emit-llvm %s -o %t.ll
 // RUN: FileCheck --check-prefix=LLVM %s --input-file=%t.ll
 
-// RUN: %clang_cc1 -triple=amdgcn-amd-amdhsa -x hip \
+// RUN: %clang_cc1 -triple=amdgpu-amd-amdhsa -x hip \
 // RUN:            -fcuda-is-device -emit-llvm %s -o %t.ogcg.ll
 // RUN: FileCheck --check-prefix=OGCG %s --input-file=%t.ogcg.ll
 
diff --git a/clang/test/CIR/CodeGenHIP/simple.cpp 
b/clang/test/CIR/CodeGenHIP/simple.cpp
index e684fc2104f4f..5902f95b9167f 100644
--- a/clang/test/CIR/CodeGenHIP/simple.cpp
+++ b/clang/test/CIR/CodeGenHIP/simple.cpp
@@ -5,7 +5,7 @@
 // RUN:            -I%S/../CodeGenCUDA/Inputs/ -emit-cir %s -o %t.cir
 // RUN: FileCheck --check-prefix=CIR-HOST --input-file=%t.cir %s
 
-// RUN: %clang_cc1 -triple=amdgcn-amd-amdhsa -x hip -fclangir \
+// RUN: %clang_cc1 -triple=amdgpu-amd-amdhsa -x hip -fclangir \
 // RUN:            -fcuda-is-device -fhip-new-launch-api \
 // RUN:            -I%S/../CodeGenCUDA/Inputs/ -emit-cir %s -o %t.cir
 // RUN: FileCheck --check-prefix=CIR-DEVICE --input-file=%t.cir %s
@@ -15,7 +15,7 @@
 // RUN:            -I%S/../CodeGenCUDA/Inputs/ %s -o %t.ll
 // RUN: FileCheck --check-prefix=OGCG-HOST --input-file=%t.ll %s
 
-// RUN: %clang_cc1 -triple=amdgcn-amd-amdhsa -x hip \
+// RUN: %clang_cc1 -triple=amdgpu-amd-amdhsa -x hip \
 // RUN:            -fcuda-is-device -fhip-new-launch-api \
 // RUN:            -fvisibility=hidden                      \
 // RUN:            -I%S/../CodeGenCUDA/Inputs/ -emit-llvm %s -o %t.ll
diff --git a/clang/test/CIR/CodeGenOpenMP/emit-device-functions.cpp 
b/clang/test/CIR/CodeGenOpenMP/emit-device-functions.cpp
index e4502991e4afe..53a8e2b7aab71 100644
--- a/clang/test/CIR/CodeGenOpenMP/emit-device-functions.cpp
+++ b/clang/test/CIR/CodeGenOpenMP/emit-device-functions.cpp
@@ -1,10 +1,10 @@
-// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa -fopenmp 
-fopenmp-is-target-device \
+// RUN: %clang_cc1 -triple amdgpu-amd-amdhsa -fopenmp 
-fopenmp-is-target-device \
 // RUN:   -fclangir -emit-cir %s -o %t.cir
 // RUN: FileCheck --input-file=%t.cir %s -check-prefix=CIR
-// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa -fopenmp 
-fopenmp-is-target-device \
+// RUN: %clang_cc1 -triple amdgpu-amd-amdhsa -fopenmp 
-fopenmp-is-target-device \
 // RUN:   -fclangir -emit-llvm %s -o %t.ll
 // RUN: FileCheck --input-file=%t.ll %s -check-prefix=LLVM
-// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa -fopenmp 
-fopenmp-is-target-device \
+// RUN: %clang_cc1 -triple amdgpu-amd-amdhsa -fopenmp 
-fopenmp-is-target-device \
 // RUN:   -emit-llvm %s -o %t.ll
 // RUN: FileCheck --input-file=%t.ll %s -check-prefix=OGCG
 
diff --git a/clang/test/CIR/CodeGenOpenMP/omp-module-attrs.c 
b/clang/test/CIR/CodeGenOpenMP/omp-module-attrs.c
index 7481975a6df7e..14a4658ce2027 100644
--- a/clang/test/CIR/CodeGenOpenMP/omp-module-attrs.c
+++ b/clang/test/CIR/CodeGenOpenMP/omp-module-attrs.c
@@ -11,7 +11,7 @@
 
 // Host with target triples
 // RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -fopenmp -fclangir 
-emit-cir \
-// RUN:   -fopenmp-targets=amdgcn-amd-amdhsa,nvptx64-nvidia-cuda %s -o - \
+// RUN:   -fopenmp-targets=amdgpu-amd-amdhsa,nvptx64-nvidia-cuda %s -o - \
 // RUN:   | FileCheck %s --check-prefix=HOST-TRIPLES
 
 // HOST-TRIPLES: module {{.*}} attributes {
@@ -20,7 +20,7 @@
 // HOST-TRIPLES-SAME: omp.target_triples = ["amdgcn-amd-amdhsa", 
"nvptx64-nvidia-cuda"]
 
 // Device, AMDGPU
-// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa -fopenmp -fclangir -emit-cir \
+// RUN: %clang_cc1 -triple amdgpu-amd-amdhsa -fopenmp -fclangir -emit-cir \
 // RUN:   -fopenmp-is-target-device %s -o - \
 // RUN:   | FileCheck %s --check-prefix=AMDGPU-DEVICE
 
@@ -47,7 +47,7 @@
 // CPU-DEVICE-SAME: omp.is_target_device = true
 
 // Device with omp.flags
-// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa -fopenmp -fclangir -emit-cir \
+// RUN: %clang_cc1 -triple amdgpu-amd-amdhsa -fopenmp -fclangir -emit-cir \
 // RUN:   -fopenmp-is-target-device \
 // RUN:   -fopenmp-assume-no-thread-state \
 // RUN:   -fopenmp-assume-no-nested-parallelism %s -o - \
diff --git a/clang/test/CodeGen/AMDGPU/sanitizer.c 
b/clang/test/CodeGen/AMDGPU/sanitizer.c
index 3b41e4dd8babe..488c0def18ddd 100644
--- a/clang/test/CodeGen/AMDGPU/sanitizer.c
+++ b/clang/test/CodeGen/AMDGPU/sanitizer.c
@@ -1,5 +1,5 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py 
UTC_ARGS: --version 6
-// RUN: %clang_cc1 -cc1 -triple amdgcn-amd-amdhsa -emit-llvm 
-fsanitize=function %s -o - | FileCheck %s
+// RUN: %clang_cc1 -cc1 -triple amdgpu-amd-amdhsa -emit-llvm 
-fsanitize=function %s -o - | FileCheck %s
 
 // CHECK-LABEL: define dso_local void @function(
 // CHECK-SAME: ) #[[ATTR0:[0-9]+]] !func_sanitize [[META2:![0-9]+...
[truncated]

``````````

</details>


https://github.com/llvm/llvm-project/pull/212053
_______________________________________________
llvm-branch-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits

Reply via email to