From 0676acb6fd8d5e22fde16e6ec977ceac08427ab0 Mon Sep 17 00:00:00 2001
From: Bjorn Pettersson <bjorn.a.pettersson@ericsson.com>
Date: Tue, 29 Nov 2022 10:15:11 +0100
Subject: [PATCH] [test] Switch to use -passes syntax in a bunch of test cases

Should cover most of the tests for GVN, GVNHoist, GVNSink, GlobalOpt,
GlobalSplit, InstCombine, Reassociate, SROA and TailCallElim that
had not been updated earlier.
---
 .../Transforms/GVN/2007-07-25-DominatedLoop.ll     |  2 +-
 .../test/Transforms/GVN/2007-07-25-InfiniteLoop.ll |  2 +-
 llvm/test/Transforms/GVN/2007-07-25-Loop.ll        |  2 +-
 llvm/test/Transforms/GVN/2007-07-25-NestedLoop.ll  |  2 +-
 .../Transforms/GVN/2007-07-25-SinglePredecessor.ll |  2 +-
 .../Transforms/GVN/2007-07-26-InterlockingLoops.ll |  2 +-
 .../test/Transforms/GVN/2007-07-26-NonRedundant.ll |  2 +-
 llvm/test/Transforms/GVN/2007-07-26-PhiErasure.ll  |  2 +-
 llvm/test/Transforms/GVN/2007-07-30-PredIDom.ll    |  2 +-
 .../test/Transforms/GVN/2007-07-31-NoDomInherit.ll |  2 +-
 .../test/Transforms/GVN/2007-07-31-RedundantPhi.ll |  2 +-
 llvm/test/Transforms/GVN/2008-02-12-UndefLoad.ll   |  2 +-
 llvm/test/Transforms/GVN/2008-07-02-Unreachable.ll |  2 +-
 llvm/test/Transforms/GVN/2008-12-09-SelfRemove.ll  |  2 +-
 llvm/test/Transforms/GVN/2008-12-12-RLE-Crash.ll   |  2 +-
 .../Transforms/GVN/2008-12-14-rle-reanalyze.ll     |  2 +-
 .../test/Transforms/GVN/2008-12-15-CacheVisited.ll |  2 +-
 .../Transforms/GVN/2009-01-21-SortInvalidation.ll  |  2 +-
 .../Transforms/GVN/2009-01-22-SortInvalidation.ll  |  2 +-
 .../Transforms/GVN/2009-07-13-MemDepSortFail.ll    |  2 +-
 .../GVN/2009-11-12-MemDepMallocBitCast.ll          |  2 +-
 .../Transforms/GVN/2010-03-31-RedundantPHIs.ll     |  2 +-
 llvm/test/Transforms/GVN/2010-11-13-Simplify.ll    |  2 +-
 .../GVN/2011-07-07-MatchIntrinsicExtract.ll        |  2 +-
 llvm/test/Transforms/GVN/2011-09-07-TypeIdFor.ll   |  2 +-
 .../2016-08-30-MaskedScatterGather-inseltpoison.ll |  2 +-
 .../GVN/2016-08-30-MaskedScatterGather.ll          |  2 +-
 llvm/test/Transforms/GVN/MemdepMiscompile.ll       |  2 +-
 .../GVN/PRE/2017-06-28-pre-load-dbgloc.ll          |  2 +-
 .../PRE/2018-06-08-pre-load-dbgloc-no-null-opt.ll  |  2 +-
 llvm/test/Transforms/GVN/PRE/atomic.ll             |  2 +-
 llvm/test/Transforms/GVN/PRE/invariant-load.ll     |  2 +-
 .../Transforms/GVN/PRE/load-pre-across-backedge.ll |  2 +-
 llvm/test/Transforms/GVN/PRE/load-pre-align.ll     |  2 +-
 llvm/test/Transforms/GVN/PRE/nonintegral.ll        |  2 +-
 llvm/test/Transforms/GVN/PRE/phi-translate-2.ll    |  2 +-
 llvm/test/Transforms/GVN/PRE/phi-translate.ll      |  2 +-
 llvm/test/Transforms/GVN/PRE/pre-no-cost-phi.ll    |  2 +-
 llvm/test/Transforms/GVN/PRE/preserve-tbaa.ll      |  2 +-
 llvm/test/Transforms/GVN/PRE/rle-phi-translate.ll  |  2 +-
 llvm/test/Transforms/GVN/PRE/rle-semidominated.ll  |  2 +-
 llvm/test/Transforms/GVN/addrspacecast.ll          |  2 +-
 llvm/test/Transforms/GVN/assume-equal.ll           |  2 +-
 llvm/test/Transforms/GVN/assume.ll                 |  2 +-
 llvm/test/Transforms/GVN/basic-undef-test.ll       |  2 +-
 llvm/test/Transforms/GVN/basic.ll                  |  2 +-
 llvm/test/Transforms/GVN/big-endian.ll             |  2 +-
 llvm/test/Transforms/GVN/bitcast-of-call.ll        |  2 +-
 .../test/Transforms/GVN/callbr-loadpre-critedge.ll |  2 +-
 .../Transforms/GVN/callbr-scalarpre-critedge.ll    |  2 +-
 llvm/test/Transforms/GVN/calls-nonlocal.ll         |  2 +-
 llvm/test/Transforms/GVN/calls-readonly.ll         |  2 +-
 llvm/test/Transforms/GVN/commute.ll                |  2 +-
 llvm/test/Transforms/GVN/cond_br.ll                |  2 +-
 llvm/test/Transforms/GVN/cond_br2.ll               |  2 +-
 llvm/test/Transforms/GVN/condprop.ll               |  2 +-
 llvm/test/Transforms/GVN/dbg-redundant-load.ll     |  2 +-
 llvm/test/Transforms/GVN/debugloc.ll               |  2 +-
 llvm/test/Transforms/GVN/edge.ll                   |  2 +-
 llvm/test/Transforms/GVN/flags.ll                  |  2 +-
 llvm/test/Transforms/GVN/fold-const-expr.ll        |  2 +-
 llvm/test/Transforms/GVN/fpmath.ll                 |  2 +-
 llvm/test/Transforms/GVN/freeze.ll                 |  2 +-
 llvm/test/Transforms/GVN/funclet.ll                |  2 +-
 llvm/test/Transforms/GVN/gc_relocate.ll            |  2 +-
 llvm/test/Transforms/GVN/int_sideeffect.ll         |  2 +-
 llvm/test/Transforms/GVN/invariant.group.ll        |  2 +-
 llvm/test/Transforms/GVN/invariant.start.ll        |  2 +-
 llvm/test/Transforms/GVN/lifetime-simple.ll        |  2 +-
 .../GVN/load-from-unreachable-predecessor.ll       |  2 +-
 llvm/test/Transforms/GVN/loadpre-context.ll        |  2 +-
 .../Transforms/GVN/masked-load-store-vn-crash.ll   |  2 +-
 llvm/test/Transforms/GVN/masked-load-store.ll      |  2 +-
 llvm/test/Transforms/GVN/noalias.ll                |  2 +-
 .../GVN/non-integral-pointers-inseltpoison.ll      |  2 +-
 llvm/test/Transforms/GVN/non-integral-pointers.ll  |  2 +-
 llvm/test/Transforms/GVN/non-local-offset.ll       |  2 +-
 llvm/test/Transforms/GVN/null-aliases-nothing.ll   |  2 +-
 .../Transforms/GVN/phi-translate-partial-alias.ll  |  2 +-
 llvm/test/Transforms/GVN/pr10820.ll                |  2 +-
 llvm/test/Transforms/GVN/pr12979.ll                |  2 +-
 llvm/test/Transforms/GVN/pr17732.ll                |  2 +-
 llvm/test/Transforms/GVN/pr25440.ll                |  2 +-
 llvm/test/Transforms/GVN/pr33549.ll                |  2 +-
 llvm/test/Transforms/GVN/pr34908.ll                |  2 +-
 llvm/test/Transforms/GVN/pre-compare.ll            |  2 +-
 llvm/test/Transforms/GVN/propagate-ir-flags.ll     |  2 +-
 llvm/test/Transforms/GVN/range.ll                  |  2 +-
 llvm/test/Transforms/GVN/readattrs.ll              |  2 +-
 llvm/test/Transforms/GVN/rle-must-alias.ll         |  2 +-
 llvm/test/Transforms/GVN/rle-no-phi-translate.ll   |  2 +-
 llvm/test/Transforms/GVN/rle-nonlocal.ll           |  2 +-
 llvm/test/Transforms/GVN/storeinvgroup.ll          |  2 +-
 llvm/test/Transforms/GVN/tbaa.ll                   |  2 +-
 .../test/Transforms/GVN/unreachable-predecessor.ll |  2 +-
 llvm/test/Transforms/GVN/volatile-nonvolatile.ll   |  2 +-
 llvm/test/Transforms/GVN/vp_gather_scatter.ll      |  2 +-
 llvm/test/Transforms/GVNHoist/hoist-call.ll        |  2 +-
 llvm/test/Transforms/GVNHoist/hoist-convergent.ll  |  2 +-
 .../Transforms/GVNHoist/hoist-drop-debug-info.ll   |  2 +-
 llvm/test/Transforms/GVNHoist/hoist-md.ll          |  2 +-
 .../GVNHoist/hoist-more-than-two-branches.ll       |  2 +-
 llvm/test/Transforms/GVNHoist/hoist-mssa.ll        |  2 +-
 llvm/test/Transforms/GVNHoist/hoist-newgvn.ll      |  2 +-
 llvm/test/Transforms/GVNHoist/hoist-pr20242.ll     |  2 +-
 llvm/test/Transforms/GVNHoist/hoist-pr22005.ll     |  2 +-
 llvm/test/Transforms/GVNHoist/hoist-pr28606.ll     |  2 +-
 llvm/test/Transforms/GVNHoist/hoist-pr31891.ll     |  2 +-
 llvm/test/Transforms/GVNHoist/hoist-pr46874.ll     |  2 +-
 .../Transforms/GVNHoist/hoist-recursive-geps.ll    |  2 +-
 .../test/Transforms/GVNHoist/hoist-simplify-phi.ll |  2 +-
 .../Transforms/GVNHoist/hoist-unsafe-pr31729.ll    |  2 +-
 llvm/test/Transforms/GVNHoist/hoist-very-busy.ll   |  2 +-
 llvm/test/Transforms/GVNHoist/hoist.ll             |  2 +-
 .../Transforms/GVNHoist/infinite-loop-direct.ll    |  2 +-
 .../Transforms/GVNHoist/infinite-loop-indirect.ll  |  2 +-
 llvm/test/Transforms/GVNHoist/int_sideeffect.ll    |  2 +-
 llvm/test/Transforms/GVNHoist/ld_hoist1.ll         |  2 +-
 llvm/test/Transforms/GVNHoist/ld_hoist_st_sink.ll  |  2 +-
 llvm/test/Transforms/GVNHoist/non-trivial-phi.ll   |  2 +-
 llvm/test/Transforms/GVNHoist/pr28626.ll           |  2 +-
 llvm/test/Transforms/GVNHoist/pr29031.ll           |  2 +-
 llvm/test/Transforms/GVNHoist/pr29034.ll           |  2 +-
 llvm/test/Transforms/GVNHoist/pr30216.ll           |  2 +-
 llvm/test/Transforms/GVNHoist/pr30499.ll           |  2 +-
 .../test/Transforms/GVNHoist/pr35222-hoist-load.ll |  2 +-
 llvm/test/Transforms/GVNHoist/pr36787.ll           |  2 +-
 llvm/test/Transforms/GVNHoist/pr37808.ll           |  2 +-
 llvm/test/Transforms/GVNHoist/pr45442.ll           |  2 +-
 llvm/test/Transforms/GVNSink/dither.ll             |  2 +-
 llvm/test/Transforms/GVNSink/fpmath.ll             |  2 +-
 llvm/test/Transforms/GVNSink/int_sideeffect.ll     |  2 +-
 llvm/test/Transforms/GVNSink/operand-mismatch.ll   |  2 +-
 .../Transforms/GVNSink/sink-combine-metadata.ll    |  2 +-
 llvm/test/Transforms/GVNSink/struct.ll             |  1 -
 .../GlobalOpt/2004-10-10-CastStoreOnce.ll          |  2 +-
 .../GlobalOpt/2009-02-15-BitcastAlias.ll           |  2 +-
 .../GlobalOpt/2009-06-01-RecursivePHI.ll           |  2 +-
 .../GlobalOpt/2022-08-23-ScalableVectorCrash.ll    |  2 +-
 .../Transforms/GlobalOpt/constantexpr-dangle.ll    |  2 +-
 llvm/test/Transforms/GlobalOpt/ctor-memset.ll      |  2 +-
 llvm/test/Transforms/GlobalOpt/evaluate-bitcast.ll |  2 +-
 .../Transforms/GlobalOpt/evaluate-call-errors.ll   |  2 +-
 llvm/test/Transforms/GlobalOpt/evaluate-call.ll    |  2 +-
 .../GlobalOpt/evaluate-constfold-call.ll           |  2 +-
 .../Transforms/GlobalOpt/evaluate-load-uniform.ll  |  2 +-
 .../Transforms/GlobalOpt/globalsra-generic-type.ll |  2 +-
 .../Transforms/GlobalOpt/globalsra-opaque-ptr.ll   |  2 +-
 .../Transforms/GlobalOpt/globalsra-recursive.ll    |  2 +-
 llvm/test/Transforms/GlobalOpt/integer-bool.ll     |  2 +-
 .../GlobalOpt/malloc-promote-opaque-ptr.ll         |  2 +-
 llvm/test/Transforms/GlobalOpt/pr39751.ll          |  2 +-
 llvm/test/Transforms/GlobalOpt/pr51879.ll          |  2 +-
 llvm/test/Transforms/GlobalOpt/pr52994.ll          |  2 +-
 llvm/test/Transforms/GlobalOpt/pr53002.ll          |  2 +-
 llvm/test/Transforms/GlobalOpt/pr54572.ll          |  2 +-
 .../recursively-delete-dead-inst-assertion.ll      |  2 +-
 .../GlobalOpt/shrink-global-to-bool-opaque-ptrs.ll |  2 +-
 .../GlobalOpt/stored-once-different-type.ll        |  2 +-
 .../GlobalOpt/stored-once-through-gep.ll           |  2 +-
 llvm/test/Transforms/GlobalOpt/undef-ctor-dtor.ll  |  2 +-
 llvm/test/Transforms/GlobalOpt/x86_mmx_load.ll     |  2 +-
 llvm/test/Transforms/GlobalSplit/basic.ll          |  1 -
 llvm/test/Transforms/GlobalSplit/non-beneficial.ll |  2 +-
 llvm/test/Transforms/GlobalSplit/nonlocal.ll       |  2 +-
 .../InstCombine/2004-09-20-BadLoadCombine.ll       |  2 +-
 .../InstCombine/2007-02-01-LoadSinkAlloca.ll       |  4 ++--
 .../Transforms/InstCombine/2007-12-28-IcmpSub2.ll  |  2 +-
 .../InstCombine/2009-02-20-InstCombine-SROA.ll     |  4 ++--
 .../AArch64/sve-intrinsic-gatherscatter.ll         |  2 +-
 llvm/test/Transforms/InstCombine/cast_phi.ll       |  2 +-
 llvm/test/Transforms/InstCombine/deadcode.ll       |  2 +-
 .../InstCombine/double-float-shrink-2.ll           | 14 +++++++-------
 .../InstCombine/early_constfold_changes_IR.ll      |  2 +-
 llvm/test/Transforms/InstCombine/fast-basictest.ll |  2 +-
 llvm/test/Transforms/InstCombine/fputs-opt-size.ll |  2 +-
 .../gep-object-size-less-than-or-equal-typesize.ll |  2 +-
 .../InstCombine/high-bit-signmask-with-trunc.ll    |  2 +-
 .../Transforms/InstCombine/high-bit-signmask.ll    |  2 +-
 llvm/test/Transforms/InstCombine/icmp-select.ll    |  2 +-
 .../Transforms/InstCombine/icmp-xor-signbit.ll     |  2 +-
 .../InstCombine/infinite-loop-postdom.ll           |  2 +-
 .../InstCombine/intersect-accessgroup.ll           |  2 +-
 .../Transforms/InstCombine/load-no-aliasing.ll     |  2 +-
 llvm/test/Transforms/InstCombine/load.ll           |  1 -
 .../test/Transforms/InstCombine/load_combine_aa.ll |  2 +-
 .../InstCombine/malloc-free-mismatched.ll          |  2 +-
 llvm/test/Transforms/InstCombine/memchr-7.ll       |  2 +-
 llvm/test/Transforms/InstCombine/mul_full_32.ll    |  2 +-
 llvm/test/Transforms/InstCombine/mul_full_64.ll    |  2 +-
 llvm/test/Transforms/InstCombine/musttail-thunk.ll |  2 +-
 llvm/test/Transforms/InstCombine/opaque-ptr.ll     |  2 +-
 llvm/test/Transforms/InstCombine/pr53357.ll        |  2 +-
 .../Transforms/InstCombine/ptrauth-intrinsics.ll   |  2 +-
 .../Transforms/InstCombine/saturating-add-sub.ll   |  2 +-
 llvm/test/Transforms/InstCombine/select-pr39595.ll |  2 +-
 .../Transforms/InstCombine/sink_to_unreachable.ll  |  1 -
 .../Transforms/InstCombine/statepoint-cleanup.ll   |  2 +-
 .../test/Transforms/InstCombine/statepoint-iter.ll |  2 +-
 .../InstCombine/store-load-unaliased-gep.ll        |  2 +-
 .../Reassociate/2002-05-15-MissedTree.ll           |  2 +-
 .../Reassociate/2002-05-15-SubReassociate.ll       |  2 +-
 .../Reassociate/2002-07-09-DominanceProblem.ll     |  2 +-
 .../Reassociate/2003-08-12-InfiniteLoop.ll         |  2 +-
 .../Reassociate/2005-09-01-ArrayOutOfBounds.ll     |  2 +-
 .../Reassociate/2011-01-26-UseAfterFree.ll         |  2 +-
 .../Reassociate/2012-06-08-InfiniteLoop.ll         |  2 +-
 llvm/test/Transforms/Reassociate/crash.ll          |  2 +-
 llvm/test/Transforms/Reassociate/crash2.ll         |  2 +-
 llvm/test/Transforms/Reassociate/deadcode.ll       |  2 +-
 .../Reassociate/fast-ArrayOutOfBounds.ll           |  2 +-
 .../test/Transforms/Reassociate/fast-MissedTree.ll |  2 +-
 .../Transforms/Reassociate/fast-SubReassociate.ll  |  2 +-
 llvm/test/Transforms/Reassociate/fast-mightymul.ll |  2 +-
 .../test/Transforms/Reassociate/infloop-deadphi.ll |  2 +-
 llvm/test/Transforms/Reassociate/inverses.ll       |  2 +-
 llvm/test/Transforms/Reassociate/long-chains.ll    |  2 +-
 llvm/test/Transforms/Reassociate/mightymul.ll      |  2 +-
 llvm/test/Transforms/Reassociate/min_int.ll        |  2 +-
 .../Reassociate/mixed-fast-nonfast-fp.ll           |  2 +-
 llvm/test/Transforms/Reassociate/negation1.ll      |  2 +-
 llvm/test/Transforms/Reassociate/otherops.ll       |  2 +-
 .../pointer-collision-non-determinism.ll           |  4 ++--
 .../Reassociate/reassociate-catchswitch.ll         |  2 +-
 .../Reassociate/reassociate-landingpad.ll          |  2 +-
 llvm/test/Transforms/Reassociate/shift-factor.ll   |  2 +-
 llvm/test/Transforms/Reassociate/shifttest.ll      |  2 +-
 llvm/test/Transforms/Reassociate/subtest.ll        |  2 +-
 llvm/test/Transforms/Reassociate/vaarg_movable.ll  |  2 +-
 llvm/test/Transforms/Reassociate/wrap-flags.ll     |  2 +-
 llvm/test/Transforms/SROA/vectors-of-pointers.ll   |  2 +-
 llvm/test/Transforms/TailCallElim/kcfi-bundle.ll   |  2 +-
 .../TailCallElim/opt-remarks-recursion.ll          |  2 +-
 .../test/Transforms/TailCallElim/ptrauth-bundle.ll |  2 +-
 234 files changed, 239 insertions(+), 243 deletions(-)

diff --git a/llvm/test/Transforms/GVN/2007-07-25-DominatedLoop.ll b/llvm/test/Transforms/GVN/2007-07-25-DominatedLoop.ll
index 10d1e229b12a..9bf6192744be 100644
--- a/llvm/test/Transforms/GVN/2007-07-25-DominatedLoop.ll
+++ b/llvm/test/Transforms/GVN/2007-07-25-DominatedLoop.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn | llvm-dis
+; RUN: opt < %s -passes=gvn | llvm-dis
 
 	%struct.PerlInterpreter = type { i8 }
 @PL_sv_count = external global i32		; <i32*> [#uses=2]
diff --git a/llvm/test/Transforms/GVN/2007-07-25-InfiniteLoop.ll b/llvm/test/Transforms/GVN/2007-07-25-InfiniteLoop.ll
index 0db2ceb6b597..cb31c893c4fd 100644
--- a/llvm/test/Transforms/GVN/2007-07-25-InfiniteLoop.ll
+++ b/llvm/test/Transforms/GVN/2007-07-25-InfiniteLoop.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn -S | FileCheck %s
+; RUN: opt < %s -passes=gvn -S | FileCheck %s
 
 	%struct.INT2 = type { i32, i32 }
 @blkshifts = external global %struct.INT2*		; <%struct.INT2**> [#uses=2]
diff --git a/llvm/test/Transforms/GVN/2007-07-25-Loop.ll b/llvm/test/Transforms/GVN/2007-07-25-Loop.ll
index 54c0d982de4d..a8f1dab0dfc0 100644
--- a/llvm/test/Transforms/GVN/2007-07-25-Loop.ll
+++ b/llvm/test/Transforms/GVN/2007-07-25-Loop.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn | llvm-dis
+; RUN: opt < %s -passes=gvn | llvm-dis
 
 	%struct.s_segment_inf = type { float, i32, i16, i16, float, float, i32, float, float }
 
diff --git a/llvm/test/Transforms/GVN/2007-07-25-NestedLoop.ll b/llvm/test/Transforms/GVN/2007-07-25-NestedLoop.ll
index 8f2c182faa89..10a1612d8cd4 100644
--- a/llvm/test/Transforms/GVN/2007-07-25-NestedLoop.ll
+++ b/llvm/test/Transforms/GVN/2007-07-25-NestedLoop.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn | llvm-dis
+; RUN: opt < %s -passes=gvn | llvm-dis
 
 	%struct.TypHeader = type { i32, %struct.TypHeader**, [3 x i8], i8 }
 
diff --git a/llvm/test/Transforms/GVN/2007-07-25-SinglePredecessor.ll b/llvm/test/Transforms/GVN/2007-07-25-SinglePredecessor.ll
index d7e6c20324f1..2a3e32ae95fa 100644
--- a/llvm/test/Transforms/GVN/2007-07-25-SinglePredecessor.ll
+++ b/llvm/test/Transforms/GVN/2007-07-25-SinglePredecessor.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn | llvm-dis
+; RUN: opt < %s -passes=gvn | llvm-dis
 
 	%struct.ggBRDF = type { i32 (...)** }
 	%struct.ggBox3 = type { %struct.ggPoint3, %struct.ggPoint3 }
diff --git a/llvm/test/Transforms/GVN/2007-07-26-InterlockingLoops.ll b/llvm/test/Transforms/GVN/2007-07-26-InterlockingLoops.ll
index 6ddf531d00f2..e6ab00cb7521 100644
--- a/llvm/test/Transforms/GVN/2007-07-26-InterlockingLoops.ll
+++ b/llvm/test/Transforms/GVN/2007-07-26-InterlockingLoops.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn -S | FileCheck %s
+; RUN: opt < %s -passes=gvn -S | FileCheck %s
 
 @last = external global [65 x i32*]
 
diff --git a/llvm/test/Transforms/GVN/2007-07-26-NonRedundant.ll b/llvm/test/Transforms/GVN/2007-07-26-NonRedundant.ll
index 211830a39af3..32f7a7ad7c03 100644
--- a/llvm/test/Transforms/GVN/2007-07-26-NonRedundant.ll
+++ b/llvm/test/Transforms/GVN/2007-07-26-NonRedundant.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn | llvm-dis
+; RUN: opt < %s -passes=gvn | llvm-dis
 
 @bsLive = external global i32		; <i32*> [#uses=2]
 
diff --git a/llvm/test/Transforms/GVN/2007-07-26-PhiErasure.ll b/llvm/test/Transforms/GVN/2007-07-26-PhiErasure.ll
index e9dab2bbac0c..8aa5829423d5 100644
--- a/llvm/test/Transforms/GVN/2007-07-26-PhiErasure.ll
+++ b/llvm/test/Transforms/GVN/2007-07-26-PhiErasure.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn -S | FileCheck %s
+; RUN: opt < %s -passes=gvn -S | FileCheck %s
 
 	%struct..0anon = type { i32 }
 	%struct.FILE = type { i8*, i32, i32, i16, i16, %struct.__sbuf, i32, i8*, i32 (i8*)*, i32 (i8*, i8*, i32)*, i64 (i8*, i64, i32)*, i32 (i8*, i8*, i32)*, %struct.__sbuf, %struct.__sFILEX*, i32, [3 x i8], [1 x i8], %struct.__sbuf, i32, i64 }
diff --git a/llvm/test/Transforms/GVN/2007-07-30-PredIDom.ll b/llvm/test/Transforms/GVN/2007-07-30-PredIDom.ll
index 3a7eec7d1424..a71a90df89ad 100644
--- a/llvm/test/Transforms/GVN/2007-07-30-PredIDom.ll
+++ b/llvm/test/Transforms/GVN/2007-07-30-PredIDom.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn | llvm-dis
+; RUN: opt < %s -passes=gvn | llvm-dis
 
 	%"struct.Block::$_16" = type { i32 }
 	%struct.Exp = type { %struct.Exp_*, i32, i32, i32, %struct.Exp*, %struct.Exp*, %"struct.Exp::$_10", %"struct.Block::$_16", %"struct.Exp::$_12" }
diff --git a/llvm/test/Transforms/GVN/2007-07-31-NoDomInherit.ll b/llvm/test/Transforms/GVN/2007-07-31-NoDomInherit.ll
index 71b1424a2137..94c0d17d7332 100644
--- a/llvm/test/Transforms/GVN/2007-07-31-NoDomInherit.ll
+++ b/llvm/test/Transforms/GVN/2007-07-31-NoDomInherit.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn -S | FileCheck %s
+; RUN: opt < %s -passes=gvn -S | FileCheck %s
 
 	%struct.anon = type { i32 (i32, i32, i32)*, i32, i32, [3 x i32], i8*, i8*, i8* }
 @debug = external constant i32		; <i32*> [#uses=0]
diff --git a/llvm/test/Transforms/GVN/2007-07-31-RedundantPhi.ll b/llvm/test/Transforms/GVN/2007-07-31-RedundantPhi.ll
index 223dcfd19200..2109e91b8f0a 100644
--- a/llvm/test/Transforms/GVN/2007-07-31-RedundantPhi.ll
+++ b/llvm/test/Transforms/GVN/2007-07-31-RedundantPhi.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn -S | FileCheck %s
+; RUN: opt < %s -passes=gvn -S | FileCheck %s
 
 @img_width = external global i16		; <i16*> [#uses=2]
 
diff --git a/llvm/test/Transforms/GVN/2008-02-12-UndefLoad.ll b/llvm/test/Transforms/GVN/2008-02-12-UndefLoad.ll
index 0e6b17c4aa50..868299a75d39 100644
--- a/llvm/test/Transforms/GVN/2008-02-12-UndefLoad.ll
+++ b/llvm/test/Transforms/GVN/2008-02-12-UndefLoad.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn -S | FileCheck %s
+; RUN: opt < %s -passes=gvn -S | FileCheck %s
 ; PR1996
 
 %struct.anon = type { i32, i8, i8, i8, i8 }
diff --git a/llvm/test/Transforms/GVN/2008-07-02-Unreachable.ll b/llvm/test/Transforms/GVN/2008-07-02-Unreachable.ll
index ef1b09e05b37..3bb3cdcb4dbe 100644
--- a/llvm/test/Transforms/GVN/2008-07-02-Unreachable.ll
+++ b/llvm/test/Transforms/GVN/2008-07-02-Unreachable.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn -S | FileCheck %s
+; RUN: opt < %s -passes=gvn -S | FileCheck %s
 ; PR2503
 
 @g_3 = external global i8		; <i8*> [#uses=2]
diff --git a/llvm/test/Transforms/GVN/2008-12-09-SelfRemove.ll b/llvm/test/Transforms/GVN/2008-12-09-SelfRemove.ll
index b0468b4def6b..ea76577c390d 100644
--- a/llvm/test/Transforms/GVN/2008-12-09-SelfRemove.ll
+++ b/llvm/test/Transforms/GVN/2008-12-09-SelfRemove.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn -S | FileCheck %s
+; RUN: opt < %s -passes=gvn -S | FileCheck %s
 
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128"
 target triple = "i386-apple-darwin9.5"
diff --git a/llvm/test/Transforms/GVN/2008-12-12-RLE-Crash.ll b/llvm/test/Transforms/GVN/2008-12-12-RLE-Crash.ll
index dabf7fa7aeb2..5edec11ce5aa 100644
--- a/llvm/test/Transforms/GVN/2008-12-12-RLE-Crash.ll
+++ b/llvm/test/Transforms/GVN/2008-12-12-RLE-Crash.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn | llvm-dis
+; RUN: opt < %s -passes=gvn | llvm-dis
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128"
 target triple = "i386-apple-darwin7"
 
diff --git a/llvm/test/Transforms/GVN/2008-12-14-rle-reanalyze.ll b/llvm/test/Transforms/GVN/2008-12-14-rle-reanalyze.ll
index 207a2519f433..cde2666480d0 100644
--- a/llvm/test/Transforms/GVN/2008-12-14-rle-reanalyze.ll
+++ b/llvm/test/Transforms/GVN/2008-12-14-rle-reanalyze.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn | llvm-dis
+; RUN: opt < %s -passes=gvn | llvm-dis
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128"
 target triple = "i386-apple-darwin7"
 @sort_value = external global [256 x i32], align 32		; <[256 x i32]*> [#uses=2]
diff --git a/llvm/test/Transforms/GVN/2008-12-15-CacheVisited.ll b/llvm/test/Transforms/GVN/2008-12-15-CacheVisited.ll
index 73adacd3cfaf..9b79eefd566c 100644
--- a/llvm/test/Transforms/GVN/2008-12-15-CacheVisited.ll
+++ b/llvm/test/Transforms/GVN/2008-12-15-CacheVisited.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn | llvm-dis
+; RUN: opt < %s -passes=gvn | llvm-dis
 ; Cached results must be added to and verified against the visited sets.
 ; PR3217
 
diff --git a/llvm/test/Transforms/GVN/2009-01-21-SortInvalidation.ll b/llvm/test/Transforms/GVN/2009-01-21-SortInvalidation.ll
index 6144697bb5b6..2f1dc1018577 100644
--- a/llvm/test/Transforms/GVN/2009-01-21-SortInvalidation.ll
+++ b/llvm/test/Transforms/GVN/2009-01-21-SortInvalidation.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn | llvm-dis
+; RUN: opt < %s -passes=gvn | llvm-dis
 ; PR3358
 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"
 target triple = "x86_64-unknown-linux-gnu"
diff --git a/llvm/test/Transforms/GVN/2009-01-22-SortInvalidation.ll b/llvm/test/Transforms/GVN/2009-01-22-SortInvalidation.ll
index 89b058a235b4..a477425676f3 100644
--- a/llvm/test/Transforms/GVN/2009-01-22-SortInvalidation.ll
+++ b/llvm/test/Transforms/GVN/2009-01-22-SortInvalidation.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn | llvm-dis
+; RUN: opt < %s -passes=gvn | llvm-dis
 
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128"
 target triple = "i386-apple-darwin7"
diff --git a/llvm/test/Transforms/GVN/2009-07-13-MemDepSortFail.ll b/llvm/test/Transforms/GVN/2009-07-13-MemDepSortFail.ll
index 0ed52370f80d..5c1b51eeb0e0 100644
--- a/llvm/test/Transforms/GVN/2009-07-13-MemDepSortFail.ll
+++ b/llvm/test/Transforms/GVN/2009-07-13-MemDepSortFail.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn | llvm-dis
+; RUN: opt < %s -passes=gvn | llvm-dis
 ; PR4256
 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"
 target triple = "i386-pc-linux-gnu"
diff --git a/llvm/test/Transforms/GVN/2009-11-12-MemDepMallocBitCast.ll b/llvm/test/Transforms/GVN/2009-11-12-MemDepMallocBitCast.ll
index a12fbddbda5a..53362608e7c0 100644
--- a/llvm/test/Transforms/GVN/2009-11-12-MemDepMallocBitCast.ll
+++ b/llvm/test/Transforms/GVN/2009-11-12-MemDepMallocBitCast.ll
@@ -1,6 +1,6 @@
 ; Test to make sure malloc's bitcast does not block detection of a store 
 ; to aliased memory; GVN should not optimize away the load in this program.
-; RUN: opt < %s -gvn -S | FileCheck %s
+; RUN: opt < %s -passes=gvn -S | FileCheck %s
 
 define i64 @test() {
   %1 = tail call i8* @malloc(i64 mul (i64 4, i64 ptrtoint (i64* getelementptr (i64, i64* null, i64 1) to i64))) ; <i8*> [#uses=2]
diff --git a/llvm/test/Transforms/GVN/2010-03-31-RedundantPHIs.ll b/llvm/test/Transforms/GVN/2010-03-31-RedundantPHIs.ll
index 1e22d1b69217..7aa744110827 100644
--- a/llvm/test/Transforms/GVN/2010-03-31-RedundantPHIs.ll
+++ b/llvm/test/Transforms/GVN/2010-03-31-RedundantPHIs.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn -S | FileCheck %s
+; RUN: opt < %s -passes=gvn -S | FileCheck %s
 
 ; CHECK-NOT: load
 ; CHECK-NOT: phi
diff --git a/llvm/test/Transforms/GVN/2010-11-13-Simplify.ll b/llvm/test/Transforms/GVN/2010-11-13-Simplify.ll
index c3606491cd87..aabd083d352e 100644
--- a/llvm/test/Transforms/GVN/2010-11-13-Simplify.ll
+++ b/llvm/test/Transforms/GVN/2010-11-13-Simplify.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn -S | FileCheck %s
+; RUN: opt < %s -passes=gvn -S | FileCheck %s
 
 declare i32 @foo(i32) readnone
 
diff --git a/llvm/test/Transforms/GVN/2011-07-07-MatchIntrinsicExtract.ll b/llvm/test/Transforms/GVN/2011-07-07-MatchIntrinsicExtract.ll
index ce60ffe449a8..b139e07bbf9a 100644
--- a/llvm/test/Transforms/GVN/2011-07-07-MatchIntrinsicExtract.ll
+++ b/llvm/test/Transforms/GVN/2011-07-07-MatchIntrinsicExtract.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn -S | FileCheck %s
+; RUN: opt < %s -passes=gvn -S | FileCheck %s
 ;
 
 %0 = type { i64, i1 }
diff --git a/llvm/test/Transforms/GVN/2011-09-07-TypeIdFor.ll b/llvm/test/Transforms/GVN/2011-09-07-TypeIdFor.ll
index a7b14eb0b4f4..77487729f031 100644
--- a/llvm/test/Transforms/GVN/2011-09-07-TypeIdFor.ll
+++ b/llvm/test/Transforms/GVN/2011-09-07-TypeIdFor.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn -S | FileCheck %s
+; RUN: opt < %s -passes=gvn -S | FileCheck %s
 %struct.__fundamental_type_info_pseudo = type { %struct.__type_info_pseudo }
 %struct.__type_info_pseudo = type { i8*, i8* }
 
diff --git a/llvm/test/Transforms/GVN/2016-08-30-MaskedScatterGather-inseltpoison.ll b/llvm/test/Transforms/GVN/2016-08-30-MaskedScatterGather-inseltpoison.ll
index 0b8bd6e0c587..dad3dfb9f71b 100644
--- a/llvm/test/Transforms/GVN/2016-08-30-MaskedScatterGather-inseltpoison.ll
+++ b/llvm/test/Transforms/GVN/2016-08-30-MaskedScatterGather-inseltpoison.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn -S | FileCheck %s
+; RUN: opt < %s -passes=gvn -S | FileCheck %s
 
 declare void @llvm.masked.scatter.v2i32.v2p0i32(<2 x i32> , <2 x i32*> , i32 , <2 x i1> )
 declare <2 x i32> @llvm.masked.gather.v2i32.v2p0i32(<2 x i32*>, i32, <2 x i1>, <2 x i32>)
diff --git a/llvm/test/Transforms/GVN/2016-08-30-MaskedScatterGather.ll b/llvm/test/Transforms/GVN/2016-08-30-MaskedScatterGather.ll
index fa68496d0de8..1e0cf389d216 100644
--- a/llvm/test/Transforms/GVN/2016-08-30-MaskedScatterGather.ll
+++ b/llvm/test/Transforms/GVN/2016-08-30-MaskedScatterGather.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn -S | FileCheck %s
+; RUN: opt < %s -passes=gvn -S | FileCheck %s
 
 declare void @llvm.masked.scatter.v2i32.v2p0i32(<2 x i32> , <2 x i32*> , i32 , <2 x i1> )
 declare <2 x i32> @llvm.masked.gather.v2i32.v2p0i32(<2 x i32*>, i32, <2 x i1>, <2 x i32>)
diff --git a/llvm/test/Transforms/GVN/MemdepMiscompile.ll b/llvm/test/Transforms/GVN/MemdepMiscompile.ll
index aafefc4b32c0..405eff009345 100644
--- a/llvm/test/Transforms/GVN/MemdepMiscompile.ll
+++ b/llvm/test/Transforms/GVN/MemdepMiscompile.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn -S | FileCheck %s
+; RUN: opt < %s -passes=gvn -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"
 target triple = "x86_64-apple-macosx10.7.0"
 
diff --git a/llvm/test/Transforms/GVN/PRE/2017-06-28-pre-load-dbgloc.ll b/llvm/test/Transforms/GVN/PRE/2017-06-28-pre-load-dbgloc.ll
index c81d5b3608e7..a08ac3a18c24 100644
--- a/llvm/test/Transforms/GVN/PRE/2017-06-28-pre-load-dbgloc.ll
+++ b/llvm/test/Transforms/GVN/PRE/2017-06-28-pre-load-dbgloc.ll
@@ -1,5 +1,5 @@
 ; This test checks if debug loc is propagated to load/store created by GVN/Instcombine.
-; RUN: opt < %s -gvn -S | FileCheck %s --check-prefixes=ALL,GVN
+; RUN: opt < %s -passes=gvn -S | FileCheck %s --check-prefixes=ALL,GVN
 ; RUN: opt < %s -gvn -instcombine -S | FileCheck %s --check-prefixes=ALL,INSTCOMBINE
 
 ; struct node {
diff --git a/llvm/test/Transforms/GVN/PRE/2018-06-08-pre-load-dbgloc-no-null-opt.ll b/llvm/test/Transforms/GVN/PRE/2018-06-08-pre-load-dbgloc-no-null-opt.ll
index f6c731444b24..fe81720e0cf6 100644
--- a/llvm/test/Transforms/GVN/PRE/2018-06-08-pre-load-dbgloc-no-null-opt.ll
+++ b/llvm/test/Transforms/GVN/PRE/2018-06-08-pre-load-dbgloc-no-null-opt.ll
@@ -1,5 +1,5 @@
 ; This test checks if debug loc is propagated to load/store created by GVN/Instcombine.
-; RUN: opt < %s -gvn -S | FileCheck %s --check-prefixes=ALL
+; RUN: opt < %s -passes=gvn -S | FileCheck %s --check-prefixes=ALL
 ; RUN: opt < %s -gvn -instcombine -S | FileCheck %s --check-prefixes=ALL
 
 ; struct node {
diff --git a/llvm/test/Transforms/GVN/PRE/atomic.ll b/llvm/test/Transforms/GVN/PRE/atomic.ll
index c27e7306a010..8cb49cb8652a 100644
--- a/llvm/test/Transforms/GVN/PRE/atomic.ll
+++ b/llvm/test/Transforms/GVN/PRE/atomic.ll
@@ -1,4 +1,4 @@
-; RUN: opt -gvn -S < %s | FileCheck %s
+; RUN: opt -passes=gvn -S < %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"
 target triple = "x86_64-apple-macosx10.7.0"
diff --git a/llvm/test/Transforms/GVN/PRE/invariant-load.ll b/llvm/test/Transforms/GVN/PRE/invariant-load.ll
index 7ffae78680d8..433fd9f04a8c 100644
--- a/llvm/test/Transforms/GVN/PRE/invariant-load.ll
+++ b/llvm/test/Transforms/GVN/PRE/invariant-load.ll
@@ -1,5 +1,5 @@
 ; Test if the !invariant.load metadata is maintained by GVN.
-; RUN: opt -gvn -S < %s | FileCheck %s
+; RUN: opt -passes=gvn -S < %s | FileCheck %s
 
 define i32 @test1(i32* nocapture %p, i8* nocapture %q) {
 ; CHECK-LABEL: test1
diff --git a/llvm/test/Transforms/GVN/PRE/load-pre-across-backedge.ll b/llvm/test/Transforms/GVN/PRE/load-pre-across-backedge.ll
index fe7ceed54fc5..a3eae62ff6dc 100644
--- a/llvm/test/Transforms/GVN/PRE/load-pre-across-backedge.ll
+++ b/llvm/test/Transforms/GVN/PRE/load-pre-across-backedge.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -gvn -S < %s | FileCheck %s
+; RUN: opt -passes=gvn -S < %s | FileCheck %s
 
 ; Check that PRE-LOAD across backedge does not
 ; result in invalid dominator tree.
diff --git a/llvm/test/Transforms/GVN/PRE/load-pre-align.ll b/llvm/test/Transforms/GVN/PRE/load-pre-align.ll
index 3445393dbfa7..ea60f317012e 100644
--- a/llvm/test/Transforms/GVN/PRE/load-pre-align.ll
+++ b/llvm/test/Transforms/GVN/PRE/load-pre-align.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn -S | FileCheck %s
+; RUN: opt < %s -passes=gvn -S | FileCheck %s
 ; RUN: opt < %s -passes="gvn<load-pre>" -S | FileCheck %s
 
 target datalayout = "e-p:32:32:32-i1:8:32-i8:8:32-i16:16:32-i32:32:32-i64:32:32-f32:32:32-f64:32:32-v64:64:64-v128:128:128-a0:0:32-n32"
diff --git a/llvm/test/Transforms/GVN/PRE/nonintegral.ll b/llvm/test/Transforms/GVN/PRE/nonintegral.ll
index 75a756e8af8c..046b432f96e7 100644
--- a/llvm/test/Transforms/GVN/PRE/nonintegral.ll
+++ b/llvm/test/Transforms/GVN/PRE/nonintegral.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -gvn -S < %s | FileCheck %s
+; RUN: opt -passes=gvn -S < %s | FileCheck %s
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128-ni:4"
 target triple = "x86_64-unknown-linux-gnu"
diff --git a/llvm/test/Transforms/GVN/PRE/phi-translate-2.ll b/llvm/test/Transforms/GVN/PRE/phi-translate-2.ll
index c2bb8eb8e02b..42116836f2ca 100644
--- a/llvm/test/Transforms/GVN/PRE/phi-translate-2.ll
+++ b/llvm/test/Transforms/GVN/PRE/phi-translate-2.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -gvn -S | FileCheck %s
+; RUN: opt < %s -passes=gvn -S | FileCheck %s
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 
 @a = common global [100 x i64] zeroinitializer, align 16
diff --git a/llvm/test/Transforms/GVN/PRE/phi-translate.ll b/llvm/test/Transforms/GVN/PRE/phi-translate.ll
index 4fd699b7c708..cb29fd41a033 100644
--- a/llvm/test/Transforms/GVN/PRE/phi-translate.ll
+++ b/llvm/test/Transforms/GVN/PRE/phi-translate.ll
@@ -1,4 +1,4 @@
-; RUN: opt -gvn -S < %s | FileCheck %s
+; RUN: opt -passes=gvn -S < %s | FileCheck %s
 
 target datalayout = "e-p:64:64:64"
 
diff --git a/llvm/test/Transforms/GVN/PRE/pre-no-cost-phi.ll b/llvm/test/Transforms/GVN/PRE/pre-no-cost-phi.ll
index 4c5afa12ddc1..ddb211e594b0 100644
--- a/llvm/test/Transforms/GVN/PRE/pre-no-cost-phi.ll
+++ b/llvm/test/Transforms/GVN/PRE/pre-no-cost-phi.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn -S | FileCheck %s
+; RUN: opt < %s -passes=gvn -S | FileCheck %s
 ; This testcase tests insertion of no-cost phis.  That is,
 ; when the value is already available in every predecessor,
 ; and we just need to insert a phi node to merge the available values.
diff --git a/llvm/test/Transforms/GVN/PRE/preserve-tbaa.ll b/llvm/test/Transforms/GVN/PRE/preserve-tbaa.ll
index fe0c58258264..51e3f94454fa 100644
--- a/llvm/test/Transforms/GVN/PRE/preserve-tbaa.ll
+++ b/llvm/test/Transforms/GVN/PRE/preserve-tbaa.ll
@@ -1,4 +1,4 @@
-; RUN: opt -gvn -S < %s | FileCheck %s
+; RUN: opt -passes=gvn -S < %s | FileCheck %s
 
 target datalayout = "e-p:64:64:64"
 
diff --git a/llvm/test/Transforms/GVN/PRE/rle-phi-translate.ll b/llvm/test/Transforms/GVN/PRE/rle-phi-translate.ll
index 7402e1a1fc00..9a31276510a8 100644
--- a/llvm/test/Transforms/GVN/PRE/rle-phi-translate.ll
+++ b/llvm/test/Transforms/GVN/PRE/rle-phi-translate.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn -S | FileCheck %s
+; RUN: opt < %s -passes=gvn -S | FileCheck %s
 
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128"
 target triple = "i386-apple-darwin7"
diff --git a/llvm/test/Transforms/GVN/PRE/rle-semidominated.ll b/llvm/test/Transforms/GVN/PRE/rle-semidominated.ll
index 501fa0477a1a..8ee227fb7a80 100644
--- a/llvm/test/Transforms/GVN/PRE/rle-semidominated.ll
+++ b/llvm/test/Transforms/GVN/PRE/rle-semidominated.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn -S | FileCheck %s
+; RUN: opt < %s -passes=gvn -S | FileCheck %s
 
 define i32 @main(i32* %p, i32 %x, i32 %y) {
 block1:
diff --git a/llvm/test/Transforms/GVN/addrspacecast.ll b/llvm/test/Transforms/GVN/addrspacecast.ll
index aa65013a6085..7b0f140356a4 100644
--- a/llvm/test/Transforms/GVN/addrspacecast.ll
+++ b/llvm/test/Transforms/GVN/addrspacecast.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -gvn -S | FileCheck %s
+; RUN: opt < %s -passes=gvn -S | FileCheck %s
 ; RUN: opt < %s -passes=gvn -S | FileCheck %s
 
 define i32 addrspace(1)* @addrspacecast(i32* %ptr) {
diff --git a/llvm/test/Transforms/GVN/assume-equal.ll b/llvm/test/Transforms/GVN/assume-equal.ll
index b51fded5bd20..d2f444d2384d 100644
--- a/llvm/test/Transforms/GVN/assume-equal.ll
+++ b/llvm/test/Transforms/GVN/assume-equal.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn -S | FileCheck %s
+; RUN: opt < %s -passes=gvn -S | FileCheck %s
 
 %struct.A = type { i32 (...)** }
 @_ZTV1A = available_externally unnamed_addr constant [4 x i8*] [i8* null, i8* bitcast (i8** @_ZTI1A to i8*), i8* bitcast (i32 (%struct.A*)* @_ZN1A3fooEv to i8*), i8* bitcast (i32 (%struct.A*)* @_ZN1A3barEv to i8*)], align 8
diff --git a/llvm/test/Transforms/GVN/assume.ll b/llvm/test/Transforms/GVN/assume.ll
index ef2865791715..3b6346f63dbb 100644
--- a/llvm/test/Transforms/GVN/assume.ll
+++ b/llvm/test/Transforms/GVN/assume.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -gvn -S | FileCheck %s
+; RUN: opt < %s -passes=gvn -S | FileCheck %s
 
 declare void @llvm.assume(i1)
 declare void @use(i1)
diff --git a/llvm/test/Transforms/GVN/basic-undef-test.ll b/llvm/test/Transforms/GVN/basic-undef-test.ll
index 29a4cb918a5c..bfaa3f467bc8 100644
--- a/llvm/test/Transforms/GVN/basic-undef-test.ll
+++ b/llvm/test/Transforms/GVN/basic-undef-test.ll
@@ -1,4 +1,4 @@
-; RUN: opt -gvn -S < %s | FileCheck %s
+; RUN: opt -passes=gvn -S < %s | FileCheck %s
 ; ModuleID = 'test3.ll'
 target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
 
diff --git a/llvm/test/Transforms/GVN/basic.ll b/llvm/test/Transforms/GVN/basic.ll
index 44b321306319..cc3ac2e7c78c 100644
--- a/llvm/test/Transforms/GVN/basic.ll
+++ b/llvm/test/Transforms/GVN/basic.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn -S | FileCheck %s
+; RUN: opt < %s -passes=gvn -S | FileCheck %s
 ; RUN: opt < %s -passes=gvn -S | FileCheck %s
 
 define i32 @main() {
diff --git a/llvm/test/Transforms/GVN/big-endian.ll b/llvm/test/Transforms/GVN/big-endian.ll
index 20c0426dfe58..b13ceb76d98d 100644
--- a/llvm/test/Transforms/GVN/big-endian.ll
+++ b/llvm/test/Transforms/GVN/big-endian.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -gvn -S < %s | FileCheck %s
+; RUN: opt -passes=gvn -S < %s | FileCheck %s
 
 target datalayout = "E-m:e-i64:64-n32:64"
 target triple = "powerpc64-unknown-linux-gnu"
diff --git a/llvm/test/Transforms/GVN/bitcast-of-call.ll b/llvm/test/Transforms/GVN/bitcast-of-call.ll
index 930e4d7373d3..9107e63720ff 100644
--- a/llvm/test/Transforms/GVN/bitcast-of-call.ll
+++ b/llvm/test/Transforms/GVN/bitcast-of-call.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn -S | FileCheck %s
+; RUN: opt < %s -passes=gvn -S | FileCheck %s
 ; PR2213
 
 define i32* @f(i8* %x) {
diff --git a/llvm/test/Transforms/GVN/callbr-loadpre-critedge.ll b/llvm/test/Transforms/GVN/callbr-loadpre-critedge.ll
index ce995da50e23..fbc2dbdf5c8f 100644
--- a/llvm/test/Transforms/GVN/callbr-loadpre-critedge.ll
+++ b/llvm/test/Transforms/GVN/callbr-loadpre-critedge.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -gvn -S | FileCheck %s
+; RUN: opt < %s -passes=gvn -S | FileCheck %s
 
 ; This test checks that we don't hang trying to split a critical edge in loadpre
 ; when the control flow uses a callbr instruction.
diff --git a/llvm/test/Transforms/GVN/callbr-scalarpre-critedge.ll b/llvm/test/Transforms/GVN/callbr-scalarpre-critedge.ll
index 3d87703c087c..5cae27cce55c 100644
--- a/llvm/test/Transforms/GVN/callbr-scalarpre-critedge.ll
+++ b/llvm/test/Transforms/GVN/callbr-scalarpre-critedge.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -gvn -S | FileCheck %s
+; RUN: opt < %s -passes=gvn -S | FileCheck %s
 
 ; This test checks that we don't hang trying to split a critical edge in scalar
 ; PRE when the control flow uses a callbr instruction.
diff --git a/llvm/test/Transforms/GVN/calls-nonlocal.ll b/llvm/test/Transforms/GVN/calls-nonlocal.ll
index ca953377b864..f7330de12d89 100644
--- a/llvm/test/Transforms/GVN/calls-nonlocal.ll
+++ b/llvm/test/Transforms/GVN/calls-nonlocal.ll
@@ -1,5 +1,5 @@
 ; Two occurrences of strlen should be zapped.
-; RUN: opt < %s -gvn -S | FileCheck %s
+; RUN: opt < %s -passes=gvn -S | FileCheck %s
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128"
 target triple = "i386-apple-darwin9"
 
diff --git a/llvm/test/Transforms/GVN/calls-readonly.ll b/llvm/test/Transforms/GVN/calls-readonly.ll
index 19f88932b7aa..7f8c4d81812c 100644
--- a/llvm/test/Transforms/GVN/calls-readonly.ll
+++ b/llvm/test/Transforms/GVN/calls-readonly.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn -S | FileCheck %s
+; RUN: opt < %s -passes=gvn -S | FileCheck %s
 ; Should delete the second call to strlen even though the intervening strchr call exists.
 
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128"
diff --git a/llvm/test/Transforms/GVN/commute.ll b/llvm/test/Transforms/GVN/commute.ll
index c76318db56a4..29f01c2a395c 100644
--- a/llvm/test/Transforms/GVN/commute.ll
+++ b/llvm/test/Transforms/GVN/commute.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -gvn -S < %s | FileCheck %s
+; RUN: opt -passes=gvn -S < %s | FileCheck %s
 
 declare void @use(i32, i32)
 
diff --git a/llvm/test/Transforms/GVN/cond_br.ll b/llvm/test/Transforms/GVN/cond_br.ll
index 46feb3a45953..e815d152dd35 100644
--- a/llvm/test/Transforms/GVN/cond_br.ll
+++ b/llvm/test/Transforms/GVN/cond_br.ll
@@ -1,4 +1,4 @@
-; RUN: opt -gvn -S < %s | FileCheck %s
+; RUN: opt -passes=gvn -S < %s | FileCheck %s
 @y = external global i32
 @z = external global i32
 
diff --git a/llvm/test/Transforms/GVN/cond_br2.ll b/llvm/test/Transforms/GVN/cond_br2.ll
index 4360c59170f6..fa3227fc3408 100644
--- a/llvm/test/Transforms/GVN/cond_br2.ll
+++ b/llvm/test/Transforms/GVN/cond_br2.ll
@@ -1,4 +1,4 @@
-; RUN: opt -gvn -S < %s | FileCheck %s
+; RUN: opt -passes=gvn -S < %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"
 
 %"class.llvm::SmallVector" = type { %"class.llvm::SmallVectorImpl", [1 x %"union.llvm::SmallVectorBase::U"] }
diff --git a/llvm/test/Transforms/GVN/condprop.ll b/llvm/test/Transforms/GVN/condprop.ll
index b20307c1ce9e..2aa67f46db29 100644
--- a/llvm/test/Transforms/GVN/condprop.ll
+++ b/llvm/test/Transforms/GVN/condprop.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -gvn -S | FileCheck %s
+; RUN: opt < %s -passes=gvn -S | FileCheck %s
 
 @a = external global i32		; <i32*> [#uses=7]
 
diff --git a/llvm/test/Transforms/GVN/dbg-redundant-load.ll b/llvm/test/Transforms/GVN/dbg-redundant-load.ll
index b3cf6b6aca59..559220f22058 100644
--- a/llvm/test/Transforms/GVN/dbg-redundant-load.ll
+++ b/llvm/test/Transforms/GVN/dbg-redundant-load.ll
@@ -1,4 +1,4 @@
-; RUN: opt -gvn -S < %s | FileCheck %s
+; RUN: opt -passes=gvn -S < %s | FileCheck %s
 
 ; Check that the redundant load from %if.then is removed.
 ; Also, check that the debug location associated to load %0 still refers to
diff --git a/llvm/test/Transforms/GVN/debugloc.ll b/llvm/test/Transforms/GVN/debugloc.ll
index d8c1632d1442..4353345c6b7b 100644
--- a/llvm/test/Transforms/GVN/debugloc.ll
+++ b/llvm/test/Transforms/GVN/debugloc.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn -S | FileCheck %s
+; RUN: opt < %s -passes=gvn -S | FileCheck %s
 ; CHECK: {{^}}for.body:
 ; CHECK-NEXT: [[VREG1:%[^ ]+]] = phi{{.*}}[[VREG2:%[^ ]+]],{{.*}}%.sink,
 ; CHECK-NOT: !dbg
diff --git a/llvm/test/Transforms/GVN/edge.ll b/llvm/test/Transforms/GVN/edge.ll
index 1d9407b788dc..a0f24750e1e4 100644
--- a/llvm/test/Transforms/GVN/edge.ll
+++ b/llvm/test/Transforms/GVN/edge.ll
@@ -1,4 +1,4 @@
-; RUN: opt -gvn -S < %s | FileCheck %s
+; RUN: opt -passes=gvn -S < %s | FileCheck %s
 
 define i32 @f1(i32 %x) {
   ; CHECK-LABEL: define i32 @f1(
diff --git a/llvm/test/Transforms/GVN/flags.ll b/llvm/test/Transforms/GVN/flags.ll
index 1b44905bb5c7..2e5aeedfc19a 100644
--- a/llvm/test/Transforms/GVN/flags.ll
+++ b/llvm/test/Transforms/GVN/flags.ll
@@ -1,4 +1,4 @@
-; RUN: opt -gvn -S < %s | FileCheck %s
+; RUN: opt -passes=gvn -S < %s | FileCheck %s
 
 declare void @use(i1)
 
diff --git a/llvm/test/Transforms/GVN/fold-const-expr.ll b/llvm/test/Transforms/GVN/fold-const-expr.ll
index 741005c6e349..5e95cfa84405 100644
--- a/llvm/test/Transforms/GVN/fold-const-expr.ll
+++ b/llvm/test/Transforms/GVN/fold-const-expr.ll
@@ -3,7 +3,7 @@
 ; expressions. As a result, the compilation never fisished.
 ; This test checks that we are folding constant expression
 ; PR 28418
-; RUN: opt -gvn -S < %s | FileCheck %s
+; RUN: opt -passes=gvn -S < %s | FileCheck %s
 
 %2 = type { i32, i32, i32, i32, i32 }
 define i32 @_Z16vector3util_mainv(i32 %x, i32 %y)  {
diff --git a/llvm/test/Transforms/GVN/fpmath.ll b/llvm/test/Transforms/GVN/fpmath.ll
index dddc45e25cde..970dd897e8bf 100644
--- a/llvm/test/Transforms/GVN/fpmath.ll
+++ b/llvm/test/Transforms/GVN/fpmath.ll
@@ -1,4 +1,4 @@
-; RUN: opt -gvn -S < %s | FileCheck %s
+; RUN: opt -passes=gvn -S < %s | FileCheck %s
 
 define double @test1(double %x, double %y) {
 ; CHECK: @test1(double %x, double %y)
diff --git a/llvm/test/Transforms/GVN/freeze.ll b/llvm/test/Transforms/GVN/freeze.ll
index 1a6d84b5f139..8b4d263b0944 100644
--- a/llvm/test/Transforms/GVN/freeze.ll
+++ b/llvm/test/Transforms/GVN/freeze.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -gvn -S | FileCheck %s
+; RUN: opt < %s -passes=gvn -S | FileCheck %s
 ; RUN: opt < %s -passes=gvn -S | FileCheck %s
 
 define i1 @f(i1 %a) {
diff --git a/llvm/test/Transforms/GVN/funclet.ll b/llvm/test/Transforms/GVN/funclet.ll
index ccd7877293ff..afff0d5db9f6 100644
--- a/llvm/test/Transforms/GVN/funclet.ll
+++ b/llvm/test/Transforms/GVN/funclet.ll
@@ -1,4 +1,4 @@
-; RUN: opt -gvn -S < %s | FileCheck %s
+; RUN: opt -passes=gvn -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/GVN/gc_relocate.ll b/llvm/test/Transforms/GVN/gc_relocate.ll
index 245970fac0d7..c50dcb19bba0 100644
--- a/llvm/test/Transforms/GVN/gc_relocate.ll
+++ b/llvm/test/Transforms/GVN/gc_relocate.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -gvn -S < %s | FileCheck %s
+; RUN: opt -passes=gvn -S < %s | FileCheck %s
 
 declare void @func()
 declare i32 @"personality_function"()
diff --git a/llvm/test/Transforms/GVN/int_sideeffect.ll b/llvm/test/Transforms/GVN/int_sideeffect.ll
index 02ee2fcbdb06..1163d8e4f5a8 100644
--- a/llvm/test/Transforms/GVN/int_sideeffect.ll
+++ b/llvm/test/Transforms/GVN/int_sideeffect.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S < %s -gvn | FileCheck %s
+; RUN: opt -S < %s -passes=gvn | FileCheck %s
 
 declare void @llvm.sideeffect()
 
diff --git a/llvm/test/Transforms/GVN/invariant.group.ll b/llvm/test/Transforms/GVN/invariant.group.ll
index e7c9b3118aa2..1226203961ca 100644
--- a/llvm/test/Transforms/GVN/invariant.group.ll
+++ b/llvm/test/Transforms/GVN/invariant.group.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn -S | FileCheck %s
+; RUN: opt < %s -passes=gvn -S | FileCheck %s
 
 %struct.A = type { i32 (...)** }
 @_ZTV1A = available_externally unnamed_addr constant [3 x i8*] [i8* null, i8* bitcast (i8** @_ZTI1A to i8*), i8* bitcast (void (%struct.A*)* @_ZN1A3fooEv to i8*)], align 8
diff --git a/llvm/test/Transforms/GVN/invariant.start.ll b/llvm/test/Transforms/GVN/invariant.start.ll
index 25f7798279df..b482d0941d91 100644
--- a/llvm/test/Transforms/GVN/invariant.start.ll
+++ b/llvm/test/Transforms/GVN/invariant.start.ll
@@ -1,5 +1,5 @@
 ; Test to make sure llvm.invariant.start calls are not treated as clobbers.
-; RUN: opt < %s -gvn -S | FileCheck %s
+; RUN: opt < %s -passes=gvn -S | FileCheck %s
 
 
 declare {}* @llvm.invariant.start.p0i8(i64, i8* nocapture) nounwind readonly
diff --git a/llvm/test/Transforms/GVN/lifetime-simple.ll b/llvm/test/Transforms/GVN/lifetime-simple.ll
index 293855615e2d..d75699120cea 100644
--- a/llvm/test/Transforms/GVN/lifetime-simple.ll
+++ b/llvm/test/Transforms/GVN/lifetime-simple.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn -S | FileCheck %s
+; RUN: opt < %s -passes=gvn -S | FileCheck %s
 
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128"
 target triple = "i386-apple-darwin7"
diff --git a/llvm/test/Transforms/GVN/load-from-unreachable-predecessor.ll b/llvm/test/Transforms/GVN/load-from-unreachable-predecessor.ll
index 29ea14d62b40..d76f250b0455 100644
--- a/llvm/test/Transforms/GVN/load-from-unreachable-predecessor.ll
+++ b/llvm/test/Transforms/GVN/load-from-unreachable-predecessor.ll
@@ -1,4 +1,4 @@
-; RUN: opt -gvn -S < %s | FileCheck %s
+; RUN: opt -passes=gvn -S < %s | FileCheck %s
 
 ; Check that an unreachable predecessor to a PHI node doesn't cause a crash.
 ; PR21625.
diff --git a/llvm/test/Transforms/GVN/loadpre-context.ll b/llvm/test/Transforms/GVN/loadpre-context.ll
index 3480db53be1e..368aeab0aefa 100644
--- a/llvm/test/Transforms/GVN/loadpre-context.ll
+++ b/llvm/test/Transforms/GVN/loadpre-context.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -gvn -S | FileCheck %s
+; RUN: opt < %s -passes=gvn -S | FileCheck %s
 
 ; load may be speculated, address is not null using context search.
 ; There is a critical edge.
diff --git a/llvm/test/Transforms/GVN/masked-load-store-vn-crash.ll b/llvm/test/Transforms/GVN/masked-load-store-vn-crash.ll
index ae8369cd1945..334d2b9b0fb4 100644
--- a/llvm/test/Transforms/GVN/masked-load-store-vn-crash.ll
+++ b/llvm/test/Transforms/GVN/masked-load-store-vn-crash.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -gvn -S < %s | FileCheck %s
+; RUN: opt -passes=gvn -S < %s | FileCheck %s
 @file_mask = external global [8 x i64], align 32
 
 define fastcc void @test() {
diff --git a/llvm/test/Transforms/GVN/masked-load-store.ll b/llvm/test/Transforms/GVN/masked-load-store.ll
index 0b71a10a067d..8570911b8fc5 100644
--- a/llvm/test/Transforms/GVN/masked-load-store.ll
+++ b/llvm/test/Transforms/GVN/masked-load-store.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -gvn -S < %s | FileCheck %s
+; RUN: opt -passes=gvn -S < %s | FileCheck %s
 
 ; Check that in both cases the second load is recognized as redundant
 ; and is removed.
diff --git a/llvm/test/Transforms/GVN/noalias.ll b/llvm/test/Transforms/GVN/noalias.ll
index d82ce9665f99..86d68d7888e2 100644
--- a/llvm/test/Transforms/GVN/noalias.ll
+++ b/llvm/test/Transforms/GVN/noalias.ll
@@ -1,4 +1,4 @@
-; RUN: opt -gvn -S < %s | FileCheck %s
+; RUN: opt -passes=gvn -S < %s | FileCheck %s
 
 define i32 @test1(i32* %p, i32* %q) {
 ; CHECK-LABEL: @test1(i32* %p, i32* %q)
diff --git a/llvm/test/Transforms/GVN/non-integral-pointers-inseltpoison.ll b/llvm/test/Transforms/GVN/non-integral-pointers-inseltpoison.ll
index d26003b2c8f2..f0be08e97ac9 100644
--- a/llvm/test/Transforms/GVN/non-integral-pointers-inseltpoison.ll
+++ b/llvm/test/Transforms/GVN/non-integral-pointers-inseltpoison.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -gvn -S < %s | FileCheck %s
+; RUN: opt -passes=gvn -S < %s | FileCheck %s
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128-ni:4:5"
 target triple = "x86_64-unknown-linux-gnu"
diff --git a/llvm/test/Transforms/GVN/non-integral-pointers.ll b/llvm/test/Transforms/GVN/non-integral-pointers.ll
index 07d941fdb619..822769789cce 100644
--- a/llvm/test/Transforms/GVN/non-integral-pointers.ll
+++ b/llvm/test/Transforms/GVN/non-integral-pointers.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -gvn -S < %s | FileCheck %s
+; RUN: opt -passes=gvn -S < %s | FileCheck %s
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128-ni:4:5"
 target triple = "x86_64-unknown-linux-gnu"
diff --git a/llvm/test/Transforms/GVN/non-local-offset.ll b/llvm/test/Transforms/GVN/non-local-offset.ll
index 5718165b5f74..582f3a83ac8b 100644
--- a/llvm/test/Transforms/GVN/non-local-offset.ll
+++ b/llvm/test/Transforms/GVN/non-local-offset.ll
@@ -1,4 +1,4 @@
-; RUN: opt -gvn -S < %s | FileCheck %s
+; RUN: opt -passes=gvn -S < %s | FileCheck %s
 
 target datalayout = "e-p:64:64:64"
 
diff --git a/llvm/test/Transforms/GVN/null-aliases-nothing.ll b/llvm/test/Transforms/GVN/null-aliases-nothing.ll
index 3558758e54b9..1fb4e53e1285 100644
--- a/llvm/test/Transforms/GVN/null-aliases-nothing.ll
+++ b/llvm/test/Transforms/GVN/null-aliases-nothing.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn -S | FileCheck %s
+; RUN: opt < %s -passes=gvn -S | FileCheck %s
 
 %t = type { i32 }
 declare void @test1f(i8*)
diff --git a/llvm/test/Transforms/GVN/phi-translate-partial-alias.ll b/llvm/test/Transforms/GVN/phi-translate-partial-alias.ll
index 5aff039b2fc0..290fac8bef38 100644
--- a/llvm/test/Transforms/GVN/phi-translate-partial-alias.ll
+++ b/llvm/test/Transforms/GVN/phi-translate-partial-alias.ll
@@ -1,4 +1,4 @@
-; RUN: opt -gvn -S < %s | FileCheck %s
+; RUN: opt -passes=gvn -S < %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-f128:128:128-n8:16:32:64"
 
diff --git a/llvm/test/Transforms/GVN/pr10820.ll b/llvm/test/Transforms/GVN/pr10820.ll
index d0dd015210d1..930dadc1b448 100644
--- a/llvm/test/Transforms/GVN/pr10820.ll
+++ b/llvm/test/Transforms/GVN/pr10820.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn -S | FileCheck %s
+; RUN: opt < %s -passes=gvn -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-f128:128:128-n8:16:32:64"
diff --git a/llvm/test/Transforms/GVN/pr12979.ll b/llvm/test/Transforms/GVN/pr12979.ll
index 919c22de02ac..2f7a4637a7a5 100644
--- a/llvm/test/Transforms/GVN/pr12979.ll
+++ b/llvm/test/Transforms/GVN/pr12979.ll
@@ -1,4 +1,4 @@
-; RUN: opt -gvn -S < %s | FileCheck %s
+; RUN: opt -passes=gvn -S < %s | FileCheck %s
 
 define i32 @test1(i32 %x, i32 %y) {
 ; CHECK: @test1(i32 %x, i32 %y)
diff --git a/llvm/test/Transforms/GVN/pr17732.ll b/llvm/test/Transforms/GVN/pr17732.ll
index d056d5251c72..6f6e7c61313a 100644
--- a/llvm/test/Transforms/GVN/pr17732.ll
+++ b/llvm/test/Transforms/GVN/pr17732.ll
@@ -1,4 +1,4 @@
-; RUN: opt -gvn -S -o - < %s | FileCheck %s
+; RUN: opt -passes=gvn -S -o - < %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/GVN/pr25440.ll b/llvm/test/Transforms/GVN/pr25440.ll
index 21ccc4e77b6c..7cd968068682 100644
--- a/llvm/test/Transforms/GVN/pr25440.ll
+++ b/llvm/test/Transforms/GVN/pr25440.ll
@@ -1,4 +1,4 @@
-;RUN: opt -gvn -S < %s | FileCheck %s
+;RUN: opt -passes=gvn -S < %s | FileCheck %s
 
 target datalayout = "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n8:16:32-S64"
 target triple = "thumbv7--linux-gnueabi"
diff --git a/llvm/test/Transforms/GVN/pr33549.ll b/llvm/test/Transforms/GVN/pr33549.ll
index 7155ba4c1e3d..4b398e53d55c 100644
--- a/llvm/test/Transforms/GVN/pr33549.ll
+++ b/llvm/test/Transforms/GVN/pr33549.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -gvn -S < %s | FileCheck %s
+; RUN: opt -passes=gvn -S < %s | FileCheck %s
 
 @Data = common local_unnamed_addr global [32 x i32] zeroinitializer, align 4
 
diff --git a/llvm/test/Transforms/GVN/pr34908.ll b/llvm/test/Transforms/GVN/pr34908.ll
index c2b58ad34a62..44ee56380d93 100644
--- a/llvm/test/Transforms/GVN/pr34908.ll
+++ b/llvm/test/Transforms/GVN/pr34908.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -gvn -S | FileCheck %s
+; RUN: opt < %s -passes=gvn -S | FileCheck %s
 
 define i1 @foo() {
 ; CHECK-LABEL: @foo(
diff --git a/llvm/test/Transforms/GVN/pre-compare.ll b/llvm/test/Transforms/GVN/pre-compare.ll
index a77684a9831e..b8d7abf4da4e 100644
--- a/llvm/test/Transforms/GVN/pre-compare.ll
+++ b/llvm/test/Transforms/GVN/pre-compare.ll
@@ -1,4 +1,4 @@
-; RUN: opt -gvn -S < %s | FileCheck %s
+; RUN: opt -passes=gvn -S < %s | FileCheck %s
 
 ; C source:
 ;
diff --git a/llvm/test/Transforms/GVN/propagate-ir-flags.ll b/llvm/test/Transforms/GVN/propagate-ir-flags.ll
index 07367a2ec51e..865f2ebb174c 100644
--- a/llvm/test/Transforms/GVN/propagate-ir-flags.ll
+++ b/llvm/test/Transforms/GVN/propagate-ir-flags.ll
@@ -1,5 +1,5 @@
 
-; RUN: opt < %s -gvn -S | FileCheck %s
+; RUN: opt < %s -passes=gvn -S | FileCheck %s
 
 ; CHECK-LABEL: func_fast
 ; CHECK:       fadd fast double
diff --git a/llvm/test/Transforms/GVN/range.ll b/llvm/test/Transforms/GVN/range.ll
index 47777a1fd095..a6ec9b3fc739 100644
--- a/llvm/test/Transforms/GVN/range.ll
+++ b/llvm/test/Transforms/GVN/range.ll
@@ -1,4 +1,4 @@
-; RUN: opt -gvn -S < %s | FileCheck %s
+; RUN: opt -passes=gvn -S < %s | FileCheck %s
 
 define i32 @test1(i32* %p) {
 ; CHECK-LABEL: @test1(i32* %p)
diff --git a/llvm/test/Transforms/GVN/readattrs.ll b/llvm/test/Transforms/GVN/readattrs.ll
index fb36d07c86e6..6a3f61e6f882 100644
--- a/llvm/test/Transforms/GVN/readattrs.ll
+++ b/llvm/test/Transforms/GVN/readattrs.ll
@@ -1,4 +1,4 @@
-; RUN: opt -gvn -S -o - < %s | FileCheck %s
+; RUN: opt -passes=gvn -S -o - < %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"
 target triple = "x86_64-unknown-linux-gnu"
diff --git a/llvm/test/Transforms/GVN/rle-must-alias.ll b/llvm/test/Transforms/GVN/rle-must-alias.ll
index 1bbd60c5a274..b472df55aaa7 100644
--- a/llvm/test/Transforms/GVN/rle-must-alias.ll
+++ b/llvm/test/Transforms/GVN/rle-must-alias.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -gvn -S | FileCheck %s
+; RUN: opt < %s -passes=gvn -S | FileCheck %s
 
 ; GVN should eliminate the fully redundant %9 GEP which
 ; allows DEAD to be removed.  This is PR3198.
diff --git a/llvm/test/Transforms/GVN/rle-no-phi-translate.ll b/llvm/test/Transforms/GVN/rle-no-phi-translate.ll
index c1fd20115379..1766b51bc3bb 100644
--- a/llvm/test/Transforms/GVN/rle-no-phi-translate.ll
+++ b/llvm/test/Transforms/GVN/rle-no-phi-translate.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn -S | FileCheck %s
+; RUN: opt < %s -passes=gvn -S | FileCheck %s
 ; XFAIL: *
 ; FIXME: This should be promotable, but memdep/gvn don't track values
 ; path/edge sensitively enough.
diff --git a/llvm/test/Transforms/GVN/rle-nonlocal.ll b/llvm/test/Transforms/GVN/rle-nonlocal.ll
index f4f2dbf0ec13..7d8d0cceaff0 100644
--- a/llvm/test/Transforms/GVN/rle-nonlocal.ll
+++ b/llvm/test/Transforms/GVN/rle-nonlocal.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn -S | FileCheck %s
+; RUN: opt < %s -passes=gvn -S | FileCheck %s
 
 define i32 @main(i32** %p, i32 %x, i32 %y) {
 block1:
diff --git a/llvm/test/Transforms/GVN/storeinvgroup.ll b/llvm/test/Transforms/GVN/storeinvgroup.ll
index 16da4b8cd424..16ae47c8f406 100644
--- a/llvm/test/Transforms/GVN/storeinvgroup.ll
+++ b/llvm/test/Transforms/GVN/storeinvgroup.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -gvn -S -o - < %s | FileCheck %s
+; RUN: opt -passes=gvn -S -o - < %s | FileCheck %s
 
 define double @code(double* %a1) {
 ; CHECK-LABEL: @code(
diff --git a/llvm/test/Transforms/GVN/tbaa.ll b/llvm/test/Transforms/GVN/tbaa.ll
index a919fefce422..8bb9c9646c63 100644
--- a/llvm/test/Transforms/GVN/tbaa.ll
+++ b/llvm/test/Transforms/GVN/tbaa.ll
@@ -1,4 +1,4 @@
-; RUN: opt -gvn -S < %s | FileCheck %s
+; RUN: opt -passes=gvn -S < %s | FileCheck %s
 
 define i32 @test1(i8* %p, i8* %q) {
 ; CHECK-LABEL: @test1(i8* %p, i8* %q)
diff --git a/llvm/test/Transforms/GVN/unreachable-predecessor.ll b/llvm/test/Transforms/GVN/unreachable-predecessor.ll
index 1fedc4acb927..d084d42fdaff 100644
--- a/llvm/test/Transforms/GVN/unreachable-predecessor.ll
+++ b/llvm/test/Transforms/GVN/unreachable-predecessor.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn -S | FileCheck %s
+; RUN: opt < %s -passes=gvn -S | FileCheck %s
 
 ; loop.then is not reachable from loop, so we should be able to deduce that the
 ; store through %phi2 cannot alias %ptr1.
diff --git a/llvm/test/Transforms/GVN/volatile-nonvolatile.ll b/llvm/test/Transforms/GVN/volatile-nonvolatile.ll
index ae7e9f8fe8dc..854d25342e96 100644
--- a/llvm/test/Transforms/GVN/volatile-nonvolatile.ll
+++ b/llvm/test/Transforms/GVN/volatile-nonvolatile.ll
@@ -1,4 +1,4 @@
-; RUN: opt -gvn -S < %s | FileCheck %s
+; RUN: opt -passes=gvn -S < %s | FileCheck %s
 
 %struct.t = type { i32* }
 
diff --git a/llvm/test/Transforms/GVN/vp_gather_scatter.ll b/llvm/test/Transforms/GVN/vp_gather_scatter.ll
index b6f78a63f8b6..cfa9e1e9f1bf 100644
--- a/llvm/test/Transforms/GVN/vp_gather_scatter.ll
+++ b/llvm/test/Transforms/GVN/vp_gather_scatter.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -gvn -S < %s | FileCheck %s
+; RUN: opt -passes=gvn -S < %s | FileCheck %s
 
 ; Make sure we don't delete the second vp.gather.
 define <vscale x 8 x i32> @foo(<vscale x 8 x ptr> %p, <vscale x 8 x i32> %x, <vscale x 8 x i1> %mask, i32 %vl) {
diff --git a/llvm/test/Transforms/GVNHoist/hoist-call.ll b/llvm/test/Transforms/GVNHoist/hoist-call.ll
index 50378f7d8226..206b78256785 100644
--- a/llvm/test/Transforms/GVNHoist/hoist-call.ll
+++ b/llvm/test/Transforms/GVNHoist/hoist-call.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -gvn-hoist < %s | FileCheck %s
+; RUN: opt -S -passes=gvn-hoist < %s | FileCheck %s
 
 ; Check that the call and fcmp are hoisted.
 ; CHECK-LABEL: define void @fun(
diff --git a/llvm/test/Transforms/GVNHoist/hoist-convergent.ll b/llvm/test/Transforms/GVNHoist/hoist-convergent.ll
index f5bf03f39b58..20e0e45fc6cd 100644
--- a/llvm/test/Transforms/GVNHoist/hoist-convergent.ll
+++ b/llvm/test/Transforms/GVNHoist/hoist-convergent.ll
@@ -1,4 +1,4 @@
-; RUN: opt -gvn-hoist -S < %s | FileCheck %s
+; RUN: opt -passes=gvn-hoist -S < %s | FileCheck %s
 
 ; Check that convergent calls are not hoisted.
 ;
diff --git a/llvm/test/Transforms/GVNHoist/hoist-drop-debug-info.ll b/llvm/test/Transforms/GVNHoist/hoist-drop-debug-info.ll
index f628c2a37c14..1d992691f362 100644
--- a/llvm/test/Transforms/GVNHoist/hoist-drop-debug-info.ll
+++ b/llvm/test/Transforms/GVNHoist/hoist-drop-debug-info.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -gvn-hoist < %s | FileCheck %s
+; RUN: opt -S -passes=gvn-hoist < %s | FileCheck %s
 
 ; Check that the debug info is dropped as per the debug info update guide
 
diff --git a/llvm/test/Transforms/GVNHoist/hoist-md.ll b/llvm/test/Transforms/GVNHoist/hoist-md.ll
index 8a7a6a426d4d..c317d79da6f7 100644
--- a/llvm/test/Transforms/GVNHoist/hoist-md.ll
+++ b/llvm/test/Transforms/GVNHoist/hoist-md.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -gvn-hoist < %s | FileCheck %s
+; RUN: opt -S -passes=gvn-hoist < %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/GVNHoist/hoist-more-than-two-branches.ll b/llvm/test/Transforms/GVNHoist/hoist-more-than-two-branches.ll
index 58864ad4e3fc..1b5ef72834b4 100644
--- a/llvm/test/Transforms/GVNHoist/hoist-more-than-two-branches.ll
+++ b/llvm/test/Transforms/GVNHoist/hoist-more-than-two-branches.ll
@@ -1,4 +1,4 @@
-; RUN: opt -gvn-hoist -S < %s | FileCheck %s
+; RUN: opt -passes=gvn-hoist -S < %s | FileCheck %s
 
 ; CHECK: store
 ; CHECK-NOT: store
diff --git a/llvm/test/Transforms/GVNHoist/hoist-mssa.ll b/llvm/test/Transforms/GVNHoist/hoist-mssa.ll
index a25ed8177246..1516256e6688 100644
--- a/llvm/test/Transforms/GVNHoist/hoist-mssa.ll
+++ b/llvm/test/Transforms/GVNHoist/hoist-mssa.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -gvn-hoist -newgvn < %s | FileCheck %s
+; RUN: opt -S -passes='function(gvn-hoist),function(newgvn)' < %s | FileCheck %s
 
 ; Check that store hoisting works: there should be only one store left.
 ; CHECK-LABEL: @getopt
diff --git a/llvm/test/Transforms/GVNHoist/hoist-newgvn.ll b/llvm/test/Transforms/GVNHoist/hoist-newgvn.ll
index 928d46af228a..6f715e7bbba4 100644
--- a/llvm/test/Transforms/GVNHoist/hoist-newgvn.ll
+++ b/llvm/test/Transforms/GVNHoist/hoist-newgvn.ll
@@ -1,4 +1,4 @@
-; RUN: opt -gvn-hoist -newgvn -S < %s | FileCheck %s
+; RUN: opt -passes='function(gvn-hoist),function(newgvn)' -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/GVNHoist/hoist-pr20242.ll b/llvm/test/Transforms/GVNHoist/hoist-pr20242.ll
index c6d25770b602..e33e733073d2 100644
--- a/llvm/test/Transforms/GVNHoist/hoist-pr20242.ll
+++ b/llvm/test/Transforms/GVNHoist/hoist-pr20242.ll
@@ -1,4 +1,4 @@
-; RUN: opt -gvn-hoist -newgvn -gvn-hoist  -S < %s | FileCheck %s
+; RUN: opt -passes='function(gvn-hoist),function(newgvn),function(gvn-hoist)'  -S < %s | FileCheck %s
 ; Test to demonstrate that newgvn creates opportunities for
 ; more gvn-hoist when sibling branches contain identical expressions.
 
diff --git a/llvm/test/Transforms/GVNHoist/hoist-pr22005.ll b/llvm/test/Transforms/GVNHoist/hoist-pr22005.ll
index 9299f4f48e55..5349e4871e2e 100644
--- a/llvm/test/Transforms/GVNHoist/hoist-pr22005.ll
+++ b/llvm/test/Transforms/GVNHoist/hoist-pr22005.ll
@@ -1,4 +1,4 @@
-; RUN: opt -gvn-hoist -S < %s | FileCheck %s
+; RUN: opt -passes=gvn-hoist -S < %s | 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/GVNHoist/hoist-pr28606.ll b/llvm/test/Transforms/GVNHoist/hoist-pr28606.ll
index d8bad7ae4563..06af9e5c3883 100644
--- a/llvm/test/Transforms/GVNHoist/hoist-pr28606.ll
+++ b/llvm/test/Transforms/GVNHoist/hoist-pr28606.ll
@@ -1,4 +1,4 @@
-; RUN: opt -gvn-hoist -S < %s | FileCheck %s
+; RUN: opt -passes=gvn-hoist -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-msvc18.0.0"
diff --git a/llvm/test/Transforms/GVNHoist/hoist-pr31891.ll b/llvm/test/Transforms/GVNHoist/hoist-pr31891.ll
index 380c197a60fd..f9fab6d07181 100644
--- a/llvm/test/Transforms/GVNHoist/hoist-pr31891.ll
+++ b/llvm/test/Transforms/GVNHoist/hoist-pr31891.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -gvn-hoist < %s | FileCheck %s
+; RUN: opt -S -passes=gvn-hoist < %s | FileCheck %s
 
 ; Hoisted inlinable calls need to have accurate scope information, but we're
 ; allowed to erase the line information.
diff --git a/llvm/test/Transforms/GVNHoist/hoist-pr46874.ll b/llvm/test/Transforms/GVNHoist/hoist-pr46874.ll
index 0b661d7e023e..7ba2ce0358b5 100644
--- a/llvm/test/Transforms/GVNHoist/hoist-pr46874.ll
+++ b/llvm/test/Transforms/GVNHoist/hoist-pr46874.ll
@@ -1,4 +1,4 @@
-; RUN: opt -gvn-hoist -S < %s | FileCheck %s
+; RUN: opt -passes=gvn-hoist -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"
 target triple = "x86_64-unknown-linux-gnu"
 
diff --git a/llvm/test/Transforms/GVNHoist/hoist-recursive-geps.ll b/llvm/test/Transforms/GVNHoist/hoist-recursive-geps.ll
index 523e40dd63ce..3ad64bcebc1e 100644
--- a/llvm/test/Transforms/GVNHoist/hoist-recursive-geps.ll
+++ b/llvm/test/Transforms/GVNHoist/hoist-recursive-geps.ll
@@ -1,4 +1,4 @@
-; RUN: opt -gvn-hoist -newgvn -gvn-hoist -S < %s | FileCheck %s
+; RUN: opt -passes='function(gvn-hoist),function(newgvn),function(gvn-hoist)' -S < %s | FileCheck %s
 
 ; Check that recursive GEPs are hoisted. Since hoisting creates
 ; fully redundant instructions, newgvn is run to remove them which then
diff --git a/llvm/test/Transforms/GVNHoist/hoist-simplify-phi.ll b/llvm/test/Transforms/GVNHoist/hoist-simplify-phi.ll
index 84f10ab79bdd..1f743f889e2d 100644
--- a/llvm/test/Transforms/GVNHoist/hoist-simplify-phi.ll
+++ b/llvm/test/Transforms/GVNHoist/hoist-simplify-phi.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn-hoist -S | FileCheck %s
+; RUN: opt < %s -passes=gvn-hoist -S | FileCheck %s
 
 ; This test is meant to make sure that MemorySSAUpdater works correctly
 ; in non-trivial cases.
diff --git a/llvm/test/Transforms/GVNHoist/hoist-unsafe-pr31729.ll b/llvm/test/Transforms/GVNHoist/hoist-unsafe-pr31729.ll
index 40a3f49574df..e606dc269300 100644
--- a/llvm/test/Transforms/GVNHoist/hoist-unsafe-pr31729.ll
+++ b/llvm/test/Transforms/GVNHoist/hoist-unsafe-pr31729.ll
@@ -1,4 +1,4 @@
-; RUN: opt -gvn-hoist -S < %s | FileCheck %s
+; RUN: opt -passes=gvn-hoist -S < %s | FileCheck %s
 
 ; Check that urem is not hoisted.
 ; CHECK-LABEL: @main
diff --git a/llvm/test/Transforms/GVNHoist/hoist-very-busy.ll b/llvm/test/Transforms/GVNHoist/hoist-very-busy.ll
index f421eff9921a..701485ee2b22 100644
--- a/llvm/test/Transforms/GVNHoist/hoist-very-busy.ll
+++ b/llvm/test/Transforms/GVNHoist/hoist-very-busy.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -gvn-hoist < %s | FileCheck %s
+; RUN: opt -S -passes=gvn-hoist < %s | FileCheck %s
 
 %struct.__jmp_buf_tag = type { [8 x i64], i32 }
 
diff --git a/llvm/test/Transforms/GVNHoist/hoist.ll b/llvm/test/Transforms/GVNHoist/hoist.ll
index 555c7670ff5b..3bb599718197 100644
--- a/llvm/test/Transforms/GVNHoist/hoist.ll
+++ b/llvm/test/Transforms/GVNHoist/hoist.ll
@@ -1,4 +1,4 @@
-; RUN: opt -gvn-hoist -S < %s | FileCheck %s
+; RUN: opt -passes=gvn-hoist -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/GVNHoist/infinite-loop-direct.ll b/llvm/test/Transforms/GVNHoist/infinite-loop-direct.ll
index 88513c12d01b..2b179e0bf4da 100644
--- a/llvm/test/Transforms/GVNHoist/infinite-loop-direct.ll
+++ b/llvm/test/Transforms/GVNHoist/infinite-loop-direct.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -gvn-hoist < %s | FileCheck %s
+; RUN: opt -S -passes=gvn-hoist < %s | FileCheck %s
 
 ; Checking gvn-hoist in case of infinite loops and irreducible control flow.
 
diff --git a/llvm/test/Transforms/GVNHoist/infinite-loop-indirect.ll b/llvm/test/Transforms/GVNHoist/infinite-loop-indirect.ll
index 9fd77f5e472c..316ee20c9887 100644
--- a/llvm/test/Transforms/GVNHoist/infinite-loop-indirect.ll
+++ b/llvm/test/Transforms/GVNHoist/infinite-loop-indirect.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -gvn-hoist < %s | FileCheck %s
+; RUN: opt -S -passes=gvn-hoist < %s | FileCheck %s
 
 ; Checking gvn-hoist in case of indirect branches.
 
diff --git a/llvm/test/Transforms/GVNHoist/int_sideeffect.ll b/llvm/test/Transforms/GVNHoist/int_sideeffect.ll
index 26029fe52ce0..1f675b2b5ff8 100644
--- a/llvm/test/Transforms/GVNHoist/int_sideeffect.ll
+++ b/llvm/test/Transforms/GVNHoist/int_sideeffect.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S < %s -gvn-hoist | FileCheck %s
+; RUN: opt -S < %s -passes=gvn-hoist | FileCheck %s
 
 declare void @llvm.sideeffect()
 
diff --git a/llvm/test/Transforms/GVNHoist/ld_hoist1.ll b/llvm/test/Transforms/GVNHoist/ld_hoist1.ll
index 8d4698d87e6f..d1472ce433af 100644
--- a/llvm/test/Transforms/GVNHoist/ld_hoist1.ll
+++ b/llvm/test/Transforms/GVNHoist/ld_hoist1.ll
@@ -1,5 +1,5 @@
 ; Test load hoist
-; RUN: opt -gvn-hoist -S < %s | FileCheck %s
+; RUN: opt -passes=gvn-hoist -S < %s | FileCheck %s
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-pc_linux"
 
diff --git a/llvm/test/Transforms/GVNHoist/ld_hoist_st_sink.ll b/llvm/test/Transforms/GVNHoist/ld_hoist_st_sink.ll
index c85edc2d8170..b4e59c1c2062 100644
--- a/llvm/test/Transforms/GVNHoist/ld_hoist_st_sink.ll
+++ b/llvm/test/Transforms/GVNHoist/ld_hoist_st_sink.ll
@@ -1,6 +1,6 @@
 ; Tests to make sure that loads and stores in a diamond get merged
 ; Loads are hoisted into the header. Stores sunks into the footer.
-; RUN: opt -gvn-hoist -S < %s | FileCheck %s
+; RUN: opt -passes=gvn-hoist -S < %s | FileCheck %s
 target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
 
 %struct.node = type { i64, %struct.node*, %struct.node*, %struct.node*, i64, %struct.arc*, i64, i64, i64 }
diff --git a/llvm/test/Transforms/GVNHoist/non-trivial-phi.ll b/llvm/test/Transforms/GVNHoist/non-trivial-phi.ll
index f77ad1bf6808..de885f07640a 100644
--- a/llvm/test/Transforms/GVNHoist/non-trivial-phi.ll
+++ b/llvm/test/Transforms/GVNHoist/non-trivial-phi.ll
@@ -1,4 +1,4 @@
-; RUN: opt -gvn-hoist %s -S -o - | FileCheck %s
+; RUN: opt -passes=gvn-hoist %s -S -o - | FileCheck %s
 
 ; CHECK: store
 ; CHECK-NOT: store
diff --git a/llvm/test/Transforms/GVNHoist/pr28626.ll b/llvm/test/Transforms/GVNHoist/pr28626.ll
index 7930e6948253..644aac03d2f5 100644
--- a/llvm/test/Transforms/GVNHoist/pr28626.ll
+++ b/llvm/test/Transforms/GVNHoist/pr28626.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -gvn-hoist < %s | FileCheck %s
+; RUN: opt -S -passes=gvn-hoist < %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/GVNHoist/pr29031.ll b/llvm/test/Transforms/GVNHoist/pr29031.ll
index cd518725b8b2..8a8d8447e7e0 100644
--- a/llvm/test/Transforms/GVNHoist/pr29031.ll
+++ b/llvm/test/Transforms/GVNHoist/pr29031.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -gvn-hoist < %s | FileCheck %s
+; RUN: opt -S -passes=gvn-hoist < %s | FileCheck %s
 
 ; Check that the stores are not hoisted: it is invalid to hoist stores if they
 ; are not executed on all paths. In this testcase, there are paths in the loop
diff --git a/llvm/test/Transforms/GVNHoist/pr29034.ll b/llvm/test/Transforms/GVNHoist/pr29034.ll
index c0fcc3e741a8..f0f2367d068c 100644
--- a/llvm/test/Transforms/GVNHoist/pr29034.ll
+++ b/llvm/test/Transforms/GVNHoist/pr29034.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -gvn-hoist < %s | FileCheck %s
+; RUN: opt -S -passes=gvn-hoist < %s | FileCheck %s
 
 ; Check that the stores are not hoisted: it is invalid to hoist stores if they
 ; are not executed on all paths. In this testcase, there are paths in the loop
diff --git a/llvm/test/Transforms/GVNHoist/pr30216.ll b/llvm/test/Transforms/GVNHoist/pr30216.ll
index a13efdb9d76b..5ee3a2e67707 100644
--- a/llvm/test/Transforms/GVNHoist/pr30216.ll
+++ b/llvm/test/Transforms/GVNHoist/pr30216.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -gvn-hoist < %s | FileCheck %s
+; RUN: opt -S -passes=gvn-hoist < %s | FileCheck %s
 
 ; Make sure the two stores @B do not get hoisted past the load @B.
 
diff --git a/llvm/test/Transforms/GVNHoist/pr30499.ll b/llvm/test/Transforms/GVNHoist/pr30499.ll
index deae28647445..99dabf16fe85 100644
--- a/llvm/test/Transforms/GVNHoist/pr30499.ll
+++ b/llvm/test/Transforms/GVNHoist/pr30499.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -gvn-hoist < %s
+; RUN: opt -S -passes=gvn-hoist < %s
 
 define void @_Z3fn2v() #0 {
 entry:
diff --git a/llvm/test/Transforms/GVNHoist/pr35222-hoist-load.ll b/llvm/test/Transforms/GVNHoist/pr35222-hoist-load.ll
index b9b1a870a59b..e3cfa02e8258 100644
--- a/llvm/test/Transforms/GVNHoist/pr35222-hoist-load.ll
+++ b/llvm/test/Transforms/GVNHoist/pr35222-hoist-load.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -gvn-hoist < %s | FileCheck %s
+; RUN: opt -S -passes=gvn-hoist < %s | FileCheck %s
 ; CHECK-LABEL: build_tree
 ; CHECK: load
 ; CHECK: load
diff --git a/llvm/test/Transforms/GVNHoist/pr36787.ll b/llvm/test/Transforms/GVNHoist/pr36787.ll
index 387b3e74cf0a..19e1349d6767 100644
--- a/llvm/test/Transforms/GVNHoist/pr36787.ll
+++ b/llvm/test/Transforms/GVNHoist/pr36787.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn-hoist -S | FileCheck %s
+; RUN: opt < %s -passes=gvn-hoist -S | FileCheck %s
 
 @g = external constant i8*
 
diff --git a/llvm/test/Transforms/GVNHoist/pr37808.ll b/llvm/test/Transforms/GVNHoist/pr37808.ll
index 5705c6b89a3d..f4e01f83c1c8 100644
--- a/llvm/test/Transforms/GVNHoist/pr37808.ll
+++ b/llvm/test/Transforms/GVNHoist/pr37808.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn-hoist -S | FileCheck %s
+; RUN: opt < %s -passes=gvn-hoist -S | FileCheck %s
 
 define void @func() {
 ; CHECK-LABEL: @func()
diff --git a/llvm/test/Transforms/GVNHoist/pr45442.ll b/llvm/test/Transforms/GVNHoist/pr45442.ll
index fe6a8be01507..d53a66233f47 100644
--- a/llvm/test/Transforms/GVNHoist/pr45442.ll
+++ b/llvm/test/Transforms/GVNHoist/pr45442.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn-hoist -S | FileCheck %s
+; RUN: opt < %s -passes=gvn-hoist -S | FileCheck %s
 
 ; gvn-hoist shouldn't crash in this case.
 ; CHECK-LABEL: @func(i1 %b)
diff --git a/llvm/test/Transforms/GVNSink/dither.ll b/llvm/test/Transforms/GVNSink/dither.ll
index 9717021aca82..445eceed8092 100644
--- a/llvm/test/Transforms/GVNSink/dither.ll
+++ b/llvm/test/Transforms/GVNSink/dither.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -S -gvn-sink | FileCheck %s
+; RUN: opt < %s -S -passes=gvn-sink | FileCheck %s
 
 ; Because %tmp17 has flipped operands to its equivalents %tmp14 and %tmp7, we
 ; can't sink the zext as we'd need a shuffling PHI in between.
diff --git a/llvm/test/Transforms/GVNSink/fpmath.ll b/llvm/test/Transforms/GVNSink/fpmath.ll
index 69e3a2471e7b..07bc0a22deb0 100644
--- a/llvm/test/Transforms/GVNSink/fpmath.ll
+++ b/llvm/test/Transforms/GVNSink/fpmath.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S < %s -gvn-sink | FileCheck %s
+; RUN: opt -S < %s -passes=gvn-sink | FileCheck %s
 
 ; CHECK-LABEL: sink
 ; CHECK-NOT: fneg
diff --git a/llvm/test/Transforms/GVNSink/int_sideeffect.ll b/llvm/test/Transforms/GVNSink/int_sideeffect.ll
index 0ea773654c4d..3cc54e84f17c 100644
--- a/llvm/test/Transforms/GVNSink/int_sideeffect.ll
+++ b/llvm/test/Transforms/GVNSink/int_sideeffect.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S < %s -gvn-sink | FileCheck %s
+; RUN: opt -S < %s -passes=gvn-sink | FileCheck %s
 
 declare void @llvm.sideeffect()
 
diff --git a/llvm/test/Transforms/GVNSink/operand-mismatch.ll b/llvm/test/Transforms/GVNSink/operand-mismatch.ll
index 2ca45cb895b3..49b2637607d7 100644
--- a/llvm/test/Transforms/GVNSink/operand-mismatch.ll
+++ b/llvm/test/Transforms/GVNSink/operand-mismatch.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -gvn-sink -S < %s | FileCheck %s
+; RUN: opt -passes=gvn-sink -S < %s | FileCheck %s
 
 ; This would assert/crash because the calls have different numbers of operands:
 ; https://bugs.llvm.org/show_bug.cgi?id=42346
diff --git a/llvm/test/Transforms/GVNSink/sink-combine-metadata.ll b/llvm/test/Transforms/GVNSink/sink-combine-metadata.ll
index 97ee8cf71612..5a9aec625c84 100644
--- a/llvm/test/Transforms/GVNSink/sink-combine-metadata.ll
+++ b/llvm/test/Transforms/GVNSink/sink-combine-metadata.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn-sink -S | FileCheck %s
+; RUN: opt < %s -passes=gvn-sink -S | FileCheck %s
 
 ; Check that nonnull metadata for non-dominating loads is not propagated.
 ; CHECK-LABEL: @test1(
diff --git a/llvm/test/Transforms/GVNSink/struct.ll b/llvm/test/Transforms/GVNSink/struct.ll
index f7300bdf54f7..60b6a36108cb 100644
--- a/llvm/test/Transforms/GVNSink/struct.ll
+++ b/llvm/test/Transforms/GVNSink/struct.ll
@@ -1,4 +1,3 @@
-; RUN: opt -gvn-sink -S < %s | FileCheck %s
 ; RUN: opt -passes=gvn-sink -S < %s | FileCheck %s
 
 %struct = type {i32, i32}
diff --git a/llvm/test/Transforms/GlobalOpt/2004-10-10-CastStoreOnce.ll b/llvm/test/Transforms/GlobalOpt/2004-10-10-CastStoreOnce.ll
index 061b9b0670f0..1012ecc858b0 100644
--- a/llvm/test/Transforms/GlobalOpt/2004-10-10-CastStoreOnce.ll
+++ b/llvm/test/Transforms/GlobalOpt/2004-10-10-CastStoreOnce.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt
+; RUN: opt < %s -passes=globalopt
 
 @V = global float 1.200000e+01          ; <float*> [#uses=1]
 @G = internal global i32* null          ; <i32**> [#uses=2]
diff --git a/llvm/test/Transforms/GlobalOpt/2009-02-15-BitcastAlias.ll b/llvm/test/Transforms/GlobalOpt/2009-02-15-BitcastAlias.ll
index e6337adefa13..5b4af9aa74fa 100644
--- a/llvm/test/Transforms/GlobalOpt/2009-02-15-BitcastAlias.ll
+++ b/llvm/test/Transforms/GlobalOpt/2009-02-15-BitcastAlias.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt
+; RUN: opt < %s -passes=globalopt
 
 @g = global i32 0
 
diff --git a/llvm/test/Transforms/GlobalOpt/2009-06-01-RecursivePHI.ll b/llvm/test/Transforms/GlobalOpt/2009-06-01-RecursivePHI.ll
index 31af1b1e6e72..d61d4d4b45be 100644
--- a/llvm/test/Transforms/GlobalOpt/2009-06-01-RecursivePHI.ll
+++ b/llvm/test/Transforms/GlobalOpt/2009-06-01-RecursivePHI.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt
+; RUN: opt < %s -passes=globalopt
 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"
 
 	%struct.s_annealing_sched = type { i32, float, float, float, float }
diff --git a/llvm/test/Transforms/GlobalOpt/2022-08-23-ScalableVectorCrash.ll b/llvm/test/Transforms/GlobalOpt/2022-08-23-ScalableVectorCrash.ll
index 6014b63b1ac4..44ba927dde1d 100644
--- a/llvm/test/Transforms/GlobalOpt/2022-08-23-ScalableVectorCrash.ll
+++ b/llvm/test/Transforms/GlobalOpt/2022-08-23-ScalableVectorCrash.ll
@@ -1,4 +1,4 @@
-; RUN: opt -globalopt < %s
+; RUN: opt -passes=globalopt < %s
 
 ; Ensure we don't ICE by trying to optimize a scalable vector load of a global
 ; variable.
diff --git a/llvm/test/Transforms/GlobalOpt/constantexpr-dangle.ll b/llvm/test/Transforms/GlobalOpt/constantexpr-dangle.ll
index 3917bfff4119..715db352c8e8 100644
--- a/llvm/test/Transforms/GlobalOpt/constantexpr-dangle.ll
+++ b/llvm/test/Transforms/GlobalOpt/constantexpr-dangle.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes='function(instcombine),globalopt' -S | FileCheck %s
 ; CHECK: internal fastcc float @foo
 
 define internal float @foo() {
diff --git a/llvm/test/Transforms/GlobalOpt/ctor-memset.ll b/llvm/test/Transforms/GlobalOpt/ctor-memset.ll
index 526076cd9a85..92b4a7d21d4f 100644
--- a/llvm/test/Transforms/GlobalOpt/ctor-memset.ll
+++ b/llvm/test/Transforms/GlobalOpt/ctor-memset.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --check-globals
-; RUN: opt -S -globalopt < %s | FileCheck %s
+; RUN: opt -S -passes=globalopt < %s | FileCheck %s
 
 target datalayout = "p1:32:32"
 
diff --git a/llvm/test/Transforms/GlobalOpt/evaluate-bitcast.ll b/llvm/test/Transforms/GlobalOpt/evaluate-bitcast.ll
index 740dba2be66f..5a129be92a96 100644
--- a/llvm/test/Transforms/GlobalOpt/evaluate-bitcast.ll
+++ b/llvm/test/Transforms/GlobalOpt/evaluate-bitcast.ll
@@ -1,4 +1,4 @@
-; RUN: opt -globalopt -instcombine %s -S -o - | FileCheck %s
+; RUN: opt -passes=globalopt,instcombine %s -S -o - | FileCheck %s
 
 ; Static constructor should have been optimized out
 ; CHECK:       i32 @main
diff --git a/llvm/test/Transforms/GlobalOpt/evaluate-call-errors.ll b/llvm/test/Transforms/GlobalOpt/evaluate-call-errors.ll
index 84fe70b08b2e..884ca514b8a2 100644
--- a/llvm/test/Transforms/GlobalOpt/evaluate-call-errors.ll
+++ b/llvm/test/Transforms/GlobalOpt/evaluate-call-errors.ll
@@ -1,7 +1,7 @@
 ; Checks for few bitcasted call evaluation errors
 
 ; REQUIRES: asserts
-; RUN: opt -globalopt -instcombine -S -debug-only=evaluator %s -o %t 2>&1 | FileCheck %s
+; RUN: opt -passes=globalopt,instcombine -S -debug-only=evaluator %s -o %t 2>&1 | FileCheck %s
 
 ; CHECK: Failed to fold bitcast call expr
 ; CHECK: Can not convert function argument
diff --git a/llvm/test/Transforms/GlobalOpt/evaluate-call.ll b/llvm/test/Transforms/GlobalOpt/evaluate-call.ll
index c0456740da44..96b6d55f601d 100644
--- a/llvm/test/Transforms/GlobalOpt/evaluate-call.ll
+++ b/llvm/test/Transforms/GlobalOpt/evaluate-call.ll
@@ -7,7 +7,7 @@
 ; We evaluate call to function _ZL3bazP3Foo casting its parameter and check that evaluated value (nullptr)
 ; is handled correctly
 
-; RUN: opt -globalopt -instcombine -S %s -o - | FileCheck %s
+; RUN: opt -passes=globalopt,instcombine -S %s -o - | FileCheck %s
 
 ; CHECK:      @gBar = local_unnamed_addr global %struct.Bar { i32 2 }
 ; CHECK-NEXT: @_s = local_unnamed_addr global %struct.S { i32 1 }, align 4
diff --git a/llvm/test/Transforms/GlobalOpt/evaluate-constfold-call.ll b/llvm/test/Transforms/GlobalOpt/evaluate-constfold-call.ll
index aeaa5e800c70..0464926872ab 100644
--- a/llvm/test/Transforms/GlobalOpt/evaluate-constfold-call.ll
+++ b/llvm/test/Transforms/GlobalOpt/evaluate-constfold-call.ll
@@ -1,7 +1,7 @@
 ; Check if we can evaluate a bitcasted call to a function which is constant folded.
 ; Evaluator folds call to fmodf, replacing it with constant value in case both operands
 ; are known at compile time.
-; RUN: opt -globalopt -instcombine %s -S -o - | FileCheck %s
+; RUN: opt -passes=globalopt,instcombine %s -S -o - | FileCheck %s
 
 ; CHECK:        @_q = dso_local local_unnamed_addr global %struct.Q { i32 1066527622 }
 ; CHECK:        define dso_local i32 @main
diff --git a/llvm/test/Transforms/GlobalOpt/evaluate-load-uniform.ll b/llvm/test/Transforms/GlobalOpt/evaluate-load-uniform.ll
index ba434a9eb67c..64a2c7076400 100644
--- a/llvm/test/Transforms/GlobalOpt/evaluate-load-uniform.ll
+++ b/llvm/test/Transforms/GlobalOpt/evaluate-load-uniform.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --check-globals
-; RUN: opt -S -globalopt < %s | FileCheck %s
+; RUN: opt -S -passes=globalopt < %s | FileCheck %s
 
 ; Make sure that the load from uniform value @g1 succeeds during evaluation.
 
diff --git a/llvm/test/Transforms/GlobalOpt/globalsra-generic-type.ll b/llvm/test/Transforms/GlobalOpt/globalsra-generic-type.ll
index cccdeade0ccc..d30fdae4ef56 100644
--- a/llvm/test/Transforms/GlobalOpt/globalsra-generic-type.ll
+++ b/llvm/test/Transforms/GlobalOpt/globalsra-generic-type.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -globalopt < %s | FileCheck %s
+; RUN: opt -S -passes=globalopt < %s | FileCheck %s
 
 @g = internal global [8 x i8] undef
 
diff --git a/llvm/test/Transforms/GlobalOpt/globalsra-opaque-ptr.ll b/llvm/test/Transforms/GlobalOpt/globalsra-opaque-ptr.ll
index 7f77d35ed91a..b911b385f390 100644
--- a/llvm/test/Transforms/GlobalOpt/globalsra-opaque-ptr.ll
+++ b/llvm/test/Transforms/GlobalOpt/globalsra-opaque-ptr.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --check-globals
-; RUN: opt -S -globalopt -opaque-pointers < %s | FileCheck %s
+; RUN: opt -S -passes=globalopt -opaque-pointers < %s | FileCheck %s
 
 ; Global SRA should not be performed here (or at least not naively), as
 ; offset 4 is accessed as both i32 and i64.
diff --git a/llvm/test/Transforms/GlobalOpt/globalsra-recursive.ll b/llvm/test/Transforms/GlobalOpt/globalsra-recursive.ll
index bb2f1f059ae3..0e40f65b5291 100644
--- a/llvm/test/Transforms/GlobalOpt/globalsra-recursive.ll
+++ b/llvm/test/Transforms/GlobalOpt/globalsra-recursive.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -globalopt < %s | FileCheck %s
+; RUN: opt -S -passes=globalopt < %s | FileCheck %s
 
 ; Make sure we don't recursively SRA if there are aggregate load/stores with
 ; the same type as the global.
diff --git a/llvm/test/Transforms/GlobalOpt/integer-bool.ll b/llvm/test/Transforms/GlobalOpt/integer-bool.ll
index 617febdc0166..3ea259182f55 100644
--- a/llvm/test/Transforms/GlobalOpt/integer-bool.ll
+++ b/llvm/test/Transforms/GlobalOpt/integer-bool.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -S -globalopt -instcombine | FileCheck %s
+; RUN: opt < %s -S -passes=globalopt,instcombine | FileCheck %s
 ;; check that global opt turns integers that only hold 0 or 1 into bools.
 
 @G = internal addrspace(1) global i32 0
diff --git a/llvm/test/Transforms/GlobalOpt/malloc-promote-opaque-ptr.ll b/llvm/test/Transforms/GlobalOpt/malloc-promote-opaque-ptr.ll
index f174c42c19fa..ab2571cfef0c 100644
--- a/llvm/test/Transforms/GlobalOpt/malloc-promote-opaque-ptr.ll
+++ b/llvm/test/Transforms/GlobalOpt/malloc-promote-opaque-ptr.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --check-globals
-; RUN: opt -S -globalopt -opaque-pointers < %s | FileCheck %s
+; RUN: opt -S -passes=globalopt -opaque-pointers < %s | FileCheck %s
 
 @g1 = internal global ptr null
 @g2 = internal global ptr null
diff --git a/llvm/test/Transforms/GlobalOpt/pr39751.ll b/llvm/test/Transforms/GlobalOpt/pr39751.ll
index c13eba900afc..a042d74b1222 100644
--- a/llvm/test/Transforms/GlobalOpt/pr39751.ll
+++ b/llvm/test/Transforms/GlobalOpt/pr39751.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --check-globals
-; RUN: opt -S -globalopt < %s | FileCheck %s
+; RUN: opt -S -passes=globalopt < %s | FileCheck %s
 
 ; Check that we don't crash on vector GEP indices.
 
diff --git a/llvm/test/Transforms/GlobalOpt/pr51879.ll b/llvm/test/Transforms/GlobalOpt/pr51879.ll
index e827ae39a230..44ed0c887020 100644
--- a/llvm/test/Transforms/GlobalOpt/pr51879.ll
+++ b/llvm/test/Transforms/GlobalOpt/pr51879.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --check-globals
-; RUN: opt -S -globalopt < %s | FileCheck %s
+; RUN: opt -S -passes=globalopt < %s | FileCheck %s
 
 %type = type { { i8** } }
 
diff --git a/llvm/test/Transforms/GlobalOpt/pr52994.ll b/llvm/test/Transforms/GlobalOpt/pr52994.ll
index 079d1d1ce3e7..584d7155f398 100644
--- a/llvm/test/Transforms/GlobalOpt/pr52994.ll
+++ b/llvm/test/Transforms/GlobalOpt/pr52994.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --check-globals
-; RUN: opt -S -globalopt < %s | FileCheck %s
+; RUN: opt -S -passes=globalopt < %s | FileCheck %s
 
 ; Check that aggregate stores work correctly.
 
diff --git a/llvm/test/Transforms/GlobalOpt/pr53002.ll b/llvm/test/Transforms/GlobalOpt/pr53002.ll
index f90ca2ccc23c..ee743d72b914 100644
--- a/llvm/test/Transforms/GlobalOpt/pr53002.ll
+++ b/llvm/test/Transforms/GlobalOpt/pr53002.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --check-globals
-; RUN: opt -S -globalopt < %s | FileCheck %s
+; RUN: opt -S -passes=globalopt < %s | FileCheck %s
 
 ; The store here writes into the padding after [5 x i8].
 ; Make sure we don't crash.
diff --git a/llvm/test/Transforms/GlobalOpt/pr54572.ll b/llvm/test/Transforms/GlobalOpt/pr54572.ll
index 83640452ed1c..962c75bd83b4 100644
--- a/llvm/test/Transforms/GlobalOpt/pr54572.ll
+++ b/llvm/test/Transforms/GlobalOpt/pr54572.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --check-globals
-; RUN: opt -S -globalopt < %s | FileCheck %s
+; RUN: opt -S -passes=globalopt < %s | FileCheck %s
 
 @b = internal global ptr null
 @c = internal global [2 x ptr] zeroinitializer
diff --git a/llvm/test/Transforms/GlobalOpt/recursively-delete-dead-inst-assertion.ll b/llvm/test/Transforms/GlobalOpt/recursively-delete-dead-inst-assertion.ll
index 63782798d652..eb3b32032f11 100644
--- a/llvm/test/Transforms/GlobalOpt/recursively-delete-dead-inst-assertion.ll
+++ b/llvm/test/Transforms/GlobalOpt/recursively-delete-dead-inst-assertion.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -globalopt < %s | FileCheck %s
+; RUN: opt -S -passes=globalopt < %s | FileCheck %s
 
 ; In this case an instruction queued for recursive deletion gets RAUWd with
 ; a constant in the meantime. Make sure this does not cause an assertion
diff --git a/llvm/test/Transforms/GlobalOpt/shrink-global-to-bool-opaque-ptrs.ll b/llvm/test/Transforms/GlobalOpt/shrink-global-to-bool-opaque-ptrs.ll
index 5d3a35f6474d..2d664b78b5bc 100644
--- a/llvm/test/Transforms/GlobalOpt/shrink-global-to-bool-opaque-ptrs.ll
+++ b/llvm/test/Transforms/GlobalOpt/shrink-global-to-bool-opaque-ptrs.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -globalopt -opaque-pointers < %s | FileCheck %s
+; RUN: opt -S -passes=globalopt -opaque-pointers < %s | FileCheck %s
 
 ; Make sure we don't try to convert to select if the load/stores don't match
 ; the global type.
diff --git a/llvm/test/Transforms/GlobalOpt/stored-once-different-type.ll b/llvm/test/Transforms/GlobalOpt/stored-once-different-type.ll
index a4fac27e7f6e..60178797f68c 100644
--- a/llvm/test/Transforms/GlobalOpt/stored-once-different-type.ll
+++ b/llvm/test/Transforms/GlobalOpt/stored-once-different-type.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --check-globals
-; RUN: opt -S -globalopt < %s | FileCheck %s
+; RUN: opt -S -passes=globalopt < %s | FileCheck %s
 
 @g = internal global [4 x i8] undef
 
diff --git a/llvm/test/Transforms/GlobalOpt/stored-once-through-gep.ll b/llvm/test/Transforms/GlobalOpt/stored-once-through-gep.ll
index dae4435f445b..6f9d53fd3688 100644
--- a/llvm/test/Transforms/GlobalOpt/stored-once-through-gep.ll
+++ b/llvm/test/Transforms/GlobalOpt/stored-once-through-gep.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -globalopt < %s | FileCheck %s
+; RUN: opt -S -passes=globalopt < %s | FileCheck %s
 
 ; The global is stored once through a trivial GEP instruction (rather than
 ; GEP constant expression) here. We should still be able to optimize it.
diff --git a/llvm/test/Transforms/GlobalOpt/undef-ctor-dtor.ll b/llvm/test/Transforms/GlobalOpt/undef-ctor-dtor.ll
index d77a5cdaafd6..00aa45dc3afc 100644
--- a/llvm/test/Transforms/GlobalOpt/undef-ctor-dtor.ll
+++ b/llvm/test/Transforms/GlobalOpt/undef-ctor-dtor.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -globalopt < %s | FileCheck %s
+; RUN: opt -S -passes=globalopt < %s | FileCheck %s
 
 ; Gracefully handle undef global_ctors/global_dtors
 
diff --git a/llvm/test/Transforms/GlobalOpt/x86_mmx_load.ll b/llvm/test/Transforms/GlobalOpt/x86_mmx_load.ll
index 3b1fa8cd73f6..e63b74da73fd 100644
--- a/llvm/test/Transforms/GlobalOpt/x86_mmx_load.ll
+++ b/llvm/test/Transforms/GlobalOpt/x86_mmx_load.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -globalopt < %s | FileCheck %s
+; RUN: opt -S -passes=globalopt < %s | FileCheck %s
 
 @m64 = internal global <1 x i64> zeroinitializer
 
diff --git a/llvm/test/Transforms/GlobalSplit/basic.ll b/llvm/test/Transforms/GlobalSplit/basic.ll
index 0a3724ffe3ee..735ddb969b18 100644
--- a/llvm/test/Transforms/GlobalSplit/basic.ll
+++ b/llvm/test/Transforms/GlobalSplit/basic.ll
@@ -1,4 +1,3 @@
-; RUN: opt -S -globalsplit %s | FileCheck %s
 ; RUN: opt -S -passes=globalsplit %s | FileCheck %s
 
 target datalayout = "e-p:64:64"
diff --git a/llvm/test/Transforms/GlobalSplit/non-beneficial.ll b/llvm/test/Transforms/GlobalSplit/non-beneficial.ll
index 97ffcc2fdbd5..9d14828af221 100644
--- a/llvm/test/Transforms/GlobalSplit/non-beneficial.ll
+++ b/llvm/test/Transforms/GlobalSplit/non-beneficial.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -globalsplit %s | FileCheck %s
+; RUN: opt -S -passes=globalsplit %s | FileCheck %s
 
 target datalayout = "e-p:64:64"
 target triple = "x86_64-unknown-linux-gnu"
diff --git a/llvm/test/Transforms/GlobalSplit/nonlocal.ll b/llvm/test/Transforms/GlobalSplit/nonlocal.ll
index 4f2f81157c58..98550cc792b2 100644
--- a/llvm/test/Transforms/GlobalSplit/nonlocal.ll
+++ b/llvm/test/Transforms/GlobalSplit/nonlocal.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -globalsplit %s | FileCheck %s
+; RUN: opt -S -passes=globalsplit %s | FileCheck %s
 
 target datalayout = "e-p:64:64"
 target triple = "x86_64-unknown-linux-gnu"
diff --git a/llvm/test/Transforms/InstCombine/2004-09-20-BadLoadCombine.ll b/llvm/test/Transforms/InstCombine/2004-09-20-BadLoadCombine.ll
index 20eb459ff1f4..02bca8102b34 100644
--- a/llvm/test/Transforms/InstCombine/2004-09-20-BadLoadCombine.ll
+++ b/llvm/test/Transforms/InstCombine/2004-09-20-BadLoadCombine.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -mem2reg -S | \
+; RUN: opt < %s -passes='function(instcombine),function(mem2reg)' -S | \
 ; RUN:   not grep "i32 1"
 
 ; When propagating the load through the select, make sure that the load is
diff --git a/llvm/test/Transforms/InstCombine/2007-02-01-LoadSinkAlloca.ll b/llvm/test/Transforms/InstCombine/2007-02-01-LoadSinkAlloca.ll
index 242c21825ade..e32b8577d3b9 100644
--- a/llvm/test/Transforms/InstCombine/2007-02-01-LoadSinkAlloca.ll
+++ b/llvm/test/Transforms/InstCombine/2007-02-01-LoadSinkAlloca.ll
@@ -1,5 +1,5 @@
-; RUN: opt < %s -instcombine -mem2reg -S | grep "%A = alloca" 
-; RUN: opt < %s -instcombine -mem2reg -S | \
+; RUN: opt < %s -passes='function(instcombine),function(mem2reg)' -S | grep "%A = alloca" 
+; RUN: opt < %s -passes='function(instcombine),function(mem2reg)' -S | \
 ; RUN:    not grep "%B = alloca"
 ; END.
 
diff --git a/llvm/test/Transforms/InstCombine/2007-12-28-IcmpSub2.ll b/llvm/test/Transforms/InstCombine/2007-12-28-IcmpSub2.ll
index 1b46f33e40f3..0244e9fdeb46 100644
--- a/llvm/test/Transforms/InstCombine/2007-12-28-IcmpSub2.ll
+++ b/llvm/test/Transforms/InstCombine/2007-12-28-IcmpSub2.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -mem2reg -instcombine -S | grep "ret i32 1" | count 8
+; RUN: opt < %s -passes=mem2reg,instcombine -S | grep "ret i32 1" | count 8
 
 define i32 @test1() {
 entry:
diff --git a/llvm/test/Transforms/InstCombine/2009-02-20-InstCombine-SROA.ll b/llvm/test/Transforms/InstCombine/2009-02-20-InstCombine-SROA.ll
index 86b9bc57fe50..f4e4a2c80fa6 100644
--- a/llvm/test/Transforms/InstCombine/2009-02-20-InstCombine-SROA.ll
+++ b/llvm/test/Transforms/InstCombine/2009-02-20-InstCombine-SROA.ll
@@ -1,6 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -instcombine -S | FileCheck --check-prefix=IC %s
-; RUN: opt < %s -instcombine -sroa -S | FileCheck --check-prefix=IC_SROA %s
+; RUN: opt < %s -passes=instcombine -S | FileCheck --check-prefix=IC %s
+; RUN: opt < %s -passes=instcombine,sroa -S | FileCheck --check-prefix=IC_SROA %s
 
 ; rdar://6417724
 ; Instcombine shouldn't do anything to this function that prevents promoting the allocas inside it.
diff --git a/llvm/test/Transforms/InstCombine/AArch64/sve-intrinsic-gatherscatter.ll b/llvm/test/Transforms/InstCombine/AArch64/sve-intrinsic-gatherscatter.ll
index 2a73f709e989..5b40d2e02749 100644
--- a/llvm/test/Transforms/InstCombine/AArch64/sve-intrinsic-gatherscatter.ll
+++ b/llvm/test/Transforms/InstCombine/AArch64/sve-intrinsic-gatherscatter.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -instcombine -dce < %s | FileCheck %s
+; RUN: opt -S -passes=instcombine,dce < %s | FileCheck %s
 
 target triple = "aarch64-unknown-linux-gnu"
 
diff --git a/llvm/test/Transforms/InstCombine/cast_phi.ll b/llvm/test/Transforms/InstCombine/cast_phi.ll
index afc52f02b6a2..983deab6c5cd 100644
--- a/llvm/test/Transforms/InstCombine/cast_phi.ll
+++ b/llvm/test/Transforms/InstCombine/cast_phi.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
 ; RUN: opt < %s -passes=instcombine -S | FileCheck %s
 
 target datalayout = "n32:64"
diff --git a/llvm/test/Transforms/InstCombine/deadcode.ll b/llvm/test/Transforms/InstCombine/deadcode.ll
index bac5f706ec09..e65f0ab6e8d8 100644
--- a/llvm/test/Transforms/InstCombine/deadcode.ll
+++ b/llvm/test/Transforms/InstCombine/deadcode.ll
@@ -1,5 +1,5 @@
 ; RUN: opt < %s -passes=instcombine -S | grep "ret i32 %A"
-; RUN: opt < %s -dce -S | not grep call.*llvm
+; RUN: opt < %s -passes=dce -S | not grep call.*llvm
 
 define i32 @test(i32 %A) {
 	%X = or i1 false, false		
diff --git a/llvm/test/Transforms/InstCombine/double-float-shrink-2.ll b/llvm/test/Transforms/InstCombine/double-float-shrink-2.ll
index 9a260cc06ee1..9f8dc9e8ac23 100644
--- a/llvm/test/Transforms/InstCombine/double-float-shrink-2.ll
+++ b/llvm/test/Transforms/InstCombine/double-float-shrink-2.ll
@@ -1,11 +1,11 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -instcombine -S -mtriple "i386-pc-linux"     | FileCheck %s
-; RUN: opt < %s -instcombine -S -mtriple "i386-pc-win32"     | FileCheck %s
-; RUN: opt < %s -instcombine -S -mtriple "x86_64-pc-win32"   | FileCheck %s
-; RUN: opt < %s -instcombine -S -mtriple "i386-pc-mingw32"   | FileCheck %s
-; RUN: opt < %s -instcombine -S -mtriple "x86_64-pc-mingw32" | FileCheck %s
-; RUN: opt < %s -instcombine -S -mtriple "sparc-sun-solaris" | FileCheck %s
-; RUN: opt < %s -instcombine -S -mtriple "x86_64-pc-win32" -enable-debugify 2>&1 | FileCheck --check-prefix=DBG-VALID %s
+; RUN: opt < %s -passes=instcombine -S -mtriple "i386-pc-linux"     | FileCheck %s
+; RUN: opt < %s -passes=instcombine -S -mtriple "i386-pc-win32"     | FileCheck %s
+; RUN: opt < %s -passes=instcombine -S -mtriple "x86_64-pc-win32"   | FileCheck %s
+; RUN: opt < %s -passes=instcombine -S -mtriple "i386-pc-mingw32"   | FileCheck %s
+; RUN: opt < %s -passes=instcombine -S -mtriple "x86_64-pc-mingw32" | FileCheck %s
+; RUN: opt < %s -passes=instcombine -S -mtriple "sparc-sun-solaris" | FileCheck %s
+; RUN: opt < %s -passes=instcombine -S -mtriple "x86_64-pc-win32" -enable-debugify 2>&1 | FileCheck --check-prefix=DBG-VALID %s
 
 declare double @floor(double)
 declare double @ceil(double)
diff --git a/llvm/test/Transforms/InstCombine/early_constfold_changes_IR.ll b/llvm/test/Transforms/InstCombine/early_constfold_changes_IR.ll
index d02ffd19b8c1..64fe1ef8e16d 100644
--- a/llvm/test/Transforms/InstCombine/early_constfold_changes_IR.ll
+++ b/llvm/test/Transforms/InstCombine/early_constfold_changes_IR.ll
@@ -1,5 +1,5 @@
 ; This run line verifies that we get the expected constant fold.
-; RUN: opt < %s -instcombine -S | FileCheck %s
+; RUN: opt < %s -passes=instcombine -S | FileCheck %s
 
 define i32 @foo(i32 %arg) #0 {
 ; CHECK-LABEL: @foo(
diff --git a/llvm/test/Transforms/InstCombine/fast-basictest.ll b/llvm/test/Transforms/InstCombine/fast-basictest.ll
index 8590c467627e..1f1c4d3b0c9d 100644
--- a/llvm/test/Transforms/InstCombine/fast-basictest.ll
+++ b/llvm/test/Transforms/InstCombine/fast-basictest.ll
@@ -6,7 +6,7 @@
 ; - PhaseOrdering/fast-reassociate-gvn.ll
 ; - Reassociate/fast-basictest.ll
 ;
-; RUN: opt < %s -instcombine -S | FileCheck %s
+; RUN: opt < %s -passes=instcombine -S | FileCheck %s
 
 ; With reassociation, constant folding can eliminate the 12 and -12 constants.
 
diff --git a/llvm/test/Transforms/InstCombine/fputs-opt-size.ll b/llvm/test/Transforms/InstCombine/fputs-opt-size.ll
index b0e7002ea4d4..a69d08a8ea56 100644
--- a/llvm/test/Transforms/InstCombine/fputs-opt-size.ll
+++ b/llvm/test/Transforms/InstCombine/fputs-opt-size.ll
@@ -1,7 +1,7 @@
 ; When optimising for size, we don't want to rewrite fputs to fwrite
 ; because it requires more arguments and thus extra MOVs are required.
 ;
-; RUN: opt < %s -instcombine -S | FileCheck %s
+; RUN: opt < %s -passes=instcombine -S | FileCheck %s
 ; RUN: opt < %s -passes='require<profile-summary>,function(instcombine)' -pgso -S | FileCheck %s -check-prefix=PGSO
 ; RUN: opt < %s -instcombine -pgso=false -S | FileCheck %s -check-prefix=NPGSO
 
diff --git a/llvm/test/Transforms/InstCombine/gep-object-size-less-than-or-equal-typesize.ll b/llvm/test/Transforms/InstCombine/gep-object-size-less-than-or-equal-typesize.ll
index 2bcf8f06b81a..9d7ae233fbdd 100644
--- a/llvm/test/Transforms/InstCombine/gep-object-size-less-than-or-equal-typesize.ll
+++ b/llvm/test/Transforms/InstCombine/gep-object-size-less-than-or-equal-typesize.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 i8 @foo(<vscale x 1 x i8> %x, i64 %idx) {
 ; CHECK-LABEL: @foo(
diff --git a/llvm/test/Transforms/InstCombine/high-bit-signmask-with-trunc.ll b/llvm/test/Transforms/InstCombine/high-bit-signmask-with-trunc.ll
index 7c98a2725a33..ec7c3c807d54 100644
--- a/llvm/test/Transforms/InstCombine/high-bit-signmask-with-trunc.ll
+++ b/llvm/test/Transforms/InstCombine/high-bit-signmask-with-trunc.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
 
 define i32 @t0(i64 %x) {
 ; CHECK-LABEL: @t0(
diff --git a/llvm/test/Transforms/InstCombine/high-bit-signmask.ll b/llvm/test/Transforms/InstCombine/high-bit-signmask.ll
index 86865556b6a5..53a7fb4461c5 100644
--- a/llvm/test/Transforms/InstCombine/high-bit-signmask.ll
+++ b/llvm/test/Transforms/InstCombine/high-bit-signmask.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
 
 define i64 @t0(i64 %x) {
 ; CHECK-LABEL: @t0(
diff --git a/llvm/test/Transforms/InstCombine/icmp-select.ll b/llvm/test/Transforms/InstCombine/icmp-select.ll
index 5332ef329090..821787232c89 100644
--- a/llvm/test/Transforms/InstCombine/icmp-select.ll
+++ b/llvm/test/Transforms/InstCombine/icmp-select.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
 
 declare void @use(i8)
 declare void @use.i1(i1)
diff --git a/llvm/test/Transforms/InstCombine/icmp-xor-signbit.ll b/llvm/test/Transforms/InstCombine/icmp-xor-signbit.ll
index ac5394351205..110c2a34e3d5 100644
--- a/llvm/test/Transforms/InstCombine/icmp-xor-signbit.ll
+++ b/llvm/test/Transforms/InstCombine/icmp-xor-signbit.ll
@@ -1,5 +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 -passes=instcombine -instcombine-infinite-loop-threshold=2 -S | FileCheck %s
 
 ; icmp u/s (a ^ signmask), (b ^ signmask) --> icmp s/u a, b
 
diff --git a/llvm/test/Transforms/InstCombine/infinite-loop-postdom.ll b/llvm/test/Transforms/InstCombine/infinite-loop-postdom.ll
index 07175f052f40..95f9bb59a596 100644
--- a/llvm/test/Transforms/InstCombine/infinite-loop-postdom.ll
+++ b/llvm/test/Transforms/InstCombine/infinite-loop-postdom.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -disable-output -instcombine -verify-dom-info
+; RUN: opt < %s -disable-output -passes=instcombine -verify-dom-info
 ; RUN: opt < %s -passes='print<postdomtree>' 2>&1 | FileCheck --check-prefixes=CHECK-POSTDOM %s
 
 ; Demonstrate that Predicate Canonicalization (InstCombine) does not invalidate PostDomTree
diff --git a/llvm/test/Transforms/InstCombine/intersect-accessgroup.ll b/llvm/test/Transforms/InstCombine/intersect-accessgroup.ll
index fc1597e6c976..2236efd5aaad 100644
--- a/llvm/test/Transforms/InstCombine/intersect-accessgroup.ll
+++ b/llvm/test/Transforms/InstCombine/intersect-accessgroup.ll
@@ -1,4 +1,4 @@
-; RUN: opt -instcombine -S < %s | FileCheck %s
+; RUN: opt -passes=instcombine -S < %s | FileCheck %s
 ;
 ; void func(long n, double A[static const restrict n]) {
 ; 	for (int i = 0; i <  n; i+=1)
diff --git a/llvm/test/Transforms/InstCombine/load-no-aliasing.ll b/llvm/test/Transforms/InstCombine/load-no-aliasing.ll
index 568e73b5d2f7..67dfe9d6da26 100644
--- a/llvm/test/Transforms/InstCombine/load-no-aliasing.ll
+++ b/llvm/test/Transforms/InstCombine/load-no-aliasing.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
 
 ; Check that load to load forwarding works with non aliasing store inbetween.
 define i32 @test_load_store_load_combine(ptr, ptr) {
diff --git a/llvm/test/Transforms/InstCombine/load.ll b/llvm/test/Transforms/InstCombine/load.ll
index b8cf7bb947a7..7f7424dd42b9 100644
--- a/llvm/test/Transforms/InstCombine/load.ll
+++ b/llvm/test/Transforms/InstCombine/load.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
 
 target datalayout = "e-m:e-p:64:64:64-i64:64-f80:128-n8:16:32:64-S128-ni:1"
diff --git a/llvm/test/Transforms/InstCombine/load_combine_aa.ll b/llvm/test/Transforms/InstCombine/load_combine_aa.ll
index 978494910e34..1c4d0e964a57 100644
--- a/llvm/test/Transforms/InstCombine/load_combine_aa.ll
+++ b/llvm/test/Transforms/InstCombine/load_combine_aa.ll
@@ -1,4 +1,4 @@
-; RUN: opt -instcombine -S < %s | FileCheck %s
+; RUN: opt -passes=instcombine -S < %s | FileCheck %s
 
 ; CHECK-LABEL: @test_load_combine_aa(
 ; CHECK: %[[V:.*]] = load i32, ptr %0
diff --git a/llvm/test/Transforms/InstCombine/malloc-free-mismatched.ll b/llvm/test/Transforms/InstCombine/malloc-free-mismatched.ll
index 4af68aabe5a9..d3f5d09ac1a3 100644
--- a/llvm/test/Transforms/InstCombine/malloc-free-mismatched.ll
+++ b/llvm/test/Transforms/InstCombine/malloc-free-mismatched.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
 
 define dso_local i32 @_Z6answeri(i32 %0) {
 ; CHECK-LABEL: @_Z6answeri(
diff --git a/llvm/test/Transforms/InstCombine/memchr-7.ll b/llvm/test/Transforms/InstCombine/memchr-7.ll
index fae95d0184c1..27f251cb06d9 100644
--- a/llvm/test/Transforms/InstCombine/memchr-7.ll
+++ b/llvm/test/Transforms/InstCombine/memchr-7.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
 
 @.str = private unnamed_addr constant [27 x i8] c"abcdefghijklmnopqrstuvwxyz\00", align 1
 @.str.1 = private unnamed_addr constant [2 x i8] c"\0D\0A", align 1
diff --git a/llvm/test/Transforms/InstCombine/mul_full_32.ll b/llvm/test/Transforms/InstCombine/mul_full_32.ll
index 6a8d73525399..c4166ffb1ec8 100644
--- a/llvm/test/Transforms/InstCombine/mul_full_32.ll
+++ b/llvm/test/Transforms/InstCombine/mul_full_32.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-p:32:32-f64:32:64-f80:32-n8:16:32-S128"
 target triple = "i386-unknown-linux-gnu"
diff --git a/llvm/test/Transforms/InstCombine/mul_full_64.ll b/llvm/test/Transforms/InstCombine/mul_full_64.ll
index ed1afeea3f99..8a57b548cd14 100644
--- a/llvm/test/Transforms/InstCombine/mul_full_64.ll
+++ b/llvm/test/Transforms/InstCombine/mul_full_64.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/musttail-thunk.ll b/llvm/test/Transforms/InstCombine/musttail-thunk.ll
index f79940af1646..67ff67abb9ab 100644
--- a/llvm/test/Transforms/InstCombine/musttail-thunk.ll
+++ b/llvm/test/Transforms/InstCombine/musttail-thunk.ll
@@ -1,4 +1,4 @@
-; RUN: opt -instcombine -S < %s | FileCheck %s
+; RUN: opt -passes=instcombine -S < %s | FileCheck %s
 ; RUN: opt -debugify-each -instcombine -S < %s | FileCheck %s
 
 ; These are both direct calls, but make sure instcombine leaves the casts
diff --git a/llvm/test/Transforms/InstCombine/opaque-ptr.ll b/llvm/test/Transforms/InstCombine/opaque-ptr.ll
index 970be839d7f2..f6202ef7e7a7 100644
--- a/llvm/test/Transforms/InstCombine/opaque-ptr.ll
+++ b/llvm/test/Transforms/InstCombine/opaque-ptr.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -instcombine -opaque-pointers < %s | FileCheck %s
+; RUN: opt -S -passes=instcombine -opaque-pointers < %s | FileCheck %s
 
 define ptr @bitcast_opaque_to_opaque(ptr %a) {
 ; CHECK-LABEL: @bitcast_opaque_to_opaque(
diff --git a/llvm/test/Transforms/InstCombine/pr53357.ll b/llvm/test/Transforms/InstCombine/pr53357.ll
index ea9ab630452d..bdb63068fd4a 100644
--- a/llvm/test/Transforms/InstCombine/pr53357.ll
+++ b/llvm/test/Transforms/InstCombine/pr53357.ll
@@ -1,6 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
 ; Test for (x & y) + ~(x | y) -> ~(x ^ y)
-; RUN: opt < %s -instcombine -S | FileCheck %s
+; RUN: opt < %s -passes=instcombine -S | FileCheck %s
 
 ; (x & y) + ~(x | y)
 define i32 @src(i32 %0, i32 %1) {
diff --git a/llvm/test/Transforms/InstCombine/ptrauth-intrinsics.ll b/llvm/test/Transforms/InstCombine/ptrauth-intrinsics.ll
index d693fd55f54f..328c2cdae667 100644
--- a/llvm/test/Transforms/InstCombine/ptrauth-intrinsics.ll
+++ b/llvm/test/Transforms/InstCombine/ptrauth-intrinsics.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
 
 define i64 @test_ptrauth_nop(ptr %p) {
 ; CHECK-LABEL: @test_ptrauth_nop(
diff --git a/llvm/test/Transforms/InstCombine/saturating-add-sub.ll b/llvm/test/Transforms/InstCombine/saturating-add-sub.ll
index 716c504446f7..d11ba1e00e4e 100644
--- a/llvm/test/Transforms/InstCombine/saturating-add-sub.ll
+++ b/llvm/test/Transforms/InstCombine/saturating-add-sub.ll
@@ -1,5 +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 -passes=instcombine -instcombine-infinite-loop-threshold=2 -S | FileCheck %s
 
 ;
 ; Saturating addition.
diff --git a/llvm/test/Transforms/InstCombine/select-pr39595.ll b/llvm/test/Transforms/InstCombine/select-pr39595.ll
index 40ddca7081f5..3b3736539895 100644
--- a/llvm/test/Transforms/InstCombine/select-pr39595.ll
+++ b/llvm/test/Transforms/InstCombine/select-pr39595.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
 
 define i32 @foo(i32 %x, i32 %y) {
 ; CHECK-LABEL: @foo(
diff --git a/llvm/test/Transforms/InstCombine/sink_to_unreachable.ll b/llvm/test/Transforms/InstCombine/sink_to_unreachable.ll
index 1adcd2618a25..e788b634da88 100644
--- a/llvm/test/Transforms/InstCombine/sink_to_unreachable.ll
+++ b/llvm/test/Transforms/InstCombine/sink_to_unreachable.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
 
 declare void @use(i32 %x)
diff --git a/llvm/test/Transforms/InstCombine/statepoint-cleanup.ll b/llvm/test/Transforms/InstCombine/statepoint-cleanup.ll
index 6c62b5aa187f..b79a7f3c75ad 100644
--- a/llvm/test/Transforms/InstCombine/statepoint-cleanup.ll
+++ b/llvm/test/Transforms/InstCombine/statepoint-cleanup.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -instcombine -instcombine-max-iterations=1 -S | FileCheck %s
+; RUN: opt < %s -passes=instcombine -instcombine-max-iterations=1 -S | FileCheck %s
 ; These tests check the optimizations specific to
 ; pointers being relocated at a statepoint.
 
diff --git a/llvm/test/Transforms/InstCombine/statepoint-iter.ll b/llvm/test/Transforms/InstCombine/statepoint-iter.ll
index cc7d9c343c75..2dff4ee2e4f2 100644
--- a/llvm/test/Transforms/InstCombine/statepoint-iter.ll
+++ b/llvm/test/Transforms/InstCombine/statepoint-iter.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -instcombine -instcombine-max-iterations=1 -S | FileCheck %s
+; RUN: opt < %s -passes=instcombine -instcombine-max-iterations=1 -S | FileCheck %s
 ; These tests check the optimizations specific to
 ; pointers being relocated at a statepoint.
 
diff --git a/llvm/test/Transforms/InstCombine/store-load-unaliased-gep.ll b/llvm/test/Transforms/InstCombine/store-load-unaliased-gep.ll
index 9fc1f9def943..737e9cbdf23f 100644
--- a/llvm/test/Transforms/InstCombine/store-load-unaliased-gep.ll
+++ b/llvm/test/Transforms/InstCombine/store-load-unaliased-gep.ll
@@ -1,4 +1,4 @@
-; RUN: opt -instcombine %s -S 2>&1 | FileCheck %s
+; RUN: opt -passes=instcombine %s -S 2>&1 | FileCheck %s
 ; RUN: opt -aa-pipeline=basic-aa -passes=instcombine %s -S 2>&1 | FileCheck %s
 
 ; Checking successful store-load optimization of array length.
diff --git a/llvm/test/Transforms/Reassociate/2002-05-15-MissedTree.ll b/llvm/test/Transforms/Reassociate/2002-05-15-MissedTree.ll
index 099c394f92e1..680259f3613a 100644
--- a/llvm/test/Transforms/Reassociate/2002-05-15-MissedTree.ll
+++ b/llvm/test/Transforms/Reassociate/2002-05-15-MissedTree.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -reassociate -instcombine -S | FileCheck %s
+; RUN: opt < %s -passes=reassociate,instcombine -S | FileCheck %s
 
 define i32 @test1(i32 %A, i32 %B) {
 ; CHECK-LABEL: @test1(
diff --git a/llvm/test/Transforms/Reassociate/2002-05-15-SubReassociate.ll b/llvm/test/Transforms/Reassociate/2002-05-15-SubReassociate.ll
index 31459deca8b2..0e10d3a72746 100644
--- a/llvm/test/Transforms/Reassociate/2002-05-15-SubReassociate.ll
+++ b/llvm/test/Transforms/Reassociate/2002-05-15-SubReassociate.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -reassociate -instcombine -dce -S | FileCheck %s
+; RUN: opt < %s -passes=reassociate,instcombine,dce -S | FileCheck %s
 
 ; With sub reassociation, constant folding can eliminate all of the constants.
 define i32 @test1(i32 %A, i32 %B) {
diff --git a/llvm/test/Transforms/Reassociate/2002-07-09-DominanceProblem.ll b/llvm/test/Transforms/Reassociate/2002-07-09-DominanceProblem.ll
index bbb08f969853..c68db4563309 100644
--- a/llvm/test/Transforms/Reassociate/2002-07-09-DominanceProblem.ll
+++ b/llvm/test/Transforms/Reassociate/2002-07-09-DominanceProblem.ll
@@ -1,6 +1,6 @@
 ; The reassociate pass is not preserving dominance properties correctly
 ;
-; RUN: opt < %s -reassociate
+; RUN: opt < %s -passes=reassociate
 
 define i32 @compute_dist(i32 %i, i32 %j) {
 	%reg119 = sub i32 %j, %i		; <i32> [#uses=1]
diff --git a/llvm/test/Transforms/Reassociate/2003-08-12-InfiniteLoop.ll b/llvm/test/Transforms/Reassociate/2003-08-12-InfiniteLoop.ll
index af7a821a4bab..07000a5a853a 100644
--- a/llvm/test/Transforms/Reassociate/2003-08-12-InfiniteLoop.ll
+++ b/llvm/test/Transforms/Reassociate/2003-08-12-InfiniteLoop.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -reassociate -disable-output
+; RUN: opt < %s -passes=reassociate -disable-output
 
 define i32 @test(i32 %A.1, i32 %B.1, i32 %C.1, i32 %D.1) {
 	%tmp.16 = and i32 %A.1, %B.1		; <i32> [#uses=1]
diff --git a/llvm/test/Transforms/Reassociate/2005-09-01-ArrayOutOfBounds.ll b/llvm/test/Transforms/Reassociate/2005-09-01-ArrayOutOfBounds.ll
index f6cef35b1779..a168e8ac9b1d 100644
--- a/llvm/test/Transforms/Reassociate/2005-09-01-ArrayOutOfBounds.ll
+++ b/llvm/test/Transforms/Reassociate/2005-09-01-ArrayOutOfBounds.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -reassociate -instcombine -S | FileCheck %s
+; RUN: opt < %s -passes=reassociate,instcombine -S | FileCheck %s
 
 define i32 @f1(i32 %a0, i32 %a1, i32 %a2, i32 %a3, i32 %a4) {
 ; CHECK-LABEL: f1
diff --git a/llvm/test/Transforms/Reassociate/2011-01-26-UseAfterFree.ll b/llvm/test/Transforms/Reassociate/2011-01-26-UseAfterFree.ll
index e5b5d6d766a8..4cde69bb0c7d 100644
--- a/llvm/test/Transforms/Reassociate/2011-01-26-UseAfterFree.ll
+++ b/llvm/test/Transforms/Reassociate/2011-01-26-UseAfterFree.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -reassociate
+; RUN: opt < %s -passes=reassociate
 ; PR9039
 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-n8:16:32"
 target triple = "i386-gnu-linux"
diff --git a/llvm/test/Transforms/Reassociate/2012-06-08-InfiniteLoop.ll b/llvm/test/Transforms/Reassociate/2012-06-08-InfiniteLoop.ll
index 6e62a287e022..650aa82c1af2 100644
--- a/llvm/test/Transforms/Reassociate/2012-06-08-InfiniteLoop.ll
+++ b/llvm/test/Transforms/Reassociate/2012-06-08-InfiniteLoop.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -reassociate -disable-output
+; RUN: opt < %s -passes=reassociate -disable-output
 ; PR13041
 
 define void @foo() {
diff --git a/llvm/test/Transforms/Reassociate/crash.ll b/llvm/test/Transforms/Reassociate/crash.ll
index ecb48f481484..8130c1bfa76f 100644
--- a/llvm/test/Transforms/Reassociate/crash.ll
+++ b/llvm/test/Transforms/Reassociate/crash.ll
@@ -1,4 +1,4 @@
-; RUN: opt -reassociate -disable-output < %s
+; RUN: opt -passes=reassociate -disable-output < %s
 
 
 ; rdar://7507855
diff --git a/llvm/test/Transforms/Reassociate/crash2.ll b/llvm/test/Transforms/Reassociate/crash2.ll
index 70355e5108a5..dab3ae9f6ebb 100644
--- a/llvm/test/Transforms/Reassociate/crash2.ll
+++ b/llvm/test/Transforms/Reassociate/crash2.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -reassociate %s -S -o - | FileCheck %s
+; RUN: opt -passes=reassociate %s -S -o - | FileCheck %s
 
 ; Reassociate pass used to crash on these example
 
diff --git a/llvm/test/Transforms/Reassociate/deadcode.ll b/llvm/test/Transforms/Reassociate/deadcode.ll
index 866cf64d2a1f..45d3364ad42a 100644
--- a/llvm/test/Transforms/Reassociate/deadcode.ll
+++ b/llvm/test/Transforms/Reassociate/deadcode.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -reassociate -disable-output
+; RUN: opt < %s -passes=reassociate -disable-output
 
 ; It has been detected that dead loops like the one in this test case can be
 ; created by -jump-threading (it was detected by a csmith generated program).
diff --git a/llvm/test/Transforms/Reassociate/fast-ArrayOutOfBounds.ll b/llvm/test/Transforms/Reassociate/fast-ArrayOutOfBounds.ll
index 0109e4fd1b3a..faabd8d7815b 100644
--- a/llvm/test/Transforms/Reassociate/fast-ArrayOutOfBounds.ll
+++ b/llvm/test/Transforms/Reassociate/fast-ArrayOutOfBounds.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -reassociate -instcombine -S | FileCheck %s
+; RUN: opt < %s -passes=reassociate,instcombine -S | FileCheck %s
 
 ; Not marked as fast, so must not change.
 define float @test1(float %a0, float %a1, float %a2, float %a3, float %a4) {
diff --git a/llvm/test/Transforms/Reassociate/fast-MissedTree.ll b/llvm/test/Transforms/Reassociate/fast-MissedTree.ll
index 021c48a293e3..11bde8642e5d 100644
--- a/llvm/test/Transforms/Reassociate/fast-MissedTree.ll
+++ b/llvm/test/Transforms/Reassociate/fast-MissedTree.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -reassociate -instcombine -S | FileCheck %s
+; RUN: opt < %s -passes=reassociate,instcombine -S | FileCheck %s
 
 define float @test1(float %A, float %B) {
 ; CHECK-LABEL: @test1(
diff --git a/llvm/test/Transforms/Reassociate/fast-SubReassociate.ll b/llvm/test/Transforms/Reassociate/fast-SubReassociate.ll
index 74ed65cb4e14..5152201ea7c9 100644
--- a/llvm/test/Transforms/Reassociate/fast-SubReassociate.ll
+++ b/llvm/test/Transforms/Reassociate/fast-SubReassociate.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -reassociate -instcombine -S | FileCheck %s
+; RUN: opt < %s -passes=reassociate,instcombine -S | FileCheck %s
 
 define float @test1(float %A, float %B) {
 ; CHECK-LABEL: @test1(
diff --git a/llvm/test/Transforms/Reassociate/fast-mightymul.ll b/llvm/test/Transforms/Reassociate/fast-mightymul.ll
index 98bdf7a55ace..5cee2377560f 100644
--- a/llvm/test/Transforms/Reassociate/fast-mightymul.ll
+++ b/llvm/test/Transforms/Reassociate/fast-mightymul.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -reassociate -disable-output
+; RUN: opt < %s -passes=reassociate -disable-output
 ; PR13021
 
 define float @test2(float %x) {
diff --git a/llvm/test/Transforms/Reassociate/infloop-deadphi.ll b/llvm/test/Transforms/Reassociate/infloop-deadphi.ll
index c5a45a4f7ebb..5b19f8d384f4 100644
--- a/llvm/test/Transforms/Reassociate/infloop-deadphi.ll
+++ b/llvm/test/Transforms/Reassociate/infloop-deadphi.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
 
 target triple = "x86_64-unknown-linux-gnu"
 
diff --git a/llvm/test/Transforms/Reassociate/inverses.ll b/llvm/test/Transforms/Reassociate/inverses.ll
index 851686143716..b6962c6872a9 100644
--- a/llvm/test/Transforms/Reassociate/inverses.ll
+++ b/llvm/test/Transforms/Reassociate/inverses.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -reassociate -dce -S | FileCheck %s
+; RUN: opt < %s -passes=reassociate,dce -S | FileCheck %s
 
 ; (A&B)&~A == 0
 define i32 @test1(i32 %a, i32 %b) {
diff --git a/llvm/test/Transforms/Reassociate/long-chains.ll b/llvm/test/Transforms/Reassociate/long-chains.ll
index b0de1c6719ea..b03676532cd8 100644
--- a/llvm/test/Transforms/Reassociate/long-chains.ll
+++ b/llvm/test/Transforms/Reassociate/long-chains.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -reassociate -stats -S 2>&1 | FileCheck %s
+; RUN: opt < %s -passes=reassociate -stats -S 2>&1 | FileCheck %s
 ; REQUIRES: asserts
 
 define i8 @longchain(i8 %in1, i8 %in2, i8 %in3, i8 %in4, i8 %in5, i8 %in6, i8 %in7, i8 %in8, i8 %in9, i8 %in10, i8 %in11, i8 %in12, i8 %in13, i8 %in14, i8 %in15, i8 %in16, i8 %in17, i8 %in18, i8 %in19, i8 %in20) {
diff --git a/llvm/test/Transforms/Reassociate/mightymul.ll b/llvm/test/Transforms/Reassociate/mightymul.ll
index ae915da8e576..b6e5f1c75d57 100644
--- a/llvm/test/Transforms/Reassociate/mightymul.ll
+++ b/llvm/test/Transforms/Reassociate/mightymul.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -reassociate -disable-output
+; RUN: opt < %s -passes=reassociate -disable-output
 ; PR13021
 
 define i32 @test1(i32 %x) {
diff --git a/llvm/test/Transforms/Reassociate/min_int.ll b/llvm/test/Transforms/Reassociate/min_int.ll
index 52dab3a531f7..364e89153d42 100644
--- a/llvm/test/Transforms/Reassociate/min_int.ll
+++ b/llvm/test/Transforms/Reassociate/min_int.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -reassociate -dce -S | FileCheck %s
+; RUN: opt < %s -passes=reassociate,dce -S | FileCheck %s
 
 ; MIN_INT cannot be negated during reassociation
 
diff --git a/llvm/test/Transforms/Reassociate/mixed-fast-nonfast-fp.ll b/llvm/test/Transforms/Reassociate/mixed-fast-nonfast-fp.ll
index d37bfbbdf52f..2c2dd1c23a0d 100644
--- a/llvm/test/Transforms/Reassociate/mixed-fast-nonfast-fp.ll
+++ b/llvm/test/Transforms/Reassociate/mixed-fast-nonfast-fp.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
 
 define float @foo(float %a,float %b, float %c) {
 ; CHECK-LABEL: @foo(
diff --git a/llvm/test/Transforms/Reassociate/negation1.ll b/llvm/test/Transforms/Reassociate/negation1.ll
index 674e57df956e..7873584d97ae 100644
--- a/llvm/test/Transforms/Reassociate/negation1.ll
+++ b/llvm/test/Transforms/Reassociate/negation1.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -reassociate -instcombine -S | FileCheck %s
+; RUN: opt < %s -passes=reassociate,instcombine -S | FileCheck %s
 
 ; Test that we can turn things like A*B + X - A*B -> X.
 
diff --git a/llvm/test/Transforms/Reassociate/otherops.ll b/llvm/test/Transforms/Reassociate/otherops.ll
index b82a6d13e7d5..b06cac27baba 100644
--- a/llvm/test/Transforms/Reassociate/otherops.ll
+++ b/llvm/test/Transforms/Reassociate/otherops.ll
@@ -1,6 +1,6 @@
 ; Reassociation should apply to Add, Mul, And, Or, & Xor
 ;
-; RUN: opt < %s -reassociate -instcombine -dce -S | FileCheck %s
+; RUN: opt < %s -passes=reassociate,instcombine,dce -S | FileCheck %s
 
 define i32 @test_mul(i32 %arg) {
 ; CHECK-LABEL: test_mul
diff --git a/llvm/test/Transforms/Reassociate/pointer-collision-non-determinism.ll b/llvm/test/Transforms/Reassociate/pointer-collision-non-determinism.ll
index c8eaa7d290fa..f9dafad42a47 100644
--- a/llvm/test/Transforms/Reassociate/pointer-collision-non-determinism.ll
+++ b/llvm/test/Transforms/Reassociate/pointer-collision-non-determinism.ll
@@ -1,6 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -run-twice -reassociate %s -S -o - | FileCheck %s
-; RUN: opt -run-twice -reassociate %s -S -o - | FileCheck %s
+; RUN: opt -run-twice -passes=reassociate %s -S -o - | FileCheck %s
+; RUN: opt -run-twice -passes=reassociate %s -S -o - | FileCheck %s
 
 ; The PairMap[NumBinaryOps] used by the Reassociate pass used to have Value
 ; *pointers as keys and no handling for values being removed. In some cases (in
diff --git a/llvm/test/Transforms/Reassociate/reassociate-catchswitch.ll b/llvm/test/Transforms/Reassociate/reassociate-catchswitch.ll
index 234d49442168..34314df019c9 100644
--- a/llvm/test/Transforms/Reassociate/reassociate-catchswitch.ll
+++ b/llvm/test/Transforms/Reassociate/reassociate-catchswitch.ll
@@ -1,7 +1,7 @@
 ; Catchswitch is interesting because reassociate previously tried to insert
 ; into the catchswitch block, which is impossible.
 ;
-; RUN: opt -reassociate -disable-output < %s
+; RUN: opt -passes=reassociate -disable-output < %s
 ;
 ; ModuleID = 'bugpoint-reduced-simplified.bc'
 source_filename = "catchswitch.cpp"
diff --git a/llvm/test/Transforms/Reassociate/reassociate-landingpad.ll b/llvm/test/Transforms/Reassociate/reassociate-landingpad.ll
index 9d4fc4d5ed31..eb6a5cabb7be 100644
--- a/llvm/test/Transforms/Reassociate/reassociate-landingpad.ll
+++ b/llvm/test/Transforms/Reassociate/reassociate-landingpad.ll
@@ -1,7 +1,7 @@
 ; Reassociate used to move the negation of $time_1_P14.0 above the
 ; landingpad.
 ;
-; RUN: opt -reassociate -disable-output < %s
+; RUN: opt -passes=reassociate -disable-output < %s
 ;
 ; ModuleID = 'bugpoint-reduced-simplified.bc'
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
diff --git a/llvm/test/Transforms/Reassociate/shift-factor.ll b/llvm/test/Transforms/Reassociate/shift-factor.ll
index d4ccf138f4f4..e1c7b6d0dec4 100644
--- a/llvm/test/Transforms/Reassociate/shift-factor.ll
+++ b/llvm/test/Transforms/Reassociate/shift-factor.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -reassociate -instcombine -S | FileCheck %s
+; RUN: opt < %s -passes=reassociate,instcombine -S | FileCheck %s
 
 ; There should be exactly one shift and one add left.
 
diff --git a/llvm/test/Transforms/Reassociate/shifttest.ll b/llvm/test/Transforms/Reassociate/shifttest.ll
index d9a5336fbfb4..102166e16c05 100644
--- a/llvm/test/Transforms/Reassociate/shifttest.ll
+++ b/llvm/test/Transforms/Reassociate/shifttest.ll
@@ -1,6 +1,6 @@
 ; With shl->mul reassociation, we can see that this is (shl A, 9) * A
 ;
-; RUN: opt < %s -reassociate -instcombine -S |\
+; RUN: opt < %s -passes=reassociate,instcombine -S |\
 ; RUN:    grep "shl .*, 9"
 
 define i32 @test(i32 %A, i32 %B) {
diff --git a/llvm/test/Transforms/Reassociate/subtest.ll b/llvm/test/Transforms/Reassociate/subtest.ll
index c1a80e26ce6d..53873b2d0e4b 100644
--- a/llvm/test/Transforms/Reassociate/subtest.ll
+++ b/llvm/test/Transforms/Reassociate/subtest.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -reassociate -instcombine -S | FileCheck %s
+; RUN: opt < %s -passes=reassociate,instcombine -S | FileCheck %s
 
 ; With sub reassociation, constant folding can eliminate the 12 and -12 constants.
 define i32 @test1(i32 %A, i32 %B) {
diff --git a/llvm/test/Transforms/Reassociate/vaarg_movable.ll b/llvm/test/Transforms/Reassociate/vaarg_movable.ll
index 6dd0bba24ed3..337877a54a90 100644
--- a/llvm/test/Transforms/Reassociate/vaarg_movable.ll
+++ b/llvm/test/Transforms/Reassociate/vaarg_movable.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -reassociate -dce < %s | FileCheck %s
+; RUN: opt -S -passes=reassociate,dce < %s | FileCheck %s
 
 ; The two va_arg instructions depend on the memory/context, are therfore not
 ; identical and the sub should not be optimized to 0 by reassociate.
diff --git a/llvm/test/Transforms/Reassociate/wrap-flags.ll b/llvm/test/Transforms/Reassociate/wrap-flags.ll
index 8726f78e5fde..0d1bee9369a5 100644
--- a/llvm/test/Transforms/Reassociate/wrap-flags.ll
+++ b/llvm/test/Transforms/Reassociate/wrap-flags.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -reassociate -dce -S | FileCheck %s
+; RUN: opt < %s -passes=reassociate,dce -S | FileCheck %s
 ; PR12985
 
 ; Verify the nsw flags are preserved when converting shl to mul.
diff --git a/llvm/test/Transforms/SROA/vectors-of-pointers.ll b/llvm/test/Transforms/SROA/vectors-of-pointers.ll
index 19f832a2189c..d22fd544a649 100644
--- a/llvm/test/Transforms/SROA/vectors-of-pointers.ll
+++ b/llvm/test/Transforms/SROA/vectors-of-pointers.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -sroa
+; RUN: opt < %s -passes=sroa
 
 ; Make sure we don't crash on this one.
 
diff --git a/llvm/test/Transforms/TailCallElim/kcfi-bundle.ll b/llvm/test/Transforms/TailCallElim/kcfi-bundle.ll
index 2ba7caa4280c..9a098401fa21 100644
--- a/llvm/test/Transforms/TailCallElim/kcfi-bundle.ll
+++ b/llvm/test/Transforms/TailCallElim/kcfi-bundle.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -tailcallelim -verify-dom-info -S | FileCheck %s
+; RUN: opt < %s -passes=tailcallelim -verify-dom-info -S | FileCheck %s
 ; Check that the "kcfi" operand bundle doesn't prevent tail calls.
 
 define i64 @f_1(i64 %x, ptr %f_0) {
diff --git a/llvm/test/Transforms/TailCallElim/opt-remarks-recursion.ll b/llvm/test/Transforms/TailCallElim/opt-remarks-recursion.ll
index b7b5bcbba6eb..08707ad9dfb1 100644
--- a/llvm/test/Transforms/TailCallElim/opt-remarks-recursion.ll
+++ b/llvm/test/Transforms/TailCallElim/opt-remarks-recursion.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -tailcallelim -verify-dom-info -pass-remarks=tailcallelim -o /dev/null 2>&1 | FileCheck %s
+; RUN: opt %s -passes=tailcallelim -verify-dom-info -pass-remarks=tailcallelim -o /dev/null 2>&1 | FileCheck %s
 ; RUN: opt %s -o /dev/null -passes='require<opt-remark-emit>,tailcallelim' -pass-remarks=tailcallelim 2>&1 | FileCheck %s
 
 ; CHECK: /home/davide/pat.c:2:20: transforming tail recursion into loop
diff --git a/llvm/test/Transforms/TailCallElim/ptrauth-bundle.ll b/llvm/test/Transforms/TailCallElim/ptrauth-bundle.ll
index 18608e0b37f2..0228d3d37133 100644
--- a/llvm/test/Transforms/TailCallElim/ptrauth-bundle.ll
+++ b/llvm/test/Transforms/TailCallElim/ptrauth-bundle.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -tailcallelim -verify-dom-info -S | FileCheck %s
+; RUN: opt < %s -passes=tailcallelim -verify-dom-info -S | FileCheck %s
 ; Check that the "ptrauth" operand bundle doesn't prevent tail calls.
 
 define i64 @f_1(i64 %x, ptr %f_0) {