[llvm] 80e8f2b - [NFC] Port all (but one) LICM tests to `-passes=` syntax

Roman Lebedev via llvm-commits llvm-commits at lists.llvm.org
Wed Dec 7 09:53:35 PST 2022


Author: Roman Lebedev
Date: 2022-12-07T20:53:15+03:00
New Revision: 80e8f2beeb954f8c241897099bb01b24da400e8a

URL: https://github.com/llvm/llvm-project/commit/80e8f2beeb954f8c241897099bb01b24da400e8a
DIFF: https://github.com/llvm/llvm-project/commit/80e8f2beeb954f8c241897099bb01b24da400e8a.diff

LOG: [NFC] Port all (but one) LICM tests to `-passes=` syntax

Added: 
    

Modified: 
    llvm/test/Transforms/LICM/2003-02-26-LoopExitNotDominated.ll
    llvm/test/Transforms/LICM/2003-02-27-NestedLoopExitBlocks.ll
    llvm/test/Transforms/LICM/2003-02-27-PreheaderExitNodeUpdate.ll
    llvm/test/Transforms/LICM/2003-02-27-PreheaderProblem.ll
    llvm/test/Transforms/LICM/2003-02-27-StoreSinkPHIs.ll
    llvm/test/Transforms/LICM/2003-02-28-PromoteDifferentType.ll
    llvm/test/Transforms/LICM/2003-05-02-LoadHoist.ll
    llvm/test/Transforms/LICM/2003-12-11-SinkingToPHI.ll
    llvm/test/Transforms/LICM/2004-11-17-UndefIndexCrash.ll
    llvm/test/Transforms/LICM/2006-09-12-DeadUserOfSunkInstr.ll
    llvm/test/Transforms/LICM/2007-05-22-VolatileSink.ll
    llvm/test/Transforms/LICM/2007-07-30-AliasSet.ll
    llvm/test/Transforms/LICM/2007-09-17-PromoteValue.ll
    llvm/test/Transforms/LICM/2007-09-24-PromoteNullValue.ll
    llvm/test/Transforms/LICM/2007-10-01-PromoteSafeValue.ll
    llvm/test/Transforms/LICM/2008-05-20-AliasSetVAArg.ll
    llvm/test/Transforms/LICM/2008-07-22-LoadGlobalConstant.ll
    llvm/test/Transforms/LICM/2009-12-10-LICM-Indbr-Crash.ll
    llvm/test/Transforms/LICM/2011-04-06-HoistMissedASTUpdate.ll
    llvm/test/Transforms/LICM/2011-04-06-PromoteResultOfPromotion.ll
    llvm/test/Transforms/LICM/2011-04-09-RAUW-AST.ll
    llvm/test/Transforms/LICM/2011-07-06-Alignment.ll
    llvm/test/Transforms/LICM/2014-09-10-doFinalizationAssert.ll
    llvm/test/Transforms/LICM/AArch64/extract-element.ll
    llvm/test/Transforms/LICM/AArch64/sve-load-hoist.ll
    llvm/test/Transforms/LICM/AMDGPU/bitcast.ll
    llvm/test/Transforms/LICM/AliasSetMemSet.ll
    llvm/test/Transforms/LICM/PR19798.ll
    llvm/test/Transforms/LICM/PR21582.ll
    llvm/test/Transforms/LICM/PR24013.ll
    llvm/test/Transforms/LICM/Preserve-LCSSA.ll
    llvm/test/Transforms/LICM/alias-set-tracker-loss.ll
    llvm/test/Transforms/LICM/assume.ll
    llvm/test/Transforms/LICM/basictest.ll
    llvm/test/Transforms/LICM/bisect-state.ll
    llvm/test/Transforms/LICM/call-hoisting.ll
    llvm/test/Transforms/LICM/callbr-crash.ll
    llvm/test/Transforms/LICM/constexpr.ll
    llvm/test/Transforms/LICM/convergent.ll
    llvm/test/Transforms/LICM/crash.ll
    llvm/test/Transforms/LICM/debug-value.ll
    llvm/test/Transforms/LICM/dropped-tbaa.ll
    llvm/test/Transforms/LICM/explicit_guards.ll
    llvm/test/Transforms/LICM/extra-copies.ll
    llvm/test/Transforms/LICM/fence.ll
    llvm/test/Transforms/LICM/freeze.ll
    llvm/test/Transforms/LICM/funclet.ll
    llvm/test/Transforms/LICM/gc-relocate.ll
    llvm/test/Transforms/LICM/guards.ll
    llvm/test/Transforms/LICM/hoist-alloc.ll
    llvm/test/Transforms/LICM/hoist-bitcast-load.ll
    llvm/test/Transforms/LICM/hoist-debuginvariant.ll
    llvm/test/Transforms/LICM/hoist-deref-load.ll
    llvm/test/Transforms/LICM/hoist-fast-fdiv.ll
    llvm/test/Transforms/LICM/hoist-invariant-load.ll
    llvm/test/Transforms/LICM/hoist-load-without-store.ll
    llvm/test/Transforms/LICM/hoist-mustexec.ll
    llvm/test/Transforms/LICM/hoist-nounwind.ll
    llvm/test/Transforms/LICM/hoist-phi.ll
    llvm/test/Transforms/LICM/hoist-round.ll
    llvm/test/Transforms/LICM/infinite_loops.ll
    llvm/test/Transforms/LICM/int_sideeffect.ll
    llvm/test/Transforms/LICM/invariant.start.ll
    llvm/test/Transforms/LICM/lcssa-ssa-promoter.ll
    llvm/test/Transforms/LICM/loopsink-pr38462.ll
    llvm/test/Transforms/LICM/loopsink-pr39570.ll
    llvm/test/Transforms/LICM/loopsink-pr39695.ll
    llvm/test/Transforms/LICM/loopsink.ll
    llvm/test/Transforms/LICM/no-preheader-test.ll
    llvm/test/Transforms/LICM/opt-remarks-conditional-load.ll
    llvm/test/Transforms/LICM/opt-remarks-intervening-store.ll
    llvm/test/Transforms/LICM/opt-remarks.ll
    llvm/test/Transforms/LICM/outer-loop-deleted-before-licm.ll
    llvm/test/Transforms/LICM/pr23608.ll
    llvm/test/Transforms/LICM/pr26843.ll
    llvm/test/Transforms/LICM/pr27262.ll
    llvm/test/Transforms/LICM/pr32129.ll
    llvm/test/Transforms/LICM/pr35342.ll
    llvm/test/Transforms/LICM/pr36228.ll
    llvm/test/Transforms/LICM/pr40317.ll
    llvm/test/Transforms/LICM/pr42969.ll
    llvm/test/Transforms/LICM/pr54495.ll
    llvm/test/Transforms/LICM/pr57780.ll
    llvm/test/Transforms/LICM/pragma-licm-disable.ll
    llvm/test/Transforms/LICM/preheader-safe.ll
    llvm/test/Transforms/LICM/promote-atomic.ll
    llvm/test/Transforms/LICM/promote-single-thread.ll
    llvm/test/Transforms/LICM/promote-tls.ll
    llvm/test/Transforms/LICM/promote-unknown-load.ll
    llvm/test/Transforms/LICM/read-volatile-register.ll
    llvm/test/Transforms/LICM/scalar-promote-memmodel.ll
    llvm/test/Transforms/LICM/scalar-promote-unwind.ll
    llvm/test/Transforms/LICM/scalar-promote.ll
    llvm/test/Transforms/LICM/sink-debuginfo-preserve.ll
    llvm/test/Transforms/LICM/sink-foldable.ll
    llvm/test/Transforms/LICM/sink-promote.ll
    llvm/test/Transforms/LICM/sinking-debugify.ll
    llvm/test/Transforms/LICM/sinking.ll
    llvm/test/Transforms/LICM/speculate.ll
    llvm/test/Transforms/LICM/strlen.ll
    llvm/test/Transforms/LICM/unrolled-deeply-nested.ll

Removed: 
    


################################################################################
diff  --git a/llvm/test/Transforms/LICM/2003-02-26-LoopExitNotDominated.ll b/llvm/test/Transforms/LICM/2003-02-26-LoopExitNotDominated.ll
index b539f90cf94e7..daded0dae6418 100644
--- a/llvm/test/Transforms/LICM/2003-02-26-LoopExitNotDominated.ll
+++ b/llvm/test/Transforms/LICM/2003-02-26-LoopExitNotDominated.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -licm -disable-output
+; RUN: opt < %s -passes=licm -disable-output
 
 ;%MoveArray = external global [64 x ulong]
 

diff  --git a/llvm/test/Transforms/LICM/2003-02-27-NestedLoopExitBlocks.ll b/llvm/test/Transforms/LICM/2003-02-27-NestedLoopExitBlocks.ll
index 4559e31017928..375721921e056 100644
--- a/llvm/test/Transforms/LICM/2003-02-27-NestedLoopExitBlocks.ll
+++ b/llvm/test/Transforms/LICM/2003-02-27-NestedLoopExitBlocks.ll
@@ -1,6 +1,6 @@
 ; Exit blocks need to be updated for all nested loops...
 
-; RUN: opt < %s -loop-simplify
+; RUN: opt < %s -passes=loop-simplify
 
 define i32 @yyparse() {
 bb0:

diff  --git a/llvm/test/Transforms/LICM/2003-02-27-PreheaderExitNodeUpdate.ll b/llvm/test/Transforms/LICM/2003-02-27-PreheaderExitNodeUpdate.ll
index bc7b5e0c3e3db..3c4b8d2b355fd 100644
--- a/llvm/test/Transforms/LICM/2003-02-27-PreheaderExitNodeUpdate.ll
+++ b/llvm/test/Transforms/LICM/2003-02-27-PreheaderExitNodeUpdate.ll
@@ -1,7 +1,7 @@
-; This testcase fails because preheader insertion is not updating exit node 
+; This testcase fails because preheader insertion is not updating exit node
 ; information for loops.
 
-; RUN: opt < %s -licm
+; RUN: opt < %s -passes=licm
 
 define i32 @main(i32 %argc, ptr %argv) {
 bb0:

diff  --git a/llvm/test/Transforms/LICM/2003-02-27-PreheaderProblem.ll b/llvm/test/Transforms/LICM/2003-02-27-PreheaderProblem.ll
index a18f3e37d8c32..527741ff216eb 100644
--- a/llvm/test/Transforms/LICM/2003-02-27-PreheaderProblem.ll
+++ b/llvm/test/Transforms/LICM/2003-02-27-PreheaderProblem.ll
@@ -3,7 +3,7 @@
 ; happens because preheader insertion doesn't insert a preheader for this
 ; case... bad.
 
-; RUN: opt < %s -licm -loop-deletion -simplifycfg -simplifycfg-require-and-preserve-domtree=1 -S | \
+; RUN: opt < %s -passes='loop-mssa(licm,loop-deletion),simplifycfg' -simplifycfg-require-and-preserve-domtree=1 -S | \
 ; RUN:   not grep "br "
 
 define i32 @main(i32 %argc) {

diff  --git a/llvm/test/Transforms/LICM/2003-02-27-StoreSinkPHIs.ll b/llvm/test/Transforms/LICM/2003-02-27-StoreSinkPHIs.ll
index ae8d215c795c5..3723e754e9a4f 100644
--- a/llvm/test/Transforms/LICM/2003-02-27-StoreSinkPHIs.ll
+++ b/llvm/test/Transforms/LICM/2003-02-27-StoreSinkPHIs.ll
@@ -1,6 +1,6 @@
 ; LICM is adding stores before phi nodes.  bad.
 
-; RUN: opt < %s -licm
+; RUN: opt < %s -passes=licm
 
 define i1 @test(i1 %c) {
 ; <label>:0

diff  --git a/llvm/test/Transforms/LICM/2003-02-28-PromoteDifferentType.ll b/llvm/test/Transforms/LICM/2003-02-28-PromoteDifferentType.ll
index 2c23258758e9d..925f9cae96e0d 100644
--- a/llvm/test/Transforms/LICM/2003-02-28-PromoteDifferentType.ll
+++ b/llvm/test/Transforms/LICM/2003-02-28-PromoteDifferentType.ll
@@ -1,6 +1,6 @@
 ; Test that hoisting is disabled for pointers of 
diff erent types...
 ;
-; RUN: opt < %s -licm
+; RUN: opt < %s -passes=licm
 
 define void @test(ptr %P) {
 	br label %Loop

diff  --git a/llvm/test/Transforms/LICM/2003-05-02-LoadHoist.ll b/llvm/test/Transforms/LICM/2003-05-02-LoadHoist.ll
index 218f9a78576a0..8bcc8adcbd1f1 100644
--- a/llvm/test/Transforms/LICM/2003-05-02-LoadHoist.ll
+++ b/llvm/test/Transforms/LICM/2003-05-02-LoadHoist.ll
@@ -1,9 +1,9 @@
-; This testcase tests for a problem where LICM hoists loads out of a loop 
-; despite the fact that calls to unknown functions may modify what is being 
+; This testcase tests for a problem where LICM hoists loads out of a loop
+; despite the fact that calls to unknown functions may modify what is being
 ; loaded from.  Basically if the load gets hoisted, the subtract gets turned
 ; into a constant zero.
 ;
-; RUN: opt < %s -licm -gvn -instcombine -S | grep load
+; RUN: opt < %s -passes='loop-mssa(licm),gvn,instcombine' -S | grep load
 
 @X = global i32 7		; <ptr> [#uses=2]
 

diff  --git a/llvm/test/Transforms/LICM/2003-12-11-SinkingToPHI.ll b/llvm/test/Transforms/LICM/2003-12-11-SinkingToPHI.ll
index d111ff1e67cf9..5bc7d4f7d0945 100644
--- a/llvm/test/Transforms/LICM/2003-12-11-SinkingToPHI.ll
+++ b/llvm/test/Transforms/LICM/2003-12-11-SinkingToPHI.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -licm | lli -jit-kind=mcjit -force-interpreter
+; RUN: opt < %s -passes=licm | lli -jit-kind=mcjit -force-interpreter
 
 define i32 @main() {
 entry:

diff  --git a/llvm/test/Transforms/LICM/2004-11-17-UndefIndexCrash.ll b/llvm/test/Transforms/LICM/2004-11-17-UndefIndexCrash.ll
index dd13b2c6e4b47..d25a8a22396c3 100644
--- a/llvm/test/Transforms/LICM/2004-11-17-UndefIndexCrash.ll
+++ b/llvm/test/Transforms/LICM/2004-11-17-UndefIndexCrash.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -licm -disable-output
+; RUN: opt < %s -passes=licm -disable-output
 	%struct.roadlet = type { ptr, ptr, [8 x ptr], [8 x ptr] }
 	%struct.vehicle = type { ptr, ptr, i32, i32, %union.._631., i32 }
 	%union.._631. = type { i32 }

diff  --git a/llvm/test/Transforms/LICM/2006-09-12-DeadUserOfSunkInstr.ll b/llvm/test/Transforms/LICM/2006-09-12-DeadUserOfSunkInstr.ll
index 56350cedcda98..c172462d6310a 100644
--- a/llvm/test/Transforms/LICM/2006-09-12-DeadUserOfSunkInstr.ll
+++ b/llvm/test/Transforms/LICM/2006-09-12-DeadUserOfSunkInstr.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -licm -disable-output
+; RUN: opt < %s -passes=licm -disable-output
 ; PR908
 ; END.
 

diff  --git a/llvm/test/Transforms/LICM/2007-05-22-VolatileSink.ll b/llvm/test/Transforms/LICM/2007-05-22-VolatileSink.ll
index 5342cbbcf07b1..55b92b27aeeb7 100644
--- a/llvm/test/Transforms/LICM/2007-05-22-VolatileSink.ll
+++ b/llvm/test/Transforms/LICM/2007-05-22-VolatileSink.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -licm -S | grep "store volatile"
+; RUN: opt < %s -passes=licm -S | grep "store volatile"
 ; PR1435
 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"
 target triple = "i686-apple-darwin8"

diff  --git a/llvm/test/Transforms/LICM/2007-07-30-AliasSet.ll b/llvm/test/Transforms/LICM/2007-07-30-AliasSet.ll
index 1a62839a280d3..8b523cce017d3 100644
--- a/llvm/test/Transforms/LICM/2007-07-30-AliasSet.ll
+++ b/llvm/test/Transforms/LICM/2007-07-30-AliasSet.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -licm -simple-loop-unswitch -disable-output
+; RUN: opt < %s -passes=licm,simple-loop-unswitch -disable-output
 	%struct.III_scalefac_t = type { [22 x i32], [13 x [3 x i32]] }
 	%struct.gr_info = type { i32, i32, i32, i32, i32, i32, i32, i32, [3 x i32], [3 x i32], i32, i32, i32, i32, i32, i32, i32, i32, i32, ptr, [4 x i32] }
 

diff  --git a/llvm/test/Transforms/LICM/2007-09-17-PromoteValue.ll b/llvm/test/Transforms/LICM/2007-09-17-PromoteValue.ll
index c9235222ca121..8427d387622b0 100644
--- a/llvm/test/Transforms/LICM/2007-09-17-PromoteValue.ll
+++ b/llvm/test/Transforms/LICM/2007-09-17-PromoteValue.ll
@@ -1,8 +1,8 @@
 ; ModuleID = 'PR1657.bc'
-; Do not promote getelementptr because it may exposes load from a null pointer 
-; and store from a null pointer  which are covered by 
+; Do not promote getelementptr because it may exposes load from a null pointer
+; and store from a null pointer  which are covered by
 ; icmp eq ptr null, null condition.
-; RUN: opt < %s -licm -S | not grep promoted
+; RUN: opt < %s -passes=licm -S | not grep promoted
 	%struct.decision = type { i8, ptr }
 
 define i32 @main() {

diff  --git a/llvm/test/Transforms/LICM/2007-09-24-PromoteNullValue.ll b/llvm/test/Transforms/LICM/2007-09-24-PromoteNullValue.ll
index 00dbdc3d06372..41da09fee7942 100644
--- a/llvm/test/Transforms/LICM/2007-09-24-PromoteNullValue.ll
+++ b/llvm/test/Transforms/LICM/2007-09-24-PromoteNullValue.ll
@@ -1,5 +1,5 @@
 ; Do not promote null value because it may be unsafe to do so.
-; RUN: opt < %s -licm -S | not grep promoted
+; RUN: opt < %s -passes=licm -S | not grep promoted
 
 define i32 @f(i32 %foo, i32 %bar, i32 %com) {
 entry:

diff  --git a/llvm/test/Transforms/LICM/2007-10-01-PromoteSafeValue.ll b/llvm/test/Transforms/LICM/2007-10-01-PromoteSafeValue.ll
index 7ac03cf4349a4..f191fbf1fca77 100644
--- a/llvm/test/Transforms/LICM/2007-10-01-PromoteSafeValue.ll
+++ b/llvm/test/Transforms/LICM/2007-10-01-PromoteSafeValue.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -licm -S | FileCheck %s
+; RUN: opt < %s -passes=licm -S | FileCheck %s
 ; Promote value if at least one use is safe
 
 
@@ -10,7 +10,7 @@ loop.head:              ; preds = %cond.true, %entry
         store i32 20, ptr %p
         %tmp3.i = icmp eq ptr null, %q            ; <i1> [#uses=1]
         br i1 %tmp3.i, label %exit, label %cond.true
-        
+
 cond.true:              ; preds = %loop.head
         store i32 40, ptr %p
         br label %loop.head

diff  --git a/llvm/test/Transforms/LICM/2008-05-20-AliasSetVAArg.ll b/llvm/test/Transforms/LICM/2008-05-20-AliasSetVAArg.ll
index 5c00d76ce5395..adc723a53b361 100644
--- a/llvm/test/Transforms/LICM/2008-05-20-AliasSetVAArg.ll
+++ b/llvm/test/Transforms/LICM/2008-05-20-AliasSetVAArg.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -licm -disable-output
+; RUN: opt < %s -passes=licm -disable-output
 ; PR2346
 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 = "i686-pc-linux-gnu"

diff  --git a/llvm/test/Transforms/LICM/2008-07-22-LoadGlobalConstant.ll b/llvm/test/Transforms/LICM/2008-07-22-LoadGlobalConstant.ll
index f0b9f741d649f..bf58a09aab4b7 100644
--- a/llvm/test/Transforms/LICM/2008-07-22-LoadGlobalConstant.ll
+++ b/llvm/test/Transforms/LICM/2008-07-22-LoadGlobalConstant.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -licm -S | FileCheck %s
+; RUN: opt < %s -passes=licm -S | FileCheck %s
 
 @a = external constant ptr
 

diff  --git a/llvm/test/Transforms/LICM/2009-12-10-LICM-Indbr-Crash.ll b/llvm/test/Transforms/LICM/2009-12-10-LICM-Indbr-Crash.ll
index 937d197212169..9fded3277fdb4 100644
--- a/llvm/test/Transforms/LICM/2009-12-10-LICM-Indbr-Crash.ll
+++ b/llvm/test/Transforms/LICM/2009-12-10-LICM-Indbr-Crash.ll
@@ -1,5 +1,5 @@
 ; Test for rdar://7452967
-; RUN: opt < %s -licm -disable-output
+; RUN: opt < %s -passes=licm -disable-output
 define void @foo (ptr %v)
 {
   entry:

diff  --git a/llvm/test/Transforms/LICM/2011-04-06-HoistMissedASTUpdate.ll b/llvm/test/Transforms/LICM/2011-04-06-HoistMissedASTUpdate.ll
index 9b4145a5b6ef1..324f7946a3fcc 100644
--- a/llvm/test/Transforms/LICM/2011-04-06-HoistMissedASTUpdate.ll
+++ b/llvm/test/Transforms/LICM/2011-04-06-HoistMissedASTUpdate.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -licm -S | FileCheck %s
+; RUN: opt < %s -passes=licm -S | FileCheck %s
 ; PR9630
 
 @g_39 = external global i16, align 2

diff  --git a/llvm/test/Transforms/LICM/2011-04-06-PromoteResultOfPromotion.ll b/llvm/test/Transforms/LICM/2011-04-06-PromoteResultOfPromotion.ll
index 1eaf6e21068a1..69a82d8444b55 100644
--- a/llvm/test/Transforms/LICM/2011-04-06-PromoteResultOfPromotion.ll
+++ b/llvm/test/Transforms/LICM/2011-04-06-PromoteResultOfPromotion.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -licm -S | FileCheck %s
+; RUN: opt < %s -passes=licm -S | FileCheck %s
 ; PR9634
 
 @g_58 = common global i32 0, align 4

diff  --git a/llvm/test/Transforms/LICM/2011-04-09-RAUW-AST.ll b/llvm/test/Transforms/LICM/2011-04-09-RAUW-AST.ll
index 95614c590ff46..ae67c3a1c50f6 100644
--- a/llvm/test/Transforms/LICM/2011-04-09-RAUW-AST.ll
+++ b/llvm/test/Transforms/LICM/2011-04-09-RAUW-AST.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -loop-rotate -licm -S | FileCheck %s
+; RUN: opt < %s -passes='loop-mssa(loop-rotate,licm)' -S | FileCheck %s
 ; PR9604
 
 @g_3 = global i32 0, align 4

diff  --git a/llvm/test/Transforms/LICM/2011-07-06-Alignment.ll b/llvm/test/Transforms/LICM/2011-07-06-Alignment.ll
index f9e2f5dfdf3cf..1dae07af0c2db 100644
--- a/llvm/test/Transforms/LICM/2011-07-06-Alignment.ll
+++ b/llvm/test/Transforms/LICM/2011-07-06-Alignment.ll
@@ -1,4 +1,4 @@
-; RUN: opt -licm -S < %s | FileCheck %s
+; RUN: opt -passes=licm -S < %s | FileCheck %s
 
 @A = common global [1024 x float] zeroinitializer, align 4
 

diff  --git a/llvm/test/Transforms/LICM/2014-09-10-doFinalizationAssert.ll b/llvm/test/Transforms/LICM/2014-09-10-doFinalizationAssert.ll
index ac5167f81ca5e..4d2d58455a51c 100644
--- a/llvm/test/Transforms/LICM/2014-09-10-doFinalizationAssert.ll
+++ b/llvm/test/Transforms/LICM/2014-09-10-doFinalizationAssert.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -licm -loop-unroll -disable-output
+; RUN: opt < %s -passes='loop-mssa(licm),loop-unroll' -disable-output
 ; Test triggered an assertion in doFinalization() because loop unroll was deleting
 ; the inner loop which caused the loop to not get removed from the
 ; LoopToAliasSetMap.

diff  --git a/llvm/test/Transforms/LICM/AArch64/extract-element.ll b/llvm/test/Transforms/LICM/AArch64/extract-element.ll
index 4d36edc75bea7..fc2078dcc4b8d 100644
--- a/llvm/test/Transforms/LICM/AArch64/extract-element.ll
+++ b/llvm/test/Transforms/LICM/AArch64/extract-element.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -licm -mtriple aarch64-linux-gnu -S < %s | FileCheck %s
+; RUN: opt -passes=licm -mtriple aarch64-linux-gnu -S < %s | FileCheck %s
 
 define i1 @func(ptr %0, i64 %1) {
 ; CHECK-LABEL: @func(

diff  --git a/llvm/test/Transforms/LICM/AArch64/sve-load-hoist.ll b/llvm/test/Transforms/LICM/AArch64/sve-load-hoist.ll
index 66caf877371ce..666e677aa3d97 100644
--- a/llvm/test/Transforms/LICM/AArch64/sve-load-hoist.ll
+++ b/llvm/test/Transforms/LICM/AArch64/sve-load-hoist.ll
@@ -1,4 +1,4 @@
-; RUN: opt -licm -mtriple aarch64-linux-gnu -mattr=+sve -S < %s | FileCheck %s
+; RUN: opt -passes=licm -mtriple aarch64-linux-gnu -mattr=+sve -S < %s | FileCheck %s
 
 define void @no_hoist_load1_nxv2i64(ptr %out, ptr %in8, i32 %n) {
 ; CHECK-LABEL: @no_hoist_load1_nxv2i64(

diff  --git a/llvm/test/Transforms/LICM/AMDGPU/bitcast.ll b/llvm/test/Transforms/LICM/AMDGPU/bitcast.ll
index ea8bf696e565a..6c610130fedc4 100644
--- a/llvm/test/Transforms/LICM/AMDGPU/bitcast.ll
+++ b/llvm/test/Transforms/LICM/AMDGPU/bitcast.ll
@@ -1,4 +1,4 @@
-; RUN: opt -licm -mtriple=amdgcn -S -o - %s | FileCheck %s
+; RUN: opt -passes=licm -mtriple=amdgcn -S -o - %s | FileCheck %s
 
 ; CHECK-LABEL: foo
 ; CHECK: ret

diff  --git a/llvm/test/Transforms/LICM/AliasSetMemSet.ll b/llvm/test/Transforms/LICM/AliasSetMemSet.ll
index 0164c409fd9c7..d1f739fdd58e1 100644
--- a/llvm/test/Transforms/LICM/AliasSetMemSet.ll
+++ b/llvm/test/Transforms/LICM/AliasSetMemSet.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -loop-deletion -licm -loop-idiom -disable-output
+; RUN: opt < %s -passes='loop-mssa(loop-deletion,licm,loop-idiom)' -disable-output
 ; Check no assertion when loop-idiom deletes the MemSet already analyzed by licm
 define void @set_array() {
   br i1 false, label %bb3.preheader.lr.ph, label %bb9

diff  --git a/llvm/test/Transforms/LICM/PR19798.ll b/llvm/test/Transforms/LICM/PR19798.ll
index 4670f0e375342..42daf53915d41 100644
--- a/llvm/test/Transforms/LICM/PR19798.ll
+++ b/llvm/test/Transforms/LICM/PR19798.ll
@@ -1,4 +1,4 @@
-; RUN: opt -licm -S < %s | FileCheck %s
+; RUN: opt -passes=licm -S < %s | FileCheck %s
 
 define void @f(i1 %c) {
 ; CHECK-LABEL: @f(

diff  --git a/llvm/test/Transforms/LICM/PR21582.ll b/llvm/test/Transforms/LICM/PR21582.ll
index 8d38db1cfe4ca..a7baaae9d04af 100644
--- a/llvm/test/Transforms/LICM/PR21582.ll
+++ b/llvm/test/Transforms/LICM/PR21582.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -licm -S | FileCheck %s
+; RUN: opt < %s -passes=licm -S | FileCheck %s
 @b = external global i32, align 4
 @fn3.i = external global i32, align 4
 

diff  --git a/llvm/test/Transforms/LICM/PR24013.ll b/llvm/test/Transforms/LICM/PR24013.ll
index 7f8489e5a0de4..55b5d1e55e143 100644
--- a/llvm/test/Transforms/LICM/PR24013.ll
+++ b/llvm/test/Transforms/LICM/PR24013.ll
@@ -1,4 +1,4 @@
-; RUN: opt -licm -S < %s | FileCheck %s
+; RUN: opt -passes=licm -S < %s | FileCheck %s
 
 define void @f(i1 zeroext %p1) {
 ; CHECK-LABEL: @f(

diff  --git a/llvm/test/Transforms/LICM/Preserve-LCSSA.ll b/llvm/test/Transforms/LICM/Preserve-LCSSA.ll
index 88f62823c14c9..ecf6673a70148 100644
--- a/llvm/test/Transforms/LICM/Preserve-LCSSA.ll
+++ b/llvm/test/Transforms/LICM/Preserve-LCSSA.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -loop-rotate -licm -simple-loop-unswitch -disable-output -verify-loop-info -verify-dom-info
+; RUN: opt < %s -passes='loop-mssa(loop-rotate,licm,simple-loop-unswitch)' -disable-output -verify-loop-info -verify-dom-info
 
 define i32 @stringSearch_Clib(i32 %count) {
 entry:

diff  --git a/llvm/test/Transforms/LICM/alias-set-tracker-loss.ll b/llvm/test/Transforms/LICM/alias-set-tracker-loss.ll
index 378d908f69870..ff8d758d05ae6 100644
--- a/llvm/test/Transforms/LICM/alias-set-tracker-loss.ll
+++ b/llvm/test/Transforms/LICM/alias-set-tracker-loss.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -licm -loop-unroll < %s
+; RUN: opt -S -passes='loop-mssa(licm),loop-unroll' < %s
 ;
 ; This test contains a carefully rotated set of three nested loops. The middle
 ; loop can be unrolled leaving one copy of the inner loop inside the outer

diff  --git a/llvm/test/Transforms/LICM/assume.ll b/llvm/test/Transforms/LICM/assume.ll
index d92cab3a2fe26..f1afa2007f8e2 100644
--- a/llvm/test/Transforms/LICM/assume.ll
+++ b/llvm/test/Transforms/LICM/assume.ll
@@ -1,4 +1,4 @@
-; RUN: opt -licm < %s -S | FileCheck %s
+; RUN: opt -passes=licm < %s -S | FileCheck %s
 ; RUN: opt -aa-pipeline=basic-aa -passes='require<aa>,require<targetir>,require<scalar-evolution>,require<opt-remark-emit>,loop-mssa(licm)' < %s -S | FileCheck %s
 
 define void @f_0(i1 %p) nounwind ssp {

diff  --git a/llvm/test/Transforms/LICM/basictest.ll b/llvm/test/Transforms/LICM/basictest.ll
index 42a3a09795a73..4152b07df5be5 100644
--- a/llvm/test/Transforms/LICM/basictest.ll
+++ b/llvm/test/Transforms/LICM/basictest.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -licm | llvm-dis
+; RUN: opt < %s -passes=licm | llvm-dis
 ; RUN: opt -aa-pipeline=basic-aa -passes='require<aa>,require<targetir>,require<scalar-evolution>,require<opt-remark-emit>,loop-mssa(licm)' < %s | llvm-dis
 
 define void @testfunc(i32 %i) {

diff  --git a/llvm/test/Transforms/LICM/bisect-state.ll b/llvm/test/Transforms/LICM/bisect-state.ll
index d8f382b22b736..b9bc232999888 100644
--- a/llvm/test/Transforms/LICM/bisect-state.ll
+++ b/llvm/test/Transforms/LICM/bisect-state.ll
@@ -1,5 +1,5 @@
 ; Make sure we don't crash in LICM.
-; RUN: opt %s -licm -opt-bisect-limit=1
+; RUN: opt %s -passes=licm -opt-bisect-limit=1
 
 define void @patatino() {
 for.cond1:

diff  --git a/llvm/test/Transforms/LICM/call-hoisting.ll b/llvm/test/Transforms/LICM/call-hoisting.ll
index e0b95db2f0bcb..cffe680cbe7df 100644
--- a/llvm/test/Transforms/LICM/call-hoisting.ll
+++ b/llvm/test/Transforms/LICM/call-hoisting.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -licm %s | FileCheck %s
+; RUN: opt -S -passes=licm %s | FileCheck %s
 ; RUN: opt -aa-pipeline=basic-aa -passes='require<aa>,require<targetir>,require<scalar-evolution>,require<opt-remark-emit>,loop-mssa(licm)' < %s -S | FileCheck %s
 
 declare i32 @load(ptr %p) argmemonly readonly nounwind

diff  --git a/llvm/test/Transforms/LICM/callbr-crash.ll b/llvm/test/Transforms/LICM/callbr-crash.ll
index 5c14594276b6e..cd7debf75aa5c 100644
--- a/llvm/test/Transforms/LICM/callbr-crash.ll
+++ b/llvm/test/Transforms/LICM/callbr-crash.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -licm < %s | FileCheck %s
+; RUN: opt -S -passes=licm < %s | FileCheck %s
 
 define i32 @j() {
 ; CHECK-LABEL: @j(

diff  --git a/llvm/test/Transforms/LICM/constexpr.ll b/llvm/test/Transforms/LICM/constexpr.ll
index 23d0426dc0e2a..5dbaf7be94011 100644
--- a/llvm/test/Transforms/LICM/constexpr.ll
+++ b/llvm/test/Transforms/LICM/constexpr.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -S -licm | FileCheck %s
+; RUN: opt < %s -S -passes=licm | FileCheck %s
 ; RUN: opt -aa-pipeline=basic-aa -passes='require<opt-remark-emit>,loop-mssa(licm)' < %s -S | FileCheck %s
 ; This fixes PR22460
 

diff  --git a/llvm/test/Transforms/LICM/convergent.ll b/llvm/test/Transforms/LICM/convergent.ll
index c3d92881a2927..c617ae26dd760 100644
--- a/llvm/test/Transforms/LICM/convergent.ll
+++ b/llvm/test/Transforms/LICM/convergent.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -S -licm | FileCheck %s
+; RUN: opt < %s -S -passes=licm | FileCheck %s
 
 ; Check that we do not hoist convergent functions out of loop
 ; CHECK: define i32 @test

diff  --git a/llvm/test/Transforms/LICM/crash.ll b/llvm/test/Transforms/LICM/crash.ll
index e724e556be855..aa9e11e851bac 100644
--- a/llvm/test/Transforms/LICM/crash.ll
+++ b/llvm/test/Transforms/LICM/crash.ll
@@ -1,4 +1,4 @@
-; RUN: opt -licm -disable-output < %s
+; RUN: opt -passes=licm -disable-output < %s
 ; RUN: opt -aa-pipeline=basic-aa -passes='require<aa>,require<targetir>,require<scalar-evolution>,require<opt-remark-emit>,loop-mssa(licm)' -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"

diff  --git a/llvm/test/Transforms/LICM/debug-value.ll b/llvm/test/Transforms/LICM/debug-value.ll
index ea6b80b74ef26..f4356f539314c 100644
--- a/llvm/test/Transforms/LICM/debug-value.ll
+++ b/llvm/test/Transforms/LICM/debug-value.ll
@@ -1,4 +1,4 @@
-; RUN: opt -licm < %s -S | FileCheck %s
+; RUN: opt -passes=licm < %s -S | FileCheck %s
 ; RUN: opt -aa-pipeline=basic-aa -passes='require<aa>,require<targetir>,require<scalar-evolution>,require<opt-remark-emit>,loop-mssa(licm)' < %s -S | FileCheck %s
 
 define void @dgefa() nounwind ssp {

diff  --git a/llvm/test/Transforms/LICM/dropped-tbaa.ll b/llvm/test/Transforms/LICM/dropped-tbaa.ll
index a43d13d7923af..ccd6df32f8c94 100644
--- a/llvm/test/Transforms/LICM/dropped-tbaa.ll
+++ b/llvm/test/Transforms/LICM/dropped-tbaa.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -licm -S | FileCheck %s
+; RUN: opt < %s -passes=licm -S | FileCheck %s
 
 ; This test case case is generated from the following C code with -fstrict-aliasing,
 ; and after passing through -inline -mem2reg -loop-rotate -instcombine

diff  --git a/llvm/test/Transforms/LICM/explicit_guards.ll b/llvm/test/Transforms/LICM/explicit_guards.ll
index 87fda22ecc49b..be963b0b01994 100644
--- a/llvm/test/Transforms/LICM/explicit_guards.ll
+++ b/llvm/test/Transforms/LICM/explicit_guards.ll
@@ -1,5 +1,4 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -make-guards-explicit -licm < %s        | FileCheck %s
 ; RUN: opt -S -aa-pipeline=basic-aa -passes='require<opt-remark-emit>,make-guards-explicit,loop-mssa(licm)' < %s | FileCheck %s
 
 declare void @llvm.experimental.guard(i1,...)

diff  --git a/llvm/test/Transforms/LICM/extra-copies.ll b/llvm/test/Transforms/LICM/extra-copies.ll
index 51b9ae465daf2..defd2690a775a 100644
--- a/llvm/test/Transforms/LICM/extra-copies.ll
+++ b/llvm/test/Transforms/LICM/extra-copies.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -licm -S | FileCheck %s
+; RUN: opt < %s -passes=licm -S | FileCheck %s
 ; RUN: opt -passes='require<aa>,require<targetir>,require<scalar-evolution>,require<opt-remark-emit>,loop-mssa(licm)' < %s -S | FileCheck %s
 ; PR19835
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"

diff  --git a/llvm/test/Transforms/LICM/fence.ll b/llvm/test/Transforms/LICM/fence.ll
index ef274acd0d129..299411aec95b7 100644
--- a/llvm/test/Transforms/LICM/fence.ll
+++ b/llvm/test/Transforms/LICM/fence.ll
@@ -1,4 +1,4 @@
-; RUN: opt -licm < %s -S | FileCheck %s
+; RUN: opt -passes=licm < %s -S | FileCheck %s
 ; RUN: opt -aa-pipeline=basic-aa -passes='require<aa>,require<targetir>,require<scalar-evolution>,require<opt-remark-emit>,loop-mssa(licm)' < %s -S | FileCheck %s
 
 define void @test1(i64 %n) {

diff  --git a/llvm/test/Transforms/LICM/freeze.ll b/llvm/test/Transforms/LICM/freeze.ll
index f17c270c97bec..6c76de201e230 100644
--- a/llvm/test/Transforms/LICM/freeze.ll
+++ b/llvm/test/Transforms/LICM/freeze.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -licm -S < %s | FileCheck %s
+; RUN: opt -passes=licm -S < %s | FileCheck %s
 
 define void @hoist(i1 %a) {
 ; CHECK-LABEL: @hoist(

diff  --git a/llvm/test/Transforms/LICM/funclet.ll b/llvm/test/Transforms/LICM/funclet.ll
index f863da6f26cf8..140bc57093f1b 100644
--- a/llvm/test/Transforms/LICM/funclet.ll
+++ b/llvm/test/Transforms/LICM/funclet.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -licm -S | FileCheck %s
+; RUN: opt < %s -passes=licm -S | FileCheck %s
 ; RUN: opt -aa-pipeline=basic-aa -passes='require<aa>,require<targetir>,require<scalar-evolution>,require<opt-remark-emit>,loop-mssa(licm)' < %s -S | FileCheck %s
 
 target datalayout = "e-m:x-p:32:32-i64:64-f80:32-n8:16:32-a:0:32-S32"

diff  --git a/llvm/test/Transforms/LICM/gc-relocate.ll b/llvm/test/Transforms/LICM/gc-relocate.ll
index 1492faab7db3c..2149e74b7ab0d 100644
--- a/llvm/test/Transforms/LICM/gc-relocate.ll
+++ b/llvm/test/Transforms/LICM/gc-relocate.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -licm < %s | FileCheck %s
+; RUN: opt -S -passes=licm < %s | FileCheck %s
 
 target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128-ni:1-p2:32:8:8:32-ni:2"
 target triple = "x86_64-unknown-linux-gnu"

diff  --git a/llvm/test/Transforms/LICM/guards.ll b/llvm/test/Transforms/LICM/guards.ll
index 41b19cc79cb60..231e770208d9b 100644
--- a/llvm/test/Transforms/LICM/guards.ll
+++ b/llvm/test/Transforms/LICM/guards.ll
@@ -1,6 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
 ; REQUIRES: asserts
-; RUN: opt -licm -ipt-expensive-asserts=true < %s -S | FileCheck %s
+; RUN: opt -passes=licm -ipt-expensive-asserts=true < %s -S | FileCheck %s
 ; RUN: opt -aa-pipeline=basic-aa -passes='require<aa>,require<targetir>,require<scalar-evolution>,require<opt-remark-emit>,loop-mssa(licm)' -ipt-expensive-asserts=true < %s -S | FileCheck %s
 
 ; Hoist guard and load.

diff  --git a/llvm/test/Transforms/LICM/hoist-alloc.ll b/llvm/test/Transforms/LICM/hoist-alloc.ll
index d190c8408e0df..76047ec8c2438 100644
--- a/llvm/test/Transforms/LICM/hoist-alloc.ll
+++ b/llvm/test/Transforms/LICM/hoist-alloc.ll
@@ -1,6 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -licm -use-dereferenceable-at-point-semantics=0 < %s | FileCheck %s
-; RUN: opt -S -licm -use-dereferenceable-at-point-semantics=1 < %s | FileCheck %s
+; RUN: opt -S -passes=licm -use-dereferenceable-at-point-semantics=0 < %s | FileCheck %s
+; RUN: opt -S -passes=licm -use-dereferenceable-at-point-semantics=1 < %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/LICM/hoist-bitcast-load.ll b/llvm/test/Transforms/LICM/hoist-bitcast-load.ll
index fc1ce99e39bc8..16d1c0e775ed4 100644
--- a/llvm/test/Transforms/LICM/hoist-bitcast-load.ll
+++ b/llvm/test/Transforms/LICM/hoist-bitcast-load.ll
@@ -1,5 +1,5 @@
 ; RUN: opt -aa-pipeline=basic-aa -passes='require<opt-remark-emit>,loop-mssa(loop-simplifycfg,licm)' -S < %s | FileCheck %s
-; RUN: opt -S -licm -verify-memoryssa < %s | FileCheck %s
+; RUN: opt -S -passes=licm -verify-memoryssa < %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/LICM/hoist-debuginvariant.ll b/llvm/test/Transforms/LICM/hoist-debuginvariant.ll
index 92bd578ab9e15..e560ac4c55378 100644
--- a/llvm/test/Transforms/LICM/hoist-debuginvariant.ll
+++ b/llvm/test/Transforms/LICM/hoist-debuginvariant.ll
@@ -1,5 +1,5 @@
-; RUN: opt < %s -strip-debug -licm -S | FileCheck %s
-; RUN: opt < %s -licm -verify-memoryssa -S | FileCheck %s
+; RUN: opt < %s -strip-debug -passes=licm -S | FileCheck %s
+; RUN: opt < %s -passes=licm -verify-memoryssa -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/LICM/hoist-deref-load.ll b/llvm/test/Transforms/LICM/hoist-deref-load.ll
index 805d92fccb186..149976ab18746 100644
--- a/llvm/test/Transforms/LICM/hoist-deref-load.ll
+++ b/llvm/test/Transforms/LICM/hoist-deref-load.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -licm -verify-memoryssa < %s | FileCheck %s
+; RUN: opt -S -passes=licm -verify-memoryssa < %s | FileCheck %s
 ; RUN: opt -aa-pipeline=basic-aa -passes='require<opt-remark-emit>,loop-mssa(loop-simplifycfg,licm)' -verify-memoryssa -S < %s | FileCheck %s
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"

diff  --git a/llvm/test/Transforms/LICM/hoist-fast-fdiv.ll b/llvm/test/Transforms/LICM/hoist-fast-fdiv.ll
index 4507f295522d1..594dff446c0b6 100644
--- a/llvm/test/Transforms/LICM/hoist-fast-fdiv.ll
+++ b/llvm/test/Transforms/LICM/hoist-fast-fdiv.ll
@@ -1,4 +1,4 @@
-; RUN: opt -licm -verify-memoryssa -S < %s | FileCheck %s
+; RUN: opt -passes=licm -verify-memoryssa -S < %s | FileCheck %s
 
 ; Function Attrs: noinline norecurse nounwind readnone ssp uwtable
 define zeroext i1 @invariant_denom(double %v) #0 {

diff  --git a/llvm/test/Transforms/LICM/hoist-invariant-load.ll b/llvm/test/Transforms/LICM/hoist-invariant-load.ll
index 040822319a5d4..1822b8fc61add 100644
--- a/llvm/test/Transforms/LICM/hoist-invariant-load.ll
+++ b/llvm/test/Transforms/LICM/hoist-invariant-load.ll
@@ -1,5 +1,5 @@
 ; REQUIRES: asserts
-; RUN: opt < %s -licm -verify-memoryssa -disable-basic-aa -stats -S 2>&1 | grep "1 licm"
+; RUN: opt < %s -passes=licm -verify-memoryssa -disable-basic-aa -stats -S 2>&1 | grep "1 licm"
 
 @"\01L_OBJC_METH_VAR_NAME_" = internal global [4 x i8] c"foo\00", section "__TEXT,__objc_methname,cstring_literals", align 1
 @"\01L_OBJC_SELECTOR_REFERENCES_" = internal global ptr @"\01L_OBJC_METH_VAR_NAME_", section "__DATA, __objc_selrefs, literal_pointers, no_dead_strip"

diff  --git a/llvm/test/Transforms/LICM/hoist-load-without-store.ll b/llvm/test/Transforms/LICM/hoist-load-without-store.ll
index 52ab8fd7836b9..306566e4c9ceb 100644
--- a/llvm/test/Transforms/LICM/hoist-load-without-store.ll
+++ b/llvm/test/Transforms/LICM/hoist-load-without-store.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -licm -S < %s | FileCheck %s
+; RUN: opt -passes=licm -S < %s | FileCheck %s
 
 ;; C reproducer:
 ;; void f(int *ptr, int n) {

diff  --git a/llvm/test/Transforms/LICM/hoist-mustexec.ll b/llvm/test/Transforms/LICM/hoist-mustexec.ll
index e804ad9224cf7..d47209941298b 100644
--- a/llvm/test/Transforms/LICM/hoist-mustexec.ll
+++ b/llvm/test/Transforms/LICM/hoist-mustexec.ll
@@ -1,5 +1,5 @@
 ; REQUIRES: asserts
-; RUN: opt -S -licm -ipt-expensive-asserts=true < %s | FileCheck %s
+; RUN: opt -S -passes=licm -ipt-expensive-asserts=true < %s | FileCheck %s
 ; RUN: opt -aa-pipeline=basic-aa -passes='require<opt-remark-emit>,loop-mssa(licm)' -ipt-expensive-asserts=true -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/LICM/hoist-nounwind.ll b/llvm/test/Transforms/LICM/hoist-nounwind.ll
index 62929ecfcc2af..f8ad969929eb7 100644
--- a/llvm/test/Transforms/LICM/hoist-nounwind.ll
+++ b/llvm/test/Transforms/LICM/hoist-nounwind.ll
@@ -1,5 +1,5 @@
 ; RUN: opt -aa-pipeline=basic-aa -passes='require<opt-remark-emit>,loop-mssa(licm)' -S %s | FileCheck %s
-; RUN: opt -S -licm -verify-memoryssa < %s | FileCheck %s
+; RUN: opt -S -passes=licm -verify-memoryssa < %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/LICM/hoist-phi.ll b/llvm/test/Transforms/LICM/hoist-phi.ll
index 90c616c8d75f8..4d8752d790737 100644
--- a/llvm/test/Transforms/LICM/hoist-phi.ll
+++ b/llvm/test/Transforms/LICM/hoist-phi.ll
@@ -1,6 +1,6 @@
-; RUN: opt -S -licm < %s | FileCheck %s -check-prefixes=CHECK,CHECK-DISABLED
-; RUN: opt -S -licm -licm-control-flow-hoisting=1 < %s | FileCheck %s -check-prefixes=CHECK,CHECK-ENABLED
-; RUN: opt -S -licm -licm-control-flow-hoisting=0 < %s | FileCheck %s -check-prefixes=CHECK,CHECK-DISABLED
+; RUN: opt -S -passes=licm < %s | FileCheck %s -check-prefixes=CHECK,CHECK-DISABLED
+; RUN: opt -S -passes=licm -licm-control-flow-hoisting=1 < %s | FileCheck %s -check-prefixes=CHECK,CHECK-ENABLED
+; RUN: opt -S -passes=licm -licm-control-flow-hoisting=0 < %s | FileCheck %s -check-prefixes=CHECK,CHECK-DISABLED
 ; RUN: opt -passes='require<opt-remark-emit>,loop-mssa(licm)' -S < %s | FileCheck %s -check-prefixes=CHECK,CHECK-DISABLED
 
 ; RUN: opt -passes='require<opt-remark-emit>,loop-mssa(licm)' -licm-control-flow-hoisting=1 -verify-memoryssa -S < %s | FileCheck %s -check-prefixes=CHECK,CHECK-ENABLED

diff  --git a/llvm/test/Transforms/LICM/hoist-round.ll b/llvm/test/Transforms/LICM/hoist-round.ll
index 0d31207cfb8ca..971e9e90a55f3 100644
--- a/llvm/test/Transforms/LICM/hoist-round.ll
+++ b/llvm/test/Transforms/LICM/hoist-round.ll
@@ -1,5 +1,5 @@
 ; RUN: opt -aa-pipeline=basic-aa -passes='require<aa>,require<targetir>,require<scalar-evolution>,require<opt-remark-emit>,loop-mssa(licm)' -S %s | FileCheck %s
-; RUN: opt -S -licm -verify-memoryssa < %s | FileCheck %s
+; RUN: opt -S -passes=licm -verify-memoryssa < %s | FileCheck %s
 
 target datalayout = "E-m:e-p:32:32-i8:8:8-i16:16:16-i64:32:32-f64:32:32-v64:32:32-v128:32:32-a0:0:32-n32"
 

diff  --git a/llvm/test/Transforms/LICM/infinite_loops.ll b/llvm/test/Transforms/LICM/infinite_loops.ll
index 24efcf03ee184..64f7e8edc7fb4 100644
--- a/llvm/test/Transforms/LICM/infinite_loops.ll
+++ b/llvm/test/Transforms/LICM/infinite_loops.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -licm < %s | FileCheck %s
+; RUN: opt -S -passes=licm < %s | FileCheck %s
 ; RUN: opt -aa-pipeline=basic-aa -passes='require<opt-remark-emit>,loop-mssa(licm)' -S %s | FileCheck %s
 
 ; Make sure we don't hoist the unsafe division to some executable block.

diff  --git a/llvm/test/Transforms/LICM/int_sideeffect.ll b/llvm/test/Transforms/LICM/int_sideeffect.ll
index c241fee4be7ef..af222bf788c40 100644
--- a/llvm/test/Transforms/LICM/int_sideeffect.ll
+++ b/llvm/test/Transforms/LICM/int_sideeffect.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S < %s -licm | FileCheck %s
+; RUN: opt -S < %s -passes=licm | FileCheck %s
 
 declare void @llvm.sideeffect()
 

diff  --git a/llvm/test/Transforms/LICM/invariant.start.ll b/llvm/test/Transforms/LICM/invariant.start.ll
index a62710234734e..aba38829e0028 100644
--- a/llvm/test/Transforms/LICM/invariant.start.ll
+++ b/llvm/test/Transforms/LICM/invariant.start.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -licm < %s -S | FileCheck %s
+; RUN: opt -passes=licm < %s -S | FileCheck %s
 ; RUN: opt -aa-pipeline=basic-aa -passes='require<aa>,require<targetir>,require<scalar-evolution>,require<opt-remark-emit>,loop-mssa(licm)' < %s -S | FileCheck %s
 
 define void @test1(i1 %cond, ptr %ptr) {

diff  --git a/llvm/test/Transforms/LICM/lcssa-ssa-promoter.ll b/llvm/test/Transforms/LICM/lcssa-ssa-promoter.ll
index 4b77ea500b4df..ca3888f0f4b09 100644
--- a/llvm/test/Transforms/LICM/lcssa-ssa-promoter.ll
+++ b/llvm/test/Transforms/LICM/lcssa-ssa-promoter.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -licm < %s | FileCheck %s
+; RUN: opt -S -passes=licm < %s | FileCheck %s
 ; RUN: opt -aa-pipeline=basic-aa -passes='require<aa>,require<targetir>,require<scalar-evolution>,require<opt-remark-emit>,loop-mssa(licm)' -S %s| FileCheck %s
 ;
 ; Manually validate LCSSA form is preserved even after SSAUpdater is used to

diff  --git a/llvm/test/Transforms/LICM/loopsink-pr38462.ll b/llvm/test/Transforms/LICM/loopsink-pr38462.ll
index 283e3c489184b..51eee1fbbde2b 100644
--- a/llvm/test/Transforms/LICM/loopsink-pr38462.ll
+++ b/llvm/test/Transforms/LICM/loopsink-pr38462.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -verify-memoryssa -loop-sink < %s | FileCheck %s
+; RUN: opt -S -verify-memoryssa -passes=loop-sink < %s | FileCheck %s
 ; RUN: opt -S -verify-memoryssa -aa-pipeline=basic-aa -passes=loop-sink < %s | FileCheck %s
 
 target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128"

diff  --git a/llvm/test/Transforms/LICM/loopsink-pr39570.ll b/llvm/test/Transforms/LICM/loopsink-pr39570.ll
index 7ec4382031f98..2894abdf71eee 100644
--- a/llvm/test/Transforms/LICM/loopsink-pr39570.ll
+++ b/llvm/test/Transforms/LICM/loopsink-pr39570.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -verify-memoryssa -loop-sink < %s | FileCheck %s
+; RUN: opt -S -verify-memoryssa -passes=loop-sink < %s | FileCheck %s
 ; RUN: opt -S -verify-memoryssa -aa-pipeline=basic-aa -passes=loop-sink < %s | FileCheck %s
 
 ; CHECK: pr39570

diff  --git a/llvm/test/Transforms/LICM/loopsink-pr39695.ll b/llvm/test/Transforms/LICM/loopsink-pr39695.ll
index 9545c8aed50b8..7c803fdbeba35 100644
--- a/llvm/test/Transforms/LICM/loopsink-pr39695.ll
+++ b/llvm/test/Transforms/LICM/loopsink-pr39695.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -verify-memoryssa -loop-sink < %s | FileCheck %s
+; RUN: opt -S -verify-memoryssa -passes=loop-sink < %s | FileCheck %s
 ; RUN: opt -S -verify-memoryssa -aa-pipeline=basic-aa -passes=loop-sink < %s | FileCheck %s
 
 ; The load instruction should not be sunk into following loop.

diff  --git a/llvm/test/Transforms/LICM/loopsink.ll b/llvm/test/Transforms/LICM/loopsink.ll
index da907f6bb3676..c08b992f35f41 100644
--- a/llvm/test/Transforms/LICM/loopsink.ll
+++ b/llvm/test/Transforms/LICM/loopsink.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -verify-memoryssa -loop-sink < %s | FileCheck %s
+; RUN: opt -S -verify-memoryssa -passes=loop-sink < %s | FileCheck %s
 ; RUN: opt -S -verify-memoryssa -aa-pipeline=basic-aa -passes=loop-sink < %s | FileCheck %s
 
 @g = global i32 0, align 4

diff  --git a/llvm/test/Transforms/LICM/no-preheader-test.ll b/llvm/test/Transforms/LICM/no-preheader-test.ll
index 867fa6abc4b84..091dbd31d3682 100644
--- a/llvm/test/Transforms/LICM/no-preheader-test.ll
+++ b/llvm/test/Transforms/LICM/no-preheader-test.ll
@@ -1,5 +1,5 @@
 ; Test that LICM works when there is not a loop-preheader
-; RUN: opt < %s -licm | llvm-dis
+; RUN: opt < %s -passes=licm | llvm-dis
 ; RUN: opt -aa-pipeline=basic-aa -passes='require<aa>,require<targetir>,require<scalar-evolution>,require<opt-remark-emit>,loop-mssa(licm)' < %s | llvm-dis
 
 define void @testfunc(i32 %i.s, i1 %ifcond) {

diff  --git a/llvm/test/Transforms/LICM/opt-remarks-conditional-load.ll b/llvm/test/Transforms/LICM/opt-remarks-conditional-load.ll
index 3e540001085a4..9d48f91337f50 100644
--- a/llvm/test/Transforms/LICM/opt-remarks-conditional-load.ll
+++ b/llvm/test/Transforms/LICM/opt-remarks-conditional-load.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -licm -pass-remarks-missed=licm -o /dev/null 2>&1 | FileCheck %s
+; RUN: opt < %s -passes=licm -pass-remarks-missed=licm -o /dev/null 2>&1 | FileCheck %s
 ; RUN: opt -aa-pipeline=basic-aa -passes='require<aa>,require<targetir>,require<scalar-evolution>,require<opt-remark-emit>,loop-mssa(licm)' %s -o /dev/null -pass-remarks-missed=licm 2>&1 | FileCheck %s
 target datalayout = "E-p:64:64:64-a0:0:8-f32:32:32-f64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-v64:64:64-v128:128:128"
 

diff  --git a/llvm/test/Transforms/LICM/opt-remarks-intervening-store.ll b/llvm/test/Transforms/LICM/opt-remarks-intervening-store.ll
index 8cdd656a43b1a..3092c82467538 100644
--- a/llvm/test/Transforms/LICM/opt-remarks-intervening-store.ll
+++ b/llvm/test/Transforms/LICM/opt-remarks-intervening-store.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -licm -pass-remarks-missed=licm -o /dev/null 2>&1 | FileCheck %s
+; RUN: opt < %s -passes=licm -pass-remarks-missed=licm -o /dev/null 2>&1 | FileCheck %s
 ; RUN: opt -aa-pipeline=basic-aa -passes='require<aa>,require<targetir>,require<scalar-evolution>,require<opt-remark-emit>,loop-mssa(licm)' %s -o /dev/null -pass-remarks-missed=licm 2>&1 | FileCheck %s
 target datalayout = "E-p:64:64:64-a0:0:8-f32:32:32-f64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-v64:64:64-v128:128:128"
 

diff  --git a/llvm/test/Transforms/LICM/opt-remarks.ll b/llvm/test/Transforms/LICM/opt-remarks.ll
index ebf784907fd99..153e685d4685e 100644
--- a/llvm/test/Transforms/LICM/opt-remarks.ll
+++ b/llvm/test/Transforms/LICM/opt-remarks.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -licm -pass-remarks=licm -o /dev/null 2>&1 | FileCheck %s
+; RUN: opt < %s -passes=licm -pass-remarks=licm -o /dev/null 2>&1 | FileCheck %s
 ; RUN: opt -aa-pipeline=basic-aa -passes='require<aa>,require<targetir>,require<scalar-evolution>,require<opt-remark-emit>,loop-mssa(licm)' %s -o /dev/null -pass-remarks=licm 2>&1 | FileCheck %s
 target datalayout = "E-p:64:64:64-a0:0:8-f32:32:32-f64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-v64:64:64-v128:128:128"
 

diff  --git a/llvm/test/Transforms/LICM/outer-loop-deleted-before-licm.ll b/llvm/test/Transforms/LICM/outer-loop-deleted-before-licm.ll
index 1865ed32ecb97..71bdd450b22d7 100644
--- a/llvm/test/Transforms/LICM/outer-loop-deleted-before-licm.ll
+++ b/llvm/test/Transforms/LICM/outer-loop-deleted-before-licm.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -S -loop-unroll -licm | FileCheck %s
+; RUN: opt %s -S -passes='loop-unroll,loop-mssa(licm)' | FileCheck %s
 
 ; Check that we can deal with loops where a parent loop gets deleted before it
 ; is visited by LICM.

diff  --git a/llvm/test/Transforms/LICM/pr23608.ll b/llvm/test/Transforms/LICM/pr23608.ll
index 181c22879219a..2477aa845ce93 100644
--- a/llvm/test/Transforms/LICM/pr23608.ll
+++ b/llvm/test/Transforms/LICM/pr23608.ll
@@ -1,6 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -licm %s | FileCheck %s --check-prefix=NO_ASSUME
-; RUN: opt -S -licm --enable-knowledge-retention %s | FileCheck %s --check-prefix=USE_ASSUME
+; RUN: opt -S -passes=licm %s | FileCheck %s --check-prefix=NO_ASSUME
+; RUN: opt -S -passes=licm --enable-knowledge-retention %s | FileCheck %s --check-prefix=USE_ASSUME
 ; ModuleID = '../pr23608.ll'
 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/LICM/pr26843.ll b/llvm/test/Transforms/LICM/pr26843.ll
index f0540eb2b246d..5796589c3681b 100644
--- a/llvm/test/Transforms/LICM/pr26843.ll
+++ b/llvm/test/Transforms/LICM/pr26843.ll
@@ -1,9 +1,9 @@
-; RUN: opt -S -licm < %s | FileCheck %s
+; RUN: opt -S -passes=licm < %s | FileCheck %s
 
 target datalayout = "e-m:x-p:32:32-i64:64-f80:32-n8:16:32-a:0:32-S32"
 target triple = "i686-pc-windows-msvc18.0.0"
 
- at v = common global i32 zeroinitializer, align 4 
+ at v = common global i32 zeroinitializer, align 4
 
 ; Make sure the store to v is not sunk past the memset
 ; CHECK-LABEL: @main
@@ -16,12 +16,12 @@ target triple = "i686-pc-windows-msvc18.0.0"
 define i32 @main(i1 %k) {
 entry:
   br label %for.body
- 
+
 for.body:
   store i32 1, ptr @v, align 4
   tail call void @llvm.memset.p0.i32(ptr align 4 @v, i8 0, i32 4, i1 false)
   br label %for.latch
-  
+
 for.latch:
   br i1 %k, label %for.body, label %end
 

diff  --git a/llvm/test/Transforms/LICM/pr27262.ll b/llvm/test/Transforms/LICM/pr27262.ll
index 985118c7ef26b..bcb2dc0c35638 100644
--- a/llvm/test/Transforms/LICM/pr27262.ll
+++ b/llvm/test/Transforms/LICM/pr27262.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -licm < %s | FileCheck %s
+; RUN: opt -S -passes=licm < %s | FileCheck %s
 
 target datalayout = "e-m:x-p:32:32-i64:64-f80:32-n8:16:32-a:0:32-S32"
 target triple = "i686-pc-windows-msvc18.0.0"
@@ -16,13 +16,13 @@ define i32 @main(i1 %k, ptr %p) {
 entry:
   %p1 = getelementptr i8, ptr %p, i32 1
   br label %for.body
- 
+
 for.body:
   store i8 1, ptr %p, align 1
   store i8 2, ptr %p1, align 1
   call void @llvm.memset.p0.i32(ptr %p, i8 255, i32 4, i1 false)
   br label %for.latch
-  
+
 for.latch:
   br i1 %k, label %for.body, label %end
 

diff  --git a/llvm/test/Transforms/LICM/pr32129.ll b/llvm/test/Transforms/LICM/pr32129.ll
index bec1634071d47..02163a6989251 100644
--- a/llvm/test/Transforms/LICM/pr32129.ll
+++ b/llvm/test/Transforms/LICM/pr32129.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -licm -simple-loop-unswitch -licm < %s | FileCheck %s
+; RUN: opt -S -passes=licm,simple-loop-unswitch,licm < %s | FileCheck %s
 
 declare void @llvm.experimental.guard(i1, ...)
 

diff  --git a/llvm/test/Transforms/LICM/pr35342.ll b/llvm/test/Transforms/LICM/pr35342.ll
index 481118357e32b..b5afc65e04d01 100644
--- a/llvm/test/Transforms/LICM/pr35342.ll
+++ b/llvm/test/Transforms/LICM/pr35342.ll
@@ -1,4 +1,4 @@
-; RUN: opt -licm -S < %s | FileCheck %s
+; RUN: opt -passes=licm -S < %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/LICM/pr36228.ll b/llvm/test/Transforms/LICM/pr36228.ll
index 5cb961a0f6744..c92bd68d294d4 100644
--- a/llvm/test/Transforms/LICM/pr36228.ll
+++ b/llvm/test/Transforms/LICM/pr36228.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -licm -o - %s | FileCheck %s
+; RUN: opt -S -passes=licm -o - %s | FileCheck %s
 ;
 ; Be sure that we don't hoist loads incorrectly if a loop has conditional UB.
 ; See PR36228.

diff  --git a/llvm/test/Transforms/LICM/pr40317.ll b/llvm/test/Transforms/LICM/pr40317.ll
index 369bf865d7906..32e0dfabd27ca 100644
--- a/llvm/test/Transforms/LICM/pr40317.ll
+++ b/llvm/test/Transforms/LICM/pr40317.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mcpu=z13 -licm -licm-control-flow-hoisting -verify-memoryssa < %s | FileCheck %s
+; RUN: opt -S -mcpu=z13 -passes=licm -licm-control-flow-hoisting -verify-memoryssa < %s | FileCheck %s
 
 target datalayout = "E-m:e-i1:8:16-i8:8:16-i64:64-f128:64-v128:64-a:8:16-n32:64"
 target triple = "s390x-ibm-linux"

diff  --git a/llvm/test/Transforms/LICM/pr42969.ll b/llvm/test/Transforms/LICM/pr42969.ll
index d076259efe6a9..ba02fbb72e710 100644
--- a/llvm/test/Transforms/LICM/pr42969.ll
+++ b/llvm/test/Transforms/LICM/pr42969.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -S -licm | FileCheck %s
+; RUN: opt %s -S -passes=licm | FileCheck %s
 
 define i16 @main(i1 %a_b_mayalias, ptr %a, ptr %b) {
 ; CHECK:       scalar.body:

diff  --git a/llvm/test/Transforms/LICM/pr54495.ll b/llvm/test/Transforms/LICM/pr54495.ll
index f4ad586ffb168..d01ca69d55242 100644
--- a/llvm/test/Transforms/LICM/pr54495.ll
+++ b/llvm/test/Transforms/LICM/pr54495.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -licm < %s | FileCheck %s
+; RUN: opt -S -passes=licm < %s | FileCheck %s
 
 ; Make sure that a store of a pointer to itself is handled correctly.
 

diff  --git a/llvm/test/Transforms/LICM/pr57780.ll b/llvm/test/Transforms/LICM/pr57780.ll
index 2c075e9192bd5..a911960e0aab6 100644
--- a/llvm/test/Transforms/LICM/pr57780.ll
+++ b/llvm/test/Transforms/LICM/pr57780.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -licm < %s | FileCheck %s
+; RUN: opt -S -passes=licm < %s | FileCheck %s
 
 @c = global i16 0, align 2
 

diff  --git a/llvm/test/Transforms/LICM/pragma-licm-disable.ll b/llvm/test/Transforms/LICM/pragma-licm-disable.ll
index 6fc7d3a832f02..7d89015a23a84 100644
--- a/llvm/test/Transforms/LICM/pragma-licm-disable.ll
+++ b/llvm/test/Transforms/LICM/pragma-licm-disable.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -S -licm | FileCheck %s
+; RUN: opt < %s -S -passes=licm | FileCheck %s
 
 ; Check that the LICM pass does not operate on a loop which has the
 ; llvm.licm.disable metadata.

diff  --git a/llvm/test/Transforms/LICM/preheader-safe.ll b/llvm/test/Transforms/LICM/preheader-safe.ll
index f27e0b7c9f46c..0fd05e5aacc9d 100644
--- a/llvm/test/Transforms/LICM/preheader-safe.ll
+++ b/llvm/test/Transforms/LICM/preheader-safe.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -licm < %s | FileCheck %s
+; RUN: opt -S -passes=licm < %s | FileCheck %s
 ; RUN: opt -aa-pipeline=basic-aa -passes='require<aa>,require<targetir>,require<scalar-evolution>,require<opt-remark-emit>,loop-mssa(licm)' -S %s | FileCheck %s
 
 declare void @use_nothrow(i64 %a) nounwind

diff  --git a/llvm/test/Transforms/LICM/promote-atomic.ll b/llvm/test/Transforms/LICM/promote-atomic.ll
index 7ce81ee270cea..392a4b5d5e450 100644
--- a/llvm/test/Transforms/LICM/promote-atomic.ll
+++ b/llvm/test/Transforms/LICM/promote-atomic.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -licm < %s | FileCheck %s
+; RUN: opt -S -passes=licm < %s | FileCheck %s
 
 %class.LiveThread = type { i64, ptr }
 

diff  --git a/llvm/test/Transforms/LICM/promote-single-thread.ll b/llvm/test/Transforms/LICM/promote-single-thread.ll
index 0f32a4e751cea..7e717615d543b 100644
--- a/llvm/test/Transforms/LICM/promote-single-thread.ll
+++ b/llvm/test/Transforms/LICM/promote-single-thread.ll
@@ -1,6 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -licm < %s | FileCheck %s --check-prefixes=CHECK,MT
-; RUN: opt -S -licm -licm-force-thread-model-single < %s | FileCheck %s --check-prefixes=CHECK,ST
+; RUN: opt -S -passes=licm < %s | FileCheck %s --check-prefixes=CHECK,MT
+; RUN: opt -S -passes=licm -licm-force-thread-model-single < %s | FileCheck %s --check-prefixes=CHECK,ST
 
 @g = external global i32
 @c = external constant i32

diff  --git a/llvm/test/Transforms/LICM/promote-tls.ll b/llvm/test/Transforms/LICM/promote-tls.ll
index 4e4eecc40a10d..65ecb87d90a18 100644
--- a/llvm/test/Transforms/LICM/promote-tls.ll
+++ b/llvm/test/Transforms/LICM/promote-tls.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -licm -S < %s | FileCheck %s
+; RUN: opt -passes=licm -S < %s | FileCheck %s
 ; RUN: opt -passes='loop-mssa(licm)' -S %s | FileCheck %s
 
 ; If we can prove a local is thread local, we can insert stores during

diff  --git a/llvm/test/Transforms/LICM/promote-unknown-load.ll b/llvm/test/Transforms/LICM/promote-unknown-load.ll
index a0ba5389703d3..4cddfdcbafd16 100644
--- a/llvm/test/Transforms/LICM/promote-unknown-load.ll
+++ b/llvm/test/Transforms/LICM/promote-unknown-load.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -licm < %s | FileCheck %s
+; RUN: opt -S -passes=licm < %s | FileCheck %s
 
 ; FIXME: The %val.ptr load might alias the %pos.ptr load/stores, but it's still
 ; fine to promote the load as long as the store is retained.

diff  --git a/llvm/test/Transforms/LICM/read-volatile-register.ll b/llvm/test/Transforms/LICM/read-volatile-register.ll
index 1836d3762b3bd..3197e6824da1a 100644
--- a/llvm/test/Transforms/LICM/read-volatile-register.ll
+++ b/llvm/test/Transforms/LICM/read-volatile-register.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -licm %s | FileCheck %s
+; RUN: opt -S -passes=licm %s | FileCheck %s
 
 ; Volatile register shouldn't be hoisted ourside loops.
 define i32 @test_read() {

diff  --git a/llvm/test/Transforms/LICM/scalar-promote-memmodel.ll b/llvm/test/Transforms/LICM/scalar-promote-memmodel.ll
index 872265029d976..762cf8fd63bf7 100644
--- a/llvm/test/Transforms/LICM/scalar-promote-memmodel.ll
+++ b/llvm/test/Transforms/LICM/scalar-promote-memmodel.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -licm -S | FileCheck %s
+; RUN: opt < %s -passes=licm -S | FileCheck %s
 ; RUN: opt -aa-pipeline=tbaa,basic-aa -passes='require<aa>,require<targetir>,require<scalar-evolution>,require<opt-remark-emit>,loop-mssa(licm)' -S %s | FileCheck %s
 
 ; Make sure we don't hoist a conditionally-executed store out of the loop;

diff  --git a/llvm/test/Transforms/LICM/scalar-promote-unwind.ll b/llvm/test/Transforms/LICM/scalar-promote-unwind.ll
index d077eaf8127db..4d5c028a06dc6 100644
--- a/llvm/test/Transforms/LICM/scalar-promote-unwind.ll
+++ b/llvm/test/Transforms/LICM/scalar-promote-unwind.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -licm -S | FileCheck %s
+; RUN: opt < %s -passes=licm -S | FileCheck %s
 ; RUN: opt -aa-pipeline=basic-aa -passes='require<aa>,require<targetir>,require<scalar-evolution>,require<opt-remark-emit>,loop-mssa(licm)' -S %s | FileCheck %s
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"

diff  --git a/llvm/test/Transforms/LICM/scalar-promote.ll b/llvm/test/Transforms/LICM/scalar-promote.ll
index 479be9d87a01a..1597a911a413b 100644
--- a/llvm/test/Transforms/LICM/scalar-promote.ll
+++ b/llvm/test/Transforms/LICM/scalar-promote.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --check-attributes
-; RUN: opt < %s -licm -S | FileCheck %s
+; RUN: opt < %s -passes=licm -S | FileCheck %s
 ; RUN: opt -aa-pipeline=tbaa,basic-aa -passes='require<aa>,require<targetir>,require<scalar-evolution>,require<opt-remark-emit>,loop-mssa(licm)' -S %s | FileCheck %s
 target datalayout = "E-p:64:64:64-a0:0:8-f32:32:32-f64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-v64:64:64-v128:128:128"
 

diff  --git a/llvm/test/Transforms/LICM/sink-debuginfo-preserve.ll b/llvm/test/Transforms/LICM/sink-debuginfo-preserve.ll
index 76b5febef95e7..de06a86224cf3 100644
--- a/llvm/test/Transforms/LICM/sink-debuginfo-preserve.ll
+++ b/llvm/test/Transforms/LICM/sink-debuginfo-preserve.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -licm < %s | FileCheck %s
+; RUN: opt -S -passes=licm < %s | FileCheck %s
 
 ; LICM is trying to merge the two `store` in block %14 and %17, but given their
 ; locations disagree, it sets a line zero location instead instead of picking a
@@ -8,16 +8,16 @@
 ; volatile int a;
 ; extern int g;
 ; int g;
-; void f1() { 
-;  while (a) { 
+; void f1() {
+;  while (a) {
 ;    g = 0;
 ;    if (a)
 ;      g = 0;
-;  } 
+;  }
 ; }
 
 ; CHECK: bb22:
-; CHECK-NEXT: store i32 0, ptr getelementptr inbounds ([2 x i32], ptr @g_390, i64 0, i64 1), align 4, !dbg [[storeLocation:![0-9]+]] 
+; CHECK-NEXT: store i32 0, ptr getelementptr inbounds ([2 x i32], ptr @g_390, i64 0, i64 1), align 4, !dbg [[storeLocation:![0-9]+]]
 ; CHECK: [[storeLocation]] = !DILocation(line: 0
 
 target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"

diff  --git a/llvm/test/Transforms/LICM/sink-foldable.ll b/llvm/test/Transforms/LICM/sink-foldable.ll
index 3b2ea4cc15243..71e522c04c5bb 100644
--- a/llvm/test/Transforms/LICM/sink-foldable.ll
+++ b/llvm/test/Transforms/LICM/sink-foldable.ll
@@ -1,7 +1,7 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
 ; REQUIRES: aarch64-registered-target
 
-; RUN: opt < %s  -licm -S   | FileCheck %s
+; RUN: opt < %s  -passes=licm -S   | FileCheck %s
 
 target triple = "aarch64--linux-gnueabi"
 

diff  --git a/llvm/test/Transforms/LICM/sink-promote.ll b/llvm/test/Transforms/LICM/sink-promote.ll
index ca133fabe176f..8a90f0b40340d 100644
--- a/llvm/test/Transforms/LICM/sink-promote.ll
+++ b/llvm/test/Transforms/LICM/sink-promote.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -licm -S | FileCheck %s
+; RUN: opt < %s -passes=licm -S | FileCheck %s
 
 ; Test moved from sinking.ll, as it tests sinking of a store who alone touches
 ; a memory location in a loop.

diff  --git a/llvm/test/Transforms/LICM/sinking-debugify.ll b/llvm/test/Transforms/LICM/sinking-debugify.ll
index c863c785f43bb..c8918bcee7dcb 100644
--- a/llvm/test/Transforms/LICM/sinking-debugify.ll
+++ b/llvm/test/Transforms/LICM/sinking-debugify.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -debugify -licm -S | FileCheck %s
+; RUN: opt < %s -passes='debugify,function(loop-mssa(licm))' -S | FileCheck %s
 
 %Ty = type { i32, i32 }
 @X2 = external global %Ty

diff  --git a/llvm/test/Transforms/LICM/sinking.ll b/llvm/test/Transforms/LICM/sinking.ll
index a04a45893b79e..153601ac642d6 100644
--- a/llvm/test/Transforms/LICM/sinking.ll
+++ b/llvm/test/Transforms/LICM/sinking.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -licm -S -verify-memoryssa | FileCheck %s
+; RUN: opt < %s -passes=licm -S -verify-memoryssa | FileCheck %s
 
 
 declare i32 @strlen(ptr) readonly nounwind willreturn

diff  --git a/llvm/test/Transforms/LICM/speculate.ll b/llvm/test/Transforms/LICM/speculate.ll
index 7b669cf339ebe..7f753b520dd3d 100644
--- a/llvm/test/Transforms/LICM/speculate.ll
+++ b/llvm/test/Transforms/LICM/speculate.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -licm < %s | FileCheck %s
+; RUN: opt -S -passes=licm < %s | FileCheck %s
 ; RUN: opt -passes='require<aa>,require<targetir>,require<scalar-evolution>,require<opt-remark-emit>,loop-mssa(licm)' -S %s | FileCheck %s
 
 ; UDiv is safe to speculate if the denominator is known non-zero.

diff  --git a/llvm/test/Transforms/LICM/strlen.ll b/llvm/test/Transforms/LICM/strlen.ll
index e4e72b253e05e..5e9f09a0971fc 100644
--- a/llvm/test/Transforms/LICM/strlen.ll
+++ b/llvm/test/Transforms/LICM/strlen.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -inferattrs -licm < %s | FileCheck %s
+; RUN: opt -S -passes='inferattrs,function(loop-mssa(licm))' < %s | FileCheck %s
 
 define void @test(ptr noalias %loc, ptr noalias %a) {
 ; CHECK-LABEL: @test

diff  --git a/llvm/test/Transforms/LICM/unrolled-deeply-nested.ll b/llvm/test/Transforms/LICM/unrolled-deeply-nested.ll
index 8099f4ddd4cce..353889ea2d6f0 100644
--- a/llvm/test/Transforms/LICM/unrolled-deeply-nested.ll
+++ b/llvm/test/Transforms/LICM/unrolled-deeply-nested.ll
@@ -4,7 +4,7 @@
 ; loop.
 ;
 ; RUN: opt -S -aa-pipeline=basic-aa -passes='require<opt-remark-emit>,loop-mssa(licm)' < %s | FileCheck %s
-; RUN: opt -S -licm < %s | FileCheck %s
+; RUN: opt -S -passes=licm < %s | FileCheck %s
 
 define i32 @test(ptr %a, i64 %n.0, i64 %n.0.0, i64 %n.0.0.0, i64 %n.0.0.0.0) nounwind uwtable readonly {
 ; CHECK-LABEL: define i32 @test


        


More information about the llvm-commits mailing list