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

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 <[email protected]> (Claude-Opus-4.8)

>From 11187cfeb88cff14442cf88ab00d77a6e90dd83b Mon Sep 17 00:00:00 2001
From: Matt Arsenault <[email protected]>
Date: Thu, 25 Jun 2026 09:53:37 +0200
Subject: [PATCH] AMDGPU: Migrate CodeGen tests to amdgpu subarch triple (6)

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 <[email protected]> (Claude-Opus-4.8)
---
 llvm/test/CodeGen/AMDGPU/amdgpu-codegenprepare-sqrt.ll |  6 +++---
 llvm/test/CodeGen/AMDGPU/amdgpu-cs-chain-cc.ll         |  8 ++++----
 llvm/test/CodeGen/AMDGPU/amdgpu-cs-chain-fp-nosave.ll  |  4 ++--
 .../test/CodeGen/AMDGPU/amdgpu-cs-chain-preserve-cc.ll |  8 ++++----
 .../AMDGPU/amdgpu-export-kernel-runtime-handles.ll     |  4 ++--
 llvm/test/CodeGen/AMDGPU/amdgpu-inline.ll              | 10 +++++-----
 .../AMDGPU/amdgpu-late-codegenprepare-crash-splat.ll   |  2 +-
 llvm/test/CodeGen/AMDGPU/amdgpu-late-codegenprepare.ll |  6 +++---
 .../AMDGPU/amdgpu-libcall-sincos-pass-ordering.ll      |  2 +-
 .../AMDGPU/amdgpu-lower-exec-sync-and-module-lds.ll    |  4 ++--
 .../AMDGPU/amdgpu-lower-exec-sync-and-sw-lds.ll        |  4 ++--
 llvm/test/CodeGen/AMDGPU/amdgpu-lower-exec-sync.ll     |  4 ++--
 .../AMDGPU/amdgpu-max-num-workgroups-load-annotate.ll  |  2 +-
 .../AMDGPU/amdgpu-miscellaneous-uniform-intrinsic.ll   |  2 +-
 llvm/test/CodeGen/AMDGPU/amdgpu-no-agprs-violations.ll |  4 ++--
 llvm/test/CodeGen/AMDGPU/amdgpu-nsa-threshold.ll       |  8 ++++----
 llvm/test/CodeGen/AMDGPU/amdgpu-num-agpr.ll            |  2 +-
 llvm/test/CodeGen/AMDGPU/amdgpu-prepare-agpr-alloc.mir |  6 +++---
 llvm/test/CodeGen/AMDGPU/amdgpu-reloc-const.ll         |  8 ++++----
 .../CodeGen/AMDGPU/amdgpu-shader-calling-convention.ll |  4 ++--
 .../amdgpu-simplify-demanded-bits-for-target-node.ll   |  2 +-
 .../CodeGen/AMDGPU/amdgpu-simplify-libcall-ceil.ll     |  2 +-
 .../CodeGen/AMDGPU/amdgpu-simplify-libcall-copysign.ll |  2 +-
 .../test/CodeGen/AMDGPU/amdgpu-simplify-libcall-exp.ll |  2 +-
 .../CodeGen/AMDGPU/amdgpu-simplify-libcall-exp2.ll     |  2 +-
 .../CodeGen/AMDGPU/amdgpu-simplify-libcall-fabs.ll     |  2 +-
 .../CodeGen/AMDGPU/amdgpu-simplify-libcall-floor.ll    |  2 +-
 .../test/CodeGen/AMDGPU/amdgpu-simplify-libcall-fma.ll |  2 +-
 .../AMDGPU/amdgpu-simplify-libcall-fmax-splat.ll       |  2 +-
 .../CodeGen/AMDGPU/amdgpu-simplify-libcall-fmax.ll     |  2 +-
 .../AMDGPU/amdgpu-simplify-libcall-fmin-splat.ll       |  2 +-
 .../CodeGen/AMDGPU/amdgpu-simplify-libcall-fmin.ll     |  2 +-
 ...mdgpu-simplify-libcall-image-function-signatures.ll |  2 +-
 .../AMDGPU/amdgpu-simplify-libcall-ldexp-splat.ll      |  2 +-
 .../CodeGen/AMDGPU/amdgpu-simplify-libcall-ldexp.ll    |  2 +-
 .../test/CodeGen/AMDGPU/amdgpu-simplify-libcall-log.ll |  2 +-
 .../CodeGen/AMDGPU/amdgpu-simplify-libcall-log10.ll    |  2 +-
 .../CodeGen/AMDGPU/amdgpu-simplify-libcall-log2.ll     |  2 +-
 .../test/CodeGen/AMDGPU/amdgpu-simplify-libcall-mad.ll |  2 +-
 .../CodeGen/AMDGPU/amdgpu-simplify-libcall-pow-fast.ll |  2 +-
 .../test/CodeGen/AMDGPU/amdgpu-simplify-libcall-pow.ll |  4 ++--
 .../AMDGPU/amdgpu-simplify-libcall-pown-fast.ll        |  2 +-
 .../CodeGen/AMDGPU/amdgpu-simplify-libcall-pown.ll     |  4 ++--
 .../AMDGPU/amdgpu-simplify-libcall-powr-fast.ll        |  2 +-
 .../CodeGen/AMDGPU/amdgpu-simplify-libcall-powr.ll     |  4 ++--
 .../CodeGen/AMDGPU/amdgpu-simplify-libcall-rint.ll     |  2 +-
 .../AMDGPU/amdgpu-simplify-libcall-rootn-fast.ll       |  2 +-
 .../CodeGen/AMDGPU/amdgpu-simplify-libcall-rootn.ll    |  4 ++--
 .../CodeGen/AMDGPU/amdgpu-simplify-libcall-round.ll    |  2 +-
 .../AMDGPU/amdgpu-simplify-libcall-sincos.defined.ll   |  2 +-
 ...amdgpu-simplify-libcall-sincos.defined.nobuiltin.ll |  2 +-
 .../amdgpu-simplify-libcall-sincos.defined.sin.cos.ll  |  2 +-
 .../CodeGen/AMDGPU/amdgpu-simplify-libcall-sincos.ll   |  2 +-
 .../amdgpu-simplify-libcall-sincos.nobuiltins.ll       |  2 +-
 .../AMDGPU/amdgpu-simplify-libcall-sincos.weak.ll      |  2 +-
 .../CodeGen/AMDGPU/amdgpu-simplify-libcall-sqrt.ll     |  2 +-
 .../CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-acos.ll |  2 +-
 .../AMDGPU/amdgpu-simplify-libcall-tdo-acosh.ll        |  2 +-
 .../AMDGPU/amdgpu-simplify-libcall-tdo-acospi.ll       |  2 +-
 .../CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-asin.ll |  2 +-
 .../AMDGPU/amdgpu-simplify-libcall-tdo-asinh.ll        |  2 +-
 .../AMDGPU/amdgpu-simplify-libcall-tdo-asinpi.ll       |  2 +-
 .../CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-atan.ll |  2 +-
 .../AMDGPU/amdgpu-simplify-libcall-tdo-atanh.ll        |  2 +-
 .../AMDGPU/amdgpu-simplify-libcall-tdo-atanpi.ll       |  2 +-
 .../CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-cbrt.ll |  2 +-
 .../CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-cos.ll  |  2 +-
 .../CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-cosh.ll |  2 +-
 .../AMDGPU/amdgpu-simplify-libcall-tdo-cospi.ll        |  2 +-
 .../CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-erf.ll  |  2 +-
 .../CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-erfc.ll |  2 +-
 .../CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-exp.ll  |  2 +-
 .../AMDGPU/amdgpu-simplify-libcall-tdo-exp10.ll        |  2 +-
 .../CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-exp2.ll |  2 +-
 .../AMDGPU/amdgpu-simplify-libcall-tdo-expm1.ll        |  2 +-
 .../CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-log.ll  |  2 +-
 .../AMDGPU/amdgpu-simplify-libcall-tdo-log10.ll        |  2 +-
 .../CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-log2.ll |  2 +-
 .../AMDGPU/amdgpu-simplify-libcall-tdo-rsqrt.ll        |  2 +-
 .../CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-sin.ll  |  2 +-
 .../CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-sinh.ll |  2 +-
 .../AMDGPU/amdgpu-simplify-libcall-tdo-sinpi.ll        |  2 +-
 .../CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-sqrt.ll |  2 +-
 .../CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-tan.ll  |  2 +-
 .../CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-tanh.ll |  2 +-
 .../AMDGPU/amdgpu-simplify-libcall-tdo-tanpi.ll        |  2 +-
 .../AMDGPU/amdgpu-simplify-libcall-tdo-tgamma.ll       |  2 +-
 .../CodeGen/AMDGPU/amdgpu-simplify-libcall-trunc.ll    |  2 +-
 .../AMDGPU/amdgpu-simplify-libcall-unexpected-types.ll |  2 +-
 llvm/test/CodeGen/AMDGPU/amdgpu-snop-padding.mir       |  4 ++--
 .../test/CodeGen/AMDGPU/amdgpu-spill-cfi-saved-regs.ll |  4 ++--
 ...amdgpu-sw-lower-lds-dynamic-indirect-access-asan.ll |  2 +-
 .../amdgpu-sw-lower-lds-dynamic-indirect-access.ll     |  2 +-
 .../amdgpu-sw-lower-lds-dynamic-lds-test-asan.ll       |  2 +-
 .../AMDGPU/amdgpu-sw-lower-lds-dynamic-lds-test.ll     |  2 +-
 .../CodeGen/AMDGPU/amdgpu-sw-lower-lds-lower-all.ll    |  2 +-
 .../CodeGen/AMDGPU/amdgpu-sw-lower-lds-lower-none.ll   |  2 +-
 ...er-lds-multi-static-dynamic-indirect-access-asan.ll |  2 +-
 ...w-lower-lds-multi-static-dynamic-indirect-access.ll |  2 +-
 99 files changed, 134 insertions(+), 134 deletions(-)

diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-codegenprepare-sqrt.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-codegenprepare-sqrt.ll
index b90afb7ae9b7f..8e154fb87eace 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-codegenprepare-sqrt.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-codegenprepare-sqrt.ll
@@ -1,7 +1,7 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py 
UTC_ARGS: --version 2
-; RUN: opt -S -mtriple=amdgcn-- -mcpu=hawaii -passes=amdgpu-codegenprepare 
-denormal-fp-math-f32=ieee %s | FileCheck -check-prefixes=CHECK,IEEE %s
-; RUN: opt -S -mtriple=amdgcn-- -mcpu=hawaii -passes=amdgpu-codegenprepare 
-denormal-fp-math-f32=dynamic %s | FileCheck -check-prefixes=CHECK,IEEE %s
-; RUN: opt -S -mtriple=amdgcn-- -mcpu=hawaii -passes=amdgpu-codegenprepare 
-denormal-fp-math-f32=preserve-sign %s | FileCheck -check-prefixes=CHECK,DAZ %s
+; RUN: opt -S -mtriple=amdgpu7.01-- -passes=amdgpu-codegenprepare 
-denormal-fp-math-f32=ieee %s | FileCheck -check-prefixes=CHECK,IEEE %s
+; RUN: opt -S -mtriple=amdgpu7.01-- -passes=amdgpu-codegenprepare 
-denormal-fp-math-f32=dynamic %s | FileCheck -check-prefixes=CHECK,IEEE %s
+; RUN: opt -S -mtriple=amdgpu7.01-- -passes=amdgpu-codegenprepare 
-denormal-fp-math-f32=preserve-sign %s | FileCheck -check-prefixes=CHECK,DAZ %s
 
 define amdgpu_kernel void @noop_sqrt_fpmath(ptr addrspace(1) %out, float %x) 
#0 {
 ; CHECK-LABEL: define amdgpu_kernel void @noop_sqrt_fpmath
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-cs-chain-cc.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-cs-chain-cc.ll
index 8e518ea411cf6..283c03d8df5bc 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-cs-chain-cc.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-cs-chain-cc.ll
@@ -1,8 +1,8 @@
 ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py 
UTC_ARGS: --version 2
-; RUN: llc -global-isel=1 -mtriple=amdgcn--amdpal -mcpu=gfx1100 < %s | 
FileCheck -check-prefix=GISEL-GFX11 %s
-; RUN: llc -global-isel=1 -mtriple=amdgcn--amdpal -mcpu=gfx1030 < %s | 
FileCheck -check-prefix=GISEL-GFX10 %s
-; RUN: llc -global-isel=0 -mtriple=amdgcn--amdpal -mcpu=gfx1100 < %s | 
FileCheck -check-prefix=DAGISEL-GFX11 %s
-; RUN: llc -global-isel=0 -mtriple=amdgcn--amdpal -mcpu=gfx1030 < %s | 
FileCheck -check-prefix=DAGISEL-GFX10 %s
+; RUN: llc -global-isel=1 -mtriple=amdgpu11.00--amdpal < %s | FileCheck 
-check-prefix=GISEL-GFX11 %s
+; RUN: llc -global-isel=1 -mtriple=amdgpu10.30--amdpal < %s | FileCheck 
-check-prefix=GISEL-GFX10 %s
+; RUN: llc -global-isel=0 -mtriple=amdgpu11.00--amdpal < %s | FileCheck 
-check-prefix=DAGISEL-GFX11 %s
+; RUN: llc -global-isel=0 -mtriple=amdgpu10.30--amdpal < %s | FileCheck 
-check-prefix=DAGISEL-GFX10 %s
 
 declare amdgpu_gfx void @use(...)
 
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-cs-chain-fp-nosave.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-cs-chain-fp-nosave.ll
index 851bd6d2f75b4..e8e90e2fcc073 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-cs-chain-fp-nosave.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-cs-chain-fp-nosave.ll
@@ -1,6 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py 
UTC_ARGS: --version 5
-; RUN: llc -mtriple=amdgcn -mcpu=gfx1200 < %s 2>&1 | FileCheck 
-check-prefix=GFX12 %s
-; RUN: llc -mtriple=amdgcn -mcpu=gfx942 < %s 2>&1 | FileCheck 
-check-prefix=GFX942 %s
+; RUN: llc -mtriple=amdgpu12.00 < %s 2>&1 | FileCheck -check-prefix=GFX12 %s
+; RUN: llc -mtriple=amdgpu9.42 < %s 2>&1 | FileCheck -check-prefix=GFX942 %s
 
 ; These situations are "special" in that they either have an alloca that is not
 ; in the entry block or that they have a dynamic alloca. Both situations affect
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-cs-chain-preserve-cc.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-cs-chain-preserve-cc.ll
index d20277a8da6c3..181ffe3ce6aed 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-cs-chain-preserve-cc.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-cs-chain-preserve-cc.ll
@@ -1,8 +1,8 @@
 ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py 
UTC_ARGS: --version 2
-; RUN: llc -global-isel=1 -mtriple=amdgcn--amdpal -mcpu=gfx1100 < %s | 
FileCheck -check-prefix=GISEL-GFX11 %s
-; RUN: llc -global-isel=1 -mtriple=amdgcn--amdpal -mcpu=gfx1030 < %s | 
FileCheck -check-prefix=GISEL-GFX10 %s
-; RUN: llc -global-isel=0 -mtriple=amdgcn--amdpal -mcpu=gfx1100 < %s | 
FileCheck -check-prefix=DAGISEL-GFX11 %s
-; RUN: llc -global-isel=0 -mtriple=amdgcn--amdpal -mcpu=gfx1030 < %s | 
FileCheck -check-prefix=DAGISEL-GFX10 %s
+; RUN: llc -global-isel=1 -mtriple=amdgpu11.00--amdpal < %s | FileCheck 
-check-prefix=GISEL-GFX11 %s
+; RUN: llc -global-isel=1 -mtriple=amdgpu10.30--amdpal < %s | FileCheck 
-check-prefix=GISEL-GFX10 %s
+; RUN: llc -global-isel=0 -mtriple=amdgpu11.00--amdpal < %s | FileCheck 
-check-prefix=DAGISEL-GFX11 %s
+; RUN: llc -global-isel=0 -mtriple=amdgpu10.30--amdpal < %s | FileCheck 
-check-prefix=DAGISEL-GFX10 %s
 
 define amdgpu_cs_chain_preserve void @amdgpu_cs_chain_preserve_no_stack({ptr, 
i32, <4 x i32>} inreg %a, {ptr, i32, <4 x i32>} %b) #0 {
 ; GISEL-GFX11-LABEL: amdgpu_cs_chain_preserve_no_stack:
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-export-kernel-runtime-handles.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-export-kernel-runtime-handles.ll
index 58b7441d85955..64f1b1cf2ee55 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-export-kernel-runtime-handles.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-export-kernel-runtime-handles.ll
@@ -1,6 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py 
UTC_ARGS: --check-attributes --check-globals all --version 5
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -amdgpu-export-kernel-runtime-handles 
< %s | FileCheck %s
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa 
-passes=amdgpu-export-kernel-runtime-handles < %s | FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -amdgpu-export-kernel-runtime-handles 
< %s | FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa 
-passes=amdgpu-export-kernel-runtime-handles < %s | FileCheck %s
 
 %block.runtime.handle.t = type { ptr addrspace(1), i32, i32 }
 
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-inline.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-inline.ll
index 5c4258147b844..85414505fbbfb 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-inline.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-inline.ll
@@ -1,8 +1,8 @@
-; RUN: opt -mtriple=amdgcn--amdhsa -O3 -S -inline-threshold=1 < %s | FileCheck 
-check-prefixes=GCN,GCN-INL1,GCN-MAXBBDEF %s
-; RUN: opt -mtriple=amdgcn--amdhsa -O3 -S < %s | FileCheck 
-check-prefixes=GCN,GCN-INLDEF,GCN-MAXBBDEF %s
-; RUN: opt -mtriple=amdgcn--amdhsa -passes='default<O3>' -S 
-inline-threshold=1 < %s | FileCheck -check-prefixes=GCN,GCN-INL1,GCN-MAXBBDEF 
%s
-; RUN: opt -mtriple=amdgcn--amdhsa -passes='default<O3>' -S < %s | FileCheck 
-check-prefixes=GCN,GCN-INLDEF,GCN-MAXBBDEF %s
-; RUN: opt -mtriple=amdgcn--amdhsa -passes='default<O3>' -S 
-amdgpu-inline-max-bb=1 < %s | FileCheck -check-prefixes=GCN,GCN-MAXBB1 %s
+; RUN: opt -mtriple=amdgpu--amdhsa -O3 -S -inline-threshold=1 < %s | FileCheck 
-check-prefixes=GCN,GCN-INL1,GCN-MAXBBDEF %s
+; RUN: opt -mtriple=amdgpu--amdhsa -O3 -S < %s | FileCheck 
-check-prefixes=GCN,GCN-INLDEF,GCN-MAXBBDEF %s
+; RUN: opt -mtriple=amdgpu--amdhsa -passes='default<O3>' -S 
-inline-threshold=1 < %s | FileCheck -check-prefixes=GCN,GCN-INL1,GCN-MAXBBDEF 
%s
+; RUN: opt -mtriple=amdgpu--amdhsa -passes='default<O3>' -S < %s | FileCheck 
-check-prefixes=GCN,GCN-INLDEF,GCN-MAXBBDEF %s
+; RUN: opt -mtriple=amdgpu--amdhsa -passes='default<O3>' -S 
-amdgpu-inline-max-bb=1 < %s | FileCheck -check-prefixes=GCN,GCN-MAXBB1 %s
 
 define coldcc float @foo(float %x, float %y) {
 entry:
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-late-codegenprepare-crash-splat.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-late-codegenprepare-crash-splat.ll
index b8464c37a5dc2..681695b912177 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-late-codegenprepare-crash-splat.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-late-codegenprepare-crash-splat.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=amdgpu-late-codegenprepare %s 
 | FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-late-codegenprepare %s 
 | FileCheck %s
 
 ; This crashed because the PHI with a splat was rejected, but then we marked 
the PHI
 ; as visited and tried to convert one of its user afterwards.
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-late-codegenprepare.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-late-codegenprepare.ll
index e816492ea381e..dd1cf68bda7b0 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-late-codegenprepare.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-late-codegenprepare.ll
@@ -1,7 +1,7 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 
-amdgpu-late-codegenprepare %s | FileCheck %s -check-prefix=GFX9
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -mcpu=gfx1200 
-amdgpu-late-codegenprepare %s | FileCheck %s -check-prefix=GFX12
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 
-passes=amdgpu-late-codegenprepare %s | FileCheck %s -check-prefix=GFX9
+; RUN: opt -S -mtriple=amdgpu9.00-amd-amdhsa -amdgpu-late-codegenprepare %s | 
FileCheck %s -check-prefix=GFX9
+; RUN: opt -S -mtriple=amdgpu12.00-amd-amdhsa -amdgpu-late-codegenprepare %s | 
FileCheck %s -check-prefix=GFX12
+; RUN: opt -S -mtriple=amdgpu9.00-amd-amdhsa 
-passes=amdgpu-late-codegenprepare %s | FileCheck %s -check-prefix=GFX9
 
 ; Make sure we don't crash when trying to create a bitcast between
 ; address spaces
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-libcall-sincos-pass-ordering.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-libcall-sincos-pass-ordering.ll
index 8c268816c9b1a..7018c539e27c2 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-libcall-sincos-pass-ordering.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-libcall-sincos-pass-ordering.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 -O1 -amdgpu-prelink %s | FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -O1 -amdgpu-prelink %s | FileCheck %s
 
 ; Make sure that sin+cos -> sincos simplification happens after
 ; initial IR simplifications, otherwise we can't identify the common
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-lower-exec-sync-and-module-lds.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-lower-exec-sync-and-module-lds.ll
index 0f9cfb48b577d..6d0ac0e8efda9 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-lower-exec-sync-and-module-lds.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-lower-exec-sync-and-module-lds.ll
@@ -1,6 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py 
UTC_ARGS: --check-globals all --version 6
-; RUN: opt -S -mtriple=amdgcn-- 
-passes=amdgpu-lower-exec-sync,amdgpu-lower-module-lds < %s 2>&1 | FileCheck %s
-; RUN: llc < %s -enable-new-pm -stop-after=amdgpu-lower-module-lds 
-mtriple=amdgcn-amd-amdhsa | FileCheck %s
+; RUN: opt -S -mtriple=amdgpu12.00-- 
-passes=amdgpu-lower-exec-sync,amdgpu-lower-module-lds < %s 2>&1 | FileCheck %s
+; RUN: llc < %s -enable-new-pm -stop-after=amdgpu-lower-module-lds 
-mtriple=amdgpu12.00-amd-amdhsa | FileCheck %s
 
 ; Test to ensure that LDS variables like named barriers are lowered correctly,
 ; where amdgpu-lower-module-lds pass runs in pipeline after 
amdgpu-lower-exec-sync pass.
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-lower-exec-sync-and-sw-lds.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-lower-exec-sync-and-sw-lds.ll
index 16533e0a204d4..2af602d23af07 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-lower-exec-sync-and-sw-lds.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-lower-exec-sync-and-sw-lds.ll
@@ -1,5 +1,5 @@
-; RUN: opt -S -mtriple=amdgcn-- 
-passes=amdgpu-lower-exec-sync,amdgpu-sw-lower-lds 
-amdgpu-asan-instrument-lds=false < %s 2>&1 | FileCheck %s
-; RUN: llc < %s -enable-new-pm -stop-after=amdgpu-sw-lower-lds 
-amdgpu-asan-instrument-lds=false -mtriple=amdgcn-amd-amdhsa | FileCheck %s
+; RUN: opt -S -mtriple=amdgpu12.00-- 
-passes=amdgpu-lower-exec-sync,amdgpu-sw-lower-lds 
-amdgpu-asan-instrument-lds=false < %s 2>&1 | FileCheck %s
+; RUN: llc < %s -enable-new-pm -stop-after=amdgpu-sw-lower-lds 
-amdgpu-asan-instrument-lds=false -mtriple=amdgpu12.00-amd-amdhsa | FileCheck %s
 
 ; Test to ensure that LDS variables like named barriers are lowered correctly 
in asan scenario,
 ; where amdgpu-sw-lower-lds pass runs in pipeline after amdgpu-lower-exec-sync 
pass.
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-lower-exec-sync.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-lower-exec-sync.ll
index ddf58900518b5..f75bf87559955 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-lower-exec-sync.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-lower-exec-sync.ll
@@ -1,6 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py 
UTC_ARGS: --check-globals all --version 6
-; RUN: opt -S -mtriple=amdgcn-- -amdgpu-lower-exec-sync < %s 2>&1 | FileCheck 
%s
-; RUN: llc < %s -enable-new-pm -stop-after=amdgpu-lower-exec-sync 
-mtriple=amdgcn-amd-amdhsa | FileCheck %s
+; RUN: opt -S -mtriple=amdgpu12.00-- -amdgpu-lower-exec-sync < %s 2>&1 | 
FileCheck %s
+; RUN: llc < %s -enable-new-pm -stop-after=amdgpu-lower-exec-sync 
-mtriple=amdgpu12.00-amd-amdhsa | FileCheck %s
 
 %class.ExpAmdWorkgroupWaveBarrier = type { target("amdgcn.named.barrier", 0) }
 
diff --git 
a/llvm/test/CodeGen/AMDGPU/amdgpu-max-num-workgroups-load-annotate.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-max-num-workgroups-load-annotate.ll
index bc28199ef13da..d7ab3e1b2ea75 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-max-num-workgroups-load-annotate.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-max-num-workgroups-load-annotate.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-amd-amdhsa 
-passes=amdgpu-lower-kernel-attributes %s | FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa 
-passes=amdgpu-lower-kernel-attributes %s | FileCheck %s
 
 define i32 @use_grid_size_x_max_num_workgroups() #0 {
 ; CHECK-LABEL: define i32 @use_grid_size_x_max_num_workgroups(
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-miscellaneous-uniform-intrinsic.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-miscellaneous-uniform-intrinsic.ll
index d35b3da59d92f..ce43cef1516fb 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-miscellaneous-uniform-intrinsic.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-miscellaneous-uniform-intrinsic.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py 
UTC_ARGS: --version 5
-; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx1100  -o - %s | FileCheck %s
+; RUN: llc -mtriple=amdgpu11.00-amd-amdhsa  -o - %s | FileCheck %s
 define amdgpu_kernel void @readfirstlane_with_readfirstlane(ptr addrspace(1) 
%out) {
 ; CHECK-LABEL: readfirstlane_with_readfirstlane:
 ; CHECK:       ; %bb.0:
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-no-agprs-violations.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-no-agprs-violations.ll
index 7bf9a29e9ff44..c8f75373a55dd 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-no-agprs-violations.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-no-agprs-violations.ll
@@ -1,5 +1,5 @@
-; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx908 < %s | FileCheck 
-check-prefixes=CHECK,GFX908 %s
-; RUN: not llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx90a < %s 2> %t.err | 
FileCheck -check-prefixes=CHECK,GFX90A %s
+; RUN: llc -mtriple=amdgpu9.08-amd-amdhsa < %s | FileCheck 
-check-prefixes=CHECK,GFX908 %s
+; RUN: not llc -mtriple=amdgpu9.0a-amd-amdhsa < %s 2> %t.err | FileCheck 
-check-prefixes=CHECK,GFX90A %s
 ; RUN: FileCheck --implicit-check-not=error -check-prefix=ERR < %t.err %s
 
 ; Test undefined behavior where a function ends up needing AGPRs that
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-nsa-threshold.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-nsa-threshold.ll
index 4f862ca0baca7..5c5967111e9eb 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-nsa-threshold.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-nsa-threshold.ll
@@ -1,8 +1,8 @@
 ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
-; RUN: llc -mtriple=amdgcn -mcpu=gfx1100 < %s | FileCheck -check-prefix=ATTRIB 
%s
-; RUN: llc -mtriple=amdgcn -mcpu=gfx1100 -amdgpu-nsa-threshold=2 < %s | 
FileCheck -check-prefix=FORCE-2 %s
-; RUN: llc -mtriple=amdgcn -mcpu=gfx1100 -amdgpu-nsa-threshold=3 < %s | 
FileCheck -check-prefix=FORCE-3 %s
-; RUN: llc -mtriple=amdgcn -mcpu=gfx1100 -amdgpu-nsa-threshold=4 < %s | 
FileCheck -check-prefix=FORCE-4 %s
+; RUN: llc -mtriple=amdgpu11.00 < %s | FileCheck -check-prefix=ATTRIB %s
+; RUN: llc -mtriple=amdgpu11.00 -amdgpu-nsa-threshold=2 < %s | FileCheck 
-check-prefix=FORCE-2 %s
+; RUN: llc -mtriple=amdgpu11.00 -amdgpu-nsa-threshold=3 < %s | FileCheck 
-check-prefix=FORCE-3 %s
+; RUN: llc -mtriple=amdgpu11.00 -amdgpu-nsa-threshold=4 < %s | FileCheck 
-check-prefix=FORCE-4 %s
 
 ; Note: command line argument should override function attribute.
 
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-num-agpr.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-num-agpr.ll
index 1f6ffe076822c..bb4f2a68b182a 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-num-agpr.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-num-agpr.ll
@@ -1,4 +1,4 @@
-; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx90a -filetype=null %s 2>&1 | 
FileCheck --implicit-check-not=warning -check-prefix=WARN %s
+; RUN: llc -mtriple=amdgpu9.0a-amd-amdhsa -filetype=null %s 2>&1 | FileCheck 
--implicit-check-not=warning -check-prefix=WARN %s
 
 ; Check the effect that amdgpu-agpr-alloc has on register reservations.
 ;
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-prepare-agpr-alloc.mir 
b/llvm/test/CodeGen/AMDGPU/amdgpu-prepare-agpr-alloc.mir
index aaacf1d6f793b..878abd30567df 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-prepare-agpr-alloc.mir
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-prepare-agpr-alloc.mir
@@ -1,7 +1,7 @@
 # NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py 
UTC_ARGS: --version 5
-# RUN: llc -mtriple=amdgcn -mcpu=gfx90a -run-pass=amdgpu-prepare-agpr-alloc -o 
- %s | FileCheck -check-prefixes=HAS-AGPR,GFX90A %s
-# RUN: llc -mtriple=amdgcn -mcpu=gfx908 -run-pass=amdgpu-prepare-agpr-alloc -o 
- %s | FileCheck -check-prefixes=HAS-AGPR,GFX908 %s
-# RUN: llc -mtriple=amdgcn -mcpu=gfx906 -passes=amdgpu-prepare-agpr-alloc -o - 
%s | FileCheck -check-prefix=NO-AGPR %s
+# RUN: llc -mtriple=amdgpu9.0a -run-pass=amdgpu-prepare-agpr-alloc -o - %s | 
FileCheck -check-prefixes=HAS-AGPR,GFX90A %s
+# RUN: llc -mtriple=amdgpu9.08 -run-pass=amdgpu-prepare-agpr-alloc -o - %s | 
FileCheck -check-prefixes=HAS-AGPR,GFX908 %s
+# RUN: llc -mtriple=amdgpu9.06 -passes=amdgpu-prepare-agpr-alloc -o - %s | 
FileCheck -check-prefix=NO-AGPR %s
 
 --- |
   define void @func() {
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-reloc-const.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-reloc-const.ll
index e5c118bb4d307..fe20295885444 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-reloc-const.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-reloc-const.ll
@@ -1,8 +1,8 @@
-; RUN: llc -mtriple=amdgcn -mcpu=gfx600 < %s | FileCheck -check-prefix=GCN %s
-; RUN: llc -mtriple=amdgcn--amdpal -mcpu=gfx900 -filetype=obj -o %t.o < %s && 
llvm-readobj -r %t.o | FileCheck --check-prefix=ELF %s
+; RUN: llc -mtriple=amdgpu6.00 < %s | FileCheck -check-prefix=GCN %s
+; RUN: llc -mtriple=amdgpu9.00--amdpal -filetype=obj -o %t.o < %s && 
llvm-readobj -r %t.o | FileCheck --check-prefix=ELF %s
 
-; RUN: llc -global-isel -mtriple=amdgcn -mcpu=gfx600 < %s | FileCheck 
-check-prefix=GCN %s
-; RUN: llc -global-isel -mtriple=amdgcn--amdpal -mcpu=gfx900 -filetype=obj -o 
%t.o < %s && llvm-readobj -r %t.o | FileCheck --check-prefix=ELF %s
+; RUN: llc -global-isel -mtriple=amdgpu6.00 < %s | FileCheck -check-prefix=GCN 
%s
+; RUN: llc -global-isel -mtriple=amdgpu9.00--amdpal -filetype=obj -o %t.o < %s 
&& llvm-readobj -r %t.o | FileCheck --check-prefix=ELF %s
 
 ; GCN-LABEL: {{^}}ps_main:
 ; GCN: v_mov_b32_{{.*}} v[[relocreg:[0-9]+]], doff_0_0_b@abs32@lo
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-shader-calling-convention.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-shader-calling-convention.ll
index ad1b78be513b5..a3fc1b46b185a 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-shader-calling-convention.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-shader-calling-convention.ll
@@ -1,5 +1,5 @@
-; RUN: llc -mtriple=amdgcn -mcpu=tahiti < %s | FileCheck -check-prefix=GCN %s
-; RUN: llc -mtriple=amdgcn -mcpu=tonga < %s | FileCheck -check-prefix=GCN %s
+; RUN: llc -mtriple=amdgpu6.00 < %s | FileCheck -check-prefix=GCN %s
+; RUN: llc -mtriple=amdgpu8.02 < %s | FileCheck -check-prefix=GCN %s
 
 
 ; GCN-LABEL: {{^}}shader_cc:
diff --git 
a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-demanded-bits-for-target-node.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-demanded-bits-for-target-node.ll
index 0cff94c67d110..1b0d3ad63c0a2 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-demanded-bits-for-target-node.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-demanded-bits-for-target-node.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py 
UTC_ARGS: --version 6
-; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 < %s | FileCheck 
-check-prefix=GCN %s
+; RUN: llc -mtriple=amdgpu9.00-amd-amdhsa < %s | FileCheck -check-prefix=GCN %s
 
 define void @readfirstlane_demanded_i8_zext_store(i8 %src, ptr addrspace(1) 
%ptr) nounwind {
 ; GCN-LABEL: readfirstlane_demanded_i8_zext_store:
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-ceil.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-ceil.ll
index f5b8c805ad88c..6660dfe2ddd2a 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-ceil.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-ceil.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-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 declare float @_Z4ceilf(float)
 declare <2 x float> @_Z4ceilDv2_f(<2 x float>)
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-copysign.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-copysign.ll
index 1e894758bfa8c..e24bc12425202 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-copysign.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-copysign.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-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 declare float @_Z8copysignff(float, float)
 declare <2 x float> @_Z8copysignDv2_fS_(<2 x float>, <2 x float>)
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-exp.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-exp.ll
index e06e40405b68a..0c372d85178e4 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-exp.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-exp.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-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 declare float @_Z3expf(float)
 declare <2 x float> @_Z3expDv2_f(<2 x float>)
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-exp2.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-exp2.ll
index e3c54cc181e5b..95a236f070c65 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-exp2.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-exp2.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-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 declare float @_Z4exp2f(float)
 declare <2 x float> @_Z4exp2Dv2_f(<2 x float>)
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-fabs.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-fabs.ll
index 2017aa1f1410d..ec2df657b951e 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-fabs.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-fabs.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-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 declare float @_Z4fabsf(float)
 declare <2 x float> @_Z4fabsDv2_f(<2 x float>)
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-floor.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-floor.ll
index 216fb2bb4fbbc..ba5b14865ad65 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-floor.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-floor.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-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 declare float @_Z5floorf(float)
 declare <2 x float> @_Z5floorDv2_f(<2 x float>)
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-fma.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-fma.ll
index 6a56deba9b551..ad8afc632f9db 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-fma.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-fma.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-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 declare float @_Z3fmafff(float, float, float)
 declare <2 x float> @_Z3fmaDv2_fS_S_(<2 x float>, <2 x float>, <2 x float>)
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-fmax-splat.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-fmax-splat.ll
index 41eafb70e8faf..07934ee4d288d 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-fmax-splat.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-fmax-splat.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-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 declare <2 x float> @_Z4fmaxDv2_ff(<2 x float>, float)
 declare <2 x float> @_Z4fmaxDv2_fS_(<2 x float>, <2 x float>)
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-fmax.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-fmax.ll
index 03bdb39c3a631..add8dc1333fbc 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-fmax.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-fmax.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-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 declare float @_Z4fmaxff(float, float)
 declare <2 x float> @_Z4fmaxDv2_fS_(<2 x float>, <2 x float>)
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-fmin-splat.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-fmin-splat.ll
index 068c160183545..213acd7e828d7 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-fmin-splat.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-fmin-splat.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-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 declare <2 x float> @_Z4fminDv2_ff(<2 x float>, float)
 declare <2 x float> @_Z4fminDv2_fS_(<2 x float>, <2 x float>)
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-fmin.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-fmin.ll
index 672196ab6057f..314351f03071f 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-fmin.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-fmin.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-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 declare float @_Z4fminff(float, float)
 declare <2 x float> @_Z4fminDv2_fS_(<2 x float>, <2 x float>)
diff --git 
a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-image-function-signatures.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-image-function-signatures.ll
index c3bdf06b1447e..189a2688756d9 100644
--- 
a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-image-function-signatures.ll
+++ 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-image-function-signatures.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=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 ; Make sure we can produce a valid FunctionType for the expected
 ; signature of image functions.
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-ldexp-splat.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-ldexp-splat.ll
index 5529acc3426de..703f5a348fc2b 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-ldexp-splat.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-ldexp-splat.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-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 declare <2 x float> @_Z5ldexpDv2_fi(<2 x float>, i32)
 declare <3 x float> @_Z5ldexpDv3_fi(<3 x float>, i32)
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-ldexp.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-ldexp.ll
index 0b0f45620b6c2..6e5e1cb4081bc 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-ldexp.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-ldexp.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-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 declare float @_Z5ldexpfi(float, i32)
 declare <2 x float> @_Z5ldexpDv2_fDv2_i(<2 x float>, <2 x i32>)
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-log.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-log.ll
index 61bf5fae73d56..a317b1a2f1db0 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-log.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-log.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-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 declare float @_Z3logf(float)
 declare <2 x float> @_Z3logDv2_f(<2 x float>)
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-log10.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-log10.ll
index 6ae04360dc9a1..9d606a295ffa8 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-log10.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-log10.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-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 declare float @_Z5log10f(float)
 declare <2 x float> @_Z5log10Dv2_f(<2 x float>)
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-log2.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-log2.ll
index 77e12b5d28268..e2d588e1f641e 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-log2.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-log2.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-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 declare float @_Z4log2f(float)
 declare <2 x float> @_Z4log2Dv2_f(<2 x float>)
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-mad.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-mad.ll
index 9cd93b9787091..c2014e6d30f5a 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-mad.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-mad.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-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 declare float @_Z3madfff(float, float, float)
 declare <2 x float> @_Z3madDv2_fS_S_(<2 x float>, <2 x float>, <2 x float>)
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-pow-fast.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-pow-fast.ll
index 87e492cb6bef7..109c0de43aeb7 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-pow-fast.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-pow-fast.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=amdgpu-simplifylib,instcombine -amdgpu-prelink %s | FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa 
-passes=amdgpu-simplifylib,instcombine -amdgpu-prelink %s | FileCheck %s
 
 define float @test_pow_afn_f32(float %x, float %y) #0 {
 ; CHECK-LABEL: define float @test_pow_afn_f32(
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-pow.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-pow.ll
index cb7e990a7a62c..da0f6f065d241 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-pow.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-pow.ll
@@ -1,6 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py 
UTC_ARGS: --version 2
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa 
-passes=amdgpu-simplifylib,instcombine -amdgpu-prelink %s | FileCheck 
-check-prefixes=CHECK,PRELINK %s
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa 
-passes=amdgpu-simplifylib,instcombine %s | FileCheck 
-check-prefixes=CHECK,NOPRELINK %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa 
-passes=amdgpu-simplifylib,instcombine -amdgpu-prelink %s | FileCheck 
-check-prefixes=CHECK,PRELINK %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa 
-passes=amdgpu-simplifylib,instcombine %s | FileCheck 
-check-prefixes=CHECK,NOPRELINK %s
 
 declare float @_Z3powff(float, float)
 declare <2 x float> @_Z3powDv2_fS_(<2 x float>, <2 x float>)
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-pown-fast.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-pown-fast.ll
index 162a9de2f10aa..265443d41148a 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-pown-fast.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-pown-fast.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=amdgpu-simplifylib,instcombine -amdgpu-prelink %s | FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa 
-passes=amdgpu-simplifylib,instcombine -amdgpu-prelink %s | FileCheck %s
 
 define float @test_pown_afn_f32(float %x, i32 %y) #0 {
 ; CHECK-LABEL: define float @test_pown_afn_f32(
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-pown.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-pown.ll
index ca80e3077605f..52edb382e4f2a 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-pown.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-pown.ll
@@ -1,6 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py 
UTC_ARGS: --version 2
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa 
-passes=amdgpu-simplifylib,instcombine -amdgpu-prelink %s | FileCheck 
-check-prefixes=CHECK,PRELINK %s
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa 
-passes=amdgpu-simplifylib,instcombine %s | FileCheck 
-check-prefixes=CHECK,NOPRELINK %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa 
-passes=amdgpu-simplifylib,instcombine -amdgpu-prelink %s | FileCheck 
-check-prefixes=CHECK,PRELINK %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa 
-passes=amdgpu-simplifylib,instcombine %s | FileCheck 
-check-prefixes=CHECK,NOPRELINK %s
 
 declare float @_Z4pownfi(float, i32)
 declare <2 x float> @_Z4pownDv2_fDv2_i(<2 x float>, <2 x i32>)
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-powr-fast.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-powr-fast.ll
index 489513f7c9cd6..7979f71a136cf 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-powr-fast.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-powr-fast.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=amdgpu-simplifylib,instcombine -amdgpu-prelink %s | FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa 
-passes=amdgpu-simplifylib,instcombine -amdgpu-prelink %s | FileCheck %s
 
 define float @test_powr_afn_f32(float %x, float %y) #0 {
 ; CHECK-LABEL: define float @test_powr_afn_f32(
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-powr.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-powr.ll
index da5f2df5a035a..73de9c358c5b2 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-powr.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-powr.ll
@@ -1,6 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py 
UTC_ARGS: --version 2
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa 
-passes=amdgpu-simplifylib,instcombine -amdgpu-prelink %s | FileCheck 
-check-prefixes=CHECK,PRELINK %s
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa 
-passes=amdgpu-simplifylib,instcombine %s | FileCheck 
-check-prefixes=CHECK,NOPRELINK %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa 
-passes=amdgpu-simplifylib,instcombine -amdgpu-prelink %s | FileCheck 
-check-prefixes=CHECK,PRELINK %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa 
-passes=amdgpu-simplifylib,instcombine %s | FileCheck 
-check-prefixes=CHECK,NOPRELINK %s
 
 declare float @_Z4powrff(float, float)
 declare <2 x float> @_Z4powrDv2_fS_(<2 x float>, <2 x float>)
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-rint.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-rint.ll
index debf96b2b4bb4..e7079b1ec310d 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-rint.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-rint.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-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 declare float @_Z4rintf(float)
 declare <2 x float> @_Z4rintDv2_f(<2 x float>)
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-rootn-fast.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-rootn-fast.ll
index e3c852b58f9bb..d5a208fada16d 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-rootn-fast.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-rootn-fast.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=amdgpu-simplifylib,instcombine -amdgpu-prelink %s | FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa 
-passes=amdgpu-simplifylib,instcombine -amdgpu-prelink %s | FileCheck %s
 
 define float @test_rootn_afn_f32(float %x, i32 %y) #0 {
 ; CHECK-LABEL: define float @test_rootn_afn_f32(
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-rootn.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-rootn.ll
index 4f0faef4486a6..805e510bde37b 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-rootn.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-rootn.ll
@@ -1,6 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py 
UTC_ARGS: --check-globals all --version 4
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa 
-passes=amdgpu-simplifylib,instcombine -amdgpu-prelink %s | FileCheck 
-check-prefixes=CHECK,PRELINK %s
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa 
-passes=amdgpu-simplifylib,instcombine %s | FileCheck 
-check-prefixes=CHECK,NOPRELINK %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa 
-passes=amdgpu-simplifylib,instcombine -amdgpu-prelink %s | FileCheck 
-check-prefixes=CHECK,PRELINK %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa 
-passes=amdgpu-simplifylib,instcombine %s | FileCheck 
-check-prefixes=CHECK,NOPRELINK %s
 
 declare float @_Z5rootnfi(float, i32)
 declare <2 x float> @_Z5rootnDv2_fDv2_i(<2 x float>, <2 x i32>)
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-round.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-round.ll
index 41e16ba22485a..d917c3b232e00 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-round.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-round.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-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 declare float @_Z5roundf(float)
 declare <2 x float> @_Z5roundDv2_f(<2 x float>)
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-sincos.defined.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-sincos.defined.ll
index bcfaf5a397993..037ae2897a22f 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-sincos.defined.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-sincos.defined.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-simplifylib < %s | FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-- -passes=amdgpu-simplifylib < %s | FileCheck %s
 
 ; sin, cos, and sincos are already defined in the module.
 
diff --git 
a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-sincos.defined.nobuiltin.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-sincos.defined.nobuiltin.ll
index efd7013182b4f..66b88f41c1f78 100644
--- 
a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-sincos.defined.nobuiltin.ll
+++ 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-sincos.defined.nobuiltin.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-simplifylib < %s | FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-- -passes=amdgpu-simplifylib < %s | FileCheck %s
 
 ; private variant of sincos is defined but marked nobuiltin, so
 ; introduce a call to the generic one.
diff --git 
a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-sincos.defined.sin.cos.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-sincos.defined.sin.cos.ll
index e85466e66dfd7..a6cf5f9204c91 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-sincos.defined.sin.cos.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-sincos.defined.sin.cos.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-simplifylib < %s | FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-- -passes=amdgpu-simplifylib < %s | FileCheck %s
 
 ; sin and cos are already defined in the module but sincos isn't.
 
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-sincos.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-sincos.ll
index ab9a23ef525e2..2bc8953dc1c45 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-sincos.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-sincos.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py 
UTC_ARGS: --version 2
-; RUN: opt -S -O1 -mtriple=amdgcn-- -amdgpu-simplify-libcall=1 -amdgpu-prelink 
< %s | FileCheck %s
+; RUN: opt -S -O1 -mtriple=amdgpu-- -amdgpu-simplify-libcall=1 -amdgpu-prelink 
< %s | FileCheck %s
 
 declare float @_Z3sinf(float) #0
 declare float @_Z3cosf(float) #0
diff --git 
a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-sincos.nobuiltins.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-sincos.nobuiltins.ll
index 49f397e5ee9d3..5b966b607b8e4 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-sincos.nobuiltins.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-sincos.nobuiltins.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py 
UTC_ARGS: --check-attributes --check-globals --version 2
-; RUN: opt -S -mtriple=amdgcn-- -passes=amdgpu-simplifylib -amdgpu-prelink < 
%s | FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-- -passes=amdgpu-simplifylib -amdgpu-prelink < 
%s | FileCheck %s
 
 declare float @_Z3sinf(float noundef)
 declare float @_Z3cosf(float noundef)
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-sincos.weak.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-sincos.weak.ll
index 95f463c9ad621..fa49be29f73bd 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-sincos.weak.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-sincos.weak.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-simplifylib < %s | FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-- -passes=amdgpu-simplifylib < %s | FileCheck %s
 
 declare extern_weak float @_Z3sinf(float noundef)
 declare extern_weak float @_Z3cosf(float noundef)
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-sqrt.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-sqrt.ll
index 9be98b3269e11..32de0acc8121e 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-sqrt.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-sqrt.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-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 declare float @_Z4sqrtf(float)
 declare <2 x float> @_Z4sqrtDv2_f(<2 x float>)
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-acos.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-acos.ll
index 49cd4006f6d79..c0a9b9ce8c282 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-acos.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-acos.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=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 define float @test_tdo_scalar_f32_acos() {
 ; CHECK-LABEL: define float @test_tdo_scalar_f32_acos() {
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-acosh.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-acosh.ll
index 5d3ace758b531..db2d267f6f5d7 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-acosh.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-acosh.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=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 define float @test_tdo_scalar_f32_acosh() {
 ; CHECK-LABEL: define float @test_tdo_scalar_f32_acosh() {
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-acospi.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-acospi.ll
index 8bcd964a2868e..c6445bea02c53 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-acospi.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-acospi.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=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 define float @test_tdo_scalar_f32_acospi() {
 ; CHECK-LABEL: define float @test_tdo_scalar_f32_acospi() {
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-asin.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-asin.ll
index db42d582df33c..dbb3adb0b114c 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-asin.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-asin.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=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 define float @test_tdo_scalar_f32_asin() {
 ; CHECK-LABEL: define float @test_tdo_scalar_f32_asin() {
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-asinh.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-asinh.ll
index 1da72d9249c11..4d0c954b37ee6 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-asinh.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-asinh.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=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 define float @test_tdo_scalar_f32_asinh() {
 ; CHECK-LABEL: define float @test_tdo_scalar_f32_asinh() {
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-asinpi.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-asinpi.ll
index 88647b8f4176a..11b1a63b322a1 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-asinpi.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-asinpi.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=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 define float @test_tdo_scalar_f32_asinpi() {
 ; CHECK-LABEL: define float @test_tdo_scalar_f32_asinpi() {
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-atan.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-atan.ll
index 1a742bd3b6ba4..190778eb25f55 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-atan.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-atan.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=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 define float @test_tdo_scalar_f32_atan() {
 ; CHECK-LABEL: define float @test_tdo_scalar_f32_atan() {
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-atanh.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-atanh.ll
index 6129ead8e2027..b643e1d0a806c 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-atanh.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-atanh.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=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 define float @test_tdo_scalar_f32_atanh() {
 ; CHECK-LABEL: define float @test_tdo_scalar_f32_atanh() {
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-atanpi.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-atanpi.ll
index 93cfe6158074e..67b89b412b989 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-atanpi.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-atanpi.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=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 define float @test_tdo_scalar_f32_atanpi() {
 ; CHECK-LABEL: define float @test_tdo_scalar_f32_atanpi() {
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-cbrt.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-cbrt.ll
index a09e0375612d4..7901a2d14e975 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-cbrt.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-cbrt.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=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 define float @test_tdo_scalar_f32_cbrt() {
 ; CHECK-LABEL: define float @test_tdo_scalar_f32_cbrt() {
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-cos.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-cos.ll
index 9b619ada4321d..936471bac4ca9 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-cos.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-cos.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=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 define float @test_tdo_scalar_f32_cos() {
 ; CHECK-LABEL: define float @test_tdo_scalar_f32_cos() {
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-cosh.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-cosh.ll
index f17b55ebc7a55..ec7a177c91641 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-cosh.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-cosh.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=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 define float @test_tdo_scalar_f32_cosh() {
 ; CHECK-LABEL: define float @test_tdo_scalar_f32_cosh() {
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-cospi.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-cospi.ll
index 9f0bbcf96b443..cdd566e752373 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-cospi.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-cospi.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=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 define float @test_tdo_scalar_f32_cospi() {
 ; CHECK-LABEL: define float @test_tdo_scalar_f32_cospi() {
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-erf.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-erf.ll
index b47ebf84f1e31..df4e5778cd3e2 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-erf.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-erf.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=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 define float @test_tdo_scalar_f32_erf() {
 ; CHECK-LABEL: define float @test_tdo_scalar_f32_erf() {
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-erfc.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-erfc.ll
index b4776c64b5b72..60cb31cb87613 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-erfc.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-erfc.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=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 define float @test_tdo_scalar_f32_erfc() {
 ; CHECK-LABEL: define float @test_tdo_scalar_f32_erfc() {
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-exp.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-exp.ll
index bd12a5e66782a..eb9ed6894914e 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-exp.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-exp.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=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 define float @test_tdo_scalar_f32_exp() {
 ; CHECK-LABEL: define float @test_tdo_scalar_f32_exp() {
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-exp10.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-exp10.ll
index 7c8e21206f9ae..87b5b5d5d0fab 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-exp10.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-exp10.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=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 define float @test_tdo_scalar_f32_exp10() {
 ; CHECK-LABEL: define float @test_tdo_scalar_f32_exp10() {
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-exp2.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-exp2.ll
index 8776f9da13cb6..23775dc5df55b 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-exp2.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-exp2.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=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 define float @test_tdo_scalar_f32_exp2() {
 ; CHECK-LABEL: define float @test_tdo_scalar_f32_exp2() {
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-expm1.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-expm1.ll
index bfe2d14793026..a6ebfa07d4f66 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-expm1.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-expm1.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=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 define float @test_tdo_scalar_f32_expm1() {
 ; CHECK-LABEL: define float @test_tdo_scalar_f32_expm1() {
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-log.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-log.ll
index 41a5ddd6fcfe8..d282d84fdbb84 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-log.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-log.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=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 define float @test_tdo_scalar_f32_log() {
 ; CHECK-LABEL: define float @test_tdo_scalar_f32_log() {
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-log10.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-log10.ll
index e210e8aba1648..4a63d24edf9a5 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-log10.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-log10.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=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 define float @test_tdo_scalar_f32_log10() {
 ; CHECK-LABEL: define float @test_tdo_scalar_f32_log10() {
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-log2.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-log2.ll
index 7d2d519573c15..7681dee858343 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-log2.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-log2.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=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 define float @test_tdo_scalar_f32_log2() {
 ; CHECK-LABEL: define float @test_tdo_scalar_f32_log2() {
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-rsqrt.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-rsqrt.ll
index 6b064cd6d3868..2092bcdd3e637 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-rsqrt.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-rsqrt.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=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 define float @test_tdo_scalar_f32_rsqrt() {
 ; CHECK-LABEL: define float @test_tdo_scalar_f32_rsqrt() {
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-sin.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-sin.ll
index a7b0554eb583e..dff86e1c0da57 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-sin.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-sin.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=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 define float @test_tdo_scalar_f32_sin() {
 ; CHECK-LABEL: define float @test_tdo_scalar_f32_sin() {
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-sinh.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-sinh.ll
index aeedcca8befb0..b89ad00215d0c 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-sinh.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-sinh.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=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 define float @test_tdo_scalar_f32_sinh() {
 ; CHECK-LABEL: define float @test_tdo_scalar_f32_sinh() {
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-sinpi.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-sinpi.ll
index 1ec380b070cae..361a14f346142 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-sinpi.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-sinpi.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=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 define float @test_tdo_scalar_f32_sinpi() {
 ; CHECK-LABEL: define float @test_tdo_scalar_f32_sinpi() {
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-sqrt.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-sqrt.ll
index 8675f07249502..d931df7f97f53 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-sqrt.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-sqrt.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=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 define float @test_tdo_scalar_f32_sqrt() {
 ; CHECK-LABEL: define float @test_tdo_scalar_f32_sqrt() {
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-tan.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-tan.ll
index 8e4152cbf73e2..82d20a92c2323 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-tan.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-tan.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=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 define float @test_tdo_scalar_f32_tan() {
 ; CHECK-LABEL: define float @test_tdo_scalar_f32_tan() {
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-tanh.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-tanh.ll
index 5a11491f3929d..dc39f00fb6bfe 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-tanh.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-tanh.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=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 define float @test_tdo_scalar_f32_tanh() {
 ; CHECK-LABEL: define float @test_tdo_scalar_f32_tanh() {
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-tanpi.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-tanpi.ll
index 05ca625bdae1e..7f4049aaaa9b2 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-tanpi.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-tanpi.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=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 define float @test_tdo_scalar_f32_tanpi() {
 ; CHECK-LABEL: define float @test_tdo_scalar_f32_tanpi() {
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-tgamma.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-tgamma.ll
index a365c840eb6c0..de1c562ec9c62 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-tgamma.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-tdo-tgamma.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=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 define float @test_tdo_scalar_f32_tgamma() {
 ; CHECK-LABEL: define float @test_tdo_scalar_f32_tgamma() {
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-trunc.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-trunc.ll
index 0dfd398c0ac99..c42cfa8efe571 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-trunc.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-trunc.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-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib %s | 
FileCheck %s
 
 declare float @_Z5truncf(float)
 declare <2 x float> @_Z5truncDv2_f(<2 x float>)
diff --git 
a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-unexpected-types.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-unexpected-types.ll
index 1cdc06ea942c2..b1389c3b5d9de 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-unexpected-types.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-simplify-libcall-unexpected-types.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=amdgpu-simplifylib 
-amdgpu-prelink %s | FileCheck %s
+; RUN: opt -S -mtriple=amdgpu-amd-amdhsa -passes=amdgpu-simplifylib 
-amdgpu-prelink %s | FileCheck %s
 ; Make sure there are no crashes on unexpected types
 
 %struct.vfloat3 = type { float, float, float }
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-snop-padding.mir 
b/llvm/test/CodeGen/AMDGPU/amdgpu-snop-padding.mir
index b5c3e3214f125..bb409a0fb4ccd 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-snop-padding.mir
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-snop-padding.mir
@@ -1,6 +1,6 @@
 # NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py
-# RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx942 -amdgpu-snop-padding=8 
-run-pass post-RA-hazard-rec %s -o - | FileCheck -check-prefix=GCN8 %s
-# RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx942 -amdgpu-snop-padding=16 
-run-pass post-RA-hazard-rec %s -o - | FileCheck -check-prefix=GCN16 %s
+# RUN: llc -mtriple=amdgpu9.42-amd-amdhsa -amdgpu-snop-padding=8 -run-pass 
post-RA-hazard-rec %s -o - | FileCheck -check-prefix=GCN8 %s
+# RUN: llc -mtriple=amdgpu9.42-amd-amdhsa -amdgpu-snop-padding=16 -run-pass 
post-RA-hazard-rec %s -o - | FileCheck -check-prefix=GCN16 %s
 
 ---
 name:            test_snop_padding
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-spill-cfi-saved-regs.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-spill-cfi-saved-regs.ll
index af89c21a4085a..c8a2c0aaf72e3 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-spill-cfi-saved-regs.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-spill-cfi-saved-regs.ll
@@ -1,6 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py 
UTC_ARGS: --version 6
-; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 
-amdgpu-spill-cfi-saved-regs -o - %s | FileCheck --check-prefixes=CHECK,WAVE64 
%s
-; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx1010 
-amdgpu-spill-cfi-saved-regs -o - %s | FileCheck --check-prefixes=CHECK,WAVE32 
%s
+; RUN: llc -mtriple=amdgpu9.00-amd-amdhsa -amdgpu-spill-cfi-saved-regs -o - %s 
| FileCheck --check-prefixes=CHECK,WAVE64 %s
+; RUN: llc -mtriple=amdgpu10.10-amd-amdhsa -amdgpu-spill-cfi-saved-regs -o - 
%s | FileCheck --check-prefixes=CHECK,WAVE32 %s
 
 define protected amdgpu_kernel void @kern() #0 {
 ; CHECK-LABEL: kern:
diff --git 
a/llvm/test/CodeGen/AMDGPU/amdgpu-sw-lower-lds-dynamic-indirect-access-asan.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-sw-lower-lds-dynamic-indirect-access-asan.ll
index e3a28b6379077..862c493c038ac 100644
--- 
a/llvm/test/CodeGen/AMDGPU/amdgpu-sw-lower-lds-dynamic-indirect-access-asan.ll
+++ 
b/llvm/test/CodeGen/AMDGPU/amdgpu-sw-lower-lds-dynamic-indirect-access-asan.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py 
UTC_ARGS: --check-globals all --version 4
-; RUN: opt < %s -passes=amdgpu-sw-lower-lds -S -mtriple=amdgcn-amd-amdhsa | 
FileCheck %s
+; RUN: opt < %s -passes=amdgpu-sw-lower-lds -S -mtriple=amdgpu-amd-amdhsa | 
FileCheck %s
 
 ; Test to check indirect dynamic LDS access through a non-kernel from kernel 
is lowered correctly.
 @lds_1 = internal addrspace(3) global [1 x i8] poison, align 1
diff --git 
a/llvm/test/CodeGen/AMDGPU/amdgpu-sw-lower-lds-dynamic-indirect-access.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-sw-lower-lds-dynamic-indirect-access.ll
index c155a99ccca80..b063ae7a10945 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-sw-lower-lds-dynamic-indirect-access.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-sw-lower-lds-dynamic-indirect-access.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py 
UTC_ARGS: --check-globals all --version 4
-; RUN: opt < %s -passes=amdgpu-sw-lower-lds -amdgpu-asan-instrument-lds=false 
-S -mtriple=amdgcn-amd-amdhsa | FileCheck %s
+; RUN: opt < %s -passes=amdgpu-sw-lower-lds -amdgpu-asan-instrument-lds=false 
-S -mtriple=amdgpu-amd-amdhsa | FileCheck %s
 
 ; Test to check indirect dynamic LDS access through a non-kernel from kernel 
is lowered correctly.
 @lds_1 = internal addrspace(3) global [1 x i8] poison, align 1
diff --git 
a/llvm/test/CodeGen/AMDGPU/amdgpu-sw-lower-lds-dynamic-lds-test-asan.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-sw-lower-lds-dynamic-lds-test-asan.ll
index 12dcc92f49dc6..cde61fa3e0f1f 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-sw-lower-lds-dynamic-lds-test-asan.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-sw-lower-lds-dynamic-lds-test-asan.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py 
UTC_ARGS: --check-globals all --version 4
-; RUN: opt < %s -passes=amdgpu-sw-lower-lds -S -mtriple=amdgcn-amd-amdhsa | 
FileCheck %s
+; RUN: opt < %s -passes=amdgpu-sw-lower-lds -S -mtriple=amdgpu-amd-amdhsa | 
FileCheck %s
 
 ; Test to check if direct access of dynamic LDS in kernel is lowered correctly.
 @lds_1 = external addrspace(3) global [0 x i8]
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-sw-lower-lds-dynamic-lds-test.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-sw-lower-lds-dynamic-lds-test.ll
index f6876702dc0bb..9d3e1f05c2caa 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-sw-lower-lds-dynamic-lds-test.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-sw-lower-lds-dynamic-lds-test.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py 
UTC_ARGS: --check-globals all --version 4
-; RUN: opt < %s -passes=amdgpu-sw-lower-lds -amdgpu-asan-instrument-lds=false 
-S -mtriple=amdgcn-amd-amdhsa | FileCheck %s
+; RUN: opt < %s -passes=amdgpu-sw-lower-lds -amdgpu-asan-instrument-lds=false 
-S -mtriple=amdgpu-amd-amdhsa | FileCheck %s
 
 ; Test to check if direct access of dynamic LDS in kernel is lowered correctly.
 @lds_1 = external addrspace(3) global [0 x i8]
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-sw-lower-lds-lower-all.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-sw-lower-lds-lower-all.ll
index bb8e762bafe6e..330dfeb20f1a0 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-sw-lower-lds-lower-all.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-sw-lower-lds-lower-all.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 -passes=amdgpu-sw-lower-lds -S 
-amdgpu-asan-instrument-lds=false -mtriple=amdgcn-amd-amdhsa | FileCheck %s
+; RUN: opt < %s -passes=amdgpu-sw-lower-lds -S 
-amdgpu-asan-instrument-lds=false -mtriple=amdgpu-amd-amdhsa | FileCheck %s
 
 ; Test to check if static LDS accesses in kernels without sanitize_address 
attribute are lowered if
 ; other kernels in module have sanitize_address attribute.
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-sw-lower-lds-lower-none.ll 
b/llvm/test/CodeGen/AMDGPU/amdgpu-sw-lower-lds-lower-none.ll
index 5ce12888babbc..24c981d0b4a5f 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-sw-lower-lds-lower-none.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-sw-lower-lds-lower-none.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 -passes=amdgpu-sw-lower-lds -S 
-amdgpu-asan-instrument-lds=false -mtriple=amdgcn-amd-amdhsa | FileCheck %s
+; RUN: opt < %s -passes=amdgpu-sw-lower-lds -S 
-amdgpu-asan-instrument-lds=false -mtriple=amdgpu-amd-amdhsa | FileCheck %s
 
 ; Test to check if LDS accesses in kernels without sanitize_address attribute 
are not lowered
 ; if all other kernels don't have sanitize_address attribute.
diff --git 
a/llvm/test/CodeGen/AMDGPU/amdgpu-sw-lower-lds-multi-static-dynamic-indirect-access-asan.ll
 
b/llvm/test/CodeGen/AMDGPU/amdgpu-sw-lower-lds-multi-static-dynamic-indirect-access-asan.ll
index ca41da7ec42e9..85b9ed0b91571 100644
--- 
a/llvm/test/CodeGen/AMDGPU/amdgpu-sw-lower-lds-multi-static-dynamic-indirect-access-asan.ll
+++ 
b/llvm/test/CodeGen/AMDGPU/amdgpu-sw-lower-lds-multi-static-dynamic-indirect-access-asan.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py 
UTC_ARGS: --version 4
-; RUN: opt < %s -passes=amdgpu-sw-lower-lds -S -mtriple=amdgcn-amd-amdhsa | 
FileCheck %s
+; RUN: opt < %s -passes=amdgpu-sw-lower-lds -S -mtriple=amdgpu-amd-amdhsa | 
FileCheck %s
 
 ; Test to check when multiple  kernels access the same non-kernel, LDS 
accesses are lowere correctly.
 @lds_1 = internal addrspace(3) global [1 x i8] poison, align 1
diff --git 
a/llvm/test/CodeGen/AMDGPU/amdgpu-sw-lower-lds-multi-static-dynamic-indirect-access.ll
 
b/llvm/test/CodeGen/AMDGPU/amdgpu-sw-lower-lds-multi-static-dynamic-indirect-access.ll
index f10bdd9c05ef0..e8fafe1831e23 100644
--- 
a/llvm/test/CodeGen/AMDGPU/amdgpu-sw-lower-lds-multi-static-dynamic-indirect-access.ll
+++ 
b/llvm/test/CodeGen/AMDGPU/amdgpu-sw-lower-lds-multi-static-dynamic-indirect-access.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py 
UTC_ARGS: --version 4
-; RUN: opt < %s -passes=amdgpu-sw-lower-lds -amdgpu-asan-instrument-lds=false 
-S -mtriple=amdgcn-amd-amdhsa | FileCheck %s
+; RUN: opt < %s -passes=amdgpu-sw-lower-lds -amdgpu-asan-instrument-lds=false 
-S -mtriple=amdgpu-amd-amdhsa | FileCheck %s
 
 ; Test to check when multiple  kernels access the same non-kernel, LDS 
accesses are lowere correctly.
 @lds_1 = internal addrspace(3) global [1 x i8] poison, align 1

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

Reply via email to