https://github.com/arsenm created 
https://github.com/llvm/llvm-project/pull/208810

Continue migrating command-line target spelling on RUN lines to the folded
amdgpu subarch triple form, covering more Analysis and Transforms tests.

Co-Authored-By: Claude <[email protected]> (Claude-Opus-4.8)

>From ea0c17d1aaeb528e95eaf1f692e0496128435d65 Mon Sep 17 00:00:00 2001
From: Matt Arsenault <[email protected]>
Date: Thu, 25 Jun 2026 09:52:04 +0200
Subject: [PATCH] AMDGPU: Migrate Analysis/Transforms tests to amdgpu subarch
 triple (2)

Continue migrating command-line target spelling on RUN lines to the folded
amdgpu subarch triple form, covering more Analysis and Transforms tests.

Co-Authored-By: Claude <[email protected]> (Claude-Opus-4.8)
---
 .../AtomicExpand/AMDGPU/no-expand-atomic-load.ll |  2 +-
 .../AMDGPU/no-expand-atomic-store.ll             |  2 +-
 .../AtomicExpand/AMDGPU/unaligned-atomic.ll      |  2 +-
 ...ace-addrspacecast-with-constantpointernull.ll |  2 +-
 .../Attributor/AMDGPU/tag-invariant-loads.ll     |  2 +-
 .../Transforms/Attributor/address_space_info.ll  |  2 +-
 .../CodeGenPrepare/AMDGPU/addressing-modes.ll    |  2 +-
 .../bypass-slow-div-debug-info-inseltpoison.ll   |  2 +-
 .../AMDGPU/bypass-slow-div-debug-info.ll         |  2 +-
 .../AMDGPU/no-sink-addrspacecast.ll              |  2 +-
 .../CodeGenPrepare/AMDGPU/sink-addrspacecast.ll  |  2 +-
 .../DivRemPairs/AMDGPU/div-rem-pairs.ll          |  2 +-
 .../EarlyCSE/AMDGPU/convergent-call.ll           |  2 +-
 .../Transforms/EarlyCSE/AMDGPU/intrinsics.ll     |  2 +-
 .../Transforms/EarlyCSE/AMDGPU/memrealtime.ll    |  2 +-
 .../Transforms/ExpandIRInsts/AMDGPU/frem-inf.ll  |  4 ++--
 .../test/Transforms/ExpandIRInsts/AMDGPU/frem.ll |  2 +-
 .../ExpandIRInsts/AMDGPU/missing-analysis.ll     |  2 +-
 .../ExpandIRInsts/AMDGPU/pass-parameters.ll      | 16 ++++++++--------
 .../GlobalOpt/address_space_initializer.ll       |  2 +-
 .../GlobalOpt/shrink-global-to-bool.ll           |  2 +-
 .../HipStdPar/accelerator-code-selection.ll      |  2 +-
 ...lobal-var-indirection-wrong-table-member-0.ll |  2 +-
 ...lobal-var-indirection-wrong-table-member-1.ll |  2 +-
 ...lobal-var-indirection-wrong-table-member-2.ll |  2 +-
 ...l-var-indirection-wrong-table-member-count.ll |  2 +-
 .../global-var-indirection-wrong-table-type.ll   |  2 +-
 .../HipStdPar/global-var-indirection.ll          |  2 +-
 llvm/test/Transforms/HipStdPar/global-var.ll     |  2 +-
 .../test/Transforms/HipStdPar/unsupported-asm.ll |  2 +-
 .../Transforms/HipStdPar/unsupported-builtins.ll |  2 +-
 .../unsupported-thread-local-direct-use.ll       |  2 +-
 .../unsupported-thread-local-indirect-use.ll     |  2 +-
 .../IndVarSimplify/AMDGPU/no-widen-to-i64.ll     |  2 +-
 .../AMDGPU/address-space-id-funcs.ll             |  2 +-
 .../AMDGPU/assumed-addrspace.ll                  |  2 +-
 .../InferAddressSpaces/AMDGPU/basic.ll           |  2 +-
 .../AMDGPU/builtin-assumed-addrspace.ll          |  2 +-
 .../InferAddressSpaces/AMDGPU/debug-info.ll      |  2 +-
 .../AMDGPU/global-atomicrmw-fadd.ll              |  2 +-
 .../Transforms/InferAddressSpaces/AMDGPU/icmp.ll |  2 +-
 .../AMDGPU/infer-address-space.ll                |  2 +-
 .../AMDGPU/infer-addrspacecast.ll                |  2 +-
 .../AMDGPU/infer-getelementptr.ll                |  2 +-
 .../AMDGPU/insert-pos-assert.ll                  |  2 +-
 .../InferAddressSpaces/AMDGPU/int2ptr.ll         |  2 +-
 .../InferAddressSpaces/AMDGPU/intrinsics.ll      |  2 +-
 .../InferAddressSpaces/AMDGPU/is.constant.ll     |  2 +-
 .../InferAddressSpaces/AMDGPU/issue110433.ll     |  2 +-
 .../InferAddressSpaces/AMDGPU/issue53665.ll      |  2 +-
 .../InferAddressSpaces/AMDGPU/lifetime.ll        |  2 +-
 .../AMDGPU/masked-load-store.ll                  |  2 +-
 .../InferAddressSpaces/AMDGPU/mem-intrinsics.ll  |  2 +-
 .../AMDGPU/multiple-uses-of-val.ll               |  2 +-
 .../AMDGPU/no-flat-addrspace.ll                  |  2 +-
 .../AMDGPU/noop-ptrint-pair.ll                   |  2 +-
 .../AMDGPU/old-pass-regressions.ll               |  2 +-
 .../InferAddressSpaces/AMDGPU/phi-poison.ll      |  2 +-
 .../InferAddressSpaces/AMDGPU/prefetch.ll        |  2 +-
 .../AMDGPU/preserving-debugloc-addrspacecast.ll  |  2 +-
 .../InferAddressSpaces/AMDGPU/ptrmask.ll         |  2 +-
 .../AMDGPU/redundant-addrspacecast.ll            |  2 +-
 .../InferAddressSpaces/AMDGPU/select.ll          |  2 +-
 .../InferAddressSpaces/AMDGPU/self-phi.ll        |  2 +-
 .../AMDGPU/store-pointer-to-self.ll              |  2 +-
 .../AMDGPU/unreachable-code-assert.ll            |  2 +-
 .../InferAddressSpaces/AMDGPU/volatile.ll        |  2 +-
 .../InferFunctionAttrs/enable-builtin.ll         |  4 ++--
 .../AMDGPU/amdgpu-inline-alloca-argument-cost.ll |  2 +-
 .../AMDGPU/amdgpu-inline-alloca-argument.ll      |  2 +-
 .../AMDGPU/amdgpu-inline-only-one-live-use.ll    |  2 +-
 .../AMDGPU/amdgpu-inline-stack-argument-i64.ll   |  2 +-
 .../AMDGPU/amdgpu-inline-stack-argument.ll       |  2 +-
 .../amdgpu-inline-stack-array-ptr-argument.ll    |  2 +-
 ...amdgpu-inline-stack-indirect-call-argument.ll |  2 +-
 .../AMDGPU/amdgpu-inline-stack-ptr-argument.ll   |  2 +-
 .../amdgpu-inline-stack-struct-argument.ll       |  2 +-
 .../amdgpu-inline-stack-vector-ptr-argument.ll   |  2 +-
 .../Inline/AMDGPU/inline-amdgpu-dx10-clamp.ll    |  2 +-
 .../Inline/AMDGPU/inline-amdgpu-ieee.ll          |  2 +-
 .../Inline/AMDGPU/inline-amdgpu-vecbonus.ll      |  2 +-
 .../AMDGPU/inline-atomicrmw-md-preserve.ll       |  2 +-
 .../Inline/AMDGPU/inline-denormal-fp-math.ll     |  2 +-
 .../test/Transforms/Inline/AMDGPU/inline-hint.ll |  2 +-
 .../Inline/AMDGPU/inline-target-cpu.ll           |  2 +-
 .../AMDGPU/inline-target-feature-sram-ecc.ll     |  2 +-
 .../Inline/AMDGPU/inline-target-feature-xnack.ll |  2 +-
 .../Transforms/Inline/AMDGPU/load-intrinsics.ll  |  2 +-
 .../InstCombine/AMDGPU/addrspacecast.ll          |  2 +-
 .../amdgcn-demanded-vector-elts-inseltpoison.ll  |  2 +-
 .../AMDGPU/amdgcn-demanded-vector-elts.ll        |  2 +-
 .../InstCombine/AMDGPU/amdgcn-intrinsics-gfx8.ll |  2 +-
 .../InstCombine/AMDGPU/amdgcn-intrinsics.ll      |  2 +-
 .../amdgcn-simplify-image-buffer-stores.ll       | 10 +++++-----
 .../AMDGPU/canonicalize-add-to-gep.ll            |  4 ++--
 .../Transforms/InstCombine/AMDGPU/fma_legacy.ll  |  2 +-
 .../InstCombine/AMDGPU/fmed3-fpext-fold.ll       |  6 +++---
 97 files changed, 113 insertions(+), 113 deletions(-)

diff --git a/llvm/test/Transforms/AtomicExpand/AMDGPU/no-expand-atomic-load.ll 
b/llvm/test/Transforms/AtomicExpand/AMDGPU/no-expand-atomic-load.ll
index 552fb4121166d..a8487aaaab098 100644
--- a/llvm/test/Transforms/AtomicExpand/AMDGPU/no-expand-atomic-load.ll
+++ b/llvm/test/Transforms/AtomicExpand/AMDGPU/no-expand-atomic-load.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py 
UTC_ARGS: --version 4
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa 
-passes='require<libcall-lowering-info>,atomic-expand' %s | FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa 
-passes='require<libcall-lowering-info>,atomic-expand' %s | FileCheck %s
 
 ; Make sure atomic loads are not bitcasted and lose metadata
 
diff --git a/llvm/test/Transforms/AtomicExpand/AMDGPU/no-expand-atomic-store.ll 
b/llvm/test/Transforms/AtomicExpand/AMDGPU/no-expand-atomic-store.ll
index 79b3f2d6ec87f..938d510a893d7 100644
--- a/llvm/test/Transforms/AtomicExpand/AMDGPU/no-expand-atomic-store.ll
+++ b/llvm/test/Transforms/AtomicExpand/AMDGPU/no-expand-atomic-store.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py 
UTC_ARGS: --version 4
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa 
-passes='require<libcall-lowering-info>,atomic-expand' %s | FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa 
-passes='require<libcall-lowering-info>,atomic-expand' %s | FileCheck %s
 
 define void @store_atomic_f32_global_system(float %val, ptr addrspace(1) %ptr) 
{
 ; CHECK-LABEL: define void @store_atomic_f32_global_system(
diff --git a/llvm/test/Transforms/AtomicExpand/AMDGPU/unaligned-atomic.ll 
b/llvm/test/Transforms/AtomicExpand/AMDGPU/unaligned-atomic.ll
index 4ad087181968b..e8884970c33e5 100644
--- a/llvm/test/Transforms/AtomicExpand/AMDGPU/unaligned-atomic.ll
+++ b/llvm/test/Transforms/AtomicExpand/AMDGPU/unaligned-atomic.ll
@@ -1,4 +1,4 @@
-; RUN: not opt -disable-output -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 
-passes='require<libcall-lowering-info>,atomic-expand' %s 2>&1 | FileCheck 
--implicit-check-not=error %s
+; RUN: not opt -disable-output -mtriple=amdgpu9.00-amd-amdhsa 
-passes='require<libcall-lowering-info>,atomic-expand' %s 2>&1 | FileCheck 
--implicit-check-not=error %s
 
 ; CHECK: error: unsupported atomic load: instruction alignment 1 is smaller 
than the required 4-byte alignment for this atomic operation
 define i32 @atomic_load_global_align1(ptr addrspace(1) %ptr) {
diff --git 
a/llvm/test/Transforms/Attributor/AMDGPU/do-not-replace-addrspacecast-with-constantpointernull.ll
 
b/llvm/test/Transforms/Attributor/AMDGPU/do-not-replace-addrspacecast-with-constantpointernull.ll
index fb4153bac808e..2bf40f398aabe 100644
--- 
a/llvm/test/Transforms/Attributor/AMDGPU/do-not-replace-addrspacecast-with-constantpointernull.ll
+++ 
b/llvm/test/Transforms/Attributor/AMDGPU/do-not-replace-addrspacecast-with-constantpointernull.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py 
UTC_ARGS: --version 5
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -passes=attributor %s -o - | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=attributor %s -o - | 
FileCheck %s
 
 define i32 @addrspacecast_ptr(ptr %p0, ptr addrspace(5) %p5) {
 ; CHECK-LABEL: define i32 @addrspacecast_ptr(
diff --git a/llvm/test/Transforms/Attributor/AMDGPU/tag-invariant-loads.ll 
b/llvm/test/Transforms/Attributor/AMDGPU/tag-invariant-loads.ll
index af877edee59c9..d98065165771c 100644
--- a/llvm/test/Transforms/Attributor/AMDGPU/tag-invariant-loads.ll
+++ b/llvm/test/Transforms/Attributor/AMDGPU/tag-invariant-loads.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py 
UTC_ARGS: --version 5
-; RUN: opt -mtriple=amdgcn-amd-amdhsa -passes=attributor %s -S | FileCheck %s 
--check-prefix=AMDGCN
+; RUN: opt -mtriple=amdgpu-amd-amdhsa -passes=attributor %s -S | FileCheck %s 
--check-prefix=AMDGCN
 
 @G = addrspace(1) global i32 zeroinitializer, align 4
 declare void @clobber(i32) #0
diff --git a/llvm/test/Transforms/Attributor/address_space_info.ll 
b/llvm/test/Transforms/Attributor/address_space_info.ll
index 2768aad960081..826363100dd37 100644
--- a/llvm/test/Transforms/Attributor/address_space_info.ll
+++ b/llvm/test/Transforms/Attributor/address_space_info.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py 
UTC_ARGS: --function-signature --check-attributes --check-globals 
--prefix-filecheck-ir-name true
-; RUN: opt -mtriple=amdgcn-amd-amdhsa -aa-pipeline=basic-aa -passes=attributor 
-attributor-manifest-internal -attributor-annotate-decl-cs -S < %s | FileCheck 
%s --check-prefix=CHECK
+; RUN: opt -mtriple=amdgpu-amd-amdhsa -aa-pipeline=basic-aa -passes=attributor 
-attributor-manifest-internal -attributor-annotate-decl-cs -S < %s | FileCheck 
%s --check-prefix=CHECK
 
 ; REQUIRES: amdgpu-registered-target
 
diff --git a/llvm/test/Transforms/CodeGenPrepare/AMDGPU/addressing-modes.ll 
b/llvm/test/Transforms/CodeGenPrepare/AMDGPU/addressing-modes.ll
index 20a5a9ededac0..29bdd75671145 100644
--- a/llvm/test/Transforms/CodeGenPrepare/AMDGPU/addressing-modes.ll
+++ b/llvm/test/Transforms/CodeGenPrepare/AMDGPU/addressing-modes.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -passes='require<profile-summary>,function(codegenprepare)' 
-mtriple=amdgcn--amdhsa < %s | FileCheck %s
+; RUN: opt -S -passes='require<profile-summary>,function(codegenprepare)' 
-mtriple=amdgpu--amdhsa < %s | FileCheck %s
 
 define amdgpu_kernel void @test_sink_as999_small_max_mubuf_offset(ptr 
addrspace(999) %out, ptr addrspace(999) %in) {
 ; CHECK-LABEL: @test_sink_as999_small_max_mubuf_offset(
diff --git 
a/llvm/test/Transforms/CodeGenPrepare/AMDGPU/bypass-slow-div-debug-info-inseltpoison.ll
 
b/llvm/test/Transforms/CodeGenPrepare/AMDGPU/bypass-slow-div-debug-info-inseltpoison.ll
index 20db568d1ff10..1223da95e9a08 100644
--- 
a/llvm/test/Transforms/CodeGenPrepare/AMDGPU/bypass-slow-div-debug-info-inseltpoison.ll
+++ 
b/llvm/test/Transforms/CodeGenPrepare/AMDGPU/bypass-slow-div-debug-info-inseltpoison.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -codegenprepare %s | FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -codegenprepare %s | FileCheck %s
 ; Make sure BypassSlowDivision doesn't drop debug info
 
 define i64 @sdiv64(i64 %a, i64 %b) {
diff --git 
a/llvm/test/Transforms/CodeGenPrepare/AMDGPU/bypass-slow-div-debug-info.ll 
b/llvm/test/Transforms/CodeGenPrepare/AMDGPU/bypass-slow-div-debug-info.ll
index c0fba863376cf..5016a4ce5e975 100644
--- a/llvm/test/Transforms/CodeGenPrepare/AMDGPU/bypass-slow-div-debug-info.ll
+++ b/llvm/test/Transforms/CodeGenPrepare/AMDGPU/bypass-slow-div-debug-info.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -codegenprepare %s | FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -codegenprepare %s | FileCheck %s
 ; Make sure BypassSlowDivision doesn't drop debug info
 
 define i64 @sdiv64(i64 %a, i64 %b) {
diff --git 
a/llvm/test/Transforms/CodeGenPrepare/AMDGPU/no-sink-addrspacecast.ll 
b/llvm/test/Transforms/CodeGenPrepare/AMDGPU/no-sink-addrspacecast.ll
index c64d5a357f3a9..bf2df438b085b 100644
--- a/llvm/test/Transforms/CodeGenPrepare/AMDGPU/no-sink-addrspacecast.ll
+++ b/llvm/test/Transforms/CodeGenPrepare/AMDGPU/no-sink-addrspacecast.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -passes='require<profile-summary>,function(codegenprepare)' 
-mtriple=amdgcn-unknown-unknown < %s | FileCheck -check-prefix=ASC 
-check-prefix=COMMON %s
+; RUN: opt -S -passes='require<profile-summary>,function(codegenprepare)' 
-mtriple=amdgpu-unknown-unknown < %s | FileCheck -check-prefix=ASC 
-check-prefix=COMMON %s
 
 ; COMMON-LABEL: @test_sink_ptrtoint_asc(
 ; ASC: addrspacecast
diff --git a/llvm/test/Transforms/CodeGenPrepare/AMDGPU/sink-addrspacecast.ll 
b/llvm/test/Transforms/CodeGenPrepare/AMDGPU/sink-addrspacecast.ll
index 77e79a902f3be..948e3004b16a3 100644
--- a/llvm/test/Transforms/CodeGenPrepare/AMDGPU/sink-addrspacecast.ll
+++ b/llvm/test/Transforms/CodeGenPrepare/AMDGPU/sink-addrspacecast.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py 
UTC_ARGS: --version 3
-; RUN: opt -S -passes='require<profile-summary>,function(codegenprepare)' 
-mtriple=amdgcn--amdhsa < %s | FileCheck %s
+; RUN: opt -S -passes='require<profile-summary>,function(codegenprepare)' 
-mtriple=amdgpu--amdhsa < %s | FileCheck %s
 
 define i64 @no_sink_local_to_flat(i1 %pred, ptr addrspace(3) %ptr) {
 ; CHECK-LABEL: define i64 @no_sink_local_to_flat(
diff --git a/llvm/test/Transforms/DivRemPairs/AMDGPU/div-rem-pairs.ll 
b/llvm/test/Transforms/DivRemPairs/AMDGPU/div-rem-pairs.ll
index ef2df8a3d678a..18827004b2558 100644
--- a/llvm/test/Transforms/DivRemPairs/AMDGPU/div-rem-pairs.ll
+++ b/llvm/test/Transforms/DivRemPairs/AMDGPU/div-rem-pairs.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py 
UTC_ARGS: --version 4
-; RUN: opt < %s -passes=div-rem-pairs -S -mtriple=amdgcn-amd-amdhsa | 
FileCheck %s
+; RUN: opt < %s -passes=div-rem-pairs -S -mtriple=amdgpu-amd-amdhsa | 
FileCheck %s
 
 define i32 @basic(ptr %p, i32 %x, i32 %y) {
 ; CHECK-LABEL: define i32 @basic(
diff --git a/llvm/test/Transforms/EarlyCSE/AMDGPU/convergent-call.ll 
b/llvm/test/Transforms/EarlyCSE/AMDGPU/convergent-call.ll
index 7ae17264a7c73..c07b03ded3ee2 100644
--- a/llvm/test/Transforms/EarlyCSE/AMDGPU/convergent-call.ll
+++ b/llvm/test/Transforms/EarlyCSE/AMDGPU/convergent-call.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py 
UTC_ARGS: --version 2
-; RUN: opt < %s -S -mtriple=amdgcn-- -passes=early-cse -earlycse-debug-hash | 
FileCheck %s
+; RUN: opt < %s -S -mtriple=amdgpu-- -passes=early-cse -earlycse-debug-hash | 
FileCheck %s
 
 ; Should not CSE calls marked as convergent, even if the callee is not 
convergent.
 
diff --git a/llvm/test/Transforms/EarlyCSE/AMDGPU/intrinsics.ll 
b/llvm/test/Transforms/EarlyCSE/AMDGPU/intrinsics.ll
index 08a13856c81b6..b9837b374facb 100644
--- a/llvm/test/Transforms/EarlyCSE/AMDGPU/intrinsics.ll
+++ b/llvm/test/Transforms/EarlyCSE/AMDGPU/intrinsics.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -S -mtriple=amdgcn-- -passes=early-cse -earlycse-debug-hash | 
FileCheck %s
+; RUN: opt < %s -S -mtriple=amdgpu-- -passes=early-cse -earlycse-debug-hash | 
FileCheck %s
 
 ; CHECK-LABEL: @no_cse
 ; CHECK: call i32 @llvm.amdgcn.s.buffer.load.i32(<4 x i32> %in, i32 0, i32 0)
diff --git a/llvm/test/Transforms/EarlyCSE/AMDGPU/memrealtime.ll 
b/llvm/test/Transforms/EarlyCSE/AMDGPU/memrealtime.ll
index 789faf3aff1e8..1050163ce6b38 100644
--- a/llvm/test/Transforms/EarlyCSE/AMDGPU/memrealtime.ll
+++ b/llvm/test/Transforms/EarlyCSE/AMDGPU/memrealtime.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -passes='early-cse<memssa>' 
-earlycse-debug-hash < %s | FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes='early-cse<memssa>' 
-earlycse-debug-hash < %s | FileCheck %s
 
 ; CHECK-LABEL: @memrealtime(
 ; CHECK: call i64 @llvm.amdgcn.s.memrealtime()
diff --git a/llvm/test/Transforms/ExpandIRInsts/AMDGPU/frem-inf.ll 
b/llvm/test/Transforms/ExpandIRInsts/AMDGPU/frem-inf.ll
index 108fe3803b168..7863e21ea8967 100644
--- a/llvm/test/Transforms/ExpandIRInsts/AMDGPU/frem-inf.ll
+++ b/llvm/test/Transforms/ExpandIRInsts/AMDGPU/frem-inf.ll
@@ -1,5 +1,5 @@
-; RUN: opt -mtriple=amdgcn 
-passes="require<libcall-lowering-info>,expand-ir-insts<O0>" %s -S -o - | 
FileCheck %s
-; RUN: opt -mtriple=amdgcn 
-passes="require<libcall-lowering-info>,expand-ir-insts<O1>" %s -S -o - | 
FileCheck --check-prefixes CHECK,OPT1 %s
+; RUN: opt -mtriple=amdgpu6.00 
-passes="require<libcall-lowering-info>,expand-ir-insts<O0>" %s -S -o - | 
FileCheck %s
+; RUN: opt -mtriple=amdgpu6.00 
-passes="require<libcall-lowering-info>,expand-ir-insts<O1>" %s -S -o - | 
FileCheck --check-prefixes CHECK,OPT1 %s
 
 ; Check the handling of potentially infinite numerators in the frem
 ; expansion at different optimization levels and with different
diff --git a/llvm/test/Transforms/ExpandIRInsts/AMDGPU/frem.ll 
b/llvm/test/Transforms/ExpandIRInsts/AMDGPU/frem.ll
index bdfc254687eaa..e3055fbc276dd 100644
--- a/llvm/test/Transforms/ExpandIRInsts/AMDGPU/frem.ll
+++ b/llvm/test/Transforms/ExpandIRInsts/AMDGPU/frem.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py 
UTC_ARGS: --version 5
-; RUN: opt -mtriple=amdgcn 
-passes="require<libcall-lowering-info>,expand-ir-insts<O1>" %s -S -o - | 
FileCheck %s
+; RUN: opt -mtriple=amdgpu 
-passes="require<libcall-lowering-info>,expand-ir-insts<O1>" %s -S -o - | 
FileCheck %s
 
 define amdgpu_kernel void @frem_f16(ptr addrspace(1) %out, ptr addrspace(1) 
%in1,
 ; CHECK-LABEL: define amdgpu_kernel void @frem_f16(
diff --git a/llvm/test/Transforms/ExpandIRInsts/AMDGPU/missing-analysis.ll 
b/llvm/test/Transforms/ExpandIRInsts/AMDGPU/missing-analysis.ll
index bb16fd992010c..cf101ba12f6e4 100644
--- a/llvm/test/Transforms/ExpandIRInsts/AMDGPU/missing-analysis.ll
+++ b/llvm/test/Transforms/ExpandIRInsts/AMDGPU/missing-analysis.ll
@@ -1,4 +1,4 @@
-; RUN: not opt -mtriple=amdgcn -passes=expand-ir-insts -disable-output %s 2>&1 
| FileCheck %s
+; RUN: not opt -mtriple=amdgpu -passes=expand-ir-insts -disable-output %s 2>&1 
| FileCheck %s
 
 ; CHECK: 'LibcallLoweringModuleAnalysis' analysis required
 define void @empty() {
diff --git a/llvm/test/Transforms/ExpandIRInsts/AMDGPU/pass-parameters.ll 
b/llvm/test/Transforms/ExpandIRInsts/AMDGPU/pass-parameters.ll
index a9fa1c8b83de1..2fcf87caaf814 100644
--- a/llvm/test/Transforms/ExpandIRInsts/AMDGPU/pass-parameters.ll
+++ b/llvm/test/Transforms/ExpandIRInsts/AMDGPU/pass-parameters.ll
@@ -1,18 +1,18 @@
-; RUN: opt -mtriple=amdgcn 
-passes="require<libcall-lowering-info>,expand-ir-insts<O0>" %s -S 
-disable-output
-; RUN: opt -mtriple=amdgcn 
-passes="require<libcall-lowering-info>,expand-ir-insts<O1>" %s -S 
-disable-output
-; RUN: opt -mtriple=amdgcn 
-passes="require<libcall-lowering-info>,expand-ir-insts<O2>" %s -S 
-disable-output
-; RUN: opt -mtriple=amdgcn 
-passes="require<libcall-lowering-info>,expand-ir-insts<O3>" %s -S 
-disable-output
+; RUN: opt -mtriple=amdgpu 
-passes="require<libcall-lowering-info>,expand-ir-insts<O0>" %s -S 
-disable-output
+; RUN: opt -mtriple=amdgpu 
-passes="require<libcall-lowering-info>,expand-ir-insts<O1>" %s -S 
-disable-output
+; RUN: opt -mtriple=amdgpu 
-passes="require<libcall-lowering-info>,expand-ir-insts<O2>" %s -S 
-disable-output
+; RUN: opt -mtriple=amdgpu 
-passes="require<libcall-lowering-info>,expand-ir-insts<O3>" %s -S 
-disable-output
 
-; RUN: not opt -mtriple=amdgcn 
-passes="require<libcall-lowering-info>,expand-ir-insts<O4>" %s -S 
-disable-output 2>&1 | FileCheck --check-prefix=TOO-LARGE %s
+; RUN: not opt -mtriple=amdgpu 
-passes="require<libcall-lowering-info>,expand-ir-insts<O4>" %s -S 
-disable-output 2>&1 | FileCheck --check-prefix=TOO-LARGE %s
 ; TOO-LARGE: {{.*}}invalid optimization level for expand-ir-insts pass: 4
 
-; RUN: not opt -mtriple=amdgcn 
-passes="require<libcall-lowering-info>,expand-ir-insts<Os>" %s -S 
-disable-output 2>&1 | FileCheck --check-prefix=NON-NUMERIC %s
+; RUN: not opt -mtriple=amdgpu 
-passes="require<libcall-lowering-info>,expand-ir-insts<Os>" %s -S 
-disable-output 2>&1 | FileCheck --check-prefix=NON-NUMERIC %s
 ; NON-NUMERIC: {{.*}}invalid expand-ir-insts pass parameter
 
-; RUN: not opt -mtriple=amdgcn 
-passes="require<libcall-lowering-info>,expand-ir-insts<O-1>" %s -S 
-disable-output 2>&1 | FileCheck --check-prefix=NEGATIVE %s
+; RUN: not opt -mtriple=amdgpu 
-passes="require<libcall-lowering-info>,expand-ir-insts<O-1>" %s -S 
-disable-output 2>&1 | FileCheck --check-prefix=NEGATIVE %s
 ; NEGATIVE: {{.*}}invalid expand-ir-insts pass parameter 'O-1'
 
-; RUN: not opt -mtriple=amdgcn 
-passes="require<libcall-lowering-info>,expand-ir-insts<foo>" %s -S 
-disable-output 2>&1 | FileCheck --check-prefix=NO-O-PREFIX %s
+; RUN: not opt -mtriple=amdgpu 
-passes="require<libcall-lowering-info>,expand-ir-insts<foo>" %s -S 
-disable-output 2>&1 | FileCheck --check-prefix=NO-O-PREFIX %s
 ; NO-O-PREFIX: {{.*}}invalid expand-ir-insts pass parameter 'foo'
 
 define void @empty() {
diff --git a/llvm/test/Transforms/GlobalOpt/address_space_initializer.ll 
b/llvm/test/Transforms/GlobalOpt/address_space_initializer.ll
index 186fa4808ff17..d4c5884760ba3 100644
--- a/llvm/test/Transforms/GlobalOpt/address_space_initializer.ll
+++ b/llvm/test/Transforms/GlobalOpt/address_space_initializer.ll
@@ -1,6 +1,6 @@
 ; RUN: opt -passes=globalopt < %s -S | FileCheck %s
 ; RUN: opt -passes=globalopt --mtriple=nvptx64 < %s -S | FileCheck %s 
--check-prefix=GPU
-; RUN: opt -passes=globalopt --mtriple=amdgcn < %s -S | FileCheck %s 
--check-prefix=GPU
+; RUN: opt -passes=globalopt --mtriple=amdgpu < %s -S | FileCheck %s 
--check-prefix=GPU
 ; REQUIRES: amdgpu-registered-target, nvptx-registered-target
 
 ; Check that we don't try to set a global initializer for non AS(0) globals.
diff --git a/llvm/test/Transforms/GlobalOpt/shrink-global-to-bool.ll 
b/llvm/test/Transforms/GlobalOpt/shrink-global-to-bool.ll
index d9f336f837ad1..13849bd322286 100644
--- a/llvm/test/Transforms/GlobalOpt/shrink-global-to-bool.ll
+++ b/llvm/test/Transforms/GlobalOpt/shrink-global-to-bool.ll
@@ -1,4 +1,4 @@
-; RUN: opt -passes=globalopt --mtriple=amdgcn-amd-amdhsa < %s -S | FileCheck %s
+; RUN: opt -passes=globalopt --mtriple=amdgpu-amd-amdhsa < %s -S | FileCheck %s
 ; REQUIRES: amdgpu-registered-target
 
 @gvar = internal unnamed_addr global i32 undef
diff --git a/llvm/test/Transforms/HipStdPar/accelerator-code-selection.ll 
b/llvm/test/Transforms/HipStdPar/accelerator-code-selection.ll
index 2d41bd9b34435..4c83e40b531d1 100644
--- a/llvm/test/Transforms/HipStdPar/accelerator-code-selection.ll
+++ b/llvm/test/Transforms/HipStdPar/accelerator-code-selection.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa 
-passes=hipstdpar-select-accelerator-code \
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa 
-passes=hipstdpar-select-accelerator-code \
 ; RUN: %s | FileCheck %s
 
 $_ZNK8CallableclEPi = comdat any
diff --git 
a/llvm/test/Transforms/HipStdPar/global-var-indirection-wrong-table-member-0.ll 
b/llvm/test/Transforms/HipStdPar/global-var-indirection-wrong-table-member-0.ll
index 258bcfba55eca..2fe155d4aa230 100644
--- 
a/llvm/test/Transforms/HipStdPar/global-var-indirection-wrong-table-member-0.ll
+++ 
b/llvm/test/Transforms/HipStdPar/global-var-indirection-wrong-table-member-0.ll
@@ -1,5 +1,5 @@
 ; REQUIRES: amdgpu-registered-target
-; RUN: not opt -S -mtriple=amdgcn-amd-amdhsa 
-passes=hipstdpar-select-accelerator-code \
+; RUN: not opt -S -mtriple=amdgpu-amd-amdhsa 
-passes=hipstdpar-select-accelerator-code \
 ; RUN: %s 2>&1 | FileCheck %s
 
 ; CHECK: error: The first element in the Indirection Table must be an integer; 
%struct.anon.1 = type { ptr, ptr } is incorrect.
diff --git 
a/llvm/test/Transforms/HipStdPar/global-var-indirection-wrong-table-member-1.ll 
b/llvm/test/Transforms/HipStdPar/global-var-indirection-wrong-table-member-1.ll
index 331f4bf92e928..cb1041b7ef7a7 100644
--- 
a/llvm/test/Transforms/HipStdPar/global-var-indirection-wrong-table-member-1.ll
+++ 
b/llvm/test/Transforms/HipStdPar/global-var-indirection-wrong-table-member-1.ll
@@ -1,5 +1,5 @@
 ; REQUIRES: amdgpu-registered-target
-; RUN: not opt -S -mtriple=amdgcn-amd-amdhsa 
-passes=hipstdpar-select-accelerator-code \
+; RUN: not opt -S -mtriple=amdgpu-amd-amdhsa 
-passes=hipstdpar-select-accelerator-code \
 ; RUN: %s 2>&1 | FileCheck %s
 
 ; CHECK: error: The second element in the Indirection Table must be a pointer; 
%struct.anon.1 = type { ptr, ptr } is incorrect.
diff --git 
a/llvm/test/Transforms/HipStdPar/global-var-indirection-wrong-table-member-2.ll 
b/llvm/test/Transforms/HipStdPar/global-var-indirection-wrong-table-member-2.ll
index 6bdedcbe65340..5f4980c967752 100644
--- 
a/llvm/test/Transforms/HipStdPar/global-var-indirection-wrong-table-member-2.ll
+++ 
b/llvm/test/Transforms/HipStdPar/global-var-indirection-wrong-table-member-2.ll
@@ -1,5 +1,5 @@
 ; REQUIRES: amdgpu-registered-target
-; RUN: not opt -S -mtriple=amdgcn-amd-amdhsa 
-passes=hipstdpar-select-accelerator-code \
+; RUN: not opt -S -mtriple=amdgpu-amd-amdhsa 
-passes=hipstdpar-select-accelerator-code \
 ; RUN: %s 2>&1 | FileCheck %s
 
 ; CHECK: error: The third element in the Indirection Table must be a struct 
type; i64 is incorrect.
diff --git 
a/llvm/test/Transforms/HipStdPar/global-var-indirection-wrong-table-member-count.ll
 
b/llvm/test/Transforms/HipStdPar/global-var-indirection-wrong-table-member-count.ll
index cf0efa0953a74..6e9602ff63843 100644
--- 
a/llvm/test/Transforms/HipStdPar/global-var-indirection-wrong-table-member-count.ll
+++ 
b/llvm/test/Transforms/HipStdPar/global-var-indirection-wrong-table-member-count.ll
@@ -1,5 +1,5 @@
 ; REQUIRES: amdgpu-registered-target
-; RUN: not opt -S -mtriple=amdgcn-amd-amdhsa 
-passes=hipstdpar-select-accelerator-code \
+; RUN: not opt -S -mtriple=amdgpu-amd-amdhsa 
-passes=hipstdpar-select-accelerator-code \
 ; RUN: %s 2>&1 | FileCheck %s
 
 ; CHECK: error: The Indirection Table must have 3 elements; 2 is incorrect.
diff --git 
a/llvm/test/Transforms/HipStdPar/global-var-indirection-wrong-table-type.ll 
b/llvm/test/Transforms/HipStdPar/global-var-indirection-wrong-table-type.ll
index f32e378038f1a..e60057016373b 100644
--- a/llvm/test/Transforms/HipStdPar/global-var-indirection-wrong-table-type.ll
+++ b/llvm/test/Transforms/HipStdPar/global-var-indirection-wrong-table-type.ll
@@ -1,5 +1,5 @@
 ; REQUIRES: amdgpu-registered-target
-; RUN: not opt -S -mtriple=amdgcn-amd-amdhsa 
-passes=hipstdpar-select-accelerator-code \
+; RUN: not opt -S -mtriple=amdgpu-amd-amdhsa 
-passes=hipstdpar-select-accelerator-code \
 ; RUN: %s 2>&1 | FileCheck %s
 
 ; CHECK: error: The Indirection Table must be a struct type; ptr is incorrect.
diff --git a/llvm/test/Transforms/HipStdPar/global-var-indirection.ll 
b/llvm/test/Transforms/HipStdPar/global-var-indirection.ll
index 459e3fe34c034..075d752da9a5a 100644
--- a/llvm/test/Transforms/HipStdPar/global-var-indirection.ll
+++ b/llvm/test/Transforms/HipStdPar/global-var-indirection.ll
@@ -1,6 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py 
UTC_ARGS: --scrub-attributes --check-globals all --version 5
 ; REQUIRES: amdgpu-registered-target
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa 
-passes=hipstdpar-select-accelerator-code \
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa 
-passes=hipstdpar-select-accelerator-code \
 ; RUN: %s | FileCheck %s
 
 %class.anon = type { i64, ptr, %struct.anon.1 }
diff --git a/llvm/test/Transforms/HipStdPar/global-var.ll 
b/llvm/test/Transforms/HipStdPar/global-var.ll
index 3a22a7b864f03..9247c59870a03 100644
--- a/llvm/test/Transforms/HipStdPar/global-var.ll
+++ b/llvm/test/Transforms/HipStdPar/global-var.ll
@@ -1,5 +1,5 @@
 ; REQUIRES: amdgpu-registered-target
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa 
-passes=hipstdpar-select-accelerator-code \
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa 
-passes=hipstdpar-select-accelerator-code \
 ; RUN: %s | FileCheck %s
 
 ; CHECK: @var = addrspace(1) global i32 poison, align 4
diff --git a/llvm/test/Transforms/HipStdPar/unsupported-asm.ll 
b/llvm/test/Transforms/HipStdPar/unsupported-asm.ll
index 19e6b28cc9164..5cdf6a1f3e5d8 100644
--- a/llvm/test/Transforms/HipStdPar/unsupported-asm.ll
+++ b/llvm/test/Transforms/HipStdPar/unsupported-asm.ll
@@ -1,4 +1,4 @@
-; RUN: not opt -S -mtriple=amdgcn-amd-amdhsa 
-passes=hipstdpar-select-accelerator-code \
+; RUN: not opt -S -mtriple=amdgpu-amd-amdhsa 
-passes=hipstdpar-select-accelerator-code \
 ; RUN: %s 2>&1 | FileCheck %s
 
 ; CHECK: error: {{.*}} in function foo void (): Accelerator does not support 
the ASM block:
diff --git a/llvm/test/Transforms/HipStdPar/unsupported-builtins.ll 
b/llvm/test/Transforms/HipStdPar/unsupported-builtins.ll
index 19490dad80bab..67b515f2e8994 100644
--- a/llvm/test/Transforms/HipStdPar/unsupported-builtins.ll
+++ b/llvm/test/Transforms/HipStdPar/unsupported-builtins.ll
@@ -1,4 +1,4 @@
-; RUN: not opt -S -mtriple=amdgcn-amd-amdhsa 
-passes=hipstdpar-select-accelerator-code \
+; RUN: not opt -S -mtriple=amdgpu-amd-amdhsa 
-passes=hipstdpar-select-accelerator-code \
 ; RUN: %s 2>&1 | FileCheck %s
 
 ; CHECK: error: {{.*}} in function foo void (): Accelerator does not support 
the __builtin_ia32_pause function
diff --git 
a/llvm/test/Transforms/HipStdPar/unsupported-thread-local-direct-use.ll 
b/llvm/test/Transforms/HipStdPar/unsupported-thread-local-direct-use.ll
index fa17bb114eae6..04c17e6db0d10 100644
--- a/llvm/test/Transforms/HipStdPar/unsupported-thread-local-direct-use.ll
+++ b/llvm/test/Transforms/HipStdPar/unsupported-thread-local-direct-use.ll
@@ -1,4 +1,4 @@
-; RUN: not opt -S -mtriple=amdgcn-amd-amdhsa 
-passes=hipstdpar-select-accelerator-code \
+; RUN: not opt -S -mtriple=amdgpu-amd-amdhsa 
-passes=hipstdpar-select-accelerator-code \
 ; RUN:   %s 2>&1 | FileCheck %s
 
 @tls = hidden thread_local addrspace(1) global i32 0, align 4
diff --git 
a/llvm/test/Transforms/HipStdPar/unsupported-thread-local-indirect-use.ll 
b/llvm/test/Transforms/HipStdPar/unsupported-thread-local-indirect-use.ll
index 960828c76f789..8a82f76c7a187 100644
--- a/llvm/test/Transforms/HipStdPar/unsupported-thread-local-indirect-use.ll
+++ b/llvm/test/Transforms/HipStdPar/unsupported-thread-local-indirect-use.ll
@@ -1,4 +1,4 @@
-; RUN: not opt -S -mtriple=amdgcn-amd-amdhsa 
-passes=hipstdpar-select-accelerator-code \
+; RUN: not opt -S -mtriple=amdgpu-amd-amdhsa 
-passes=hipstdpar-select-accelerator-code \
 ; RUN:   %s 2>&1 | FileCheck %s
 ; XFAIL: *
 
diff --git a/llvm/test/Transforms/IndVarSimplify/AMDGPU/no-widen-to-i64.ll 
b/llvm/test/Transforms/IndVarSimplify/AMDGPU/no-widen-to-i64.ll
index 8a4013bf97609..3a535029cf005 100644
--- a/llvm/test/Transforms/IndVarSimplify/AMDGPU/no-widen-to-i64.ll
+++ b/llvm/test/Transforms/IndVarSimplify/AMDGPU/no-widen-to-i64.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mtriple=amdgcn-unknown-amdhsa -passes=indvars %s | FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-unknown-amdhsa -passes=indvars %s | FileCheck %s
 
 ; Bug 21148
 
diff --git 
a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/address-space-id-funcs.ll 
b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/address-space-id-funcs.ll
index 5bdb171dc6fff..2e33c77b96b18 100644
--- a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/address-space-id-funcs.ll
+++ b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/address-space-id-funcs.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa 
-passes=infer-address-spaces,instsimplify %s | FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa 
-passes=infer-address-spaces,instsimplify %s | FileCheck %s
 
 define amdgpu_kernel void @is_local_true(ptr addrspace(3) %lptr) {
 ; CHECK-LABEL: @is_local_true(
diff --git 
a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/assumed-addrspace.ll 
b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/assumed-addrspace.ll
index b981a8eb541d8..9c3a00024382c 100644
--- a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/assumed-addrspace.ll
+++ b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/assumed-addrspace.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -passes=infer-address-spaces -o - %s 
| FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=infer-address-spaces -o - %s 
| FileCheck %s
 
 @c0 = addrspace(4) global ptr poison
 
diff --git a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/basic.ll 
b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/basic.ll
index 1171c9c077b6a..afbd2b6791a33 100644
--- a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/basic.ll
+++ b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/basic.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py 
UTC_ARGS: --prefix-filecheck-ir-name _ --version 5
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -passes=infer-address-spaces %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=infer-address-spaces %s | 
FileCheck %s
 
 ; Trivial optimization of generic addressing
 
diff --git 
a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/builtin-assumed-addrspace.ll 
b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/builtin-assumed-addrspace.ll
index 32dca860a7ded..5438f02ddf834 100644
--- 
a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/builtin-assumed-addrspace.ll
+++ 
b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/builtin-assumed-addrspace.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py 
UTC_ARGS: --version 5
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -passes=infer-address-spaces -o - %s 
| FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=infer-address-spaces -o - %s 
| FileCheck %s
 
 define float @assume_is_shared_gep(ptr %p) {
 ; CHECK-LABEL: define float @assume_is_shared_gep(
diff --git a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/debug-info.ll 
b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/debug-info.ll
index e2c51f3db72f1..c85c3a4ada3bf 100644
--- a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/debug-info.ll
+++ b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/debug-info.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -passes=infer-address-spaces %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=infer-address-spaces %s | 
FileCheck %s
 
 ; check that the debug locations are correctly propagated
 
diff --git 
a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/global-atomicrmw-fadd.ll 
b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/global-atomicrmw-fadd.ll
index fd698196ffb77..b4b39f6d22e49 100644
--- a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/global-atomicrmw-fadd.ll
+++ b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/global-atomicrmw-fadd.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py 
UTC_ARGS: --version 5
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -mcpu=gfx942 
-passes=infer-address-spaces < %s | FileCheck %s
+; RUN: opt -S -mtriple=amdgpu9.42-amd-amdhsa -passes=infer-address-spaces < %s 
| FileCheck %s
 
 define amdgpu_kernel void @infer_as_before_atomic(ptr addrspace(4) %arg) #0 {
 ; CHECK-LABEL: define amdgpu_kernel void @infer_as_before_atomic(
diff --git a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/icmp.ll 
b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/icmp.ll
index 7e810e4909be0..07c55d0c81b57 100644
--- a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/icmp.ll
+++ b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/icmp.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -passes=infer-address-spaces %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=infer-address-spaces %s | 
FileCheck %s
 
 ; CHECK-LABEL: @icmp_flat_cmp_self(
 ; CHECK: %cmp = icmp eq ptr addrspace(3) %group.ptr.0, %group.ptr.0
diff --git 
a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/infer-address-space.ll 
b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/infer-address-space.ll
index a08110defc8b3..b1abf62d9ef76 100644
--- a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/infer-address-space.ll
+++ b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/infer-address-space.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py 
UTC_ARGS: --version 5
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -passes=infer-address-spaces %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=infer-address-spaces %s | 
FileCheck %s
 ; Ports of most of test/CodeGen/NVPTX/access-non-generic.ll
 
 @scalar = internal addrspace(3) global float 0.0, align 4
diff --git 
a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/infer-addrspacecast.ll 
b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/infer-addrspacecast.ll
index c97f608ea70fe..4375eebd8e16b 100644
--- a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/infer-addrspacecast.ll
+++ b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/infer-addrspacecast.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -passes=infer-address-spaces %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=infer-address-spaces %s | 
FileCheck %s
 
 ; Test that pure addrspacecast instructions not directly connected to
 ; a memory operation are inferred.
diff --git 
a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/infer-getelementptr.ll 
b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/infer-getelementptr.ll
index 53ded91ac311a..46d9bbae9f2a5 100644
--- a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/infer-getelementptr.ll
+++ b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/infer-getelementptr.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -passes=infer-address-spaces %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=infer-address-spaces %s | 
FileCheck %s
 
 ; Test that pure GetElementPtr instructions not directly connected to
 ; a memory operation are inferred.
diff --git 
a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/insert-pos-assert.ll 
b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/insert-pos-assert.ll
index 70203a031f739..1bcf6f4214a96 100644
--- a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/insert-pos-assert.ll
+++ b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/insert-pos-assert.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -passes=infer-address-spaces %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=infer-address-spaces %s | 
FileCheck %s
 
 ; Addrspacecasts or bitcasts must be inserted after the instructions that 
define their uses.
 
diff --git a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/int2ptr.ll 
b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/int2ptr.ll
index 6b6d8162b6e7b..3e6d731dcbfa4 100644
--- a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/int2ptr.ll
+++ b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/int2ptr.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py 
UTC_ARGS: --version 6
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -passes=infer-address-spaces %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=infer-address-spaces %s | 
FileCheck %s
 
 ; Test that address space inference works correctly for inttoptr/ptrtoint
 ; patterns when the pointer manipulation is within the preserved mask.
diff --git a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/intrinsics.ll 
b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/intrinsics.ll
index 2743f1749adc0..00a8f5bf4169e 100644
--- a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/intrinsics.ll
+++ b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/intrinsics.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -passes=infer-address-spaces %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=infer-address-spaces %s | 
FileCheck %s
 
 ; CHECK-LABEL: @objectsize_group_to_flat_i32(
 ; CHECK: %val = call i32 @llvm.objectsize.i32.p3(ptr addrspace(3) %group.ptr, 
i1 true, i1 false, i1 false)
diff --git a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/is.constant.ll 
b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/is.constant.ll
index a761f59b4312f..8e72647fa3e23 100644
--- a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/is.constant.ll
+++ b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/is.constant.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py 
UTC_ARGS: --version 5
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -passes=infer-address-spaces %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=infer-address-spaces %s | 
FileCheck %s
 
 define i1 @is_constant_global_to_flat(ptr addrspace(1) %ptr) {
 ; CHECK-LABEL: define i1 @is_constant_global_to_flat(
diff --git a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/issue110433.ll 
b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/issue110433.ll
index 1a4d2d9d3bdd3..c58ccbffa957a 100644
--- a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/issue110433.ll
+++ b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/issue110433.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py 
UTC_ARGS: --version 5
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -passes=infer-address-spaces %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=infer-address-spaces %s | 
FileCheck %s
 
 define <8 x i1> @load_vector_of_flat_ptr_from_constant(ptr addrspace(4) %ptr) {
 ; CHECK-LABEL: define <8 x i1> @load_vector_of_flat_ptr_from_constant(
diff --git a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/issue53665.ll 
b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/issue53665.ll
index 04dd2eed6f78e..572f4454fff80 100644
--- a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/issue53665.ll
+++ b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/issue53665.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -passes=infer-address-spaces -o - %s 
| FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=infer-address-spaces -o - %s 
| FileCheck %s
 ; https://github.com/llvm/llvm-project/issues/53665
 
 define i32 @addrspacecast_ptrtoint_inttoptr(ptr addrspace(1) %arg) {
diff --git a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/lifetime.ll 
b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/lifetime.ll
index 4c04e6d02e7be..d243f39c8838d 100644
--- a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/lifetime.ll
+++ b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/lifetime.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py 
UTC_ARGS: --version 5
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -passes=infer-address-spaces %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=infer-address-spaces %s | 
FileCheck %s
 
 define i32 @lifetime_flat_pointer() {
 ; CHECK-LABEL: define i32 @lifetime_flat_pointer() {
diff --git 
a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/masked-load-store.ll 
b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/masked-load-store.ll
index ed58f394a2939..6e81be49a6fdf 100644
--- a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/masked-load-store.ll
+++ b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/masked-load-store.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py 
UTC_ARGS: --version 5
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -passes=infer-address-spaces %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=infer-address-spaces %s | 
FileCheck %s
 
 define <32 x i32> @masked_load_v32i32_global_to_flat(ptr addrspace(1) %ptr, 
<32 x i1> %mask) {
 ; CHECK-LABEL: define <32 x i32> @masked_load_v32i32_global_to_flat(
diff --git a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/mem-intrinsics.ll 
b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/mem-intrinsics.ll
index 678d462b0c1b7..35ceeb1d75d21 100644
--- a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/mem-intrinsics.ll
+++ b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/mem-intrinsics.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py 
UTC_ARGS: --version 6
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -passes=infer-address-spaces %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=infer-address-spaces %s | 
FileCheck %s
 
 define amdgpu_kernel void @memset_group_to_flat(ptr addrspace(3) %group.ptr, 
i32 %y) #0 {
 ; CHECK-LABEL: define amdgpu_kernel void @memset_group_to_flat(
diff --git 
a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/multiple-uses-of-val.ll 
b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/multiple-uses-of-val.ll
index 717bd09897732..6178a9b7b22f3 100644
--- a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/multiple-uses-of-val.ll
+++ b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/multiple-uses-of-val.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -mtriple=amdgcn-amd-amdhsa -mcpu=gfx90a -S 
-passes=infer-address-spaces --verify-each %s | FileCheck %s
+; RUN: opt -mtriple=amdgpu9.0a-amd-amdhsa -S -passes=infer-address-spaces 
--verify-each %s | FileCheck %s
 
 ; Inst can use a value multiple time. When we're inserting an addrspacecast to 
flat,
 ; it's important all the identical uses use an indentical replacement, 
especially
diff --git 
a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/no-flat-addrspace.ll 
b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/no-flat-addrspace.ll
index 18b3b21c990ad..b96b4b215b486 100644
--- a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/no-flat-addrspace.ll
+++ b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/no-flat-addrspace.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mtriple=amdgcn-mesa-mesa3d -mcpu=tahiti 
-passes=infer-address-spaces %s | FileCheck %s
+; RUN: opt -S -mtriple=amdgpu6.00-mesa-mesa3d -passes=infer-address-spaces %s 
| FileCheck %s
 
 ; Make sure addrspace(0) is still treated as flat on targets without
 ; flat instructions. It's still flat, it just doesn't work.
diff --git a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/noop-ptrint-pair.ll 
b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/noop-ptrint-pair.ll
index c684b6b7c1ade..a53dc1cf4a351 100644
--- a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/noop-ptrint-pair.ll
+++ b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/noop-ptrint-pair.ll
@@ -1,4 +1,4 @@
-; RUN: opt -mtriple=amdgcn-amd-amdhsa -S -o - -passes=infer-address-spaces %s 
| FileCheck -check-prefixes=COMMON,AMDGCN %s
+; RUN: opt -mtriple=amdgpu-amd-amdhsa -S -o - -passes=infer-address-spaces %s 
| FileCheck -check-prefixes=COMMON,AMDGCN %s
 ; RUN: opt -S -o - -passes=infer-address-spaces 
-assume-default-is-flat-addrspace %s | FileCheck -check-prefixes=COMMON,NOTTI %s
 
 
diff --git 
a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/old-pass-regressions.ll 
b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/old-pass-regressions.ll
index b94ab41e81f09..c61e4e7d9595b 100644
--- a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/old-pass-regressions.ll
+++ b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/old-pass-regressions.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -passes=infer-address-spaces %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=infer-address-spaces %s | 
FileCheck %s
 
 ; Regression tests from old HSAIL addrspacecast optimization pass
 
diff --git a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/phi-poison.ll 
b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/phi-poison.ll
index 0ccf7e3df8af9..7f9f1e92144d4 100644
--- a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/phi-poison.ll
+++ b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/phi-poison.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 -S 
-passes=infer-address-spaces %s | FileCheck %s
+; RUN: opt -mtriple=amdgpu9.00-amd-amdhsa -S -passes=infer-address-spaces %s | 
FileCheck %s
 
 define void @phi_poison(ptr addrspace(1) %arg, <2 x ptr addrspace(1)> %arg1) {
 ; CHECK-LABEL: @phi_poison(
diff --git a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/prefetch.ll 
b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/prefetch.ll
index e2c12c4c37141..499c7f4fac438 100644
--- a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/prefetch.ll
+++ b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/prefetch.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py 
UTC_ARGS: --version 5
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -passes=infer-address-spaces %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=infer-address-spaces %s | 
FileCheck %s
 
 define void @prefetch_shared_to_flat(ptr addrspace(3) %group.ptr) {
 ; CHECK-LABEL: define void @prefetch_shared_to_flat(
diff --git 
a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/preserving-debugloc-addrspacecast.ll
 
b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/preserving-debugloc-addrspacecast.ll
index b60d7d7da088c..70273ec253236 100644
--- 
a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/preserving-debugloc-addrspacecast.ll
+++ 
b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/preserving-debugloc-addrspacecast.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -passes=infer-address-spaces -o - %s 
| FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=infer-address-spaces -o - %s 
| FileCheck %s
 
 ; Check that InferAddressSpaces's cloneInstructionWithNewAddressSpace() 
propagates
 ; the debug location to new addrspacecast instruction which casts `%p` in the 
following test.
diff --git a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/ptrmask.ll 
b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/ptrmask.ll
index c4bd698099bdf..28d089b920e58 100644
--- a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/ptrmask.ll
+++ b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/ptrmask.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa 
-passes=infer-address-spaces,instsimplify %s | FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa 
-passes=infer-address-spaces,instsimplify %s | FileCheck %s
 
 define i8 @ptrmask_cast_local_to_flat(ptr addrspace(3) %src.ptr, i64 %mask) {
 ; CHECK-LABEL: @ptrmask_cast_local_to_flat(
diff --git 
a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/redundant-addrspacecast.ll 
b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/redundant-addrspacecast.ll
index 9ac1c63e3f4cf..9447a7b5cfd3c 100644
--- a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/redundant-addrspacecast.ll
+++ b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/redundant-addrspacecast.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -passes=infer-address-spaces %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=infer-address-spaces %s | 
FileCheck %s
 
 %0 = type { i8, i8, i8 }
 
diff --git a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/select.ll 
b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/select.ll
index 4de45ab8bea64..b7df0bdd73b9c 100644
--- a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/select.ll
+++ b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/select.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -passes=infer-address-spaces %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=infer-address-spaces %s | 
FileCheck %s
 
 ; Instcombine pulls the addrspacecast out of the select, make sure
 ;  this doesn't do something insane on non-canonical IR.
diff --git a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/self-phi.ll 
b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/self-phi.ll
index 91a106c79e576..f145b652ba228 100644
--- a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/self-phi.ll
+++ b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/self-phi.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 -S 
-passes=infer-address-spaces %s | FileCheck %s
+; RUN: opt -mtriple=amdgpu9.00-amd-amdhsa -S -passes=infer-address-spaces %s | 
FileCheck %s
 
 define amdgpu_kernel void @phi_self(ptr addrspace(1) %arg) {
 ; CHECK-LABEL: @phi_self(
diff --git 
a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/store-pointer-to-self.ll 
b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/store-pointer-to-self.ll
index 0b2c4744d4723..3a2076d805648 100644
--- a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/store-pointer-to-self.ll
+++ b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/store-pointer-to-self.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py 
UTC_ARGS: --version 5
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -passes=infer-address-spaces %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=infer-address-spaces %s | 
FileCheck %s
 
 ; Make sure memory instructions where the pointer appears in both a
 ; pointer and value operand work correctly.
diff --git 
a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/unreachable-code-assert.ll 
b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/unreachable-code-assert.ll
index 9cb58573adb1c..ef2d62f99615c 100644
--- a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/unreachable-code-assert.ll
+++ b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/unreachable-code-assert.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 -S 
-passes=infer-address-spaces %s | FileCheck %s
+; RUN: opt -mtriple=amdgpu9.00-amd-amdhsa -S -passes=infer-address-spaces %s | 
FileCheck %s
 
 define amdgpu_kernel void @subclass_data_assert() {
 ; CHECK-LABEL: @subclass_data_assert(
diff --git a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/volatile.ll 
b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/volatile.ll
index 39c2b41375864..0431328174db5 100644
--- a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/volatile.ll
+++ b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/volatile.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -passes=infer-address-spaces %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=infer-address-spaces %s | 
FileCheck %s
 
 ; Check that volatile users of addrspacecast are not replaced.
 
diff --git a/llvm/test/Transforms/InferFunctionAttrs/enable-builtin.ll 
b/llvm/test/Transforms/InferFunctionAttrs/enable-builtin.ll
index 1aba13d35889a..459a2eab6a13f 100644
--- a/llvm/test/Transforms/InferFunctionAttrs/enable-builtin.ll
+++ b/llvm/test/Transforms/InferFunctionAttrs/enable-builtin.ll
@@ -1,5 +1,5 @@
-; RUN: opt -S -mtriple=amdgcn-- -passes=inferattrs %s | FileCheck 
-check-prefix=NOBUILTIN %s
-; RUN: opt -S -enable-builtin=malloc -mtriple=amdgcn-- -passes=inferattrs %s | 
FileCheck -check-prefix=WITHBUILTIN %s
+; RUN: opt -S -mtriple=amdgpu-- -passes=inferattrs %s | FileCheck 
-check-prefix=NOBUILTIN %s
+; RUN: opt -S -enable-builtin=malloc -mtriple=amdgpu-- -passes=inferattrs %s | 
FileCheck -check-prefix=WITHBUILTIN %s
 
 ; Test that the -enable-builtin flag works and forces recognition of
 ; malloc despite the target's default TargetLibraryInfo.
diff --git 
a/llvm/test/Transforms/Inline/AMDGPU/amdgpu-inline-alloca-argument-cost.ll 
b/llvm/test/Transforms/Inline/AMDGPU/amdgpu-inline-alloca-argument-cost.ll
index 9bec92a25efa4..4eafb26b30255 100644
--- a/llvm/test/Transforms/Inline/AMDGPU/amdgpu-inline-alloca-argument-cost.ll
+++ b/llvm/test/Transforms/Inline/AMDGPU/amdgpu-inline-alloca-argument-cost.ll
@@ -1,4 +1,4 @@
-; RUN: opt -mtriple=amdgcn--amdhsa -S -passes=inline -inline-threshold=0 
-debug-only=inline-cost %s 2>&1 | FileCheck %s
+; RUN: opt -mtriple=amdgpu--amdhsa -S -passes=inline -inline-threshold=0 
-debug-only=inline-cost %s 2>&1 | FileCheck %s
 
 ; REQUIRES: asserts
 
diff --git 
a/llvm/test/Transforms/Inline/AMDGPU/amdgpu-inline-alloca-argument.ll 
b/llvm/test/Transforms/Inline/AMDGPU/amdgpu-inline-alloca-argument.ll
index a131848e16698..9ac0f0414dfc2 100644
--- a/llvm/test/Transforms/Inline/AMDGPU/amdgpu-inline-alloca-argument.ll
+++ b/llvm/test/Transforms/Inline/AMDGPU/amdgpu-inline-alloca-argument.ll
@@ -1,4 +1,4 @@
-; RUN: opt -mtriple=amdgcn--amdhsa -S -passes=inline -inline-threshold=0 < %s 
| FileCheck %s
+; RUN: opt -mtriple=amdgpu--amdhsa -S -passes=inline -inline-threshold=0 < %s 
| FileCheck %s
 
 define void @use_flat_ptr_arg(ptr nocapture %p) {
 entry:
diff --git 
a/llvm/test/Transforms/Inline/AMDGPU/amdgpu-inline-only-one-live-use.ll 
b/llvm/test/Transforms/Inline/AMDGPU/amdgpu-inline-only-one-live-use.ll
index 043b73e28b893..ce93a43b4a1d3 100644
--- a/llvm/test/Transforms/Inline/AMDGPU/amdgpu-inline-only-one-live-use.ll
+++ b/llvm/test/Transforms/Inline/AMDGPU/amdgpu-inline-only-one-live-use.ll
@@ -1,4 +1,4 @@
-; RUN: opt -mtriple=amdgcn-amd-amdhsa -S -passes=inline -inline-threshold=0 
-debug-only=inline-cost %s -o - 2>&1 | FileCheck %s
+; RUN: opt -mtriple=amdgpu-amd-amdhsa -S -passes=inline -inline-threshold=0 
-debug-only=inline-cost %s -o - 2>&1 | FileCheck %s
 ; REQUIRES: asserts
 
 ; CHECK: Analyzing call of callee_not_only_one_live_use... (caller:caller)
diff --git 
a/llvm/test/Transforms/Inline/AMDGPU/amdgpu-inline-stack-argument-i64.ll 
b/llvm/test/Transforms/Inline/AMDGPU/amdgpu-inline-stack-argument-i64.ll
index af21cd686c2b5..291dc2a7fa1ec 100644
--- a/llvm/test/Transforms/Inline/AMDGPU/amdgpu-inline-stack-argument-i64.ll
+++ b/llvm/test/Transforms/Inline/AMDGPU/amdgpu-inline-stack-argument-i64.ll
@@ -1,5 +1,5 @@
 ; REQUIRES: asserts
-; RUN: opt -mtriple=amdgcn-amd-amdhsa -S -passes=inline -inline-cost-full=true 
-inline-threshold=0 -inline-instr-cost=5 -inline-call-penalty=0 
-debug-only=inline < %s 2>&1 | FileCheck %s
+; RUN: opt -mtriple=amdgpu-amd-amdhsa -S -passes=inline -inline-cost-full=true 
-inline-threshold=0 -inline-instr-cost=5 -inline-call-penalty=0 
-debug-only=inline < %s 2>&1 | FileCheck %s
 
 ; CHECK:      NOT Inlining (cost={{[0-9]+}}, threshold={{[0-9]+}}), Call:   
%noinlinecall1 = call noundef i64 @non_inlining_call
 ; CHECK:      NOT Inlining (cost={{[0-9]+}}, threshold={{[0-9]+}}), Call:   
%noinlinecall2 = call noundef i64 @non_inlining_call
diff --git a/llvm/test/Transforms/Inline/AMDGPU/amdgpu-inline-stack-argument.ll 
b/llvm/test/Transforms/Inline/AMDGPU/amdgpu-inline-stack-argument.ll
index 3f5af81e9fddd..f8e46d2f3895f 100644
--- a/llvm/test/Transforms/Inline/AMDGPU/amdgpu-inline-stack-argument.ll
+++ b/llvm/test/Transforms/Inline/AMDGPU/amdgpu-inline-stack-argument.ll
@@ -1,5 +1,5 @@
 ; REQUIRES: asserts
-; RUN: opt -mtriple=amdgcn-amd-amdhsa -S -passes=inline -inline-cost-full=true 
-inline-threshold=0 -inline-instr-cost=5 -inline-call-penalty=0 
-debug-only=inline < %s 2>&1 | FileCheck %s
+; RUN: opt -mtriple=amdgpu-amd-amdhsa -S -passes=inline -inline-cost-full=true 
-inline-threshold=0 -inline-instr-cost=5 -inline-call-penalty=0 
-debug-only=inline < %s 2>&1 | FileCheck %s
 
 ; CHECK:      NOT Inlining (cost={{[0-9]+}}, threshold={{[0-9]+}}), Call:   
%noinlinecall1 = call noundef i32 @non_inlining_call
 ; CHECK:      NOT Inlining (cost={{[0-9]+}}, threshold={{[0-9]+}}), Call:   
%noinlinecall2 = call noundef i32 @non_inlining_call
diff --git 
a/llvm/test/Transforms/Inline/AMDGPU/amdgpu-inline-stack-array-ptr-argument.ll 
b/llvm/test/Transforms/Inline/AMDGPU/amdgpu-inline-stack-array-ptr-argument.ll
index 61a8ab6056c49..8743d616d881f 100644
--- 
a/llvm/test/Transforms/Inline/AMDGPU/amdgpu-inline-stack-array-ptr-argument.ll
+++ 
b/llvm/test/Transforms/Inline/AMDGPU/amdgpu-inline-stack-array-ptr-argument.ll
@@ -1,5 +1,5 @@
 ; REQUIRES: asserts
-; RUN: opt -mtriple=amdgcn-amd-amdhsa -S -passes=inline -inline-cost-full=true 
-inline-threshold=0 -inline-instr-cost=5 -inline-call-penalty=0 
-debug-only=inline < %s 2>&1 | FileCheck %s
+; RUN: opt -mtriple=amdgpu-amd-amdhsa -S -passes=inline -inline-cost-full=true 
-inline-threshold=0 -inline-instr-cost=5 -inline-call-penalty=0 
-debug-only=inline < %s 2>&1 | FileCheck %s
 
 ; CHECK:      NOT Inlining (cost={{[0-9]+}}, threshold={{[0-9]+}}), Call:   
%noinlinecall1 = call noundef i64 @non_inlining_call
 ; CHECK:      NOT Inlining (cost={{[0-9]+}}, threshold={{[0-9]+}}), Call:   
%noinlinecall2 = call noundef i64 @non_inlining_call
diff --git 
a/llvm/test/Transforms/Inline/AMDGPU/amdgpu-inline-stack-indirect-call-argument.ll
 
b/llvm/test/Transforms/Inline/AMDGPU/amdgpu-inline-stack-indirect-call-argument.ll
index 8a44f7d3b247d..25faacb42a1a6 100644
--- 
a/llvm/test/Transforms/Inline/AMDGPU/amdgpu-inline-stack-indirect-call-argument.ll
+++ 
b/llvm/test/Transforms/Inline/AMDGPU/amdgpu-inline-stack-indirect-call-argument.ll
@@ -1,5 +1,5 @@
 ; REQUIRES: asserts
-; RUN: opt -mtriple=amdgcn-amd-amdhsa -S -passes=inline -inline-cost-full=true 
-inline-threshold=0 -inline-instr-cost=5 -inline-call-penalty=0 
-debug-only=inline < %s 2>&1 | FileCheck %s
+; RUN: opt -mtriple=amdgpu-amd-amdhsa -S -passes=inline -inline-cost-full=true 
-inline-threshold=0 -inline-instr-cost=5 -inline-call-penalty=0 
-debug-only=inline < %s 2>&1 | FileCheck %s
 
 ; CHECK:      Inlining (cost={{-+[0-9]+}}, threshold=330), Call:   call void 
@Dummy
 
diff --git 
a/llvm/test/Transforms/Inline/AMDGPU/amdgpu-inline-stack-ptr-argument.ll 
b/llvm/test/Transforms/Inline/AMDGPU/amdgpu-inline-stack-ptr-argument.ll
index e03fc1cbd4573..d37b7142563b9 100644
--- a/llvm/test/Transforms/Inline/AMDGPU/amdgpu-inline-stack-ptr-argument.ll
+++ b/llvm/test/Transforms/Inline/AMDGPU/amdgpu-inline-stack-ptr-argument.ll
@@ -1,5 +1,5 @@
 ; REQUIRES: asserts
-; RUN: opt -mtriple=amdgcn-amd-amdhsa -S -passes=inline -inline-cost-full=true 
-inline-threshold=0 -inline-instr-cost=5 -inline-call-penalty=0 
-debug-only=inline < %s 2>&1 | FileCheck %s
+; RUN: opt -mtriple=amdgpu-amd-amdhsa -S -passes=inline -inline-cost-full=true 
-inline-threshold=0 -inline-instr-cost=5 -inline-call-penalty=0 
-debug-only=inline < %s 2>&1 | FileCheck %s
 
 ; CHECK:      NOT Inlining (cost={{[0-9]+}}, threshold={{[0-9]+}}), Call:   
%noinlinecall1 = call noundef i64 @non_inlining_call
 ; CHECK:      NOT Inlining (cost={{[0-9]+}}, threshold={{[0-9]+}}), Call:   
%noinlinecall2 = call noundef i64 @non_inlining_call
diff --git 
a/llvm/test/Transforms/Inline/AMDGPU/amdgpu-inline-stack-struct-argument.ll 
b/llvm/test/Transforms/Inline/AMDGPU/amdgpu-inline-stack-struct-argument.ll
index 91c9ee1ad3c09..4a5cffd9ac801 100644
--- a/llvm/test/Transforms/Inline/AMDGPU/amdgpu-inline-stack-struct-argument.ll
+++ b/llvm/test/Transforms/Inline/AMDGPU/amdgpu-inline-stack-struct-argument.ll
@@ -1,5 +1,5 @@
 ; REQUIRES: asserts
-; RUN: opt -mtriple=amdgcn-amd-amdhsa -S -passes=inline -inline-cost-full=true 
-inline-threshold=0 -inline-instr-cost=5 -inline-call-penalty=0 
-debug-only=inline < %s 2>&1 | FileCheck %s
+; RUN: opt -mtriple=amdgpu-amd-amdhsa -S -passes=inline -inline-cost-full=true 
-inline-threshold=0 -inline-instr-cost=5 -inline-call-penalty=0 
-debug-only=inline < %s 2>&1 | FileCheck %s
 
 ; CHECK:      NOT Inlining (cost={{[0-9]+}}, threshold={{[0-9]+}}), Call:   
%noinlinecall1 = call noundef i64 @non_inlining_call
 ; CHECK:      NOT Inlining (cost={{[0-9]+}}, threshold={{[0-9]+}}), Call:   
%noinlinecall2 = call noundef i64 @non_inlining_call
diff --git 
a/llvm/test/Transforms/Inline/AMDGPU/amdgpu-inline-stack-vector-ptr-argument.ll 
b/llvm/test/Transforms/Inline/AMDGPU/amdgpu-inline-stack-vector-ptr-argument.ll
index bbb26a36b2e2d..a388dde6a069f 100644
--- 
a/llvm/test/Transforms/Inline/AMDGPU/amdgpu-inline-stack-vector-ptr-argument.ll
+++ 
b/llvm/test/Transforms/Inline/AMDGPU/amdgpu-inline-stack-vector-ptr-argument.ll
@@ -1,5 +1,5 @@
 ; REQUIRES: asserts
-; RUN: opt -mtriple=amdgcn-amd-amdhsa -S -passes=inline -inline-cost-full=true 
-inline-threshold=0 -inline-instr-cost=5 -inline-call-penalty=0 
-debug-only=inline < %s 2>&1 | FileCheck %s
+; RUN: opt -mtriple=amdgpu-amd-amdhsa -S -passes=inline -inline-cost-full=true 
-inline-threshold=0 -inline-instr-cost=5 -inline-call-penalty=0 
-debug-only=inline < %s 2>&1 | FileCheck %s
 
 ; CHECK:      NOT Inlining (cost={{[0-9]+}}, threshold={{[0-9]+}}), Call:   
%noinlinecall1 = call noundef i64 @non_inlining_call
 ; CHECK:      NOT Inlining (cost={{[0-9]+}}, threshold={{[0-9]+}}), Call:   
%noinlinecall2 = call noundef i64 @non_inlining_call
diff --git a/llvm/test/Transforms/Inline/AMDGPU/inline-amdgpu-dx10-clamp.ll 
b/llvm/test/Transforms/Inline/AMDGPU/inline-amdgpu-dx10-clamp.ll
index c8645780d392c..47bbd6a00b878 100644
--- a/llvm/test/Transforms/Inline/AMDGPU/inline-amdgpu-dx10-clamp.ll
+++ b/llvm/test/Transforms/Inline/AMDGPU/inline-amdgpu-dx10-clamp.ll
@@ -1,4 +1,4 @@
-; RUN: opt -mtriple=amdgcn-amd-amdhsa -mattr=+dx10-clamp-and-ieee-mode -S 
-passes=inline < %s | FileCheck %s
+; RUN: opt -mtriple=amdgpu-amd-amdhsa -mattr=+dx10-clamp-and-ieee-mode -S 
-passes=inline < %s | FileCheck %s
 
 define i32 @func_default() #0 {
   ret i32 0
diff --git a/llvm/test/Transforms/Inline/AMDGPU/inline-amdgpu-ieee.ll 
b/llvm/test/Transforms/Inline/AMDGPU/inline-amdgpu-ieee.ll
index 4f2279dd92605..ecdfe2ade862e 100644
--- a/llvm/test/Transforms/Inline/AMDGPU/inline-amdgpu-ieee.ll
+++ b/llvm/test/Transforms/Inline/AMDGPU/inline-amdgpu-ieee.ll
@@ -1,4 +1,4 @@
-; RUN: opt -mtriple=amdgcn-amd-amdhsa -mattr=+dx10-clamp-and-ieee-mode -S 
-passes=inline < %s | FileCheck %s
+; RUN: opt -mtriple=amdgpu-amd-amdhsa -mattr=+dx10-clamp-and-ieee-mode -S 
-passes=inline < %s | FileCheck %s
 
 define i32 @func_default() #0 {
   ret i32 0
diff --git a/llvm/test/Transforms/Inline/AMDGPU/inline-amdgpu-vecbonus.ll 
b/llvm/test/Transforms/Inline/AMDGPU/inline-amdgpu-vecbonus.ll
index 910f4173b1192..d7f77a9e67f92 100644
--- a/llvm/test/Transforms/Inline/AMDGPU/inline-amdgpu-vecbonus.ll
+++ b/llvm/test/Transforms/Inline/AMDGPU/inline-amdgpu-vecbonus.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mtriple=amdgcn-unknown-amdhsa -passes=inline 
--inline-threshold=1 < %s | FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-unknown-amdhsa -passes=inline 
--inline-threshold=1 < %s | FileCheck %s
 
 define hidden <16 x i32> @div_vecbonus(<16 x i32> %x, <16 x i32> %y) {
 entry:
diff --git a/llvm/test/Transforms/Inline/AMDGPU/inline-atomicrmw-md-preserve.ll 
b/llvm/test/Transforms/Inline/AMDGPU/inline-atomicrmw-md-preserve.ll
index 6cf09118ba429..2a78b94c565d5 100644
--- a/llvm/test/Transforms/Inline/AMDGPU/inline-atomicrmw-md-preserve.ll
+++ b/llvm/test/Transforms/Inline/AMDGPU/inline-atomicrmw-md-preserve.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py 
UTC_ARGS: --version 4
-; RUN: opt -mtriple=amdgcn-amd-amdhsa -S -passes=inline < %s | FileCheck %s
+; RUN: opt -mtriple=amdgpu-amd-amdhsa -S -passes=inline < %s | FileCheck %s
 
 ; Ensure that custom metadata survives inlining
 
diff --git a/llvm/test/Transforms/Inline/AMDGPU/inline-denormal-fp-math.ll 
b/llvm/test/Transforms/Inline/AMDGPU/inline-denormal-fp-math.ll
index 28ecfea397aea..317655d12a441 100644
--- a/llvm/test/Transforms/Inline/AMDGPU/inline-denormal-fp-math.ll
+++ b/llvm/test/Transforms/Inline/AMDGPU/inline-denormal-fp-math.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -mtriple=amdgcn-amd-amdhsa -S -passes=inline < %s | FileCheck %s
+; RUN: opt -mtriple=amdgpu-amd-amdhsa -S -passes=inline < %s | FileCheck %s
 
 define i32 @func_default() {
 ; CHECK-LABEL: @func_default(
diff --git a/llvm/test/Transforms/Inline/AMDGPU/inline-hint.ll 
b/llvm/test/Transforms/Inline/AMDGPU/inline-hint.ll
index 0f76767557147..3222525b7ade4 100644
--- a/llvm/test/Transforms/Inline/AMDGPU/inline-hint.ll
+++ b/llvm/test/Transforms/Inline/AMDGPU/inline-hint.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mtriple=amdgcn-unknown-amdhsa -passes=inline 
--inline-threshold=1 --inlinehint-threshold=4 < %s | FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-unknown-amdhsa -passes=inline 
--inline-threshold=1 --inlinehint-threshold=4 < %s | FileCheck %s
 
 define hidden <16 x i32> @div_hint(<16 x i32> %x, <16 x i32> %y) #0 {
 entry:
diff --git a/llvm/test/Transforms/Inline/AMDGPU/inline-target-cpu.ll 
b/llvm/test/Transforms/Inline/AMDGPU/inline-target-cpu.ll
index a4c2069633cd0..0f4f327e4b77b 100644
--- a/llvm/test/Transforms/Inline/AMDGPU/inline-target-cpu.ll
+++ b/llvm/test/Transforms/Inline/AMDGPU/inline-target-cpu.ll
@@ -1,4 +1,4 @@
-; RUN: opt -mtriple=amdgcn-amd-amdhsa -S -passes=inline < %s | FileCheck %s
+; RUN: opt -mtriple=amdgpu-amd-amdhsa -S -passes=inline < %s | FileCheck %s
 
 ; CHECK-LABEL: @func_no_target_cpu(
 define i32 @func_no_target_cpu() #0 {
diff --git 
a/llvm/test/Transforms/Inline/AMDGPU/inline-target-feature-sram-ecc.ll 
b/llvm/test/Transforms/Inline/AMDGPU/inline-target-feature-sram-ecc.ll
index 69a20d8b0077e..a7eacd474270e 100644
--- a/llvm/test/Transforms/Inline/AMDGPU/inline-target-feature-sram-ecc.ll
+++ b/llvm/test/Transforms/Inline/AMDGPU/inline-target-feature-sram-ecc.ll
@@ -1,4 +1,4 @@
-; RUN: opt -mtriple=amdgcn-amd-amdhsa -S -passes=inline < %s | FileCheck %s
+; RUN: opt -mtriple=amdgpu-amd-amdhsa -S -passes=inline < %s | FileCheck %s
 
 ; sram-ecc can be safely ignored when inlining, since no intrinisics
 ; or other directly exposed operations depend on it.
diff --git a/llvm/test/Transforms/Inline/AMDGPU/inline-target-feature-xnack.ll 
b/llvm/test/Transforms/Inline/AMDGPU/inline-target-feature-xnack.ll
index 99b69758c0ea8..3ccbc48e152d3 100644
--- a/llvm/test/Transforms/Inline/AMDGPU/inline-target-feature-xnack.ll
+++ b/llvm/test/Transforms/Inline/AMDGPU/inline-target-feature-xnack.ll
@@ -1,4 +1,4 @@
-; RUN: opt -mtriple=amdgcn-amd-amdhsa -S -passes=inline < %s | FileCheck %s
+; RUN: opt -mtriple=amdgpu-amd-amdhsa -S -passes=inline < %s | FileCheck %s
 
 define i32 @func_default() #0 {
   ret i32 0
diff --git a/llvm/test/Transforms/Inline/AMDGPU/load-intrinsics.ll 
b/llvm/test/Transforms/Inline/AMDGPU/load-intrinsics.ll
index 46f53d8f82cfd..b67579b82bb22 100644
--- a/llvm/test/Transforms/Inline/AMDGPU/load-intrinsics.ll
+++ b/llvm/test/Transforms/Inline/AMDGPU/load-intrinsics.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py 
UTC_ARGS: --check-attributes --check-globals all --version 5
-; RUN: opt -mtriple=amdgcn --passes=inline --enable-noalias-to-md-conversion 
-S %s | FileCheck --check-prefix=OPT %s
+; RUN: opt -mtriple=amdgpu --passes=inline --enable-noalias-to-md-conversion 
-S %s | FileCheck --check-prefix=OPT %s
 
 ; This test tests if the load intrinsic gets correct memory(argmem: read) 
attribute and
 ; the call instruction is assigned correct !alias.scope metadata post inlining
diff --git a/llvm/test/Transforms/InstCombine/AMDGPU/addrspacecast.ll 
b/llvm/test/Transforms/InstCombine/AMDGPU/addrspacecast.ll
index 1436d830531f5..bedc8787d4a52 100644
--- a/llvm/test/Transforms/InstCombine/AMDGPU/addrspacecast.ll
+++ b/llvm/test/Transforms/InstCombine/AMDGPU/addrspacecast.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py 
UTC_ARGS: --version 5
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -passes=instcombine %s | FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=instcombine %s | FileCheck %s
 
 ; Check that `select B, true, C` isn't optimized to `or B, C`,
 ; because the invalid addrspacecast %asc.shared introduces poison.
diff --git 
a/llvm/test/Transforms/InstCombine/AMDGPU/amdgcn-demanded-vector-elts-inseltpoison.ll
 
b/llvm/test/Transforms/InstCombine/AMDGPU/amdgcn-demanded-vector-elts-inseltpoison.ll
index ea6422e5ed8c2..6897f160a500c 100644
--- 
a/llvm/test/Transforms/InstCombine/AMDGPU/amdgcn-demanded-vector-elts-inseltpoison.ll
+++ 
b/llvm/test/Transforms/InstCombine/AMDGPU/amdgcn-demanded-vector-elts-inseltpoison.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -passes=instcombine -mtriple=amdgcn-amd-amdhsa %s | FileCheck %s
+; RUN: opt -S -passes=instcombine -mtriple=amdgpu-amd-amdhsa %s | FileCheck %s
 
 ; --------------------------------------------------------------------
 ; llvm.amdgcn.raw.buffer.load
diff --git 
a/llvm/test/Transforms/InstCombine/AMDGPU/amdgcn-demanded-vector-elts.ll 
b/llvm/test/Transforms/InstCombine/AMDGPU/amdgcn-demanded-vector-elts.ll
index 37e3b9a3593f2..d0f23250f3177 100644
--- a/llvm/test/Transforms/InstCombine/AMDGPU/amdgcn-demanded-vector-elts.ll
+++ b/llvm/test/Transforms/InstCombine/AMDGPU/amdgcn-demanded-vector-elts.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -passes=instcombine -mtriple=amdgcn-amd-amdhsa %s | FileCheck %s
+; RUN: opt -S -passes=instcombine -mtriple=amdgpu-amd-amdhsa %s | FileCheck %s
 
 ; --------------------------------------------------------------------
 ; llvm.amdgcn.raw.buffer.load
diff --git a/llvm/test/Transforms/InstCombine/AMDGPU/amdgcn-intrinsics-gfx8.ll 
b/llvm/test/Transforms/InstCombine/AMDGPU/amdgcn-intrinsics-gfx8.ll
index 4df170dc8f85c..decbf7ed56db1 100644
--- a/llvm/test/Transforms/InstCombine/AMDGPU/amdgcn-intrinsics-gfx8.ll
+++ b/llvm/test/Transforms/InstCombine/AMDGPU/amdgcn-intrinsics-gfx8.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -mtriple=amdgcn-amd-amdhsa -mcpu=fiji -passes=instcombine -S < %s | 
FileCheck %s
+; RUN: opt -mtriple=amdgpu8.03-amd-amdhsa -passes=instcombine -S < %s | 
FileCheck %s
 
 ; --------------------------------------------------------------------
 ; llvm.amdgcn.image.sample a16 is disabled on pre-gfx9
diff --git a/llvm/test/Transforms/InstCombine/AMDGPU/amdgcn-intrinsics.ll 
b/llvm/test/Transforms/InstCombine/AMDGPU/amdgcn-intrinsics.ll
index 0bedef0d93a59..f32b6a0c32b96 100644
--- a/llvm/test/Transforms/InstCombine/AMDGPU/amdgcn-intrinsics.ll
+++ b/llvm/test/Transforms/InstCombine/AMDGPU/amdgcn-intrinsics.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -mtriple=amdgcn-amd-amdhsa -mcpu=gfx1010 -passes=instcombine -S < 
%s | FileCheck %s
+; RUN: opt -mtriple=amdgpu10.10-amd-amdhsa -passes=instcombine -S < %s | 
FileCheck %s
 
 ; --------------------------------------------------------------------
 ; llvm.amdgcn.rcp
diff --git 
a/llvm/test/Transforms/InstCombine/AMDGPU/amdgcn-simplify-image-buffer-stores.ll
 
b/llvm/test/Transforms/InstCombine/AMDGPU/amdgcn-simplify-image-buffer-stores.ll
index e7a36e805a012..ce36325731b81 100644
--- 
a/llvm/test/Transforms/InstCombine/AMDGPU/amdgcn-simplify-image-buffer-stores.ll
+++ 
b/llvm/test/Transforms/InstCombine/AMDGPU/amdgcn-simplify-image-buffer-stores.ll
@@ -1,9 +1,9 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -mcpu=gfx900 -S -passes=instcombine -mtriple=amdgcn-amd-amdhsa %s | 
FileCheck -check-prefixes=GCN %s
-; RUN: opt -mcpu=gfx1010 -S -passes=instcombine -mtriple=amdgcn-amd-amdhsa %s 
| FileCheck -check-prefixes=GCN %s
-; RUN: opt -mcpu=gfx1100 -S -passes=instcombine -mtriple=amdgcn-amd-amdhsa %s 
| FileCheck -check-prefixes=GCN %s
-; RUN: opt -mcpu=gfx1200 -S -passes=instcombine -mtriple=amdgcn-amd-amdhsa %s 
| FileCheck -check-prefixes=GFX12 %s
-; RUN: opt -S -passes=instcombine -mtriple=amdgcn-amd-amdhsa %s | FileCheck 
-check-prefixes=GFXUNKNOWN %s
+; RUN: opt -S -passes=instcombine -mtriple=amdgpu9.00-amd-amdhsa %s | 
FileCheck -check-prefixes=GCN %s
+; RUN: opt -S -passes=instcombine -mtriple=amdgpu10.10-amd-amdhsa %s | 
FileCheck -check-prefixes=GCN %s
+; RUN: opt -S -passes=instcombine -mtriple=amdgpu11.00-amd-amdhsa %s | 
FileCheck -check-prefixes=GCN %s
+; RUN: opt -S -passes=instcombine -mtriple=amdgpu12.00-amd-amdhsa %s | 
FileCheck -check-prefixes=GFX12 %s
+; RUN: opt -S -passes=instcombine -mtriple=amdgpu-amd-amdhsa %s | FileCheck 
-check-prefixes=GFXUNKNOWN %s
 
 define amdgpu_ps void @image_store_1d_store_all_zeros(<8 x i32> inreg %rsrc, 
i32 %s) #0 {
 ; GCN-LABEL: @image_store_1d_store_all_zeros(
diff --git a/llvm/test/Transforms/InstCombine/AMDGPU/canonicalize-add-to-gep.ll 
b/llvm/test/Transforms/InstCombine/AMDGPU/canonicalize-add-to-gep.ll
index 1350f68ede271..fdf2b8db439f4 100644
--- a/llvm/test/Transforms/InstCombine/AMDGPU/canonicalize-add-to-gep.ll
+++ b/llvm/test/Transforms/InstCombine/AMDGPU/canonicalize-add-to-gep.ll
@@ -1,6 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py 
UTC_ARGS: --version 6
-; RUN: opt -mtriple=amdgcn-- -mattr=+wavefrontsize32 -passes=instcombine -S < 
%s | FileCheck --check-prefixes=CHECK,WAVE32 %s
-; RUN: opt -mtriple=amdgcn-- -mattr=+wavefrontsize64 -passes=instcombine -S < 
%s | FileCheck --check-prefixes=CHECK,WAVE64 %s
+; RUN: opt -mtriple=amdgpu-- -mattr=+wavefrontsize32 -passes=instcombine -S < 
%s | FileCheck --check-prefixes=CHECK,WAVE32 %s
+; RUN: opt -mtriple=amdgpu-- -mattr=+wavefrontsize64 -passes=instcombine -S < 
%s | FileCheck --check-prefixes=CHECK,WAVE64 %s
 
 ; As the addition of 32 does not overflow, it can be canonicalized as gep.
 define amdgpu_ps <2 x float> @turn_add_into_gep(ptr addrspace(1) inreg %sbase) 
{
diff --git a/llvm/test/Transforms/InstCombine/AMDGPU/fma_legacy.ll 
b/llvm/test/Transforms/InstCombine/AMDGPU/fma_legacy.ll
index 3efd68b9c1444..737df3a931a77 100644
--- a/llvm/test/Transforms/InstCombine/AMDGPU/fma_legacy.ll
+++ b/llvm/test/Transforms/InstCombine/AMDGPU/fma_legacy.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -mtriple=amdgcn-amd-amdhsa -passes=instcombine -S | FileCheck 
%s
+; RUN: opt < %s -mtriple=amdgpu-amd-amdhsa -passes=instcombine -S | FileCheck 
%s
 
 ; Simplify to +0.0 + z.
 define float @test_zero(float %x, float %z) {
diff --git a/llvm/test/Transforms/InstCombine/AMDGPU/fmed3-fpext-fold.ll 
b/llvm/test/Transforms/InstCombine/AMDGPU/fmed3-fpext-fold.ll
index 1e3f8800d37e7..a288b967666dd 100644
--- a/llvm/test/Transforms/InstCombine/AMDGPU/fmed3-fpext-fold.ll
+++ b/llvm/test/Transforms/InstCombine/AMDGPU/fmed3-fpext-fold.ll
@@ -1,12 +1,12 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py 
UTC_ARGS: --version 2
 ; Unknown/default target
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -passes=instcombine < %s | FileCheck 
-check-prefixes=NO-FMED3F16,UNKNOWN %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=instcombine < %s | FileCheck 
-check-prefixes=NO-FMED3F16,UNKNOWN %s
 
 ; Known target, no med3_f16
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -mcpu=fiji -passes=instcombine < %s | 
FileCheck -check-prefixes=NO-FMED3F16,GFX8 %s
+; RUN: opt -S -mtriple=amdgpu8.03-amd-amdhsa -passes=instcombine < %s | 
FileCheck -check-prefixes=NO-FMED3F16,GFX8 %s
 
 ; Has med3_f16
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 -passes=instcombine < %s 
| FileCheck -check-prefixes=GFX9 %s
+; RUN: opt -S -mtriple=amdgpu9.00-amd-amdhsa -passes=instcombine < %s | 
FileCheck -check-prefixes=GFX9 %s
 
 
 declare float @llvm.fabs.f32(float) #0

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

Reply via email to