[llvm] 6017d9a - [NFC] Port all IndVarSimplify tests to `-passes=` syntax

Roman Lebedev via llvm-commits llvm-commits at lists.llvm.org
Wed Dec 7 11:23:00 PST 2022


Author: Roman Lebedev
Date: 2022-12-07T22:22:09+03:00
New Revision: 6017d9a628fc71e5679c0e80bf6e13c2d55e0a1b

URL: https://github.com/llvm/llvm-project/commit/6017d9a628fc71e5679c0e80bf6e13c2d55e0a1b
DIFF: https://github.com/llvm/llvm-project/commit/6017d9a628fc71e5679c0e80bf6e13c2d55e0a1b.diff

LOG: [NFC] Port all IndVarSimplify tests to `-passes=` syntax

Added: 
    

Modified: 
    llvm/test/Transforms/IndVarSimplify/2014-06-21-congruent-constant.ll
    llvm/test/Transforms/IndVarSimplify/AArch64/widen-loop-comp.ll
    llvm/test/Transforms/IndVarSimplify/AMDGPU/no-widen-to-i64.ll
    llvm/test/Transforms/IndVarSimplify/ARM/code-size.ll
    llvm/test/Transforms/IndVarSimplify/ARM/indvar-cost.ll
    llvm/test/Transforms/IndVarSimplify/ARM/indvar-unroll-imm-cost.ll
    llvm/test/Transforms/IndVarSimplify/X86/2009-04-15-shorten-iv-vars-2.ll
    llvm/test/Transforms/IndVarSimplify/X86/deterministic-scev-verify.ll
    llvm/test/Transforms/IndVarSimplify/X86/eliminate-congruent-ivs.ll
    llvm/test/Transforms/IndVarSimplify/X86/indvar-debug-value.ll
    llvm/test/Transforms/IndVarSimplify/X86/indvar-debug-value2.ll
    llvm/test/Transforms/IndVarSimplify/X86/polynomial-expand.ll
    llvm/test/Transforms/IndVarSimplify/X86/pr24356.ll
    llvm/test/Transforms/IndVarSimplify/X86/pr24804.ll
    llvm/test/Transforms/IndVarSimplify/X86/pr35406.ll
    llvm/test/Transforms/IndVarSimplify/X86/pr45360.ll
    llvm/test/Transforms/IndVarSimplify/X86/variable-stride-ivs-1.ll
    llvm/test/Transforms/IndVarSimplify/X86/verify-scev.ll
    llvm/test/Transforms/IndVarSimplify/avoid-i0.ll
    llvm/test/Transforms/IndVarSimplify/backedge-on-min-max.ll
    llvm/test/Transforms/IndVarSimplify/casted-argument.ll
    llvm/test/Transforms/IndVarSimplify/crash.ll
    llvm/test/Transforms/IndVarSimplify/dangling-use.ll
    llvm/test/Transforms/IndVarSimplify/divide-pointer.ll
    llvm/test/Transforms/IndVarSimplify/eliminate-max.ll
    llvm/test/Transforms/IndVarSimplify/eliminate-sat.ll
    llvm/test/Transforms/IndVarSimplify/exit_value_test2.ll
    llvm/test/Transforms/IndVarSimplify/exit_value_test3.ll
    llvm/test/Transforms/IndVarSimplify/exit_value_tests.ll
    llvm/test/Transforms/IndVarSimplify/interesting-invoke-use.ll
    llvm/test/Transforms/IndVarSimplify/iterationCount_zext_or_trunc.ll
    llvm/test/Transforms/IndVarSimplify/lcssa-preservation.ll
    llvm/test/Transforms/IndVarSimplify/lftr-address-space-pointers.ll
    llvm/test/Transforms/IndVarSimplify/lftr-dead-ivs.ll
    llvm/test/Transforms/IndVarSimplify/lftr-opaque-pointers.ll
    llvm/test/Transforms/IndVarSimplify/lftr.ll
    llvm/test/Transforms/IndVarSimplify/lftr_disabled.ll
    llvm/test/Transforms/IndVarSimplify/loop-predication.ll
    llvm/test/Transforms/IndVarSimplify/loop_evaluate11.ll
    llvm/test/Transforms/IndVarSimplify/loop_evaluate7.ll
    llvm/test/Transforms/IndVarSimplify/loop_evaluate_1.ll
    llvm/test/Transforms/IndVarSimplify/loop_evaluate_6.ll
    llvm/test/Transforms/IndVarSimplify/phi-uses-value-multiple-times.ll
    llvm/test/Transforms/IndVarSimplify/post-inc-range.ll
    llvm/test/Transforms/IndVarSimplify/pr26974.ll
    llvm/test/Transforms/IndVarSimplify/pr38674.ll
    llvm/test/Transforms/IndVarSimplify/pr38855.ll
    llvm/test/Transforms/IndVarSimplify/pr39673.ll
    llvm/test/Transforms/IndVarSimplify/pr40454.ll
    llvm/test/Transforms/IndVarSimplify/pr45835.ll
    llvm/test/Transforms/IndVarSimplify/preserve-memoryssa.ll
    llvm/test/Transforms/IndVarSimplify/rewrite-loop-exit-value.ll
    llvm/test/Transforms/IndVarSimplify/sharpen-range.ll
    llvm/test/Transforms/IndVarSimplify/single-element-range.ll
    llvm/test/Transforms/IndVarSimplify/sink-from-preheader.ll
    llvm/test/Transforms/IndVarSimplify/tripcount_infinite.ll
    llvm/test/Transforms/IndVarSimplify/variable-stride-ivs-0.ll

Removed: 
    


################################################################################
diff  --git a/llvm/test/Transforms/IndVarSimplify/2014-06-21-congruent-constant.ll b/llvm/test/Transforms/IndVarSimplify/2014-06-21-congruent-constant.ll
index 3e9f70902a9b9..a53df53b8e6b2 100644
--- a/llvm/test/Transforms/IndVarSimplify/2014-06-21-congruent-constant.ll
+++ b/llvm/test/Transforms/IndVarSimplify/2014-06-21-congruent-constant.ll
@@ -1,7 +1,7 @@
 ; RUN: opt -passes='loop-mssa(simple-loop-unswitch<nontrivial>),instcombine,indvars' -S %s | FileCheck %s
 
 ; This used to crash in SCEVExpander when there were congruent phis with and
-; undef incoming value from the loop header. The -loop-unswitch -instcombine is
+; undef incoming value from the loop header. The -loop-unswitch -passes=instcombine is
 ; necessary to create just this pattern, which is essentially a nop and gets
 ; folded away aggressively if spelled out in IR directly.
 ; PR 20093

diff  --git a/llvm/test/Transforms/IndVarSimplify/AArch64/widen-loop-comp.ll b/llvm/test/Transforms/IndVarSimplify/AArch64/widen-loop-comp.ll
index 8d825d977f8bc..8e32143784d30 100644
--- a/llvm/test/Transforms/IndVarSimplify/AArch64/widen-loop-comp.ll
+++ b/llvm/test/Transforms/IndVarSimplify/AArch64/widen-loop-comp.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -indvars -scalar-evolution-use-expensive-range-sharpening -S | FileCheck %s
+; RUN: opt < %s -passes=indvars -scalar-evolution-use-expensive-range-sharpening -S | FileCheck %s
 
 target triple = "aarch64--linux-gnu"
 

diff  --git a/llvm/test/Transforms/IndVarSimplify/AMDGPU/no-widen-to-i64.ll b/llvm/test/Transforms/IndVarSimplify/AMDGPU/no-widen-to-i64.ll
index 1e76cc1fbb0ed..c537a912c8bfe 100644
--- a/llvm/test/Transforms/IndVarSimplify/AMDGPU/no-widen-to-i64.ll
+++ b/llvm/test/Transforms/IndVarSimplify/AMDGPU/no-widen-to-i64.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mtriple=amdgcn-unknown-amdhsa -indvars %s | FileCheck %s
+; RUN: opt -S -mtriple=amdgcn-unknown-amdhsa -passes=indvars %s | FileCheck %s
 
 ; Bug 21148
 

diff  --git a/llvm/test/Transforms/IndVarSimplify/ARM/code-size.ll b/llvm/test/Transforms/IndVarSimplify/ARM/code-size.ll
index f3f7084893c7f..3ff0aaa1c3c47 100644
--- a/llvm/test/Transforms/IndVarSimplify/ARM/code-size.ll
+++ b/llvm/test/Transforms/IndVarSimplify/ARM/code-size.ll
@@ -1,6 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -mtriple=thumbv8m.main -indvars -S < %s | FileCheck %s --check-prefix=CHECK-V8M
-; RUN: opt -mtriple=thumbv8a -indvars -S < %s | FileCheck %s --check-prefix=CHECK-V8A
+; RUN: opt -mtriple=thumbv8m.main -passes=indvars -S < %s | FileCheck %s --check-prefix=CHECK-V8M
+; RUN: opt -mtriple=thumbv8a -passes=indvars -S < %s | FileCheck %s --check-prefix=CHECK-V8A
 
 define i32 @remove_loop(i32 %size) #0 {
 ; CHECK-V8M-LABEL: @remove_loop(

diff  --git a/llvm/test/Transforms/IndVarSimplify/ARM/indvar-cost.ll b/llvm/test/Transforms/IndVarSimplify/ARM/indvar-cost.ll
index 14d873d9e3ac2..d5b1eaa1ed92e 100644
--- a/llvm/test/Transforms/IndVarSimplify/ARM/indvar-cost.ll
+++ b/llvm/test/Transforms/IndVarSimplify/ARM/indvar-cost.ll
@@ -1,6 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -indvars -mtriple=thumbv8m.base -S %s -o - | FileCheck %s --check-prefix=CHECK-T1
-; RUN: opt -indvars -mtriple=thumbv8m.main -S %s -o - | FileCheck %s --check-prefix=CHECK-T2
+; RUN: opt -passes=indvars -mtriple=thumbv8m.base -S %s -o - | FileCheck %s --check-prefix=CHECK-T1
+; RUN: opt -passes=indvars -mtriple=thumbv8m.main -S %s -o - | FileCheck %s --check-prefix=CHECK-T2
 
 define dso_local arm_aapcscc void @arm_conv_fast_q15(i16* %pSrcA, i32 %srcALen, i16* %pSrcB, i32 %srcBLen, i16* %pDst, i16** %store.px, i16** %store.py, i32* %store.res) local_unnamed_addr {
 ; CHECK-T1-LABEL: @arm_conv_fast_q15(

diff  --git a/llvm/test/Transforms/IndVarSimplify/ARM/indvar-unroll-imm-cost.ll b/llvm/test/Transforms/IndVarSimplify/ARM/indvar-unroll-imm-cost.ll
index 16f967be12c21..15bcb006303ed 100644
--- a/llvm/test/Transforms/IndVarSimplify/ARM/indvar-unroll-imm-cost.ll
+++ b/llvm/test/Transforms/IndVarSimplify/ARM/indvar-unroll-imm-cost.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -indvars -loop-unroll -mtriple=thumbv8m.main %s -S -o - | FileCheck %s
+; RUN: opt -passes='loop(indvars),loop-unroll' -mtriple=thumbv8m.main %s -S -o - | FileCheck %s
 
 define dso_local arm_aapcscc void @test(i32* nocapture %pDest, i16* nocapture readonly %pSrcA, i16* nocapture readonly %pSrcB, i32 %blkCnt) local_unnamed_addr #0 {
 ; CHECK-LABEL: @test(

diff  --git a/llvm/test/Transforms/IndVarSimplify/X86/2009-04-15-shorten-iv-vars-2.ll b/llvm/test/Transforms/IndVarSimplify/X86/2009-04-15-shorten-iv-vars-2.ll
index 67a971ac3d78f..1e98a65fbe828 100644
--- a/llvm/test/Transforms/IndVarSimplify/X86/2009-04-15-shorten-iv-vars-2.ll
+++ b/llvm/test/Transforms/IndVarSimplify/X86/2009-04-15-shorten-iv-vars-2.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -indvars -instcombine -S | FileCheck %s
+; RUN: opt < %s -passes='loop(indvars),instcombine' -S | FileCheck %s
 ; ModuleID = '<stdin>'
 ;extern int *a, *b, *c, *d, *e, *f;  /* 64 bit */
 ;extern int K[256];

diff  --git a/llvm/test/Transforms/IndVarSimplify/X86/deterministic-scev-verify.ll b/llvm/test/Transforms/IndVarSimplify/X86/deterministic-scev-verify.ll
index 30d560fcd1e5e..e600d28fad987 100644
--- a/llvm/test/Transforms/IndVarSimplify/X86/deterministic-scev-verify.ll
+++ b/llvm/test/Transforms/IndVarSimplify/X86/deterministic-scev-verify.ll
@@ -1,11 +1,11 @@
 ; RUN: opt -passes=indvars -S < %s | FileCheck %s
 
 ; Check that IndVarSimplify's result is not influenced by stray calls to
-; ScalarEvolution in debug builds. However, -verify-indvars may still do
+; ScalarEvolution in debug builds. However, -verify-passes=indvars may still do
 ; such calls.
 ; llvm.org/PR44815
 
-; In this test, adding -verify-indvars causes %tmp13 to not be optimized away.
+; In this test, adding -verify-passes=indvars causes %tmp13 to not be optimized away.
 ; CHECK-LABEL: @foo
 ; CHECK-NOT:   phi i32
 

diff  --git a/llvm/test/Transforms/IndVarSimplify/X86/eliminate-congruent-ivs.ll b/llvm/test/Transforms/IndVarSimplify/X86/eliminate-congruent-ivs.ll
index 20308c493e810..8f29bbefa0e08 100644
--- a/llvm/test/Transforms/IndVarSimplify/X86/eliminate-congruent-ivs.ll
+++ b/llvm/test/Transforms/IndVarSimplify/X86/eliminate-congruent-ivs.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -indvars -scalar-evolution-use-expensive-range-sharpening -S | FileCheck %s
+; RUN: opt < %s -passes=indvars -scalar-evolution-use-expensive-range-sharpening -S | FileCheck %s
 
 target triple = "x86_64--linux-gnu"
 

diff  --git a/llvm/test/Transforms/IndVarSimplify/X86/indvar-debug-value.ll b/llvm/test/Transforms/IndVarSimplify/X86/indvar-debug-value.ll
index 06d5f719d1fbd..685526c4c4d8f 100644
--- a/llvm/test/Transforms/IndVarSimplify/X86/indvar-debug-value.ll
+++ b/llvm/test/Transforms/IndVarSimplify/X86/indvar-debug-value.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -indvars -verify -S -o - | FileCheck %s
+; RUN: opt %s -passes='loop(indvars),verify' -S -o - | FileCheck %s
 
 ; Hand-reduced from this example:
 ;

diff  --git a/llvm/test/Transforms/IndVarSimplify/X86/indvar-debug-value2.ll b/llvm/test/Transforms/IndVarSimplify/X86/indvar-debug-value2.ll
index 3859111eb2a9b..e62717c592d65 100644
--- a/llvm/test/Transforms/IndVarSimplify/X86/indvar-debug-value2.ll
+++ b/llvm/test/Transforms/IndVarSimplify/X86/indvar-debug-value2.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -indvars -verify -S -o - | FileCheck %s
+; RUN: opt %s -passes='loop(indvars),verify' -S -o - | FileCheck %s
 
 ; Hand-reduced from this example:
 ;

diff  --git a/llvm/test/Transforms/IndVarSimplify/X86/polynomial-expand.ll b/llvm/test/Transforms/IndVarSimplify/X86/polynomial-expand.ll
index 5708c64d6c8ef..6e4b3714d424a 100644
--- a/llvm/test/Transforms/IndVarSimplify/X86/polynomial-expand.ll
+++ b/llvm/test/Transforms/IndVarSimplify/X86/polynomial-expand.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -indvars -disable-output
+; RUN: opt < %s -passes=indvars -disable-output
 ; PR5073
 
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128"

diff  --git a/llvm/test/Transforms/IndVarSimplify/X86/pr24356.ll b/llvm/test/Transforms/IndVarSimplify/X86/pr24356.ll
index 2718a6c247fb4..44aca9dfc38e4 100644
--- a/llvm/test/Transforms/IndVarSimplify/X86/pr24356.ll
+++ b/llvm/test/Transforms/IndVarSimplify/X86/pr24356.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -indvars -indvars-predicate-loops=0  < %s | FileCheck %s
+; RUN: opt -S -passes=indvars -indvars-predicate-loops=0  < %s | FileCheck %s
 
 target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-apple-macosx10.10.0"

diff  --git a/llvm/test/Transforms/IndVarSimplify/X86/pr24804.ll b/llvm/test/Transforms/IndVarSimplify/X86/pr24804.ll
index 6f89481853ad7..7c5a39be10445 100644
--- a/llvm/test/Transforms/IndVarSimplify/X86/pr24804.ll
+++ b/llvm/test/Transforms/IndVarSimplify/X86/pr24804.ll
@@ -1,4 +1,4 @@
-; RUN: opt -indvars -loop-idiom -loop-deletion -S < %s | FileCheck %s
+; RUN: opt -passes=indvars,loop-idiom,loop-deletion -S < %s | FileCheck %s
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"

diff  --git a/llvm/test/Transforms/IndVarSimplify/X86/pr35406.ll b/llvm/test/Transforms/IndVarSimplify/X86/pr35406.ll
index bb6f891b583ad..c8b05ff473e79 100644
--- a/llvm/test/Transforms/IndVarSimplify/X86/pr35406.ll
+++ b/llvm/test/Transforms/IndVarSimplify/X86/pr35406.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -indvars -verify-scev %s | FileCheck %s
+; RUN: opt -S -passes=indvars -verify-scev %s | FileCheck %s
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128-ni:1"
 target triple = "x86_64-unknown-linux-gnu"
 

diff  --git a/llvm/test/Transforms/IndVarSimplify/X86/pr45360.ll b/llvm/test/Transforms/IndVarSimplify/X86/pr45360.ll
index a124dbd970d69..4be5b7e846f53 100644
--- a/llvm/test/Transforms/IndVarSimplify/X86/pr45360.ll
+++ b/llvm/test/Transforms/IndVarSimplify/X86/pr45360.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -indvars -scev-cheap-expansion-budget=1024 %s | FileCheck %s
+; RUN: opt -S -passes=indvars -scev-cheap-expansion-budget=1024 %s | FileCheck %s
 
 ; See https://bugs.llvm.org/show_bug.cgi?id=45360
 ; This is reduced from that (runnable) test.

diff  --git a/llvm/test/Transforms/IndVarSimplify/X86/variable-stride-ivs-1.ll b/llvm/test/Transforms/IndVarSimplify/X86/variable-stride-ivs-1.ll
index 98cfa345962c2..80cc14b38e551 100644
--- a/llvm/test/Transforms/IndVarSimplify/X86/variable-stride-ivs-1.ll
+++ b/llvm/test/Transforms/IndVarSimplify/X86/variable-stride-ivs-1.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -indvars
+; RUN: opt < %s -passes=indvars
 ; PR4315
 
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128"

diff  --git a/llvm/test/Transforms/IndVarSimplify/X86/verify-scev.ll b/llvm/test/Transforms/IndVarSimplify/X86/verify-scev.ll
index ddf2e7f1e1445..c0dbc11d05797 100644
--- a/llvm/test/Transforms/IndVarSimplify/X86/verify-scev.ll
+++ b/llvm/test/Transforms/IndVarSimplify/X86/verify-scev.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -S -indvars -verify-scev
+; RUN: opt < %s -S -passes=indvars -verify-scev
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128"
 target triple = "x86_64-apple-macosx10.8.0"
 

diff  --git a/llvm/test/Transforms/IndVarSimplify/avoid-i0.ll b/llvm/test/Transforms/IndVarSimplify/avoid-i0.ll
index cc38590c0998e..69d9890041f3b 100644
--- a/llvm/test/Transforms/IndVarSimplify/avoid-i0.ll
+++ b/llvm/test/Transforms/IndVarSimplify/avoid-i0.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -indvars
+; RUN: opt < %s -passes=indvars
 ; PR4052
 ; PR4054
 

diff  --git a/llvm/test/Transforms/IndVarSimplify/backedge-on-min-max.ll b/llvm/test/Transforms/IndVarSimplify/backedge-on-min-max.ll
index fda2c55ab8481..fb05da59d1e61 100644
--- a/llvm/test/Transforms/IndVarSimplify/backedge-on-min-max.ll
+++ b/llvm/test/Transforms/IndVarSimplify/backedge-on-min-max.ll
@@ -1,5 +1,5 @@
 ; RUN: opt < %s -passes=indvars -S | FileCheck %s
-; RUN: opt -lcssa -loop-simplify -S < %s | opt -S -passes='require<targetir>,require<scalar-evolution>,require<domtree>,loop(indvars)'
+; RUN: opt -passes=lcssa,loop-simplify -S < %s | opt -S -passes='require<targetir>,require<scalar-evolution>,require<domtree>,loop(indvars)'
 
 ;; --- signed ---
 

diff  --git a/llvm/test/Transforms/IndVarSimplify/casted-argument.ll b/llvm/test/Transforms/IndVarSimplify/casted-argument.ll
index 9d868e800e98f..2db53f388211c 100644
--- a/llvm/test/Transforms/IndVarSimplify/casted-argument.ll
+++ b/llvm/test/Transforms/IndVarSimplify/casted-argument.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -indvars -disable-output
+; RUN: opt < %s -passes=indvars -disable-output
 ; PR4009
 ; PR4038
 

diff  --git a/llvm/test/Transforms/IndVarSimplify/crash.ll b/llvm/test/Transforms/IndVarSimplify/crash.ll
index 63683ff56117c..20ca822d0be77 100644
--- a/llvm/test/Transforms/IndVarSimplify/crash.ll
+++ b/llvm/test/Transforms/IndVarSimplify/crash.ll
@@ -1,4 +1,4 @@
-; RUN: opt -indvars -disable-output < %s
+; RUN: opt -passes=indvars -disable-output < %s
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
 
 declare i32 @putchar(i8) nounwind

diff  --git a/llvm/test/Transforms/IndVarSimplify/dangling-use.ll b/llvm/test/Transforms/IndVarSimplify/dangling-use.ll
index 208f1a6fde556..d7702fff49a2e 100644
--- a/llvm/test/Transforms/IndVarSimplify/dangling-use.ll
+++ b/llvm/test/Transforms/IndVarSimplify/dangling-use.ll
@@ -1,4 +1,4 @@
-; RUN: opt -indvars -disable-output < %s 
+; RUN: opt -passes=indvars -disable-output < %s
 
 target datalayout = "E-p:32:32:32-i1:8:8-i8:8:8-i8:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f128:64:128-n32"
 target triple = "powerpc-unknown-linux-gnu"

diff  --git a/llvm/test/Transforms/IndVarSimplify/divide-pointer.ll b/llvm/test/Transforms/IndVarSimplify/divide-pointer.ll
index 16608ee8280e1..5ad66a95d8768 100644
--- a/llvm/test/Transforms/IndVarSimplify/divide-pointer.ll
+++ b/llvm/test/Transforms/IndVarSimplify/divide-pointer.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -indvars
+; RUN: opt < %s -passes=indvars
 ; PR4271
 
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128"

diff  --git a/llvm/test/Transforms/IndVarSimplify/eliminate-max.ll b/llvm/test/Transforms/IndVarSimplify/eliminate-max.ll
index 6d07c2cdcce9b..540eb255584ff 100644
--- a/llvm/test/Transforms/IndVarSimplify/eliminate-max.ll
+++ b/llvm/test/Transforms/IndVarSimplify/eliminate-max.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -S -indvars | FileCheck %s
+; RUN: opt < %s -S -passes=indvars | FileCheck %s
 ; PR4914.ll
 
 ; Indvars should be able to do range analysis and eliminate icmps.

diff  --git a/llvm/test/Transforms/IndVarSimplify/eliminate-sat.ll b/llvm/test/Transforms/IndVarSimplify/eliminate-sat.ll
index 1b3eb69d01f92..a124cf7531edc 100644
--- a/llvm/test/Transforms/IndVarSimplify/eliminate-sat.ll
+++ b/llvm/test/Transforms/IndVarSimplify/eliminate-sat.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -S -indvars | FileCheck %s
+; RUN: opt < %s -S -passes=indvars | FileCheck %s
 
 declare i32 @llvm.uadd.sat.i32(i32, i32)
 declare i32 @llvm.sadd.sat.i32(i32, i32)

diff  --git a/llvm/test/Transforms/IndVarSimplify/exit_value_test2.ll b/llvm/test/Transforms/IndVarSimplify/exit_value_test2.ll
index b60d27a310eee..f85c348c4efdc 100644
--- a/llvm/test/Transforms/IndVarSimplify/exit_value_test2.ll
+++ b/llvm/test/Transforms/IndVarSimplify/exit_value_test2.ll
@@ -1,6 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
 ; PR23538
-; RUN: opt < %s -indvars -loop-deletion -S | FileCheck %s
+; RUN: opt < %s -passes=indvars,loop-deletion -S | FileCheck %s
 
 ; Check IndVarSimplify should not replace exit value because or else
 ; udiv will be introduced by expand and the cost will be high.

diff  --git a/llvm/test/Transforms/IndVarSimplify/exit_value_test3.ll b/llvm/test/Transforms/IndVarSimplify/exit_value_test3.ll
index 2051d2a46b20a..b3c2ebd85d6a0 100644
--- a/llvm/test/Transforms/IndVarSimplify/exit_value_test3.ll
+++ b/llvm/test/Transforms/IndVarSimplify/exit_value_test3.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -indvars -loop-deletion -S |FileCheck %s
+; RUN: opt < %s -passes=indvars,loop-deletion -S |FileCheck %s
 
 ; Check IndVarSimplify should replace exit value even if the expansion cost
 ; is high because the loop can be deleted after the exit value rewrite.

diff  --git a/llvm/test/Transforms/IndVarSimplify/exit_value_tests.ll b/llvm/test/Transforms/IndVarSimplify/exit_value_tests.ll
index 6dc8ede1de36a..571e261e3c6a2 100644
--- a/llvm/test/Transforms/IndVarSimplify/exit_value_tests.ll
+++ b/llvm/test/Transforms/IndVarSimplify/exit_value_tests.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -indvars -loop-deletion -simplifycfg -simplifycfg-require-and-preserve-domtree=1 -S | FileCheck %s
+; RUN: opt < %s -passes='loop(indvars,loop-deletion),simplifycfg' -simplifycfg-require-and-preserve-domtree=1 -S | FileCheck %s
 
 ; Test that we can evaluate the exit values of various expression types.  Since
 ; these loops all have predictable exit values we can replace the use outside

diff  --git a/llvm/test/Transforms/IndVarSimplify/interesting-invoke-use.ll b/llvm/test/Transforms/IndVarSimplify/interesting-invoke-use.ll
index 38ee11cc68362..2b76229b34571 100644
--- a/llvm/test/Transforms/IndVarSimplify/interesting-invoke-use.ll
+++ b/llvm/test/Transforms/IndVarSimplify/interesting-invoke-use.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -indvars
+; RUN: opt < %s -passes=indvars
 
 ; An invoke has a result value which is used in an "Interesting"
 ; expression inside the loop. IndVars should be able to rewrite

diff  --git a/llvm/test/Transforms/IndVarSimplify/iterationCount_zext_or_trunc.ll b/llvm/test/Transforms/IndVarSimplify/iterationCount_zext_or_trunc.ll
index 02145d1c5e7af..ba0e479a6bcfb 100644
--- a/llvm/test/Transforms/IndVarSimplify/iterationCount_zext_or_trunc.ll
+++ b/llvm/test/Transforms/IndVarSimplify/iterationCount_zext_or_trunc.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -indvars -disable-output
+; RUN: opt < %s -passes=indvars -disable-output
 
 ; ModuleID = 'testcase.bc'
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64"

diff  --git a/llvm/test/Transforms/IndVarSimplify/lcssa-preservation.ll b/llvm/test/Transforms/IndVarSimplify/lcssa-preservation.ll
index 4b288c2a891bc..1242e0080422d 100644
--- a/llvm/test/Transforms/IndVarSimplify/lcssa-preservation.ll
+++ b/llvm/test/Transforms/IndVarSimplify/lcssa-preservation.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -indvars -replexitval=always -S | FileCheck %s
+; RUN: opt < %s -passes=indvars -replexitval=always -S | FileCheck %s
 ; Make sure IndVars preserves LCSSA form, especially across loop nests.
 
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"

diff  --git a/llvm/test/Transforms/IndVarSimplify/lftr-address-space-pointers.ll b/llvm/test/Transforms/IndVarSimplify/lftr-address-space-pointers.ll
index b1ff97fff2991..9033bd6a85353 100644
--- a/llvm/test/Transforms/IndVarSimplify/lftr-address-space-pointers.ll
+++ b/llvm/test/Transforms/IndVarSimplify/lftr-address-space-pointers.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -indvars -o - %s | FileCheck %s
+; RUN: opt -S -passes=indvars -o - %s | FileCheck %s
 target datalayout = "e-p:32:32:32-p1:64:64:64-p2:8:8:8-p3:16:16:16-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:32-n8:16:32:64"
 
 ; Derived from ptriv in lftr-reuse.ll

diff  --git a/llvm/test/Transforms/IndVarSimplify/lftr-dead-ivs.ll b/llvm/test/Transforms/IndVarSimplify/lftr-dead-ivs.ll
index d358108f653d4..31143c172e52c 100644
--- a/llvm/test/Transforms/IndVarSimplify/lftr-dead-ivs.ll
+++ b/llvm/test/Transforms/IndVarSimplify/lftr-dead-ivs.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -indvars -indvars-predicate-loops=0 < %s | FileCheck %s
+; RUN: opt -S -passes=indvars -indvars-predicate-loops=0 < %s | FileCheck %s
 
 ; Tests in this file are specifically about correctly handling possibly poison
 ; producing flags when converting from one IV to another.  In particular, there

diff  --git a/llvm/test/Transforms/IndVarSimplify/lftr-opaque-pointers.ll b/llvm/test/Transforms/IndVarSimplify/lftr-opaque-pointers.ll
index 4edcf5b3414e1..3e2c5dfe195af 100644
--- a/llvm/test/Transforms/IndVarSimplify/lftr-opaque-pointers.ll
+++ b/llvm/test/Transforms/IndVarSimplify/lftr-opaque-pointers.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -indvars -opaque-pointers < %s | FileCheck %s
+; RUN: opt -S -passes=indvars -opaque-pointers < %s | FileCheck %s
 
 target datalayout = "n8:16:32:64"
 

diff  --git a/llvm/test/Transforms/IndVarSimplify/lftr.ll b/llvm/test/Transforms/IndVarSimplify/lftr.ll
index 1a77505a8761b..3a6fc8c7673cd 100644
--- a/llvm/test/Transforms/IndVarSimplify/lftr.ll
+++ b/llvm/test/Transforms/IndVarSimplify/lftr.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -indvars -dce -S -indvars-predicate-loops=0 | FileCheck %s
+; RUN: opt < %s -passes='loop(indvars),dce' -S -indvars-predicate-loops=0 | FileCheck %s
 
 ; Provide legal integer types.
 target datalayout = "n8:16:32:64"

diff  --git a/llvm/test/Transforms/IndVarSimplify/lftr_disabled.ll b/llvm/test/Transforms/IndVarSimplify/lftr_disabled.ll
index 7acaba6e328a5..952b5d0ae7a12 100644
--- a/llvm/test/Transforms/IndVarSimplify/lftr_disabled.ll
+++ b/llvm/test/Transforms/IndVarSimplify/lftr_disabled.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -indvars -dce -disable-lftr -S | FileCheck %s
+; RUN: opt < %s -passes='loop(indvars),dce' -disable-lftr -S | FileCheck %s
 
 ; LFTR should not eliminate the need for the computation of i*i completely
 ; due to LFTR is disabled.

diff  --git a/llvm/test/Transforms/IndVarSimplify/loop-predication.ll b/llvm/test/Transforms/IndVarSimplify/loop-predication.ll
index 3b5e0ba5dbcb7..5630bbeb937bb 100644
--- a/llvm/test/Transforms/IndVarSimplify/loop-predication.ll
+++ b/llvm/test/Transforms/IndVarSimplify/loop-predication.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -indvars -indvars-predicate-loops=1 -S | FileCheck %s
+; RUN: opt < %s -passes=indvars -indvars-predicate-loops=1 -S | FileCheck %s
 
 declare void @prevent_merging()
 

diff  --git a/llvm/test/Transforms/IndVarSimplify/loop_evaluate11.ll b/llvm/test/Transforms/IndVarSimplify/loop_evaluate11.ll
index 689c5e39b4089..912c48ea72b06 100644
--- a/llvm/test/Transforms/IndVarSimplify/loop_evaluate11.ll
+++ b/llvm/test/Transforms/IndVarSimplify/loop_evaluate11.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -indvars -loop-deletion
+; RUN: opt < %s -passes=indvars,loop-deletion
 
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128"
 

diff  --git a/llvm/test/Transforms/IndVarSimplify/loop_evaluate7.ll b/llvm/test/Transforms/IndVarSimplify/loop_evaluate7.ll
index 333ab7a4967b9..81070258662a6 100644
--- a/llvm/test/Transforms/IndVarSimplify/loop_evaluate7.ll
+++ b/llvm/test/Transforms/IndVarSimplify/loop_evaluate7.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -indvars
+; RUN: opt < %s -passes=indvars
 ; PR4436
 
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:32:32"

diff  --git a/llvm/test/Transforms/IndVarSimplify/loop_evaluate_1.ll b/llvm/test/Transforms/IndVarSimplify/loop_evaluate_1.ll
index 4dceec4aeb7c4..e496f8f6014c2 100644
--- a/llvm/test/Transforms/IndVarSimplify/loop_evaluate_1.ll
+++ b/llvm/test/Transforms/IndVarSimplify/loop_evaluate_1.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -indvars -loop-deletion -simplifycfg -simplifycfg-require-and-preserve-domtree=1 -S | FileCheck %s
+; RUN: opt < %s -passes='loop(indvars,loop-deletion),simplifycfg' -simplifycfg-require-and-preserve-domtree=1 -S | FileCheck %s
 
 ; Testcase distilled from 256.bzip2
 define i32 @test1() {

diff  --git a/llvm/test/Transforms/IndVarSimplify/loop_evaluate_6.ll b/llvm/test/Transforms/IndVarSimplify/loop_evaluate_6.ll
index fd49674f80b07..a26c5c906081a 100644
--- a/llvm/test/Transforms/IndVarSimplify/loop_evaluate_6.ll
+++ b/llvm/test/Transforms/IndVarSimplify/loop_evaluate_6.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -indvars -loop-deletion -S | FileCheck %s
+; RUN: opt < %s -passes=indvars,loop-deletion -S | FileCheck %s
 
 define i32 @test(i32 %x_offs) nounwind readnone {
 ; CHECK-LABEL: @test(

diff  --git a/llvm/test/Transforms/IndVarSimplify/phi-uses-value-multiple-times.ll b/llvm/test/Transforms/IndVarSimplify/phi-uses-value-multiple-times.ll
index 519d34d76cbdb..1a51b8ced4f17 100644
--- a/llvm/test/Transforms/IndVarSimplify/phi-uses-value-multiple-times.ll
+++ b/llvm/test/Transforms/IndVarSimplify/phi-uses-value-multiple-times.ll
@@ -1,5 +1,5 @@
 ; REQUIRES: asserts
-; RUN: opt < %s -indvars -disable-output -stats -info-output-file - | FileCheck %s
+; RUN: opt < %s -passes=indvars -disable-output -stats -info-output-file - | FileCheck %s
 ; Check that IndVarSimplify is not creating unnecessary canonical IVs
 ; that will never be used.
 ; CHECK-NOT: indvars

diff  --git a/llvm/test/Transforms/IndVarSimplify/post-inc-range.ll b/llvm/test/Transforms/IndVarSimplify/post-inc-range.ll
index 8ee770d96f8b0..2fdf0913a65a0 100644
--- a/llvm/test/Transforms/IndVarSimplify/post-inc-range.ll
+++ b/llvm/test/Transforms/IndVarSimplify/post-inc-range.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -indvars -indvars-post-increment-ranges -S | FileCheck %s
+; RUN: opt < %s -passes=indvars -indvars-post-increment-ranges -S | FileCheck %s
 
 target datalayout = "p:64:64:64-n32:64"
 

diff  --git a/llvm/test/Transforms/IndVarSimplify/pr26974.ll b/llvm/test/Transforms/IndVarSimplify/pr26974.ll
index 28a736441cd06..0d2d435311c83 100644
--- a/llvm/test/Transforms/IndVarSimplify/pr26974.ll
+++ b/llvm/test/Transforms/IndVarSimplify/pr26974.ll
@@ -1,4 +1,4 @@
-; RUN: opt -indvars  -S < %s | FileCheck %s
+; RUN: opt -passes=indvars  -S < %s | FileCheck %s
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 

diff  --git a/llvm/test/Transforms/IndVarSimplify/pr38674.ll b/llvm/test/Transforms/IndVarSimplify/pr38674.ll
index bd4a23dc3b9a2..e701c4df82072 100644
--- a/llvm/test/Transforms/IndVarSimplify/pr38674.ll
+++ b/llvm/test/Transforms/IndVarSimplify/pr38674.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -indvars -indvars-predicate-loops=0  < %s | FileCheck %s
+; RUN: opt -S -passes=indvars -indvars-predicate-loops=0  < %s | FileCheck %s
 
 ; Check that we don't reuse %zext instead of %inc11 for LCSSA Phi node. Case
 ; with constants SCEV.

diff  --git a/llvm/test/Transforms/IndVarSimplify/pr38855.ll b/llvm/test/Transforms/IndVarSimplify/pr38855.ll
index 4088584f6f0af..0ebad14fe5196 100644
--- a/llvm/test/Transforms/IndVarSimplify/pr38855.ll
+++ b/llvm/test/Transforms/IndVarSimplify/pr38855.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -disable-nounwind-inference=false -inline -function-attrs -indvars  < %s | FileCheck %s
+; RUN: opt -S -disable-nounwind-inference=false -passes=inline,function-attrs,indvars  < %s | FileCheck %s
 
 ; Check that the invalidation happens correctly and the test does not crash.
 define void @f2() {

diff  --git a/llvm/test/Transforms/IndVarSimplify/pr39673.ll b/llvm/test/Transforms/IndVarSimplify/pr39673.ll
index 7fb90a90071ac..7b093b34b91ad 100644
--- a/llvm/test/Transforms/IndVarSimplify/pr39673.ll
+++ b/llvm/test/Transforms/IndVarSimplify/pr39673.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -indvars -indvars-predicate-loops=0  < %s | FileCheck %s
+; RUN: opt -S -passes=indvars -indvars-predicate-loops=0  < %s | FileCheck %s
 
 define i16 @constant() {
 ; CHECK-LABEL: @constant(

diff  --git a/llvm/test/Transforms/IndVarSimplify/pr40454.ll b/llvm/test/Transforms/IndVarSimplify/pr40454.ll
index 84c8c732b17e5..d77ec74b330c1 100644
--- a/llvm/test/Transforms/IndVarSimplify/pr40454.ll
+++ b/llvm/test/Transforms/IndVarSimplify/pr40454.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -indvars  < %s | FileCheck %s
+; RUN: opt -S -passes=indvars  < %s | FileCheck %s
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 

diff  --git a/llvm/test/Transforms/IndVarSimplify/pr45835.ll b/llvm/test/Transforms/IndVarSimplify/pr45835.ll
index f9fb50e3e8f1a..9a973462b81cb 100644
--- a/llvm/test/Transforms/IndVarSimplify/pr45835.ll
+++ b/llvm/test/Transforms/IndVarSimplify/pr45835.ll
@@ -1,7 +1,7 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -indvars -replexitval=always -S | FileCheck %s --check-prefix=ALWAYS
-; RUN: opt < %s -indvars -replexitval=never -S | FileCheck %s --check-prefix=NEVER
-; RUN: opt < %s -indvars -replexitval=cheap -scev-cheap-expansion-budget=1 -S | FileCheck %s --check-prefix=CHEAP
+; RUN: opt < %s -passes=indvars -replexitval=always -S | FileCheck %s --check-prefix=ALWAYS
+; RUN: opt < %s -passes=indvars -replexitval=never -S | FileCheck %s --check-prefix=NEVER
+; RUN: opt < %s -passes=indvars -replexitval=cheap -scev-cheap-expansion-budget=1 -S | FileCheck %s --check-prefix=CHEAP
 
 ; rewriteLoopExitValues() must rewrite all or none of a PHI's values from a given block.
 

diff  --git a/llvm/test/Transforms/IndVarSimplify/preserve-memoryssa.ll b/llvm/test/Transforms/IndVarSimplify/preserve-memoryssa.ll
index dcbad54eb4046..a999621ab8e41 100644
--- a/llvm/test/Transforms/IndVarSimplify/preserve-memoryssa.ll
+++ b/llvm/test/Transforms/IndVarSimplify/preserve-memoryssa.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -licm -indvars -verify-memoryssa < %s | FileCheck %s
+; RUN: opt -S -passes=licm,indvars -verify-memoryssa < %s | FileCheck %s
 ; REQUIRES: asserts
 @v_69 = external constant { i16, i16 }, align 1
 

diff  --git a/llvm/test/Transforms/IndVarSimplify/rewrite-loop-exit-value.ll b/llvm/test/Transforms/IndVarSimplify/rewrite-loop-exit-value.ll
index aac87039d9bce..3b71343247491 100644
--- a/llvm/test/Transforms/IndVarSimplify/rewrite-loop-exit-value.ll
+++ b/llvm/test/Transforms/IndVarSimplify/rewrite-loop-exit-value.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -indvars -instcombine -S < %s | FileCheck %s
+; RUN: opt -passes='loop(indvars),instcombine' -S < %s | FileCheck %s
 
 ;; Test that loop's exit value is rewritten to its initial
 ;; value from loop preheader

diff  --git a/llvm/test/Transforms/IndVarSimplify/sharpen-range.ll b/llvm/test/Transforms/IndVarSimplify/sharpen-range.ll
index c68ed6d408192..a994213deff80 100644
--- a/llvm/test/Transforms/IndVarSimplify/sharpen-range.ll
+++ b/llvm/test/Transforms/IndVarSimplify/sharpen-range.ll
@@ -1,5 +1,5 @@
 ;; RUN: opt -S < %s -passes=indvars | FileCheck %s
-; RUN: opt -lcssa -loop-simplify -S < %s | opt -S -passes='require<targetir>,require<scalar-evolution>,require<domtree>,loop(indvars)'
+; RUN: opt -passes=lcssa,loop-simplify -S < %s | opt -S -passes='require<targetir>,require<scalar-evolution>,require<domtree>,loop(indvars)'
 
 ;; Check if llvm can narrow !range metadata based on loop entry
 ;; predicates.

diff  --git a/llvm/test/Transforms/IndVarSimplify/single-element-range.ll b/llvm/test/Transforms/IndVarSimplify/single-element-range.ll
index e047a0b254e15..05bab1b136cd3 100644
--- a/llvm/test/Transforms/IndVarSimplify/single-element-range.ll
+++ b/llvm/test/Transforms/IndVarSimplify/single-element-range.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -indvars
+; RUN: opt < %s -passes=indvars
 
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:32-f32:32:32-f64:32:32-v64:64:64-v128:128:128-a0:0:64"
 target triple = "armv6-apple-darwin10"

diff  --git a/llvm/test/Transforms/IndVarSimplify/sink-from-preheader.ll b/llvm/test/Transforms/IndVarSimplify/sink-from-preheader.ll
index 00067fc979e96..89583f9131518 100644
--- a/llvm/test/Transforms/IndVarSimplify/sink-from-preheader.ll
+++ b/llvm/test/Transforms/IndVarSimplify/sink-from-preheader.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -indvars -indvars-predicate-loops=0 -S | FileCheck %s
+; RUN: opt < %s -passes=indvars -indvars-predicate-loops=0 -S | FileCheck %s
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128"
 target triple = "i386-apple-darwin10.0"
 

diff  --git a/llvm/test/Transforms/IndVarSimplify/tripcount_infinite.ll b/llvm/test/Transforms/IndVarSimplify/tripcount_infinite.ll
index 75d3de03e8ed3..2950be1f36e98 100644
--- a/llvm/test/Transforms/IndVarSimplify/tripcount_infinite.ll
+++ b/llvm/test/Transforms/IndVarSimplify/tripcount_infinite.ll
@@ -1,7 +1,7 @@
 ; These tests have an infinite trip count.  We obviously shouldn't remove the
 ; loops!  :)
 ;
-; RUN: opt < %s -indvars -adce -simplifycfg -simplifycfg-require-and-preserve-domtree=1 -S | FileCheck %s
+; RUN: opt < %s -passes='loop(indvars),adce,simplifycfg' -simplifycfg-require-and-preserve-domtree=1 -S | FileCheck %s
 
 ;; test for (i = 1; i != 100; i += 2)
 define i32 @infinite_linear() {

diff  --git a/llvm/test/Transforms/IndVarSimplify/variable-stride-ivs-0.ll b/llvm/test/Transforms/IndVarSimplify/variable-stride-ivs-0.ll
index 5fa4a17b9159c..6b1fc306fda1e 100644
--- a/llvm/test/Transforms/IndVarSimplify/variable-stride-ivs-0.ll
+++ b/llvm/test/Transforms/IndVarSimplify/variable-stride-ivs-0.ll
@@ -1,6 +1,6 @@
-; RUN: opt < %s -indvars -instcombine -S | FileCheck %s
+; RUN: opt < %s -passes='loop(indvars),instcombine' -S | FileCheck %s
 ;
-; Test that -indvars can reduce variable stride IVs.  If it can reduce variable
+; Test that -passes=indvars can reduce variable stride IVs.  If it can reduce variable
 ; stride iv's, it will make %iv. and %m.0.0 isomorphic to each other without
 ; cycles, allowing the tmp.21 subtraction to be eliminated.
 


        


More information about the llvm-commits mailing list