[llvm-branch-commits] [llvm] AMDGPU: Migrate CodeGen tests to amdgpu subarch triple (24) (PR #209485)

Tue Jul 14 07:35:36 PDT 2026

llvmorg-github-actions[bot] wrote:




@llvm/pr-subscribers-backend-amdgpu

Author: Matt Arsenault (arsenm)

<details>
<summary>Changes</summary>

Mechanically migrate the command-line target spelling on llc/opt RUN lines in
llvm/test/CodeGen/AMDGPU from -mtriple=amdgcn ... -mcpu=<gfx> to the folded
subarch triple form (e.g. -mtriple=amdgpu9.00-amd-amdhsa), dropping the
redundant -mcpu.

Co-Authored-By: Claude <noreply@anthropic.com> (Claude-Opus-4.8)

---

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


98 Files Affected:

- (modified) llvm/test/CodeGen/AMDGPU/lower-module-lds-all-indirect-accesses.ll (+1-1) 
- (modified) llvm/test/CodeGen/AMDGPU/lower-module-lds-constantexpr-phi.ll (+2-2) 
- (modified) llvm/test/CodeGen/AMDGPU/lower-module-lds-constantexpr.ll (+2-2) 
- (modified) llvm/test/CodeGen/AMDGPU/lower-module-lds-inactive.ll (+2-2) 
- (modified) llvm/test/CodeGen/AMDGPU/lower-module-lds-indirect-extern-uses-max-reachable-alignment.ll (+1-1) 
- (modified) llvm/test/CodeGen/AMDGPU/lower-module-lds-link-time-classify.ll (+1-1) 
- (modified) llvm/test/CodeGen/AMDGPU/lower-module-lds-link-time-global-scope.ll (+1-1) 
- (modified) llvm/test/CodeGen/AMDGPU/lower-module-lds-link-time-internal-func.ll (+1-1) 
- (modified) llvm/test/CodeGen/AMDGPU/lower-module-lds-link-time-internal-multi-user.ll (+1-1) 
- (modified) llvm/test/CodeGen/AMDGPU/lower-module-lds-offsets.ll (+3-3) 
- (modified) llvm/test/CodeGen/AMDGPU/lower-module-lds-precise-allocate-to-module-struct.ll (+1-1) 
- (modified) llvm/test/CodeGen/AMDGPU/lower-module-lds-single-var-ambiguous.ll (+4-4) 
- (modified) llvm/test/CodeGen/AMDGPU/lower-module-lds-single-var-unambiguous.ll (+4-4) 
- (modified) llvm/test/CodeGen/AMDGPU/lower-module-lds-used-list.ll (+2-2) 
- (modified) llvm/test/CodeGen/AMDGPU/lower-module-lds-via-table.ll (+2-2) 
- (modified) llvm/test/CodeGen/AMDGPU/lower-module-lds-zero-size-arr.ll (+1-1) 
- (modified) llvm/test/CodeGen/AMDGPU/lower-module-lds.ll (+2-2) 
- (modified) llvm/test/CodeGen/AMDGPU/lower-multiple-ctor-dtor.ll (+2-2) 
- (modified) llvm/test/CodeGen/AMDGPU/lower-noalias-kernargs.ll (+1-1) 
- (modified) llvm/test/CodeGen/AMDGPU/lower-term-opcodes.mir (+4-4) 
- (modified) llvm/test/CodeGen/AMDGPU/lower-work-group-id-intrinsics-hsa.ll (+6-6) 
- (modified) llvm/test/CodeGen/AMDGPU/lower-work-group-id-intrinsics-opt.ll (+2-2) 
- (modified) llvm/test/CodeGen/AMDGPU/lower-work-group-id-intrinsics-pal.ll (+6-6) 
- (modified) llvm/test/CodeGen/AMDGPU/lower-work-group-id-intrinsics.ll (+6-6) 
- (modified) llvm/test/CodeGen/AMDGPU/lrint.ll (+8-8) 
- (modified) llvm/test/CodeGen/AMDGPU/lro-coerce-v4i8-phi-loop.ll (+1-1) 
- (modified) llvm/test/CodeGen/AMDGPU/lro-phi-samebb-nonlookthrough-store.ll (+1-1) 
- (modified) llvm/test/CodeGen/AMDGPU/lround.ll (+8-8) 
- (modified) llvm/test/CodeGen/AMDGPU/lshl-add-u64.ll (+4-4) 
- (modified) llvm/test/CodeGen/AMDGPU/lshl64-to-32.ll (+1-1) 
- (modified) llvm/test/CodeGen/AMDGPU/lshr.v2i16.ll (+5-5) 
- (modified) llvm/test/CodeGen/AMDGPU/lsr-cost-model-vector-iv.ll (+1-1) 
- (modified) llvm/test/CodeGen/AMDGPU/lto-lower-module-lds.ll (+8-8) 
- (modified) llvm/test/CodeGen/AMDGPU/machine-cp-propagation.mir (+1-1) 
- (modified) llvm/test/CodeGen/AMDGPU/machine-cse-commute-target-flags.mir (+2-2) 
- (modified) llvm/test/CodeGen/AMDGPU/machine-cse-ssa.mir (+2-2) 
- (modified) llvm/test/CodeGen/AMDGPU/machine-function-info-cwsr.ll (+1-1) 
- (modified) llvm/test/CodeGen/AMDGPU/machine-scheduler-rematerialization-scoring.mir (+1-1) 
- (modified) llvm/test/CodeGen/AMDGPU/machine-scheduler-revert-slot-monotonicity.mir (+1-1) 
- (modified) llvm/test/CodeGen/AMDGPU/machine-scheduler-sink-trivial-remats-attr.mir (+2-2) 
- (modified) llvm/test/CodeGen/AMDGPU/machine-scheduler-sink-trivial-remats-debug.mir (+2-2) 
- (modified) llvm/test/CodeGen/AMDGPU/machine-scheduler-sink-trivial-remats.mir (+4-4) 
- (modified) llvm/test/CodeGen/AMDGPU/machine-sink-cycle.mir (+2-2) 
- (modified) llvm/test/CodeGen/AMDGPU/machine-sink-fence.ll (+1-1) 
- (modified) llvm/test/CodeGen/AMDGPU/machine-sink-ignorable-exec-use.mir (+2-2) 
- (modified) llvm/test/CodeGen/AMDGPU/machine-sink-lane-mask.mir (+2-2) 
- (modified) llvm/test/CodeGen/AMDGPU/machine-sink-loop-var-out-of-divergent-loop-swdev407790.ll (+1-1) 
- (modified) llvm/test/CodeGen/AMDGPU/machine-sink-loop-var-out-of-divergent-loop-swdev407790.mir (+1-1) 
- (modified) llvm/test/CodeGen/AMDGPU/machine-sink-temporal-divergence-swdev407790.mir (+2-2) 
- (modified) llvm/test/CodeGen/AMDGPU/machinelicm-undef-use.mir (+2-2) 
- (modified) llvm/test/CodeGen/AMDGPU/macro-fusion-cluster-vcc-uses.mir (+2-2) 
- (modified) llvm/test/CodeGen/AMDGPU/mad-combine.ll (+3-3) 
- (modified) llvm/test/CodeGen/AMDGPU/mad-mix-bf16.ll (+2-2) 
- (modified) llvm/test/CodeGen/AMDGPU/mad-mix-hi-bf16.ll (+2-2) 
- (modified) llvm/test/CodeGen/AMDGPU/mad-mix-hi.ll (+10-10) 
- (modified) llvm/test/CodeGen/AMDGPU/mad-mix-lo-bf16.ll (+2-2) 
- (modified) llvm/test/CodeGen/AMDGPU/mad-mix-lo.ll (+12-12) 
- (modified) llvm/test/CodeGen/AMDGPU/mad-mix.ll (+14-14) 
- (modified) llvm/test/CodeGen/AMDGPU/mad.u16.ll (+5-5) 
- (modified) llvm/test/CodeGen/AMDGPU/mad_64_32.ll (+8-8) 
- (modified) llvm/test/CodeGen/AMDGPU/mad_int24.ll (+6-6) 
- (modified) llvm/test/CodeGen/AMDGPU/mad_u64_u32.ll (+6-6) 
- (modified) llvm/test/CodeGen/AMDGPU/mad_uint24.ll (+3-3) 
- (modified) llvm/test/CodeGen/AMDGPU/madak.ll (+8-8) 
- (modified) llvm/test/CodeGen/AMDGPU/mai-hazards-gfx90a.mir (+1-1) 
- (modified) llvm/test/CodeGen/AMDGPU/mai-hazards-gfx942.mir (+3-3) 
- (modified) llvm/test/CodeGen/AMDGPU/mai-hazards-mfma-scale.gfx950.mir (+1-1) 
- (modified) llvm/test/CodeGen/AMDGPU/mai-hazards.mir (+1-1) 
- (modified) llvm/test/CodeGen/AMDGPU/mai-inline.ll (+1-1) 
- (modified) llvm/test/CodeGen/AMDGPU/make-buffer-rsrc-lds-fails.ll (+2-2) 
- (modified) llvm/test/CodeGen/AMDGPU/masked-load-vectortypes.ll (+1-1) 
- (modified) llvm/test/CodeGen/AMDGPU/match-perm-extract-vector-elt-bug.ll (+3-3) 
- (modified) llvm/test/CodeGen/AMDGPU/materialize-frame-index-sgpr.gfx10.ll (+7-7) 
- (modified) llvm/test/CodeGen/AMDGPU/materialize-frame-index-sgpr.ll (+8-8) 
- (modified) llvm/test/CodeGen/AMDGPU/max-hard-clause-length.ll (+3-3) 
- (modified) llvm/test/CodeGen/AMDGPU/max.i16.ll (+2-2) 
- (modified) llvm/test/CodeGen/AMDGPU/max.ll (+2-2) 
- (modified) llvm/test/CodeGen/AMDGPU/max3.ll (+4-4) 
- (modified) llvm/test/CodeGen/AMDGPU/maximumnum.bf16.ll (+9-9) 
- (modified) llvm/test/CodeGen/AMDGPU/maximumnum.ll (+26-26) 
- (modified) llvm/test/CodeGen/AMDGPU/mcexpr-knownbits-assign-crash-gh-issue-110930.ll (+1-1) 
- (modified) llvm/test/CodeGen/AMDGPU/mcp-aligned-vgprs.mir (+1-1) 
- (modified) llvm/test/CodeGen/AMDGPU/mcp-implicit-clobber.mir (+1-1) 
- (modified) llvm/test/CodeGen/AMDGPU/mcp-overlap-after-propagation.mir (+2-2) 
- (modified) llvm/test/CodeGen/AMDGPU/mdt-preserving-crash.ll (+1-1) 
- (modified) llvm/test/CodeGen/AMDGPU/med3-knownbits.ll (+2-2) 
- (modified) llvm/test/CodeGen/AMDGPU/med3-no-simplify.ll (+3-3) 
- (modified) llvm/test/CodeGen/AMDGPU/memcpy-crash-issue63986.ll (+1-1) 
- (modified) llvm/test/CodeGen/AMDGPU/memcpy-fixed-align.ll (+2-2) 
- (modified) llvm/test/CodeGen/AMDGPU/memcpy-libcall.ll (+1-1) 
- (modified) llvm/test/CodeGen/AMDGPU/memcpy-param-combinations.ll (+1-1) 
- (modified) llvm/test/CodeGen/AMDGPU/memcpy-scalar-load.ll (+1-1) 
- (modified) llvm/test/CodeGen/AMDGPU/memcpy-scoped-aa.ll (+2-2) 
- (modified) llvm/test/CodeGen/AMDGPU/memcpy_const_compare.ll (+1-1) 
- (modified) llvm/test/CodeGen/AMDGPU/memintrinsic-unroll.ll (+3-3) 
- (modified) llvm/test/CodeGen/AMDGPU/memmove-param-combinations.ll (+1-1) 
- (modified) llvm/test/CodeGen/AMDGPU/memmove-scalar-load.ll (+1-1) 
- (modified) llvm/test/CodeGen/AMDGPU/memmove-var-size.ll (+1-1) 


``````````diff

diff --git a/llvm/test/CodeGen/AMDGPU/lower-module-lds-all-indirect-accesses.ll b/llvm/test/CodeGen/AMDGPU/lower-module-lds-all-indirect-accesses.ll
index c95ebb5918627..ceac736fdcf25 100644
--- a/llvm/test/CodeGen/AMDGPU/lower-module-lds-all-indirect-accesses.ll
+++ b/llvm/test/CodeGen/AMDGPU/lower-module-lds-all-indirect-accesses.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 2
-; RUN: opt -S -mtriple=amdgcn-- -passes=amdgpu-lower-module-lds --amdgpu-lower-module-lds-strategy=hybrid < %s | FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-- -passes=amdgpu-lower-module-lds --amdgpu-lower-module-lds-strategy=hybrid < %s | FileCheck %s
 
 ;; Reduced from a larger test case. Checks that functions and kernels that use only dynamic lds
 ;; are lowered successfully. Previously they only worked if the kernel happened to also use static lds
diff --git a/llvm/test/CodeGen/AMDGPU/lower-module-lds-constantexpr-phi.ll b/llvm/test/CodeGen/AMDGPU/lower-module-lds-constantexpr-phi.ll
index 1378cf1453693..1089f52aabc47 100644
--- a/llvm/test/CodeGen/AMDGPU/lower-module-lds-constantexpr-phi.ll
+++ b/llvm/test/CodeGen/AMDGPU/lower-module-lds-constantexpr-phi.ll
@@ -1,6 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -mtriple=amdgcn-- -amdgpu-lower-module-lds --amdgpu-lower-module-lds-strategy=module < %s | FileCheck %s
-; RUN: opt -S -mtriple=amdgcn-- -passes=amdgpu-lower-module-lds --amdgpu-lower-module-lds-strategy=module < %s | FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-- -amdgpu-lower-module-lds --amdgpu-lower-module-lds-strategy=module < %s | FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-- -passes=amdgpu-lower-module-lds --amdgpu-lower-module-lds-strategy=module < %s | FileCheck %s
 
 @var = addrspace(3) global i32 poison, align 4
 
diff --git a/llvm/test/CodeGen/AMDGPU/lower-module-lds-constantexpr.ll b/llvm/test/CodeGen/AMDGPU/lower-module-lds-constantexpr.ll
index deb2d00e8bd81..410e568242cbb 100644
--- a/llvm/test/CodeGen/AMDGPU/lower-module-lds-constantexpr.ll
+++ b/llvm/test/CodeGen/AMDGPU/lower-module-lds-constantexpr.ll
@@ -1,6 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 6
-; RUN: opt -S -mtriple=amdgcn-- -amdgpu-lower-module-lds --amdgpu-lower-module-lds-strategy=module < %s | FileCheck %s
-; RUN: opt -S -mtriple=amdgcn-- -passes=amdgpu-lower-module-lds --amdgpu-lower-module-lds-strategy=module < %s | FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-- -amdgpu-lower-module-lds --amdgpu-lower-module-lds-strategy=module < %s | FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-- -passes=amdgpu-lower-module-lds --amdgpu-lower-module-lds-strategy=module < %s | FileCheck %s
 
 ; CHECK: %llvm.amdgcn.module.lds.t = type { float, float }
 ; CHECK: %llvm.amdgcn.kernel.timestwo.lds.t = type { float, float }
diff --git a/llvm/test/CodeGen/AMDGPU/lower-module-lds-inactive.ll b/llvm/test/CodeGen/AMDGPU/lower-module-lds-inactive.ll
index b2c30cd174c78..9038fc00aaf32 100644
--- a/llvm/test/CodeGen/AMDGPU/lower-module-lds-inactive.ll
+++ b/llvm/test/CodeGen/AMDGPU/lower-module-lds-inactive.ll
@@ -1,5 +1,5 @@
-; RUN: opt -S -mtriple=amdgcn-- -amdgpu-lower-module-lds < %s | FileCheck %s
-; RUN: opt -S -mtriple=amdgcn-- -passes=amdgpu-lower-module-lds < %s | FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-- -amdgpu-lower-module-lds < %s | FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-- -passes=amdgpu-lower-module-lds < %s | FileCheck %s
 
 ; Variables that are not lowered by this pass are left unchanged
 ; CHECK-NOT: asm
diff --git a/llvm/test/CodeGen/AMDGPU/lower-module-lds-indirect-extern-uses-max-reachable-alignment.ll b/llvm/test/CodeGen/AMDGPU/lower-module-lds-indirect-extern-uses-max-reachable-alignment.ll
index 4bd08c19a081c..fcb724a639fac 100644
--- a/llvm/test/CodeGen/AMDGPU/lower-module-lds-indirect-extern-uses-max-reachable-alignment.ll
+++ b/llvm/test/CodeGen/AMDGPU/lower-module-lds-indirect-extern-uses-max-reachable-alignment.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --check-globals --version 3
-; RUN: opt -S -mtriple=amdgcn-- -passes=amdgpu-lower-module-lds < %s | FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-- -passes=amdgpu-lower-module-lds < %s | FileCheck %s
 
 ; Not reached by a non-kernel function and therefore not changed by this pass
 @dynamic_kernel_only = external addrspace(3) global [0 x double]
diff --git a/llvm/test/CodeGen/AMDGPU/lower-module-lds-link-time-classify.ll b/llvm/test/CodeGen/AMDGPU/lower-module-lds-link-time-classify.ll
index 364494d7b1c40..ece648a9aceed 100644
--- a/llvm/test/CodeGen/AMDGPU/lower-module-lds-link-time-classify.ll
+++ b/llvm/test/CodeGen/AMDGPU/lower-module-lds-link-time-classify.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -passes=amdgpu-lower-module-lds -amdgpu-enable-object-linking < %s | FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-lower-module-lds -amdgpu-enable-object-linking < %s | FileCheck %s
 
 ; Test the three-way classification of LDS variables:
 ;   1. Global-scope (external linkage): standalone external declaration
diff --git a/llvm/test/CodeGen/AMDGPU/lower-module-lds-link-time-global-scope.ll b/llvm/test/CodeGen/AMDGPU/lower-module-lds-link-time-global-scope.ll
index 4435e32aa856a..0bc65201503ba 100644
--- a/llvm/test/CodeGen/AMDGPU/lower-module-lds-link-time-global-scope.ll
+++ b/llvm/test/CodeGen/AMDGPU/lower-module-lds-link-time-global-scope.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -passes=amdgpu-lower-module-lds -amdgpu-enable-object-linking < %s | FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-lower-module-lds -amdgpu-enable-object-linking < %s | FileCheck %s
 
 ; Comprehensive test for global-scope (external linkage) LDS in link-time mode.
 ; External LDS variables remain as standalone external declarations -- they are
diff --git a/llvm/test/CodeGen/AMDGPU/lower-module-lds-link-time-internal-func.ll b/llvm/test/CodeGen/AMDGPU/lower-module-lds-link-time-internal-func.ll
index 525b03f017290..10f05233c147f 100644
--- a/llvm/test/CodeGen/AMDGPU/lower-module-lds-link-time-internal-func.ll
+++ b/llvm/test/CodeGen/AMDGPU/lower-module-lds-link-time-internal-func.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -passes=amdgpu-lower-module-lds -amdgpu-enable-object-linking < %s | FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-lower-module-lds -amdgpu-enable-object-linking < %s | FileCheck %s
 
 ; An internal (static) device function uses an internal LDS variable.
 ; The per-function struct must get a module-unique hash suffix to avoid
diff --git a/llvm/test/CodeGen/AMDGPU/lower-module-lds-link-time-internal-multi-user.ll b/llvm/test/CodeGen/AMDGPU/lower-module-lds-link-time-internal-multi-user.ll
index 7d9042e212e0f..849771e5ba502 100644
--- a/llvm/test/CodeGen/AMDGPU/lower-module-lds-link-time-internal-multi-user.ll
+++ b/llvm/test/CodeGen/AMDGPU/lower-module-lds-link-time-internal-multi-user.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -passes=amdgpu-lower-module-lds -amdgpu-enable-object-linking < %s | FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-lower-module-lds -amdgpu-enable-object-linking < %s | FileCheck %s
 
 source_filename = "source_a.hip"
 
diff --git a/llvm/test/CodeGen/AMDGPU/lower-module-lds-offsets.ll b/llvm/test/CodeGen/AMDGPU/lower-module-lds-offsets.ll
index 95e2ae9634b0e..82386629b40a4 100644
--- a/llvm/test/CodeGen/AMDGPU/lower-module-lds-offsets.ll
+++ b/llvm/test/CodeGen/AMDGPU/lower-module-lds-offsets.ll
@@ -1,7 +1,7 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -mtriple=amdgcn-- -amdgpu-lower-module-lds < %s --amdgpu-lower-module-lds-strategy=module | FileCheck -check-prefix=OPT %s
-; RUN: opt -S -mtriple=amdgcn-- -passes=amdgpu-lower-module-lds < %s --amdgpu-lower-module-lds-strategy=module | FileCheck -check-prefix=OPT %s
-; RUN: llc -mtriple=amdgcn -mcpu=gfx900 < %s --amdgpu-lower-module-lds-strategy=module | FileCheck -check-prefix=GCN %s
+; RUN: opt -S -mtriple=amdgpu-- -amdgpu-lower-module-lds < %s --amdgpu-lower-module-lds-strategy=module | FileCheck -check-prefix=OPT %s
+; RUN: opt -S -mtriple=amdgpu-- -passes=amdgpu-lower-module-lds < %s --amdgpu-lower-module-lds-strategy=module | FileCheck -check-prefix=OPT %s
+; RUN: llc -mtriple=amdgpu9.00 < %s --amdgpu-lower-module-lds-strategy=module | FileCheck -check-prefix=GCN %s
 
 ; Check that module LDS is allocated at address 0 and kernel starts its
 ; allocation past module LDS when a call is present.
diff --git a/llvm/test/CodeGen/AMDGPU/lower-module-lds-precise-allocate-to-module-struct.ll b/llvm/test/CodeGen/AMDGPU/lower-module-lds-precise-allocate-to-module-struct.ll
index 9f23e3b953453..b7986da1700d9 100644
--- a/llvm/test/CodeGen/AMDGPU/lower-module-lds-precise-allocate-to-module-struct.ll
+++ b/llvm/test/CodeGen/AMDGPU/lower-module-lds-precise-allocate-to-module-struct.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --function-signature --check-globals
-; RUN: opt -S -mtriple=amdgcn-- -passes=amdgpu-lower-module-lds < %s | FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-- -passes=amdgpu-lower-module-lds < %s | FileCheck %s
 
 ; Regression test for issue 160181
 ; One variable is chosen to be assigned at zero. Here, that's @both
diff --git a/llvm/test/CodeGen/AMDGPU/lower-module-lds-single-var-ambiguous.ll b/llvm/test/CodeGen/AMDGPU/lower-module-lds-single-var-ambiguous.ll
index 9c71d212132c0..eeee0b8c1c6c3 100644
--- a/llvm/test/CodeGen/AMDGPU/lower-module-lds-single-var-ambiguous.ll
+++ b/llvm/test/CodeGen/AMDGPU/lower-module-lds-single-var-ambiguous.ll
@@ -1,8 +1,8 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -mtriple=amdgcn-- -passes=amdgpu-lower-module-lds < %s --amdgpu-lower-module-lds-strategy=module | FileCheck -check-prefixes=CHECK,M_OR_HY %s
-; RUN: opt -S -mtriple=amdgcn-- -passes=amdgpu-lower-module-lds < %s --amdgpu-lower-module-lds-strategy=table | FileCheck -check-prefixes=CHECK,TABLE %s
-; RUN: not opt -S -mtriple=amdgcn-- -passes=amdgpu-lower-module-lds < %s --amdgpu-lower-module-lds-strategy=kernel 2>&1 | FileCheck -check-prefixes=KERNEL %s
-; RUN: opt -S -mtriple=amdgcn-- -passes=amdgpu-lower-module-lds < %s --amdgpu-lower-module-lds-strategy=hybrid | FileCheck -check-prefixes=CHECK,M_OR_HY %s
+; RUN: opt -S -mtriple=amdgpu-- -passes=amdgpu-lower-module-lds < %s --amdgpu-lower-module-lds-strategy=module | FileCheck -check-prefixes=CHECK,M_OR_HY %s
+; RUN: opt -S -mtriple=amdgpu-- -passes=amdgpu-lower-module-lds < %s --amdgpu-lower-module-lds-strategy=table | FileCheck -check-prefixes=CHECK,TABLE %s
+; RUN: not opt -S -mtriple=amdgpu-- -passes=amdgpu-lower-module-lds < %s --amdgpu-lower-module-lds-strategy=kernel 2>&1 | FileCheck -check-prefixes=KERNEL %s
+; RUN: opt -S -mtriple=amdgpu-- -passes=amdgpu-lower-module-lds < %s --amdgpu-lower-module-lds-strategy=hybrid | FileCheck -check-prefixes=CHECK,M_OR_HY %s
 
 ;; Two kernels access the same variable, specialisation gives them each their own copy of it
 
diff --git a/llvm/test/CodeGen/AMDGPU/lower-module-lds-single-var-unambiguous.ll b/llvm/test/CodeGen/AMDGPU/lower-module-lds-single-var-unambiguous.ll
index d32ea069b3e59..28e0e8b67dba9 100644
--- a/llvm/test/CodeGen/AMDGPU/lower-module-lds-single-var-unambiguous.ll
+++ b/llvm/test/CodeGen/AMDGPU/lower-module-lds-single-var-unambiguous.ll
@@ -1,8 +1,8 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -mtriple=amdgcn-- -passes=amdgpu-lower-module-lds < %s --amdgpu-lower-module-lds-strategy=module | FileCheck -check-prefixes=CHECK,MODULE %s
-; RUN: opt -S -mtriple=amdgcn-- -passes=amdgpu-lower-module-lds < %s --amdgpu-lower-module-lds-strategy=table | FileCheck -check-prefixes=CHECK,TABLE %s
-; RUN: opt -S -mtriple=amdgcn-- -passes=amdgpu-lower-module-lds < %s --amdgpu-lower-module-lds-strategy=kernel | FileCheck -check-prefixes=CHECK,K_OR_HY %s
-; RUN: opt -S -mtriple=amdgcn-- -passes=amdgpu-lower-module-lds < %s --amdgpu-lower-module-lds-strategy=hybrid | FileCheck -check-prefixes=CHECK,K_OR_HY %s
+; RUN: opt -S -mtriple=amdgpu-- -passes=amdgpu-lower-module-lds < %s --amdgpu-lower-module-lds-strategy=module | FileCheck -check-prefixes=CHECK,MODULE %s
+; RUN: opt -S -mtriple=amdgpu-- -passes=amdgpu-lower-module-lds < %s --amdgpu-lower-module-lds-strategy=table | FileCheck -check-prefixes=CHECK,TABLE %s
+; RUN: opt -S -mtriple=amdgpu-- -passes=amdgpu-lower-module-lds < %s --amdgpu-lower-module-lds-strategy=kernel | FileCheck -check-prefixes=CHECK,K_OR_HY %s
+; RUN: opt -S -mtriple=amdgpu-- -passes=amdgpu-lower-module-lds < %s --amdgpu-lower-module-lds-strategy=hybrid | FileCheck -check-prefixes=CHECK,K_OR_HY %s
 
 ;; Same checks for kernel and for hybrid as an unambiguous reference to a variable - one where exactly one kernel
 ;; can reach it - is the case where hybrid lowering can always prefer the direct access.
diff --git a/llvm/test/CodeGen/AMDGPU/lower-module-lds-used-list.ll b/llvm/test/CodeGen/AMDGPU/lower-module-lds-used-list.ll
index 6c504315e8d7a..07634d61fe562 100644
--- a/llvm/test/CodeGen/AMDGPU/lower-module-lds-used-list.ll
+++ b/llvm/test/CodeGen/AMDGPU/lower-module-lds-used-list.ll
@@ -1,6 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 3
-; RUN: opt -S -mtriple=amdgcn-- -amdgpu-lower-module-lds --amdgpu-lower-module-lds-strategy=module < %s | FileCheck %s
-; RUN: opt -S -mtriple=amdgcn-- -passes=amdgpu-lower-module-lds --amdgpu-lower-module-lds-strategy=module < %s | FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-- -amdgpu-lower-module-lds --amdgpu-lower-module-lds-strategy=module < %s | FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-- -passes=amdgpu-lower-module-lds --amdgpu-lower-module-lds-strategy=module < %s | FileCheck %s
 
 ; Check new struct is added to compiler.used and that the replaced variable is removed
 
diff --git a/llvm/test/CodeGen/AMDGPU/lower-module-lds-via-table.ll b/llvm/test/CodeGen/AMDGPU/lower-module-lds-via-table.ll
index e4e1d6c99de6a..4586bd23ab82d 100644
--- a/llvm/test/CodeGen/AMDGPU/lower-module-lds-via-table.ll
+++ b/llvm/test/CodeGen/AMDGPU/lower-module-lds-via-table.ll
@@ -1,6 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 3
-; RUN: opt -S -mtriple=amdgcn--amdhsa -passes=amdgpu-lower-module-lds < %s --amdgpu-lower-module-lds-strategy=table | FileCheck -check-prefix=OPT %s
-; RUN: llc -mtriple=amdgcn--amdhsa -mcpu=gfx700 < %s --amdgpu-lower-module-lds-strategy=table | FileCheck -check-prefix=GCN %s
+; RUN: opt -S -mtriple=amdgpu7.00--amdhsa -passes=amdgpu-lower-module-lds < %s --amdgpu-lower-module-lds-strategy=table | FileCheck -check-prefix=OPT %s
+; RUN: llc -mtriple=amdgpu7.00--amdhsa < %s --amdgpu-lower-module-lds-strategy=table | FileCheck -check-prefix=GCN %s
 
 ; Opt checks from utils/update_test_checks.py, llc checks from utils/update_llc_test_checks.py, both modified.
 
diff --git a/llvm/test/CodeGen/AMDGPU/lower-module-lds-zero-size-arr.ll b/llvm/test/CodeGen/AMDGPU/lower-module-lds-zero-size-arr.ll
index 7707b8526d08f..2dc928d35a83b 100644
--- a/llvm/test/CodeGen/AMDGPU/lower-module-lds-zero-size-arr.ll
+++ b/llvm/test/CodeGen/AMDGPU/lower-module-lds-zero-size-arr.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --check-globals all --version 5
-; RUN: opt -S -mtriple=amdgcn-- -passes=amdgpu-lower-module-lds < %s | FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-- -passes=amdgpu-lower-module-lds < %s | FileCheck %s
 
 ; This is an extension and should be rejected by the front-end in most cases.
 ; If it goes through, lower it as dynlds.
diff --git a/llvm/test/CodeGen/AMDGPU/lower-module-lds.ll b/llvm/test/CodeGen/AMDGPU/lower-module-lds.ll
index 2f1cb6adf72a7..c870fbb2e6ef2 100644
--- a/llvm/test/CodeGen/AMDGPU/lower-module-lds.ll
+++ b/llvm/test/CodeGen/AMDGPU/lower-module-lds.ll
@@ -1,5 +1,5 @@
-; RUN: opt -S -mtriple=amdgcn-- -amdgpu-lower-module-lds --amdgpu-lower-module-lds-strategy=module < %s | FileCheck %s
-; RUN: opt -S -mtriple=amdgcn-- -passes=amdgpu-lower-module-lds --amdgpu-lower-module-lds-strategy=module < %s | FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-- -amdgpu-lower-module-lds --amdgpu-lower-module-lds-strategy=module < %s | FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-- -passes=amdgpu-lower-module-lds --amdgpu-lower-module-lds-strategy=module < %s | FileCheck %s
 
 ; Padding to meet alignment, so references to @var1 replaced with gep ptr, 0, 2
 ; No i64 as addrspace(3) types with initializers are ignored. Likewise no addrspace(4).
diff --git a/llvm/test/CodeGen/AMDGPU/lower-multiple-ctor-dtor.ll b/llvm/test/CodeGen/AMDGPU/lower-multiple-ctor-dtor.ll
index a3a779852ce9a..5a6a523ec522f 100644
--- a/llvm/test/CodeGen/AMDGPU/lower-multiple-ctor-dtor.ll
+++ b/llvm/test/CodeGen/AMDGPU/lower-multiple-ctor-dtor.ll
@@ -1,6 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --include-generated-funcs --version 3
-; RUN: opt -S -mtriple=amdgcn--  -amdgpu-lower-ctor-dtor < %s | FileCheck %s
-; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx700 -filetype=obj -o - < %s | llvm-readelf -s - 2>&1 | FileCheck %s -check-prefix=CHECK-VIS
+; RUN: opt -S -mtriple=amdgpu--  -amdgpu-lower-ctor-dtor < %s | FileCheck %s
+; RUN: llc -mtriple=amdgpu7.00-amd-amdhsa -filetype=obj -o - < %s | llvm-readelf -s - 2>&1 | FileCheck %s -check-prefix=CHECK-VIS
 
 
 @llvm.global_ctors = appending addrspace(1) global [2 x { i32, ptr, ptr }] [{ i32, ptr, ptr } { i32 1, ptr @foo, ptr null }, { i32, ptr, ptr } { i32 1, ptr @foo.5, ptr null }]
diff --git a/llvm/test/CodeGen/AMDGPU/lower-noalias-kernargs.ll b/llvm/test/CodeGen/AMDGPU/lower-noalias-kernargs.ll
index 36fad7beb6b9b..722eb1c073fb8 100644
--- a/llvm/test/CodeGen/AMDGPU/lower-noalias-kernargs.ll
+++ b/llvm/test/CodeGen/AMDGPU/lower-noalias-kernargs.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 6
-; RUN: opt -mtriple=amdgcn-- -S -o - -passes=amdgpu-lower-kernel-arguments %s | FileCheck %s
+; RUN: opt -mtriple=amdgpu-- -S -o - -passes=amdgpu-lower-kernel-arguments %s | FileCheck %s
 
 define amdgpu_kernel void @aliasinfo_2i32(ptr addrspace(1) %out, ptr addrspace(1) %in) nounwind {
 ; CHECK-LABEL: define amdgpu_kernel void @aliasinfo_2i32(
diff --git a/llvm/test/CodeGen/AMDGPU/lower-term-opcodes.mir b/llvm/test/CodeGen/AMDGPU/lower-term-opcodes.mir
index acc9bf78a3401..af1818fb2ff65 100644
--- a/llvm/test/CodeGen/AMDGPU/lower-term-opcodes.mir
+++ b/llvm/test/CodeGen/AMDGPU/lower-term-opcodes.mir
@@ -1,9 +1,9 @@
 # NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py
-# RUN: llc -mtriple=amdgcn -mcpu=gfx1010 -run-pass=si-optimize-exec-masking -verify-machineinstrs  %s -o - | FileCheck %s
-# RUN: llc -mtriple=amdgcn -mcpu=gfx1100 -run-pass=si-optimize-exec-masking -verify-machineinstrs  %s -o - | FileCheck %s
+# RUN: llc -mtriple=amdgpu10.10 -run-pass=si-optimize-exec-masking -verify-machineinstrs  %s -o - | FileCheck %s
+# RUN: llc -mtriple=amdgpu11.00 -run-pass=si-optimize-exec-masking -verify-machineinstrs  %s -o - | FileCheck %s
 
-# RUN: llc -mtriple=amdgcn -mcpu=gfx1010 -passes=si-optimize-exec-masking -verify-machineinstrs  %s -o - | FileCheck %s
-# RUN: llc -mtriple=amdgcn -mcpu=gfx1100 -passes=si-optimize-exec-masking -verify-machineinstrs  %s -o - | FileCheck %s
+# RUN: llc -mtriple=amdgpu10.10 -passes=si-optimize-exec-masking -verify-machineinstrs  %s -o - | FileCheck %s
+# RUN: llc -mtriple=amdgpu11.00 -passes=si-optimize-exec-masking -verify-machineinstrs  %s -o - | FileCheck %s
 ---
 name: lower_term_opcodes
 tracksRegLiveness: false
diff --git a/llvm/test/CodeGen/AMDGPU/lower-work-group-id-intrinsics-hsa.ll b/llvm/test/CodeGen/AMDGPU/lower-work-group-id-intrinsics-hsa.ll
index 11bade44eb909..44ff13dd81303 100644
--- a/llvm/test/CodeGen/AMDGPU/lower-work-group-id-intrinsics-hsa.ll
+++ b/llvm/test/CodeGen/AMDGPU/lower-work-group-id-intrinsics-hsa.ll
@@ -1,10 +1,10 @@
 ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
-; RUN: llc -mtriple=amdgcn-amd-hsa -mcpu=gfx900 -mattr=-arc...
[truncated]

``````````

</details>


https://github.com/llvm/llvm-project/pull/209485
