[llvm] 211cf8a - [test] Use -passes in more Transforms tests

Bjorn Pettersson via llvm-commits llvm-commits at lists.llvm.org
Fri Oct 21 08:03:13 PDT 2022


Author: Bjorn Pettersson
Date: 2022-10-21T17:02:02+02:00
New Revision: 211cf8a384ebb29787367c8fd5858e2a5ed3c10f

URL: https://github.com/llvm/llvm-project/commit/211cf8a384ebb29787367c8fd5858e2a5ed3c10f
DIFF: https://github.com/llvm/llvm-project/commit/211cf8a384ebb29787367c8fd5858e2a5ed3c10f.diff

LOG: [test] Use -passes in more Transforms tests

Another step towards getting rid of dependencies to the legacy
pass manager.

Primary change here is to just do -passes=foo instead of -foo in
simple situations (when running a single transform pass). But also
updated a few test running multiple passes.

Also removed some "duplicated" RUN lines in a few tests that where
using both -foo and -passes=foo syntax. No need to do the same kind
of testing twice.

Added: 
    

Modified: 
    llvm/test/Transforms/DeadStoreElimination/debuginfo.ll
    llvm/test/Transforms/DeadStoreElimination/libcalls.ll
    llvm/test/Transforms/DeadStoreElimination/memcpy-complete-overwrite.ll
    llvm/test/Transforms/DeadStoreElimination/memset-and-memcpy.ll
    llvm/test/Transforms/DeadStoreElimination/noop-stores.ll
    llvm/test/Transforms/InstCombine/PR30597.ll
    llvm/test/Transforms/InstCombine/PR37526.ll
    llvm/test/Transforms/InstCombine/alloca-cast-debuginfo.ll
    llvm/test/Transforms/InstCombine/assume-inseltpoison.ll
    llvm/test/Transforms/InstCombine/assume.ll
    llvm/test/Transforms/InstCombine/branch.ll
    llvm/test/Transforms/InstCombine/builtin-object-size-strdup-family.ll
    llvm/test/Transforms/InstCombine/call-guard.ll
    llvm/test/Transforms/InstCombine/cast-mul-select.ll
    llvm/test/Transforms/InstCombine/debuginfo-skip.ll
    llvm/test/Transforms/InstCombine/debuginfo-variables.ll
    llvm/test/Transforms/InstCombine/debuginfo.ll
    llvm/test/Transforms/InstCombine/debuginfo_add.ll
    llvm/test/Transforms/InstCombine/do-not-clone-dbg-declare.ll
    llvm/test/Transforms/LoopReroll/basic.ll
    llvm/test/Transforms/LoopReroll/basic32iters.ll
    llvm/test/Transforms/LoopReroll/complex_reroll.ll
    llvm/test/Transforms/LoopReroll/external_use.ll
    llvm/test/Transforms/LoopReroll/extra_instr.ll
    llvm/test/Transforms/LoopReroll/indvar_with_ext.ll
    llvm/test/Transforms/LoopReroll/negative.ll
    llvm/test/Transforms/LoopReroll/nonconst_lb.ll
    llvm/test/Transforms/LoopReroll/ptrindvar.ll
    llvm/test/Transforms/LoopReroll/reduction.ll
    llvm/test/Transforms/LoopReroll/reroll_with_dbg.ll
    llvm/test/Transforms/Mem2Reg/opaque-ptr.ll
    llvm/test/Transforms/MemCpyOpt/2008-02-24-MultipleUseofSRet.ll
    llvm/test/Transforms/MemCpyOpt/memcpy-to-memset-with-lifetimes.ll
    llvm/test/Transforms/MemCpyOpt/memcpy.ll
    llvm/test/Transforms/MemCpyOpt/pr29105.ll
    llvm/test/Transforms/Reassociate/2002-05-15-AgressiveSubMove.ll
    llvm/test/Transforms/Reassociate/2006-04-27-ReassociateVector.ll
    llvm/test/Transforms/Reassociate/2012-05-08-UndefLeak.ll
    llvm/test/Transforms/Reassociate/2019-08-22-FNegAssert.ll
    llvm/test/Transforms/Reassociate/absorption.ll
    llvm/test/Transforms/Reassociate/add-like-or.ll
    llvm/test/Transforms/Reassociate/add_across_block_crash.ll
    llvm/test/Transforms/Reassociate/binop-identity.ll
    llvm/test/Transforms/Reassociate/callbr.ll
    llvm/test/Transforms/Reassociate/commute.ll
    llvm/test/Transforms/Reassociate/factorize-again.ll
    llvm/test/Transforms/Reassociate/fast-AgressiveSubMove.ll
    llvm/test/Transforms/Reassociate/fast-ReassociateVector.ll
    llvm/test/Transforms/Reassociate/fast-basictest.ll
    llvm/test/Transforms/Reassociate/fast-fp-commute.ll
    llvm/test/Transforms/Reassociate/fast-multistep.ll
    llvm/test/Transforms/Reassociate/fp-commute.ll
    llvm/test/Transforms/Reassociate/fp-expr.ll
    llvm/test/Transforms/Reassociate/keep-debug-loc.ll
    llvm/test/Transforms/Reassociate/load-combine-like-or.ll
    llvm/test/Transforms/Reassociate/looptest.ll
    llvm/test/Transforms/Reassociate/matching-binops.ll
    llvm/test/Transforms/Reassociate/mulfactor.ll
    llvm/test/Transforms/Reassociate/multistep.ll
    llvm/test/Transforms/Reassociate/negation.ll
    llvm/test/Transforms/Reassociate/no-op.ll
    llvm/test/Transforms/Reassociate/optional-flags.ll
    llvm/test/Transforms/Reassociate/pr21205.ll
    llvm/test/Transforms/Reassociate/pr28367.ll
    llvm/test/Transforms/Reassociate/pr42349.ll
    llvm/test/Transforms/Reassociate/propagate-flags.ll
    llvm/test/Transforms/Reassociate/reassoc-intermediate-fnegs.ll
    llvm/test/Transforms/Reassociate/reassociate_dbgvalue_discard.ll
    llvm/test/Transforms/Reassociate/reassociate_salvages_debug_info.ll
    llvm/test/Transforms/Reassociate/repeats.ll
    llvm/test/Transforms/Reassociate/secondary.ll
    llvm/test/Transforms/Reassociate/undef_intrinsics_when_deleting_instructions.ll
    llvm/test/Transforms/Reassociate/xor_reassoc.ll
    llvm/test/Transforms/Sink/badloadsink.ll
    llvm/test/Transforms/Sink/basic.ll
    llvm/test/Transforms/Sink/call.ll
    llvm/test/Transforms/Sink/catchswitch.ll
    llvm/test/Transforms/Sink/convergent.ll
    llvm/test/Transforms/Sink/dead-user.ll
    llvm/test/Transforms/Sink/fence.ll
    llvm/test/Transforms/Sink/invariant-load.ll
    llvm/test/Transforms/Sink/landingpad.ll
    llvm/test/Transforms/Util/Debugify/loc-only-original-mode.ll
    llvm/test/Transforms/Util/add-TLI-mappings.ll
    llvm/test/Transforms/Util/annotation-remarks-dbg-info.ll
    llvm/test/Transforms/Util/annotation-remarks.ll
    llvm/test/Transforms/Util/annotation2metadata.ll
    llvm/test/Transforms/Util/combine-alias-scope-metadata.ll
    llvm/test/Transforms/Util/dbg-call-bitcast.ll
    llvm/test/Transforms/Util/dbg-user-of-aext.ll
    llvm/test/Transforms/Util/libcalls-fast-math-inf-loop.ll
    llvm/test/Transforms/Util/libcalls-shrinkwrap-double.ll
    llvm/test/Transforms/Util/libcalls-shrinkwrap-float.ll
    llvm/test/Transforms/Util/libcalls-shrinkwrap-long-double.ll
    llvm/test/Transforms/Util/salvage-debuginfo.ll
    llvm/test/Transforms/Util/simplify-dbg-declare-load.ll
    llvm/test/Transforms/Util/store-first-op.ll
    llvm/test/Transforms/Util/strip-gc-relocates.ll
    llvm/test/Transforms/Util/strip-nonlinetable-debuginfo-containingtypes.ll
    llvm/test/Transforms/Util/strip-nonlinetable-debuginfo-cus.ll
    llvm/test/Transforms/Util/strip-nonlinetable-debuginfo-heapallocsite.ll
    llvm/test/Transforms/Util/strip-nonlinetable-debuginfo-labels.ll
    llvm/test/Transforms/Util/strip-nonlinetable-debuginfo-localvars.ll
    llvm/test/Transforms/Util/strip-nonlinetable-debuginfo-loops.ll
    llvm/test/Transforms/Util/strip-nonlinetable-debuginfo-subroutinetypes.ll

Removed: 
    


################################################################################
diff  --git a/llvm/test/Transforms/DeadStoreElimination/debuginfo.ll b/llvm/test/Transforms/DeadStoreElimination/debuginfo.ll
index 678df9d089ffa..44f7b1111f594 100644
--- a/llvm/test/Transforms/DeadStoreElimination/debuginfo.ll
+++ b/llvm/test/Transforms/DeadStoreElimination/debuginfo.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -debugify -dse -S | FileCheck %s
+; RUN: opt < %s -passes=debugify,dse -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/DeadStoreElimination/libcalls.ll b/llvm/test/Transforms/DeadStoreElimination/libcalls.ll
index 3198f3c7c96a5..f437112618b35 100644
--- a/llvm/test/Transforms/DeadStoreElimination/libcalls.ll
+++ b/llvm/test/Transforms/DeadStoreElimination/libcalls.ll
@@ -1,5 +1,4 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -S -inferattrs -dse | FileCheck %s
 ; RUN: opt < %s -S -aa-pipeline=basic-aa -passes=inferattrs,dse | FileCheck %s
 
 target triple = "x86_64-unknown-linux-gnu"

diff  --git a/llvm/test/Transforms/DeadStoreElimination/memcpy-complete-overwrite.ll b/llvm/test/Transforms/DeadStoreElimination/memcpy-complete-overwrite.ll
index b799476000078..d2ae8b232f61c 100644
--- a/llvm/test/Transforms/DeadStoreElimination/memcpy-complete-overwrite.ll
+++ b/llvm/test/Transforms/DeadStoreElimination/memcpy-complete-overwrite.ll
@@ -1,7 +1,7 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
 
+; FIXME: These were broken when swapping to MSSA(?). So currently XFAIL:ed.
 ; XFAIL: *
-; RUN: opt < %s -dse -S | FileCheck %s
 ; RUN: opt < %s -aa-pipeline=basic-aa -passes=dse -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/DeadStoreElimination/memset-and-memcpy.ll b/llvm/test/Transforms/DeadStoreElimination/memset-and-memcpy.ll
index be929a83859c5..39550c65772a1 100644
--- a/llvm/test/Transforms/DeadStoreElimination/memset-and-memcpy.ll
+++ b/llvm/test/Transforms/DeadStoreElimination/memset-and-memcpy.ll
@@ -1,5 +1,4 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -dse -S | FileCheck %s
 ; RUN: opt < %s -aa-pipeline=basic-aa -passes=dse -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/DeadStoreElimination/noop-stores.ll b/llvm/test/Transforms/DeadStoreElimination/noop-stores.ll
index 9284a996f661b..8790bf640ca1a 100644
--- a/llvm/test/Transforms/DeadStoreElimination/noop-stores.ll
+++ b/llvm/test/Transforms/DeadStoreElimination/noop-stores.ll
@@ -1,5 +1,4 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -dse -S | FileCheck %s
 ; RUN: opt < %s -aa-pipeline=basic-aa -passes='dse,verify<memoryssa>' -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/InstCombine/PR30597.ll b/llvm/test/Transforms/InstCombine/PR30597.ll
index 1e463e396551b..75d06b6723b32 100644
--- a/llvm/test/Transforms/InstCombine/PR30597.ll
+++ b/llvm/test/Transforms/InstCombine/PR30597.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -instcombine -S | FileCheck %s
+; RUN: opt < %s -passes=instcombine -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/InstCombine/PR37526.ll b/llvm/test/Transforms/InstCombine/PR37526.ll
index e2ef0261296f4..1ad9d5d2752c3 100644
--- a/llvm/test/Transforms/InstCombine/PR37526.ll
+++ b/llvm/test/Transforms/InstCombine/PR37526.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -instcombine -S < %s | FileCheck %s
+; RUN: opt -passes=instcombine -S < %s | FileCheck %s
 
 define void @PR37526(ptr %pz, ptr %px, ptr %py) {
 ; CHECK-LABEL: @PR37526(

diff  --git a/llvm/test/Transforms/InstCombine/alloca-cast-debuginfo.ll b/llvm/test/Transforms/InstCombine/alloca-cast-debuginfo.ll
index 46419d317772a..7f0e905263bff 100644
--- a/llvm/test/Transforms/InstCombine/alloca-cast-debuginfo.ll
+++ b/llvm/test/Transforms/InstCombine/alloca-cast-debuginfo.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -S -instcombine -instcombine-lower-dbg-declare=0 | FileCheck %s
+; RUN: opt < %s -S -passes=instcombine -instcombine-lower-dbg-declare=0 | FileCheck %s
 
 ; In this example, instcombine wants to turn "local" into an i64, since that's
 ; how it is stored. It should keep the debug info referring to the alloca when

diff  --git a/llvm/test/Transforms/InstCombine/assume-inseltpoison.ll b/llvm/test/Transforms/InstCombine/assume-inseltpoison.ll
index f49755570ddc9..df18c6605ccea 100644
--- a/llvm/test/Transforms/InstCombine/assume-inseltpoison.ll
+++ b/llvm/test/Transforms/InstCombine/assume-inseltpoison.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -instcombine -S -instcombine-infinite-loop-threshold=2 | FileCheck %s
+; RUN: opt < %s -passes=instcombine -S -instcombine-infinite-loop-threshold=2 | 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/InstCombine/assume.ll b/llvm/test/Transforms/InstCombine/assume.ll
index d6490dbd2d365..388bc4998ce01 100644
--- a/llvm/test/Transforms/InstCombine/assume.ll
+++ b/llvm/test/Transforms/InstCombine/assume.ll
@@ -1,6 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -instcombine -S  -instcombine-infinite-loop-threshold=2  | FileCheck --check-prefixes=CHECK,DEFAULT %s
-; RUN: opt < %s -instcombine --enable-knowledge-retention -S  -instcombine-infinite-loop-threshold=2  | FileCheck --check-prefixes=CHECK,BUNDLES %s
+; RUN: opt < %s -passes=instcombine -S  -instcombine-infinite-loop-threshold=2  | FileCheck --check-prefixes=CHECK,DEFAULT %s
+; RUN: opt < %s -passes=instcombine --enable-knowledge-retention -S  -instcombine-infinite-loop-threshold=2  | FileCheck --check-prefixes=CHECK,BUNDLES %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/InstCombine/branch.ll b/llvm/test/Transforms/InstCombine/branch.ll
index 70a818242ae56..7857aa29ebccf 100644
--- a/llvm/test/Transforms/InstCombine/branch.ll
+++ b/llvm/test/Transforms/InstCombine/branch.ll
@@ -1,5 +1,4 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -instcombine -S < %s | FileCheck %s
 ; RUN: opt -passes=instcombine -S < %s | FileCheck %s
 
 ; Check that we fold the condition of branches of the

diff  --git a/llvm/test/Transforms/InstCombine/builtin-object-size-strdup-family.ll b/llvm/test/Transforms/InstCombine/builtin-object-size-strdup-family.ll
index f8bbe74a8c373..63f3edc20c0f3 100644
--- a/llvm/test/Transforms/InstCombine/builtin-object-size-strdup-family.ll
+++ b/llvm/test/Transforms/InstCombine/builtin-object-size-strdup-family.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -instcombine -S < %s | FileCheck %s
+; RUN: opt -passes=instcombine -S < %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"

diff  --git a/llvm/test/Transforms/InstCombine/call-guard.ll b/llvm/test/Transforms/InstCombine/call-guard.ll
index 5ed9a37981dca..dbe8cf25237d0 100644
--- a/llvm/test/Transforms/InstCombine/call-guard.ll
+++ b/llvm/test/Transforms/InstCombine/call-guard.ll
@@ -1,6 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -instcombine -instcombine-infinite-loop-threshold=2 -S | FileCheck %s
-; RUN: opt < %s -instcombine -S -debugify-each | FileCheck %s
+; RUN: opt < %s -passes=instcombine -instcombine-infinite-loop-threshold=2 -S | FileCheck %s
 ; RUN: opt < %s -passes=instcombine -S -debugify-each | FileCheck %s
 
 declare void @llvm.experimental.guard(i1, ...)

diff  --git a/llvm/test/Transforms/InstCombine/cast-mul-select.ll b/llvm/test/Transforms/InstCombine/cast-mul-select.ll
index 865bbef2b9ece..8c06e556de48a 100644
--- a/llvm/test/Transforms/InstCombine/cast-mul-select.ll
+++ b/llvm/test/Transforms/InstCombine/cast-mul-select.ll
@@ -1,6 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -instcombine -S | FileCheck %s
-; RUN: opt -debugify -instcombine -S < %s | FileCheck %s -check-prefix DBGINFO
+; RUN: opt < %s -passes=instcombine -S | FileCheck %s
+; RUN: opt -passes=debugify,instcombine -S < %s | FileCheck %s -check-prefix DBGINFO
 
 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"
 

diff  --git a/llvm/test/Transforms/InstCombine/debuginfo-skip.ll b/llvm/test/Transforms/InstCombine/debuginfo-skip.ll
index d142cf1921377..dd1146e51595c 100644
--- a/llvm/test/Transforms/InstCombine/debuginfo-skip.ll
+++ b/llvm/test/Transforms/InstCombine/debuginfo-skip.ll
@@ -1,5 +1,5 @@
-; RUN: opt -instcombine-lower-dbg-declare=0 < %s -instcombine -S | FileCheck %s
-; RUN: opt -instcombine-lower-dbg-declare=1 < %s -instcombine -S | FileCheck %s
+; RUN: opt -instcombine-lower-dbg-declare=0 < %s -passes=instcombine -S | FileCheck %s
+; RUN: opt -instcombine-lower-dbg-declare=1 < %s -passes=instcombine -S | FileCheck %s
 
 define i32 @foo(i32 %j) #0 !dbg !7 {
 entry:

diff  --git a/llvm/test/Transforms/InstCombine/debuginfo-variables.ll b/llvm/test/Transforms/InstCombine/debuginfo-variables.ll
index 404344cff3f3f..2c62694cbe349 100644
--- a/llvm/test/Transforms/InstCombine/debuginfo-variables.ll
+++ b/llvm/test/Transforms/InstCombine/debuginfo-variables.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -debugify -instcombine -S | FileCheck %s
+; RUN: opt < %s -passes=debugify,instcombine -S | FileCheck %s
 
 declare void @escape32(i32)
 

diff  --git a/llvm/test/Transforms/InstCombine/debuginfo.ll b/llvm/test/Transforms/InstCombine/debuginfo.ll
index b97c5002f2051..81fd67d547443 100644
--- a/llvm/test/Transforms/InstCombine/debuginfo.ll
+++ b/llvm/test/Transforms/InstCombine/debuginfo.ll
@@ -1,6 +1,6 @@
-; RUN: opt < %s -instcombine -instcombine-lower-dbg-declare=0 -S \
+; RUN: opt < %s -passes=instcombine -instcombine-lower-dbg-declare=0 -S \
 ; RUN:      | FileCheck %s --check-prefix=CHECK --check-prefix=NOLOWER
-; RUN: opt < %s -instcombine -instcombine-lower-dbg-declare=1 -S | FileCheck %s
+; RUN: opt < %s -passes=instcombine -instcombine-lower-dbg-declare=1 -S | FileCheck %s
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64--linux"

diff  --git a/llvm/test/Transforms/InstCombine/debuginfo_add.ll b/llvm/test/Transforms/InstCombine/debuginfo_add.ll
index 83c428803daa5..47ba3b31f8d8c 100644
--- a/llvm/test/Transforms/InstCombine/debuginfo_add.ll
+++ b/llvm/test/Transforms/InstCombine/debuginfo_add.ll
@@ -1,4 +1,4 @@
-; RUN: opt -instcombine %s -o - -S | FileCheck %s
+; RUN: opt -passes=instcombine %s -o - -S | FileCheck %s
 ; typedef struct v *v_t;
 ; struct v {
 ;   unsigned long long p;

diff  --git a/llvm/test/Transforms/InstCombine/do-not-clone-dbg-declare.ll b/llvm/test/Transforms/InstCombine/do-not-clone-dbg-declare.ll
index bef6838393f32..ce177d9596c0f 100644
--- a/llvm/test/Transforms/InstCombine/do-not-clone-dbg-declare.ll
+++ b/llvm/test/Transforms/InstCombine/do-not-clone-dbg-declare.ll
@@ -1,5 +1,5 @@
 
-; RUN: opt < %s -instcombine -verify -S -o - | FileCheck %s
+; RUN: opt < %s -passes=instcombine,verify -S -o - | FileCheck %s
 
 ; Hand-reduced from this example.
 ; -g -O -mllvm -disable-llvm-optzns -gno-column-info

diff  --git a/llvm/test/Transforms/LoopReroll/basic.ll b/llvm/test/Transforms/LoopReroll/basic.ll
index c49dc9e364c96..80e5d9b7885d1 100644
--- a/llvm/test/Transforms/LoopReroll/basic.ll
+++ b/llvm/test/Transforms/LoopReroll/basic.ll
@@ -1,4 +1,3 @@
-; RUN: opt < %s -loop-reroll -S | FileCheck %s
 ; RUN: opt < %s -passes=loop-reroll -S | FileCheck %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-S128"
 target triple = "x86_64-unknown-linux-gnu"

diff  --git a/llvm/test/Transforms/LoopReroll/basic32iters.ll b/llvm/test/Transforms/LoopReroll/basic32iters.ll
index 758fd8a0a7903..c0827deaf4d32 100644
--- a/llvm/test/Transforms/LoopReroll/basic32iters.ll
+++ b/llvm/test/Transforms/LoopReroll/basic32iters.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -loop-reroll -verify-scev -S | FileCheck %s
+; RUN: opt < %s -passes=loop-reroll -verify-scev -S | FileCheck %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-S128"
 target triple = "x86_64-unknown-linux-gnu"
 

diff  --git a/llvm/test/Transforms/LoopReroll/complex_reroll.ll b/llvm/test/Transforms/LoopReroll/complex_reroll.ll
index 60c04c909f318..090fb2a86583d 100644
--- a/llvm/test/Transforms/LoopReroll/complex_reroll.ll
+++ b/llvm/test/Transforms/LoopReroll/complex_reroll.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S  -loop-reroll   %s | FileCheck %s
+; RUN: opt -S  -passes=loop-reroll   %s | FileCheck %s
 declare i32 @goo(i32, i32)
 
 @buf = external global i8*

diff  --git a/llvm/test/Transforms/LoopReroll/external_use.ll b/llvm/test/Transforms/LoopReroll/external_use.ll
index 8f57c03b2e971..2124f3b15cd2d 100644
--- a/llvm/test/Transforms/LoopReroll/external_use.ll
+++ b/llvm/test/Transforms/LoopReroll/external_use.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -loop-reroll -S | FileCheck %s
+; RUN: opt < %s -passes=loop-reroll -S | FileCheck %s
 
 ; Check whether rerolling is rejected if values of the base and root
 ; instruction are used outside the loop block.

diff  --git a/llvm/test/Transforms/LoopReroll/extra_instr.ll b/llvm/test/Transforms/LoopReroll/extra_instr.ll
index aae29079ade7f..cf262fd6362f3 100644
--- a/llvm/test/Transforms/LoopReroll/extra_instr.ll
+++ b/llvm/test/Transforms/LoopReroll/extra_instr.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S  -loop-reroll   %s | FileCheck %s
+; RUN: opt -S  -passes=loop-reroll   %s | FileCheck %s
 target triple = "aarch64--linux-gnu"
 
 define void @rerollable1([2 x i32]* nocapture %a) {

diff  --git a/llvm/test/Transforms/LoopReroll/indvar_with_ext.ll b/llvm/test/Transforms/LoopReroll/indvar_with_ext.ll
index 59d5ea5ff87af..25a13a6116eb8 100644
--- a/llvm/test/Transforms/LoopReroll/indvar_with_ext.ll
+++ b/llvm/test/Transforms/LoopReroll/indvar_with_ext.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S  -loop-reroll   %s | FileCheck %s
+; RUN: opt -S  -passes=loop-reroll   %s | FileCheck %s
 target triple = "aarch64--linux-gnu"
 
 define void @test(i32 %n, float* %arrayidx200, float* %arrayidx164, float* %arrayidx172) {

diff  --git a/llvm/test/Transforms/LoopReroll/negative.ll b/llvm/test/Transforms/LoopReroll/negative.ll
index 36f6806e1c37e..cc508d26a8671 100644
--- a/llvm/test/Transforms/LoopReroll/negative.ll
+++ b/llvm/test/Transforms/LoopReroll/negative.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S  -loop-reroll   %s | FileCheck %s
+; RUN: opt -S  -passes=loop-reroll   %s | FileCheck %s
 target triple = "aarch64--linux-gnu"
 @buf = global [16 x i8] c"\0A\0A\0A\0A\0A\0A\0A\0A\0A\0A\0A\0A\0A\0A\0A\0A", align 1
 

diff  --git a/llvm/test/Transforms/LoopReroll/nonconst_lb.ll b/llvm/test/Transforms/LoopReroll/nonconst_lb.ll
index 31cc10e9d7ff2..426cf2e4440ea 100644
--- a/llvm/test/Transforms/LoopReroll/nonconst_lb.ll
+++ b/llvm/test/Transforms/LoopReroll/nonconst_lb.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -loop-reroll -S | FileCheck %s
+; RUN: opt < %s -passes=loop-reroll -S | FileCheck %s
 target datalayout = "e-p:32:32:32-i1:8:32-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:32:64-v128:32:128-a0:0:32-n32-S32"
 target triple = "thumbv7-none-linux"
 

diff  --git a/llvm/test/Transforms/LoopReroll/ptrindvar.ll b/llvm/test/Transforms/LoopReroll/ptrindvar.ll
index 8c876b495f9d6..28006bd1ce8aa 100644
--- a/llvm/test/Transforms/LoopReroll/ptrindvar.ll
+++ b/llvm/test/Transforms/LoopReroll/ptrindvar.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S  -loop-reroll   %s | FileCheck %s
+; RUN: opt -S  -passes=loop-reroll   %s | FileCheck %s
 target triple = "aarch64--linux-gnu"
 
 define i32 @test(i32* readonly %buf, i32* readnone %end) #0 {

diff  --git a/llvm/test/Transforms/LoopReroll/reduction.ll b/llvm/test/Transforms/LoopReroll/reduction.ll
index b1e92478f264c..bc7d81f000a2f 100644
--- a/llvm/test/Transforms/LoopReroll/reduction.ll
+++ b/llvm/test/Transforms/LoopReroll/reduction.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -loop-reroll -S | FileCheck %s
+; RUN: opt < %s -passes=loop-reroll -S | FileCheck %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-S128"
 target triple = "x86_64-unknown-linux-gnu"
 

diff  --git a/llvm/test/Transforms/LoopReroll/reroll_with_dbg.ll b/llvm/test/Transforms/LoopReroll/reroll_with_dbg.ll
index a57ccd42a92cb..2102cc9c32276 100644
--- a/llvm/test/Transforms/LoopReroll/reroll_with_dbg.ll
+++ b/llvm/test/Transforms/LoopReroll/reroll_with_dbg.ll
@@ -1,4 +1,4 @@
-;RUN: opt < %s -loop-reroll -S | FileCheck %s
+;RUN: opt < %s -passes=loop-reroll -S | FileCheck %s
 ;void foo(float * restrict a, float * restrict b, int n) {
 ;  for(int i = 0; i < n; i+=4) {
 ;    a[i] = b[i];

diff  --git a/llvm/test/Transforms/Mem2Reg/opaque-ptr.ll b/llvm/test/Transforms/Mem2Reg/opaque-ptr.ll
index 0eec7b6f41747..6d8d18bc8a16a 100644
--- a/llvm/test/Transforms/Mem2Reg/opaque-ptr.ll
+++ b/llvm/test/Transforms/Mem2Reg/opaque-ptr.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -mem2reg -opaque-pointers < %s | FileCheck %s
+; RUN: opt -S -passes=mem2reg -opaque-pointers < %s | FileCheck %s
 
 define i32 @test_same_type() {
 ; CHECK-LABEL: @test_same_type(

diff  --git a/llvm/test/Transforms/MemCpyOpt/2008-02-24-MultipleUseofSRet.ll b/llvm/test/Transforms/MemCpyOpt/2008-02-24-MultipleUseofSRet.ll
index c52fe27d0d4d1..66e109ae0bca9 100644
--- a/llvm/test/Transforms/MemCpyOpt/2008-02-24-MultipleUseofSRet.ll
+++ b/llvm/test/Transforms/MemCpyOpt/2008-02-24-MultipleUseofSRet.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -memcpyopt -dse -S -verify-memoryssa | FileCheck %s
+; RUN: opt < %s -passes=memcpyopt,dse -S -verify-memoryssa | FileCheck %s
 ; PR2077
 
 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/MemCpyOpt/memcpy-to-memset-with-lifetimes.ll b/llvm/test/Transforms/MemCpyOpt/memcpy-to-memset-with-lifetimes.ll
index a1520712da8e2..1771fe6c31f9b 100644
--- a/llvm/test/Transforms/MemCpyOpt/memcpy-to-memset-with-lifetimes.ll
+++ b/llvm/test/Transforms/MemCpyOpt/memcpy-to-memset-with-lifetimes.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -memcpyopt -instcombine -S < %s -verify-memoryssa | FileCheck %s
+; RUN: opt -passes=memcpyopt,instcombine -S < %s -verify-memoryssa | FileCheck %s
 
 target datalayout = "e-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"

diff  --git a/llvm/test/Transforms/MemCpyOpt/memcpy.ll b/llvm/test/Transforms/MemCpyOpt/memcpy.ll
index ca06f1694745f..553bb787cca08 100644
--- a/llvm/test/Transforms/MemCpyOpt/memcpy.ll
+++ b/llvm/test/Transforms/MemCpyOpt/memcpy.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -memcpyopt -dse -S -verify-memoryssa | FileCheck %s
+; RUN: opt < %s -passes=memcpyopt,dse -S -verify-memoryssa | 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 = "i686-apple-darwin9"

diff  --git a/llvm/test/Transforms/MemCpyOpt/pr29105.ll b/llvm/test/Transforms/MemCpyOpt/pr29105.ll
index dd9f3c34a916c..86fc93f1aa6da 100644
--- a/llvm/test/Transforms/MemCpyOpt/pr29105.ll
+++ b/llvm/test/Transforms/MemCpyOpt/pr29105.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -memcpyopt -instcombine -S %s -verify-memoryssa | FileCheck %s
+; RUN: opt -passes=memcpyopt,instcombine -S %s -verify-memoryssa | FileCheck %s
 %Foo = type { [2048 x i64] }
 
 ; Make sure that all mempcy calls are converted to memset calls, or removed.

diff  --git a/llvm/test/Transforms/Reassociate/2002-05-15-AgressiveSubMove.ll b/llvm/test/Transforms/Reassociate/2002-05-15-AgressiveSubMove.ll
index 24300352a62c3..d8a73fb408594 100644
--- a/llvm/test/Transforms/Reassociate/2002-05-15-AgressiveSubMove.ll
+++ b/llvm/test/Transforms/Reassociate/2002-05-15-AgressiveSubMove.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -reassociate -S | FileCheck %s
+; RUN: opt < %s -passes=reassociate -S | FileCheck %s
 
 define i32 @test1(i32 %A) {
 ; CHECK-LABEL: test1

diff  --git a/llvm/test/Transforms/Reassociate/2006-04-27-ReassociateVector.ll b/llvm/test/Transforms/Reassociate/2006-04-27-ReassociateVector.ll
index ea869842b1802..7c746feffa0e7 100644
--- a/llvm/test/Transforms/Reassociate/2006-04-27-ReassociateVector.ll
+++ b/llvm/test/Transforms/Reassociate/2006-04-27-ReassociateVector.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -reassociate -S | FileCheck %s
+; RUN: opt < %s -passes=reassociate -S | FileCheck %s
 
 define <4 x float> @test1() {
 ; CHECK-LABEL: test1

diff  --git a/llvm/test/Transforms/Reassociate/2012-05-08-UndefLeak.ll b/llvm/test/Transforms/Reassociate/2012-05-08-UndefLeak.ll
index c563fe26c1347..2019a5d9ebc87 100644
--- a/llvm/test/Transforms/Reassociate/2012-05-08-UndefLeak.ll
+++ b/llvm/test/Transforms/Reassociate/2012-05-08-UndefLeak.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -reassociate -S | FileCheck %s
+; RUN: opt < %s -passes=reassociate -S | FileCheck %s
 ; PR12169
 ; PR12764
 ; XFAIL: *

diff  --git a/llvm/test/Transforms/Reassociate/2019-08-22-FNegAssert.ll b/llvm/test/Transforms/Reassociate/2019-08-22-FNegAssert.ll
index 345d4e339fc97..71a9e5789596f 100644
--- a/llvm/test/Transforms/Reassociate/2019-08-22-FNegAssert.ll
+++ b/llvm/test/Transforms/Reassociate/2019-08-22-FNegAssert.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -reassociate -S | FileCheck %s
+; RUN: opt < %s -passes=reassociate -S | FileCheck %s
 ; D61675
 
 define float @test1(float %arg, float %arg1, float %arg2, float %arg3) {

diff  --git a/llvm/test/Transforms/Reassociate/absorption.ll b/llvm/test/Transforms/Reassociate/absorption.ll
index 744107c842442..c014ab6ede670 100644
--- a/llvm/test/Transforms/Reassociate/absorption.ll
+++ b/llvm/test/Transforms/Reassociate/absorption.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -reassociate < %s | FileCheck %s
+; RUN: opt -S -passes=reassociate < %s | FileCheck %s
 
 ; Check that if constants combine to an absorbing value then the expression is
 ; evaluated as the absorbing value.

diff  --git a/llvm/test/Transforms/Reassociate/add-like-or.ll b/llvm/test/Transforms/Reassociate/add-like-or.ll
index 2558a027194d4..514b10b5a76b3 100644
--- a/llvm/test/Transforms/Reassociate/add-like-or.ll
+++ b/llvm/test/Transforms/Reassociate/add-like-or.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -reassociate -S | FileCheck %s
+; RUN: opt < %s -passes=reassociate -S | FileCheck %s
 
 define i32 @shl_add(i8 %x) {
 ; CHECK-LABEL: @shl_add(

diff  --git a/llvm/test/Transforms/Reassociate/add_across_block_crash.ll b/llvm/test/Transforms/Reassociate/add_across_block_crash.ll
index 8a753a2dfa0c0..26e971266d344 100644
--- a/llvm/test/Transforms/Reassociate/add_across_block_crash.ll
+++ b/llvm/test/Transforms/Reassociate/add_across_block_crash.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -reassociate -S | FileCheck %s
+; RUN: opt < %s -passes=reassociate -S | FileCheck %s
 
 ; This test is to make sure while processing a block, uses of instructions
 ; from a 
diff erent basic block don't get added to be re-optimized

diff  --git a/llvm/test/Transforms/Reassociate/binop-identity.ll b/llvm/test/Transforms/Reassociate/binop-identity.ll
index 13333fad5992d..ad697b56bc9ca 100644
--- a/llvm/test/Transforms/Reassociate/binop-identity.ll
+++ b/llvm/test/Transforms/Reassociate/binop-identity.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -reassociate -S | FileCheck %s
+; RUN: opt < %s -passes=reassociate -S | FileCheck %s
 
 ; Don't produce an instruction that is a no-op because the constant is an identity constant.
 

diff  --git a/llvm/test/Transforms/Reassociate/callbr.ll b/llvm/test/Transforms/Reassociate/callbr.ll
index 26cb7d51dc338..8b7be30b245d7 100644
--- a/llvm/test/Transforms/Reassociate/callbr.ll
+++ b/llvm/test/Transforms/Reassociate/callbr.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -reassociate < %s | FileCheck %s
+; RUN: opt -S -passes=reassociate < %s | FileCheck %s
 
 define i32 @test(i1 %b) {
 ; CHECK-LABEL: @test(

diff  --git a/llvm/test/Transforms/Reassociate/commute.ll b/llvm/test/Transforms/Reassociate/commute.ll
index 6009159d787db..5ebc11e814456 100644
--- a/llvm/test/Transforms/Reassociate/commute.ll
+++ b/llvm/test/Transforms/Reassociate/commute.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -reassociate -S < %s | FileCheck %s
+; RUN: opt -passes=reassociate -S < %s | FileCheck %s
 
 declare void @use(i32)
 

diff  --git a/llvm/test/Transforms/Reassociate/factorize-again.ll b/llvm/test/Transforms/Reassociate/factorize-again.ll
index d86fbf4017903..7b1a7d9dfe0d1 100644
--- a/llvm/test/Transforms/Reassociate/factorize-again.ll
+++ b/llvm/test/Transforms/Reassociate/factorize-again.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -reassociate < %s | FileCheck %s
+; RUN: opt -S -passes=reassociate < %s | FileCheck %s
 
 define void @main(float, float) {
 ; CHECK-LABEL: @main(

diff  --git a/llvm/test/Transforms/Reassociate/fast-AgressiveSubMove.ll b/llvm/test/Transforms/Reassociate/fast-AgressiveSubMove.ll
index d74d3121359ea..8b060ade2da98 100644
--- a/llvm/test/Transforms/Reassociate/fast-AgressiveSubMove.ll
+++ b/llvm/test/Transforms/Reassociate/fast-AgressiveSubMove.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -reassociate -S | FileCheck %s
+; RUN: opt < %s -passes=reassociate -S | FileCheck %s
 
 define float @test1(float %A) {
 ; CHECK-LABEL: @test1(

diff  --git a/llvm/test/Transforms/Reassociate/fast-ReassociateVector.ll b/llvm/test/Transforms/Reassociate/fast-ReassociateVector.ll
index 9a96afad0b082..0b88a65a793e9 100644
--- a/llvm/test/Transforms/Reassociate/fast-ReassociateVector.ll
+++ b/llvm/test/Transforms/Reassociate/fast-ReassociateVector.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -reassociate -S | FileCheck %s
+; RUN: opt < %s -passes=reassociate -S | FileCheck %s
 
 ; Check that a*c+b*c is turned into (a+b)*c
 

diff  --git a/llvm/test/Transforms/Reassociate/fast-basictest.ll b/llvm/test/Transforms/Reassociate/fast-basictest.ll
index 189613c204c55..3e2a58fa2fbc0 100644
--- a/llvm/test/Transforms/Reassociate/fast-basictest.ll
+++ b/llvm/test/Transforms/Reassociate/fast-basictest.ll
@@ -6,7 +6,7 @@
 ; - PhaseOrdering/fast-reassociate-gvn.ll
 ; - Reassociate/fast-basictest.ll
 ;
-; RUN: opt < %s -reassociate -S | FileCheck %s
+; RUN: opt < %s -passes=reassociate -S | FileCheck %s
 
 ; ((a + (-3)) + b) + 3 -> a + b
 ; That only works with both instcombine and reassociate passes enabled.

diff  --git a/llvm/test/Transforms/Reassociate/fast-fp-commute.ll b/llvm/test/Transforms/Reassociate/fast-fp-commute.ll
index 937c4c112eef6..d1893b770d9d9 100644
--- a/llvm/test/Transforms/Reassociate/fast-fp-commute.ll
+++ b/llvm/test/Transforms/Reassociate/fast-fp-commute.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -reassociate -S < %s | FileCheck %s
+; RUN: opt -passes=reassociate -S < %s | FileCheck %s
 
 declare void @use(float)
 

diff  --git a/llvm/test/Transforms/Reassociate/fast-multistep.ll b/llvm/test/Transforms/Reassociate/fast-multistep.ll
index 419e101cde963..c06a8b7d9781a 100644
--- a/llvm/test/Transforms/Reassociate/fast-multistep.ll
+++ b/llvm/test/Transforms/Reassociate/fast-multistep.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -reassociate -S | FileCheck %s
+; RUN: opt < %s -passes=reassociate -S | FileCheck %s
 
 ; Check that a*a*b+a*a*c is turned into a*(a*(b+c)).
 

diff  --git a/llvm/test/Transforms/Reassociate/fp-commute.ll b/llvm/test/Transforms/Reassociate/fp-commute.ll
index eac5b5920ac12..ccf0ea4237971 100644
--- a/llvm/test/Transforms/Reassociate/fp-commute.ll
+++ b/llvm/test/Transforms/Reassociate/fp-commute.ll
@@ -1,4 +1,4 @@
-; RUN: opt -reassociate -S < %s | FileCheck %s
+; RUN: opt -passes=reassociate -S < %s | FileCheck %s
 
 declare void @use(float)
 

diff  --git a/llvm/test/Transforms/Reassociate/fp-expr.ll b/llvm/test/Transforms/Reassociate/fp-expr.ll
index ef285efa11a9c..edc2ead601ada 100644
--- a/llvm/test/Transforms/Reassociate/fp-expr.ll
+++ b/llvm/test/Transforms/Reassociate/fp-expr.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -reassociate < %s | FileCheck %s
+; RUN: opt -S -passes=reassociate < %s | FileCheck %s
 
 define void @test1() {
 ; CHECK-LABEL: @test1(

diff  --git a/llvm/test/Transforms/Reassociate/keep-debug-loc.ll b/llvm/test/Transforms/Reassociate/keep-debug-loc.ll
index c3e8779c01955..682708eeb39ac 100644
--- a/llvm/test/Transforms/Reassociate/keep-debug-loc.ll
+++ b/llvm/test/Transforms/Reassociate/keep-debug-loc.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -reassociate < %s | FileCheck %s
+; RUN: opt -S -passes=reassociate < %s | FileCheck %s
 
 ; PR34231
 ;

diff  --git a/llvm/test/Transforms/Reassociate/load-combine-like-or.ll b/llvm/test/Transforms/Reassociate/load-combine-like-or.ll
index 06ac9347f3d8c..a1a029ba9530f 100644
--- a/llvm/test/Transforms/Reassociate/load-combine-like-or.ll
+++ b/llvm/test/Transforms/Reassociate/load-combine-like-or.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -reassociate -S | FileCheck %s
+; RUN: opt < %s -passes=reassociate -S | FileCheck %s
 
 ; Basic pattern where two contiguous i8 loads form a wider i16 load
 define i16 @p0_i8_i8_i16(i8* %ptr) {

diff  --git a/llvm/test/Transforms/Reassociate/looptest.ll b/llvm/test/Transforms/Reassociate/looptest.ll
index 6130d435977e3..0202662a78dea 100644
--- a/llvm/test/Transforms/Reassociate/looptest.ll
+++ b/llvm/test/Transforms/Reassociate/looptest.ll
@@ -13,7 +13,7 @@
 ; In this case, we want to reassociate the specified expr so that i+j can be
 ; hoisted out of the inner most loop.
 ;
-; RUN: opt < %s -reassociate -S | FileCheck %s
+; RUN: opt < %s -passes=reassociate -S | FileCheck %s
 ; END.
 @.LC0 = internal global [4 x i8] c"%d\0A\00"		; <[4 x i8]*> [#uses=1]
 

diff  --git a/llvm/test/Transforms/Reassociate/matching-binops.ll b/llvm/test/Transforms/Reassociate/matching-binops.ll
index 4771e3c8e1cd9..31f38708907b7 100644
--- a/llvm/test/Transforms/Reassociate/matching-binops.ll
+++ b/llvm/test/Transforms/Reassociate/matching-binops.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -reassociate -S | FileCheck %s
+; RUN: opt < %s -passes=reassociate -S | FileCheck %s
 
 ; PR37098 - https://bugs.llvm.org/show_bug.cgi?id=37098
 ; In all positive tests, we should reassociate binops

diff  --git a/llvm/test/Transforms/Reassociate/mulfactor.ll b/llvm/test/Transforms/Reassociate/mulfactor.ll
index 4cbeaad38b542..34197782a1d89 100644
--- a/llvm/test/Transforms/Reassociate/mulfactor.ll
+++ b/llvm/test/Transforms/Reassociate/mulfactor.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -reassociate -S | FileCheck %s
+; RUN: opt < %s -passes=reassociate -S | FileCheck %s
 
 define i32 @test1(i32 %a, i32 %b) {
 ; CHECK-LABEL: @test1(

diff  --git a/llvm/test/Transforms/Reassociate/multistep.ll b/llvm/test/Transforms/Reassociate/multistep.ll
index 35a853d820b96..4e5418956faa0 100644
--- a/llvm/test/Transforms/Reassociate/multistep.ll
+++ b/llvm/test/Transforms/Reassociate/multistep.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -reassociate -S | FileCheck %s
+; RUN: opt < %s -passes=reassociate -S | FileCheck %s
 
 ; Check that a*a*b+a*a*c is turned into a*(a*(b+c)).
 

diff  --git a/llvm/test/Transforms/Reassociate/negation.ll b/llvm/test/Transforms/Reassociate/negation.ll
index 21b21122e282a..4718d9d87ae1b 100644
--- a/llvm/test/Transforms/Reassociate/negation.ll
+++ b/llvm/test/Transforms/Reassociate/negation.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -reassociate -S | FileCheck %s
+; RUN: opt < %s -passes=reassociate -S | FileCheck %s
 
 ; Test that we can turn things like X*-(Y*Z) -> X*-1*Y*Z.
 

diff  --git a/llvm/test/Transforms/Reassociate/no-op.ll b/llvm/test/Transforms/Reassociate/no-op.ll
index 248766d394343..1ee3e2cdad7da 100644
--- a/llvm/test/Transforms/Reassociate/no-op.ll
+++ b/llvm/test/Transforms/Reassociate/no-op.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -reassociate -S | FileCheck %s
+; RUN: opt < %s -passes=reassociate -S | FileCheck %s
 
 ; When there is nothing to do, or not much to do, check that reassociate leaves
 ; things alone.

diff  --git a/llvm/test/Transforms/Reassociate/optional-flags.ll b/llvm/test/Transforms/Reassociate/optional-flags.ll
index 00c2d0ac3128f..766e4301d56ae 100644
--- a/llvm/test/Transforms/Reassociate/optional-flags.ll
+++ b/llvm/test/Transforms/Reassociate/optional-flags.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -reassociate < %s | FileCheck %s
+; RUN: opt -S -passes=reassociate < %s | FileCheck %s
 ; rdar://8944681
 
 ; Reassociate should clear optional flags like nsw when reassociating.

diff  --git a/llvm/test/Transforms/Reassociate/pr21205.ll b/llvm/test/Transforms/Reassociate/pr21205.ll
index 0c6fd3ab5693d..c2ac84a4db070 100644
--- a/llvm/test/Transforms/Reassociate/pr21205.ll
+++ b/llvm/test/Transforms/Reassociate/pr21205.ll
@@ -1,4 +1,4 @@
-; RUN: opt -reassociate -S < %s | FileCheck %s
+; RUN: opt -passes=reassociate -S < %s | FileCheck %s
 ; PR21205
 
 @a = common global i32 0, align 4

diff  --git a/llvm/test/Transforms/Reassociate/pr28367.ll b/llvm/test/Transforms/Reassociate/pr28367.ll
index 55a6fcba26c4f..b8688535d9d4e 100644
--- a/llvm/test/Transforms/Reassociate/pr28367.ll
+++ b/llvm/test/Transforms/Reassociate/pr28367.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -reassociate -S
+; RUN: opt < %s -passes=reassociate -S
 
 ; PR28367
 

diff  --git a/llvm/test/Transforms/Reassociate/pr42349.ll b/llvm/test/Transforms/Reassociate/pr42349.ll
index d888f68707360..3bed0598a377c 100644
--- a/llvm/test/Transforms/Reassociate/pr42349.ll
+++ b/llvm/test/Transforms/Reassociate/pr42349.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -reassociate -S | FileCheck %s
+; RUN: opt < %s -passes=reassociate -S | FileCheck %s
 
 define  float @wibble(float %tmp6) #0 {
 ; CHECK-LABEL: @wibble(

diff  --git a/llvm/test/Transforms/Reassociate/propagate-flags.ll b/llvm/test/Transforms/Reassociate/propagate-flags.ll
index fe477213c8f39..e9daad383b6a2 100644
--- a/llvm/test/Transforms/Reassociate/propagate-flags.ll
+++ b/llvm/test/Transforms/Reassociate/propagate-flags.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -reassociate -S | FileCheck %s
+; RUN: opt < %s -passes=reassociate -S | FileCheck %s
 
 define double @func(double %a, double %b) {
 ; CHECK-LABEL: @func(

diff  --git a/llvm/test/Transforms/Reassociate/reassoc-intermediate-fnegs.ll b/llvm/test/Transforms/Reassociate/reassoc-intermediate-fnegs.ll
index 7f247de6cf937..9b2bbf2483f86 100644
--- a/llvm/test/Transforms/Reassociate/reassoc-intermediate-fnegs.ll
+++ b/llvm/test/Transforms/Reassociate/reassoc-intermediate-fnegs.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -reassociate -S | FileCheck %s
+; RUN: opt < %s -passes=reassociate -S | FileCheck %s
 
 ; B * 5 + A * -5
 ; TODO: (B - A) * 5

diff  --git a/llvm/test/Transforms/Reassociate/reassociate_dbgvalue_discard.ll b/llvm/test/Transforms/Reassociate/reassociate_dbgvalue_discard.ll
index 1addee5fa3106..c5a83c38aa24f 100644
--- a/llvm/test/Transforms/Reassociate/reassociate_dbgvalue_discard.ll
+++ b/llvm/test/Transforms/Reassociate/reassociate_dbgvalue_discard.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -reassociate -S -o - | FileCheck %s
+; RUN: opt < %s -passes=reassociate -S -o - | FileCheck %s
 
 ; After reassociation m1 and m2 aren't calculated as m1=c*a and m2=c*b any longer.
 ; So let's verify that the dbg.value nodes for m1 and m3 are invalidated.

diff  --git a/llvm/test/Transforms/Reassociate/reassociate_salvages_debug_info.ll b/llvm/test/Transforms/Reassociate/reassociate_salvages_debug_info.ll
index 34e0b9a04bb32..926131f1f8be2 100644
--- a/llvm/test/Transforms/Reassociate/reassociate_salvages_debug_info.ll
+++ b/llvm/test/Transforms/Reassociate/reassociate_salvages_debug_info.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -reassociate -S | FileCheck %s
+; RUN: opt < %s -passes=reassociate -S | FileCheck %s
 
 ; Check that reassociate pass now salvages debug info when dropping instructions.
 

diff  --git a/llvm/test/Transforms/Reassociate/repeats.ll b/llvm/test/Transforms/Reassociate/repeats.ll
index 547cb0ad72c17..c18db19fa73e3 100644
--- a/llvm/test/Transforms/Reassociate/repeats.ll
+++ b/llvm/test/Transforms/Reassociate/repeats.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -reassociate -S | FileCheck %s
+; RUN: opt < %s -passes=reassociate -S | FileCheck %s
 
 ; Tests involving repeated operations on the same value.
 

diff  --git a/llvm/test/Transforms/Reassociate/secondary.ll b/llvm/test/Transforms/Reassociate/secondary.ll
index a52000ada5378..87a6691c5bc1d 100644
--- a/llvm/test/Transforms/Reassociate/secondary.ll
+++ b/llvm/test/Transforms/Reassociate/secondary.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -reassociate < %s | FileCheck %s
+; RUN: opt -S -passes=reassociate < %s | FileCheck %s
 ; rdar://9167457
 
 ; Reassociate shouldn't break this testcase involving a secondary

diff  --git a/llvm/test/Transforms/Reassociate/undef_intrinsics_when_deleting_instructions.ll b/llvm/test/Transforms/Reassociate/undef_intrinsics_when_deleting_instructions.ll
index 349da85cc80f7..777bfc91ec28e 100644
--- a/llvm/test/Transforms/Reassociate/undef_intrinsics_when_deleting_instructions.ll
+++ b/llvm/test/Transforms/Reassociate/undef_intrinsics_when_deleting_instructions.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -reassociate -S | FileCheck %s
+; RUN: opt < %s -passes=reassociate -S | FileCheck %s
 
 ; Check that reassociate pass now undefs debug intrinsics that reference a value
 ; that gets dropped and cannot be salvaged.

diff  --git a/llvm/test/Transforms/Reassociate/xor_reassoc.ll b/llvm/test/Transforms/Reassociate/xor_reassoc.ll
index 81b0311bd7f07..73d9abbc5e9a6 100644
--- a/llvm/test/Transforms/Reassociate/xor_reassoc.ll
+++ b/llvm/test/Transforms/Reassociate/xor_reassoc.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-;RUN: opt -S -reassociate < %s | FileCheck %s
+;RUN: opt -S -passes=reassociate < %s | FileCheck %s
 
 ; ==========================================================================
 ;

diff  --git a/llvm/test/Transforms/Sink/badloadsink.ll b/llvm/test/Transforms/Sink/badloadsink.ll
index 1bb039bcc3a44..a502170e77c45 100644
--- a/llvm/test/Transforms/Sink/badloadsink.ll
+++ b/llvm/test/Transforms/Sink/badloadsink.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -sink -S | FileCheck %s
+; RUN: opt < %s -passes=sink -S | FileCheck %s
 declare void @foo(i64 *)
 declare i8* @llvm.load.relative.i32(i8* %ptr, i32 %offset) argmemonly nounwind readonly
 define i64 @sinkload(i1 %cmp, i8* %ptr, i32 %off) {

diff  --git a/llvm/test/Transforms/Sink/basic.ll b/llvm/test/Transforms/Sink/basic.ll
index 97e70ce2b488e..790e38624969c 100644
--- a/llvm/test/Transforms/Sink/basic.ll
+++ b/llvm/test/Transforms/Sink/basic.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -sink -S | FileCheck %s
+; RUN: opt < %s -passes=sink -S | FileCheck %s
 ; RUN: opt < %s -aa-pipeline='basic-aa' -passes='sink' -S | FileCheck %s
 
 @A = external global i32

diff  --git a/llvm/test/Transforms/Sink/call.ll b/llvm/test/Transforms/Sink/call.ll
index f6ffc0ba3a03e..c0940673aaafc 100644
--- a/llvm/test/Transforms/Sink/call.ll
+++ b/llvm/test/Transforms/Sink/call.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -sink -S | FileCheck %s
+; RUN: opt < %s -passes=sink -S | FileCheck %s
 
 declare i32 @f_load_global() nounwind willreturn readonly
 declare i32 @f_load_global_throwable() willreturn readonly

diff  --git a/llvm/test/Transforms/Sink/catchswitch.ll b/llvm/test/Transforms/Sink/catchswitch.ll
index 2648f85f3eb40..1da1e86ad5850 100644
--- a/llvm/test/Transforms/Sink/catchswitch.ll
+++ b/llvm/test/Transforms/Sink/catchswitch.ll
@@ -1,4 +1,4 @@
-; RUN: opt -sink -S < %s | FileCheck %s
+; RUN: opt -passes=sink -S < %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-msvc"

diff  --git a/llvm/test/Transforms/Sink/convergent.ll b/llvm/test/Transforms/Sink/convergent.ll
index 292162b593148..de0f6c27175cd 100644
--- a/llvm/test/Transforms/Sink/convergent.ll
+++ b/llvm/test/Transforms/Sink/convergent.ll
@@ -1,4 +1,4 @@
-; RUN: opt -sink -S < %s | FileCheck %s
+; RUN: opt -passes=sink -S < %s | FileCheck %s
 
 ; Verify that IR sinking does not move convergent operations to
 ; blocks that are not control equivalent.

diff  --git a/llvm/test/Transforms/Sink/dead-user.ll b/llvm/test/Transforms/Sink/dead-user.ll
index 2d21defbb42af..9478e29cc12ef 100644
--- a/llvm/test/Transforms/Sink/dead-user.ll
+++ b/llvm/test/Transforms/Sink/dead-user.ll
@@ -1,5 +1,5 @@
 ; Compiler should not be broken with a dead user.
-; RUN: opt -sink -S < %s | FileCheck %s
+; RUN: opt -passes=sink -S < %s | FileCheck %s
 
 ; CHECK-LABEL: @test(
 ; CHECK:       bb.0:

diff  --git a/llvm/test/Transforms/Sink/fence.ll b/llvm/test/Transforms/Sink/fence.ll
index 09aa565d88f80..21f6fb6a94887 100644
--- a/llvm/test/Transforms/Sink/fence.ll
+++ b/llvm/test/Transforms/Sink/fence.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -sink < %s | FileCheck %s
+; RUN: opt -S -passes=sink < %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/Sink/invariant-load.ll b/llvm/test/Transforms/Sink/invariant-load.ll
index 0e5ab2fbf7fef..c3bce49f56c7b 100644
--- a/llvm/test/Transforms/Sink/invariant-load.ll
+++ b/llvm/test/Transforms/Sink/invariant-load.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -sink -S < %s | FileCheck %s
+; RUN: opt -passes=sink -S < %s | FileCheck %s
 
 ; Loads marked invariant can be sunk across critical edges
 

diff  --git a/llvm/test/Transforms/Sink/landingpad.ll b/llvm/test/Transforms/Sink/landingpad.ll
index 10548fd5b7d40..b90ef610fff4d 100644
--- a/llvm/test/Transforms/Sink/landingpad.ll
+++ b/llvm/test/Transforms/Sink/landingpad.ll
@@ -1,5 +1,5 @@
 ; Test that we don't sink landingpads
-; RUN: opt -sink -S < %s | FileCheck %s
+; RUN: opt -passes=sink -S < %s | FileCheck %s
 
 declare hidden void @g()
 declare void @h()

diff  --git a/llvm/test/Transforms/Util/Debugify/loc-only-original-mode.ll b/llvm/test/Transforms/Util/Debugify/loc-only-original-mode.ll
index b49a8ff5c9196..65f24831bc89c 100644
--- a/llvm/test/Transforms/Util/Debugify/loc-only-original-mode.ll
+++ b/llvm/test/Transforms/Util/Debugify/loc-only-original-mode.ll
@@ -1,16 +1,16 @@
-; RUN: opt < %s -deadargelim \
+; RUN: opt < %s -passes=deadargelim \
 ; RUN:     -verify-each-debuginfo-preserve \
 ; RUN:     -debugify-level=locations -S 2>&1 | FileCheck %s
 
-; RUN: opt < %s -deadargelim \
+; RUN: opt < %s -passes=deadargelim \
 ; RUN:     -verify-each-debuginfo-preserve \
 ; RUN:     -debugify-level=location+variables -S 2>&1 | FileCheck %s --check-prefix=CHECK-DROP
 
-; RUN: opt < %s -deadargelim \
+; RUN: opt < %s -passes=deadargelim \
 ; RUN:     -verify-each-debuginfo-preserve \
 ; RUN:     -debugify-func-limit=0 -S 2>&1 | FileCheck %s
 
-; RUN: opt < %s -deadargelim \
+; RUN: opt < %s -passes=deadargelim \
 ; RUN:     -verify-each-debuginfo-preserve \
 ; RUN:     -debugify-func-limit=2 -S 2>&1 | FileCheck %s --check-prefix=CHECK-DROP
 

diff  --git a/llvm/test/Transforms/Util/add-TLI-mappings.ll b/llvm/test/Transforms/Util/add-TLI-mappings.ll
index 8e04c22bfdc3e..e649bcb0948e5 100644
--- a/llvm/test/Transforms/Util/add-TLI-mappings.ll
+++ b/llvm/test/Transforms/Util/add-TLI-mappings.ll
@@ -1,9 +1,5 @@
-; RUN: opt -vector-library=SVML       -inject-tli-mappings        -S < %s | FileCheck %s  --check-prefixes=COMMON,SVML
 ; RUN: opt -vector-library=SVML       -passes=inject-tli-mappings -S < %s | FileCheck %s  --check-prefixes=COMMON,SVML
-; RUN: opt -vector-library=MASSV      -inject-tli-mappings        -S < %s | FileCheck %s  --check-prefixes=COMMON,MASSV
 ; RUN: opt -vector-library=MASSV      -passes=inject-tli-mappings -S < %s | FileCheck %s  --check-prefixes=COMMON,MASSV
-; RUN: opt -vector-library=Accelerate -inject-tli-mappings        -S < %s | FileCheck %s  --check-prefixes=COMMON,ACCELERATE
-; RUN: opt -vector-library=LIBMVEC-X86 -inject-tli-mappings        -S < %s | FileCheck %s  --check-prefixes=COMMON,LIBMVEC-X86
 ; RUN: opt -vector-library=LIBMVEC-X86 -passes=inject-tli-mappings -S < %s | FileCheck %s  --check-prefixes=COMMON,LIBMVEC-X86
 ; RUN: opt -vector-library=Accelerate -passes=inject-tli-mappings -S < %s | FileCheck %s  --check-prefixes=COMMON,ACCELERATE
 

diff  --git a/llvm/test/Transforms/Util/annotation-remarks-dbg-info.ll b/llvm/test/Transforms/Util/annotation-remarks-dbg-info.ll
index 88ebe6040b82a..a0fa79aa7edbe 100644
--- a/llvm/test/Transforms/Util/annotation-remarks-dbg-info.ll
+++ b/llvm/test/Transforms/Util/annotation-remarks-dbg-info.ll
@@ -1,5 +1,3 @@
-; RUN: opt -annotation-remarks -pass-remarks-missed='annotation-remarks' -disable-output -pass-remarks-output=%t.opt.yaml %s
-; RUN: FileCheck --input-file=%t.opt.yaml %s
 ; RUN: opt -passes='annotation-remarks' -pass-remarks-missed='annotation-remarks' -disable-output -pass-remarks-output=%t.opt.yaml %s
 ; RUN: FileCheck --input-file=%t.opt.yaml %s
 

diff  --git a/llvm/test/Transforms/Util/annotation-remarks.ll b/llvm/test/Transforms/Util/annotation-remarks.ll
index 8415c40f90a38..c18aaa92f85c4 100644
--- a/llvm/test/Transforms/Util/annotation-remarks.ll
+++ b/llvm/test/Transforms/Util/annotation-remarks.ll
@@ -1,5 +1,3 @@
-; RUN: opt -annotation-remarks -pass-remarks-missed='annotation-remarks' -disable-output -pass-remarks-output=%t.opt.yaml %s
-; RUN: FileCheck --input-file=%t.opt.yaml %s
 ; RUN: opt -passes='annotation-remarks' -pass-remarks-missed='annotation-remarks' -disable-output -pass-remarks-output=%t.opt.yaml %s
 ; RUN: FileCheck --input-file=%t.opt.yaml %s
 

diff  --git a/llvm/test/Transforms/Util/annotation2metadata.ll b/llvm/test/Transforms/Util/annotation2metadata.ll
index 14940227d7561..35ec3e75559fb 100644
--- a/llvm/test/Transforms/Util/annotation2metadata.ll
+++ b/llvm/test/Transforms/Util/annotation2metadata.ll
@@ -1,5 +1,4 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -annotation2metadata -pass-remarks-analysis='annotation-remarks' -S %s | FileCheck %s
 ; RUN: opt -passes='annotation2metadata' -pass-remarks-analysis='annotation-remarks' -S %s | FileCheck %s
 
 @.str = private unnamed_addr constant [10 x i8] c"_remarks1\00", section "llvm.metadata"

diff  --git a/llvm/test/Transforms/Util/combine-alias-scope-metadata.ll b/llvm/test/Transforms/Util/combine-alias-scope-metadata.ll
index 35c99cb0db5c4..1e8e8b516567e 100644
--- a/llvm/test/Transforms/Util/combine-alias-scope-metadata.ll
+++ b/llvm/test/Transforms/Util/combine-alias-scope-metadata.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -S -memcpyopt | FileCheck %s
+; RUN: opt < %s -S -passes=memcpyopt | FileCheck %s
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 
 define void @test(ptr noalias dereferenceable(1) %in, ptr noalias dereferenceable(1) %out) {

diff  --git a/llvm/test/Transforms/Util/dbg-call-bitcast.ll b/llvm/test/Transforms/Util/dbg-call-bitcast.ll
index 42ced41f7f573..f3da1a6b1eaec 100644
--- a/llvm/test/Transforms/Util/dbg-call-bitcast.ll
+++ b/llvm/test/Transforms/Util/dbg-call-bitcast.ll
@@ -1,4 +1,4 @@
-; RUN: opt -instcombine -S %s | FileCheck %s
+; RUN: opt -passes=instcombine -S %s | FileCheck %s
 
 define dso_local void @_Z1fv() {
   %1 = alloca i32, align 4

diff  --git a/llvm/test/Transforms/Util/dbg-user-of-aext.ll b/llvm/test/Transforms/Util/dbg-user-of-aext.ll
index d27d9c532b31c..ad418e12e0126 100644
--- a/llvm/test/Transforms/Util/dbg-user-of-aext.ll
+++ b/llvm/test/Transforms/Util/dbg-user-of-aext.ll
@@ -1,7 +1,7 @@
 ; Checks that llvm.dbg.declare -> llvm.dbg.value conversion utility
 ; (here exposed through the SROA) pass refers to [s|z]exts of values (as
 ; opposed to the operand of a [s|z]ext).
-; RUN: opt -S -sroa %s | FileCheck %s
+; RUN: opt -S -passes=sroa %s | FileCheck %s
 
 ; Built from:
 ; struct foo { bool b; long i; };

diff  --git a/llvm/test/Transforms/Util/libcalls-fast-math-inf-loop.ll b/llvm/test/Transforms/Util/libcalls-fast-math-inf-loop.ll
index 1efbcfa299831..ad23bf7425bc7 100644
--- a/llvm/test/Transforms/Util/libcalls-fast-math-inf-loop.ll
+++ b/llvm/test/Transforms/Util/libcalls-fast-math-inf-loop.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -instcombine -o - %s | FileCheck %s
+; RUN: opt -S -passes=instcombine -o - %s | FileCheck %s
 
 ; Test that fast math lib call simplification of double math function to float
 ; equivalent doesn't occur when the calling function matches the float

diff  --git a/llvm/test/Transforms/Util/libcalls-shrinkwrap-double.ll b/llvm/test/Transforms/Util/libcalls-shrinkwrap-double.ll
index d015a9d4d6019..3357ed8646e79 100644
--- a/llvm/test/Transforms/Util/libcalls-shrinkwrap-double.ll
+++ b/llvm/test/Transforms/Util/libcalls-shrinkwrap-double.ll
@@ -1,5 +1,3 @@
-; RUN: opt < %s -libcalls-shrinkwrap -S | FileCheck %s
-; New PM
 ; RUN: opt < %s -passes=libcalls-shrinkwrap -S | FileCheck %s
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"

diff  --git a/llvm/test/Transforms/Util/libcalls-shrinkwrap-float.ll b/llvm/test/Transforms/Util/libcalls-shrinkwrap-float.ll
index 4affc006e38f5..43583cde33c3b 100644
--- a/llvm/test/Transforms/Util/libcalls-shrinkwrap-float.ll
+++ b/llvm/test/Transforms/Util/libcalls-shrinkwrap-float.ll
@@ -1,5 +1,3 @@
-; RUN: opt < %s -libcalls-shrinkwrap -S | FileCheck %s
-; New PM
 ; RUN: opt < %s -passes=libcalls-shrinkwrap -S | FileCheck %s
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"

diff  --git a/llvm/test/Transforms/Util/libcalls-shrinkwrap-long-double.ll b/llvm/test/Transforms/Util/libcalls-shrinkwrap-long-double.ll
index 54a31e5173f51..d84473d2e59c5 100644
--- a/llvm/test/Transforms/Util/libcalls-shrinkwrap-long-double.ll
+++ b/llvm/test/Transforms/Util/libcalls-shrinkwrap-long-double.ll
@@ -1,5 +1,3 @@
-; RUN: opt < %s -libcalls-shrinkwrap -S | FileCheck %s
-; New PM
 ; RUN: opt < %s -passes=libcalls-shrinkwrap -S | FileCheck %s
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"

diff  --git a/llvm/test/Transforms/Util/salvage-debuginfo.ll b/llvm/test/Transforms/Util/salvage-debuginfo.ll
index b877d1bded602..566104e9e358b 100644
--- a/llvm/test/Transforms/Util/salvage-debuginfo.ll
+++ b/llvm/test/Transforms/Util/salvage-debuginfo.ll
@@ -1,5 +1,5 @@
-; RUN: opt -adce %s -S -o - | FileCheck %s
-; RUN: opt -bdce %s -S -o - | FileCheck %s
+; RUN: opt -passes=adce %s -S -o - | FileCheck %s
+; RUN: opt -passes=bdce %s -S -o - | FileCheck %s
 target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-apple-macosx"
 define void @f(i32) !dbg !8 {

diff  --git a/llvm/test/Transforms/Util/simplify-dbg-declare-load.ll b/llvm/test/Transforms/Util/simplify-dbg-declare-load.ll
index 7a37ac4f1053a..75f0dbbdc413f 100644
--- a/llvm/test/Transforms/Util/simplify-dbg-declare-load.ll
+++ b/llvm/test/Transforms/Util/simplify-dbg-declare-load.ll
@@ -1,5 +1,5 @@
-; RUN: opt -instcombine -instcombine-lower-dbg-declare=1 -S < %s | FileCheck %s
-; RUN: opt -instcombine -instcombine-lower-dbg-declare=0 -S < %s | FileCheck %s --check-prefix=DECLARE
+; RUN: opt -passes=instcombine -instcombine-lower-dbg-declare=1 -S < %s | FileCheck %s
+; RUN: opt -passes=instcombine -instcombine-lower-dbg-declare=0 -S < %s | FileCheck %s --check-prefix=DECLARE
 ; XFAIL: *
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-pc-linux-gnu"

diff  --git a/llvm/test/Transforms/Util/store-first-op.ll b/llvm/test/Transforms/Util/store-first-op.ll
index d88138d55e5a4..199a1ec6ce255 100644
--- a/llvm/test/Transforms/Util/store-first-op.ll
+++ b/llvm/test/Transforms/Util/store-first-op.ll
@@ -1,4 +1,4 @@
-; RUN: opt -instcombine -S %s | FileCheck %s
+; RUN: opt -passes=instcombine -S %s | FileCheck %s
 
 %foo = type { i8 }
 

diff  --git a/llvm/test/Transforms/Util/strip-gc-relocates.ll b/llvm/test/Transforms/Util/strip-gc-relocates.ll
index 215a4fafd0e3a..04782158ad69c 100644
--- a/llvm/test/Transforms/Util/strip-gc-relocates.ll
+++ b/llvm/test/Transforms/Util/strip-gc-relocates.ll
@@ -1,4 +1,3 @@
-; RUN: opt -S -strip-gc-relocates -instcombine < %s | FileCheck %s
 ; RUN: opt -S -passes=strip-gc-relocates,instcombine < %s | FileCheck %s
 ; test utility/debugging pass which removes gc.relocates, inserted by -rewrite-statepoints-for-gc
 declare void @use_obj32(ptr addrspace(1)) "gc-leaf-function"

diff  --git a/llvm/test/Transforms/Util/strip-nonlinetable-debuginfo-containingtypes.ll b/llvm/test/Transforms/Util/strip-nonlinetable-debuginfo-containingtypes.ll
index 286491bdcbe77..6b92264db5fa9 100644
--- a/llvm/test/Transforms/Util/strip-nonlinetable-debuginfo-containingtypes.ll
+++ b/llvm/test/Transforms/Util/strip-nonlinetable-debuginfo-containingtypes.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -strip-nonlinetable-debuginfo %s -o %t.ll
+; RUN: opt -S -passes=strip-nonlinetable-debuginfo %s -o %t.ll
 ; RUN: cat %t.ll | FileCheck %s
 ; RUN: cat %t.ll | FileCheck %s --check-prefix=CHECK-NEG
 ;

diff  --git a/llvm/test/Transforms/Util/strip-nonlinetable-debuginfo-cus.ll b/llvm/test/Transforms/Util/strip-nonlinetable-debuginfo-cus.ll
index 71145dded1bdf..47074048d8769 100644
--- a/llvm/test/Transforms/Util/strip-nonlinetable-debuginfo-cus.ll
+++ b/llvm/test/Transforms/Util/strip-nonlinetable-debuginfo-cus.ll
@@ -1,4 +1,3 @@
-; RUN: opt -S -strip-nonlinetable-debuginfo %s -o - | FileCheck %s
 ; RUN: opt -S -passes=strip-nonlinetable-debuginfo %s -o - | FileCheck %s
 !llvm.dbg.cu = !{!2, !6}
 !llvm.gcov = !{!3}

diff  --git a/llvm/test/Transforms/Util/strip-nonlinetable-debuginfo-heapallocsite.ll b/llvm/test/Transforms/Util/strip-nonlinetable-debuginfo-heapallocsite.ll
index 02d96764a8b73..30f25e6166084 100644
--- a/llvm/test/Transforms/Util/strip-nonlinetable-debuginfo-heapallocsite.ll
+++ b/llvm/test/Transforms/Util/strip-nonlinetable-debuginfo-heapallocsite.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -strip-nonlinetable-debuginfo %s -o - |  FileCheck %s
+; RUN: opt -S -passes=strip-nonlinetable-debuginfo %s -o - |  FileCheck %s
 ; RUN: opt -S -strip-debug %s -o - |  FileCheck %s
 ; int *get() { return new int[256]; }
 ; ModuleID = '/tmp/heapallocsite.cpp'

diff  --git a/llvm/test/Transforms/Util/strip-nonlinetable-debuginfo-labels.ll b/llvm/test/Transforms/Util/strip-nonlinetable-debuginfo-labels.ll
index ed48add3b115a..bd20e8ce8a4ff 100644
--- a/llvm/test/Transforms/Util/strip-nonlinetable-debuginfo-labels.ll
+++ b/llvm/test/Transforms/Util/strip-nonlinetable-debuginfo-labels.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -strip-nonlinetable-debuginfo %s -o - | FileCheck %s
+; RUN: opt -S -passes=strip-nonlinetable-debuginfo %s -o - | FileCheck %s
 ; CHECK: define void @f()
 define void @f() !dbg !4 {
 entry:

diff  --git a/llvm/test/Transforms/Util/strip-nonlinetable-debuginfo-localvars.ll b/llvm/test/Transforms/Util/strip-nonlinetable-debuginfo-localvars.ll
index fa687a4730a39..8b3f71aee319e 100644
--- a/llvm/test/Transforms/Util/strip-nonlinetable-debuginfo-localvars.ll
+++ b/llvm/test/Transforms/Util/strip-nonlinetable-debuginfo-localvars.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -strip-nonlinetable-debuginfo %s -o - | FileCheck %s
+; RUN: opt -S -passes=strip-nonlinetable-debuginfo %s -o - | FileCheck %s
 ; CHECK: define void @f() !dbg ![[F:[0-9]+]]
 define void @f() !dbg !4 {
 entry:

diff  --git a/llvm/test/Transforms/Util/strip-nonlinetable-debuginfo-loops.ll b/llvm/test/Transforms/Util/strip-nonlinetable-debuginfo-loops.ll
index 5dc4b1d5dd2de..2acf4f40bb562 100644
--- a/llvm/test/Transforms/Util/strip-nonlinetable-debuginfo-loops.ll
+++ b/llvm/test/Transforms/Util/strip-nonlinetable-debuginfo-loops.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -strip-nonlinetable-debuginfo %s -o %t
+; RUN: opt -S -passes=strip-nonlinetable-debuginfo %s -o %t
 ; RUN: cat %t | FileCheck %s
 ; RUN: cat %t | FileCheck %s --check-prefix=NEGATIVE
 ; void f(volatile int *i) {

diff  --git a/llvm/test/Transforms/Util/strip-nonlinetable-debuginfo-subroutinetypes.ll b/llvm/test/Transforms/Util/strip-nonlinetable-debuginfo-subroutinetypes.ll
index 6dce41f56fa63..d1a66f587c1ce 100644
--- a/llvm/test/Transforms/Util/strip-nonlinetable-debuginfo-subroutinetypes.ll
+++ b/llvm/test/Transforms/Util/strip-nonlinetable-debuginfo-subroutinetypes.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -strip-nonlinetable-debuginfo %s -o - | FileCheck %s
+; RUN: opt -S -passes=strip-nonlinetable-debuginfo %s -o - | FileCheck %s
 ; Test that subroutine types are downgraded to (void)().
 define internal i32 @"__hidden#2878_"() #0 !dbg !12 {
   ret i32 0, !dbg !634


        


More information about the llvm-commits mailing list