[llvm] 8ebb3ea - [test] Use -passes syntax when specifying pipeline in some more tests

Sat Nov 27 01:13:21 PST 2021

Author: Bjorn Pettersson
Date: 2021-11-27T09:52:55+01:00
New Revision: 8ebb3eac02a926ffa4298c12834c57aefb2e8579

URL: https://github.com/llvm/llvm-project/commit/8ebb3eac02a926ffa4298c12834c57aefb2e8579
DIFF: https://github.com/llvm/llvm-project/commit/8ebb3eac02a926ffa4298c12834c57aefb2e8579.diff

LOG: [test] Use -passes syntax when specifying pipeline in some more tests

The legacy PM is deprecated, so update a bunch of lit tests running
opt to use the new PM syntax when specifying the pipeline.
In this patch focus has been put on test cases for ConstantMerge,
ConstraintElimination, CorrelatedValuePropagation, GlobalDCE,
GlobalOpt, SCCP, TailCallElim and PredicateInfo.

Differential Revision: https://reviews.llvm.org/D114516

Added: 
    

Modified: 
    llvm/test/Other/debugcounter-predicateinfo.ll
    llvm/test/Transforms/ConstantMerge/2002-09-23-CPR-Update.ll
    llvm/test/Transforms/ConstantMerge/2003-10-28-MergeExternalConstants.ll
    llvm/test/Transforms/ConstantMerge/2011-01-15-EitherOrder.ll
    llvm/test/Transforms/ConstantMerge/align.ll
    llvm/test/Transforms/ConstantMerge/dont-merge.ll
    llvm/test/Transforms/ConstantMerge/merge-dbg.ll
    llvm/test/Transforms/ConstantMerge/unnamed-addr.ll
    llvm/test/Transforms/ConstraintElimination/add-nuw.ll
    llvm/test/Transforms/ConstraintElimination/add.ll
    llvm/test/Transforms/ConstraintElimination/and.ll
    llvm/test/Transforms/ConstraintElimination/assumes.ll
    llvm/test/Transforms/ConstraintElimination/decompose-with-temporary-indices.ll
    llvm/test/Transforms/ConstraintElimination/dom.ll
    llvm/test/Transforms/ConstraintElimination/empty-constraint.ll
    llvm/test/Transforms/ConstraintElimination/eq.ll
    llvm/test/Transforms/ConstraintElimination/gep-arithmetic.ll
    llvm/test/Transforms/ConstraintElimination/geps-inbounds-precondition.ll
    llvm/test/Transforms/ConstraintElimination/geps-pointers-to-arrays.ll
    llvm/test/Transforms/ConstraintElimination/geps-pointers-to-structs.ll
    llvm/test/Transforms/ConstraintElimination/geps-precondition-overflow-check.ll
    llvm/test/Transforms/ConstraintElimination/geps.ll
    llvm/test/Transforms/ConstraintElimination/i128.ll
    llvm/test/Transforms/ConstraintElimination/large-system-growth.ll
    llvm/test/Transforms/ConstraintElimination/loops-bottom-tested-base.ll
    llvm/test/Transforms/ConstraintElimination/loops-bottom-tested-pointer-cmps.ll
    llvm/test/Transforms/ConstraintElimination/loops-header-tested-base.ll
    llvm/test/Transforms/ConstraintElimination/loops-header-tested-pointer-cmps.ll
    llvm/test/Transforms/ConstraintElimination/loops-header-tested-pointer-iv.ll
    llvm/test/Transforms/ConstraintElimination/loops.ll
    llvm/test/Transforms/ConstraintElimination/mixed-signed-unsigned-predicates.ll
    llvm/test/Transforms/ConstraintElimination/mixed.ll
    llvm/test/Transforms/ConstraintElimination/ne.ll
    llvm/test/Transforms/ConstraintElimination/or.ll
    llvm/test/Transforms/ConstraintElimination/pointercast.ll
    llvm/test/Transforms/ConstraintElimination/sge.ll
    llvm/test/Transforms/ConstraintElimination/sub-nuw.ll
    llvm/test/Transforms/ConstraintElimination/sub.ll
    llvm/test/Transforms/ConstraintElimination/uge.ll
    llvm/test/Transforms/ConstraintElimination/ugt-ule.ll
    llvm/test/Transforms/ConstraintElimination/ule.ll
    llvm/test/Transforms/ConstraintElimination/vector-compares.ll
    llvm/test/Transforms/ConstraintElimination/wrapping-math.ll
    llvm/test/Transforms/ConstraintElimination/zext.ll
    llvm/test/Transforms/CorrelatedValuePropagation/2010-09-02-Trunc.ll
    llvm/test/Transforms/CorrelatedValuePropagation/abs.ll
    llvm/test/Transforms/CorrelatedValuePropagation/add.ll
    llvm/test/Transforms/CorrelatedValuePropagation/alloca.ll
    llvm/test/Transforms/CorrelatedValuePropagation/and.ll
    llvm/test/Transforms/CorrelatedValuePropagation/ashr.ll
    llvm/test/Transforms/CorrelatedValuePropagation/basic.ll
    llvm/test/Transforms/CorrelatedValuePropagation/conflict.ll
    llvm/test/Transforms/CorrelatedValuePropagation/crash.ll
    llvm/test/Transforms/CorrelatedValuePropagation/deopt.ll
    llvm/test/Transforms/CorrelatedValuePropagation/guards.ll
    llvm/test/Transforms/CorrelatedValuePropagation/icmp.ll
    llvm/test/Transforms/CorrelatedValuePropagation/merge-range-and-undef.ll
    llvm/test/Transforms/CorrelatedValuePropagation/min-max.ll
    llvm/test/Transforms/CorrelatedValuePropagation/minmaxabs.ll
    llvm/test/Transforms/CorrelatedValuePropagation/mul.ll
    llvm/test/Transforms/CorrelatedValuePropagation/non-null.ll
    llvm/test/Transforms/CorrelatedValuePropagation/overflow_predicate.ll
    llvm/test/Transforms/CorrelatedValuePropagation/overflows.ll
    llvm/test/Transforms/CorrelatedValuePropagation/phi-common-val.ll
    llvm/test/Transforms/CorrelatedValuePropagation/pointer.ll
    llvm/test/Transforms/CorrelatedValuePropagation/pr35807.ll
    llvm/test/Transforms/CorrelatedValuePropagation/profmd.ll
    llvm/test/Transforms/CorrelatedValuePropagation/range.ll
    llvm/test/Transforms/CorrelatedValuePropagation/sdiv.ll
    llvm/test/Transforms/CorrelatedValuePropagation/select.ll
    llvm/test/Transforms/CorrelatedValuePropagation/sext.ll
    llvm/test/Transforms/CorrelatedValuePropagation/shl.ll
    llvm/test/Transforms/CorrelatedValuePropagation/srem.ll
    llvm/test/Transforms/CorrelatedValuePropagation/sub.ll
    llvm/test/Transforms/CorrelatedValuePropagation/udiv.ll
    llvm/test/Transforms/CorrelatedValuePropagation/urem.ll
    llvm/test/Transforms/GlobalDCE/2002-07-17-CastRef.ll
    llvm/test/Transforms/GlobalDCE/2002-07-17-ConstantRef.ll
    llvm/test/Transforms/GlobalDCE/2002-08-17-FunctionDGE.ll
    llvm/test/Transforms/GlobalDCE/2002-08-17-WorkListTest.ll
    llvm/test/Transforms/GlobalDCE/2002-09-12-Redeletion.ll
    llvm/test/Transforms/GlobalDCE/2003-07-01-SelfReference.ll
    llvm/test/Transforms/GlobalDCE/2003-10-09-PreserveWeakGlobals.ll
    llvm/test/Transforms/GlobalDCE/2009-01-05-DeadAliases.ll
    llvm/test/Transforms/GlobalDCE/2009-02-17-AliasUsesAliasee.ll
    llvm/test/Transforms/GlobalDCE/call-with-ptrtoint.ll
    llvm/test/Transforms/GlobalDCE/comdats.ll
    llvm/test/Transforms/GlobalDCE/externally_available.ll
    llvm/test/Transforms/GlobalDCE/global-ifunc.ll
    llvm/test/Transforms/GlobalDCE/global_ctors.ll
    llvm/test/Transforms/GlobalDCE/indirectbr.ll
    llvm/test/Transforms/GlobalDCE/virtual-functions-base-call.ll
    llvm/test/Transforms/GlobalDCE/virtual-functions-base-pointer-call.ll
    llvm/test/Transforms/GlobalDCE/virtual-functions-derived-call.ll
    llvm/test/Transforms/GlobalDCE/virtual-functions-derived-pointer-call.ll
    llvm/test/Transforms/GlobalDCE/virtual-functions-novfe.ll
    llvm/test/Transforms/GlobalDCE/virtual-functions-relative-pointers-bad.ll
    llvm/test/Transforms/GlobalDCE/virtual-functions-relative-pointers.ll
    llvm/test/Transforms/GlobalDCE/virtual-functions-visibility-post-lto.ll
    llvm/test/Transforms/GlobalDCE/virtual-functions-visibility-pre-lto.ll
    llvm/test/Transforms/GlobalDCE/virtual-functions.ll
    llvm/test/Transforms/GlobalDCE/vtable-rtti.ll
    llvm/test/Transforms/GlobalOpt/2005-06-15-LocalizeConstExprCrash.ll
    llvm/test/Transforms/GlobalOpt/2005-09-27-Crash.ll
    llvm/test/Transforms/GlobalOpt/2006-07-07-InlineAsmCrash.ll
    llvm/test/Transforms/GlobalOpt/2006-11-01-ShrinkGlobalPhiCrash.ll
    llvm/test/Transforms/GlobalOpt/2007-04-05-Crash.ll
    llvm/test/Transforms/GlobalOpt/2007-05-13-Crash.ll
    llvm/test/Transforms/GlobalOpt/2007-06-04-PackedStruct.ll
    llvm/test/Transforms/GlobalOpt/2007-11-09-GEP-GEP-Crash.ll
    llvm/test/Transforms/GlobalOpt/2008-01-03-Crash.ll
    llvm/test/Transforms/GlobalOpt/2008-01-13-OutOfRangeSROA.ll
    llvm/test/Transforms/GlobalOpt/2008-01-29-VolatileGlobal.ll
    llvm/test/Transforms/GlobalOpt/2008-04-26-SROA-Global-Align.ll
    llvm/test/Transforms/GlobalOpt/2008-07-17-addrspace.ll
    llvm/test/Transforms/GlobalOpt/2008-12-16-HeapSRACrash-2.ll
    llvm/test/Transforms/GlobalOpt/2008-12-16-HeapSRACrash.ll
    llvm/test/Transforms/GlobalOpt/2009-01-13-phi-user.ll
    llvm/test/Transforms/GlobalOpt/2009-02-15-ResolveAlias.ll
    llvm/test/Transforms/GlobalOpt/2009-03-05-dbg.ll
    llvm/test/Transforms/GlobalOpt/2009-03-06-Anonymous.ll
    llvm/test/Transforms/GlobalOpt/2009-03-07-PromotePtrToBool.ll
    llvm/test/Transforms/GlobalOpt/2009-11-16-BrokenPerformHeapAllocSRoA.ll
    llvm/test/Transforms/GlobalOpt/2009-11-16-MallocSingleStoreToGlobalVar.ll
    llvm/test/Transforms/GlobalOpt/2010-02-25-MallocPromote.ll
    llvm/test/Transforms/GlobalOpt/2010-02-26-MallocSROA.ll
    llvm/test/Transforms/GlobalOpt/2010-10-19-WeakOdr.ll
    llvm/test/Transforms/GlobalOpt/2011-04-09-EmptyGlobalCtors.ll
    llvm/test/Transforms/GlobalOpt/2012-05-11-blockaddress.ll
    llvm/test/Transforms/GlobalOpt/2021-08-02-CastStoreOnceP2I.ll
    llvm/test/Transforms/GlobalOpt/2021-08-03-StoreOnceLoadMultiCasts.ll
    llvm/test/Transforms/GlobalOpt/GSROA-section.ll
    llvm/test/Transforms/GlobalOpt/MallocSROA-section-no-null-opt.ll
    llvm/test/Transforms/GlobalOpt/MallocSROA-section.ll
    llvm/test/Transforms/GlobalOpt/PowerPC/coldcc_coldsites.ll
    llvm/test/Transforms/GlobalOpt/SROA-section.ll
    llvm/test/Transforms/GlobalOpt/alias-resolve.ll
    llvm/test/Transforms/GlobalOpt/alias-used-address-space.ll
    llvm/test/Transforms/GlobalOpt/alias-used-section.ll
    llvm/test/Transforms/GlobalOpt/alias-used.ll
    llvm/test/Transforms/GlobalOpt/amdgcn-ctor-alloca.ll
    llvm/test/Transforms/GlobalOpt/array-elem-refs.ll
    llvm/test/Transforms/GlobalOpt/assume.ll
    llvm/test/Transforms/GlobalOpt/atexit.ll
    llvm/test/Transforms/GlobalOpt/atomic.ll
    llvm/test/Transforms/GlobalOpt/available_externally_global_ctors.ll
    llvm/test/Transforms/GlobalOpt/basictest.ll
    llvm/test/Transforms/GlobalOpt/blockaddress.ll
    llvm/test/Transforms/GlobalOpt/cleanup-pointer-root-users.ll
    llvm/test/Transforms/GlobalOpt/coldcc_stress_test.ll
    llvm/test/Transforms/GlobalOpt/compiler-used.ll
    llvm/test/Transforms/GlobalOpt/const-return-status-atomic.ll
    llvm/test/Transforms/GlobalOpt/const-return-status.ll
    llvm/test/Transforms/GlobalOpt/constantfold-initializers.ll
    llvm/test/Transforms/GlobalOpt/crash-2.ll
    llvm/test/Transforms/GlobalOpt/crash.ll
    llvm/test/Transforms/GlobalOpt/ctor-list-opt-constexpr.ll
    llvm/test/Transforms/GlobalOpt/ctor-list-opt-inbounds.ll
    llvm/test/Transforms/GlobalOpt/ctor-list-opt.ll
    llvm/test/Transforms/GlobalOpt/dead-store-status.ll
    llvm/test/Transforms/GlobalOpt/deaddeclaration.ll
    llvm/test/Transforms/GlobalOpt/deadfunction.ll
    llvm/test/Transforms/GlobalOpt/deadglobal-2.ll
    llvm/test/Transforms/GlobalOpt/deadglobal-diarglist-use.ll
    llvm/test/Transforms/GlobalOpt/deadglobal.ll
    llvm/test/Transforms/GlobalOpt/evaluate-bitcast-2.ll
    llvm/test/Transforms/GlobalOpt/evaluate-bitcast-3.ll
    llvm/test/Transforms/GlobalOpt/evaluate-bitcast-4.ll
    llvm/test/Transforms/GlobalOpt/externally-initialized-aggregate.ll
    llvm/test/Transforms/GlobalOpt/externally-initialized-global-ctr.ll
    llvm/test/Transforms/GlobalOpt/externally-initialized.ll
    llvm/test/Transforms/GlobalOpt/fastcc.ll
    llvm/test/Transforms/GlobalOpt/global-demotion.ll
    llvm/test/Transforms/GlobalOpt/globalsra-align.ll
    llvm/test/Transforms/GlobalOpt/globalsra-multigep.ll
    llvm/test/Transforms/GlobalOpt/globalsra-partial.ll
    llvm/test/Transforms/GlobalOpt/globalsra-unknown-index.ll
    llvm/test/Transforms/GlobalOpt/globalsra.ll
    llvm/test/Transforms/GlobalOpt/heap-sra-1-no-null-opt.ll
    llvm/test/Transforms/GlobalOpt/heap-sra-1.ll
    llvm/test/Transforms/GlobalOpt/heap-sra-2-no-null-opt.ll
    llvm/test/Transforms/GlobalOpt/heap-sra-2.ll
    llvm/test/Transforms/GlobalOpt/heap-sra-phi-no-null-opt.ll
    llvm/test/Transforms/GlobalOpt/heap-sra-phi.ll
    llvm/test/Transforms/GlobalOpt/int_sideeffect.ll
    llvm/test/Transforms/GlobalOpt/integer-bool-dwarf.ll
    llvm/test/Transforms/GlobalOpt/invariant-nodatalayout.ll
    llvm/test/Transforms/GlobalOpt/invariant.group.ll
    llvm/test/Transforms/GlobalOpt/invariant.ll
    llvm/test/Transforms/GlobalOpt/invoke.ll
    llvm/test/Transforms/GlobalOpt/iterate.ll
    llvm/test/Transforms/GlobalOpt/large-int-crash.ll
    llvm/test/Transforms/GlobalOpt/load-store-global-no-null-opt.ll
    llvm/test/Transforms/GlobalOpt/load-store-global.ll
    llvm/test/Transforms/GlobalOpt/localize-constexpr-debuginfo.ll
    llvm/test/Transforms/GlobalOpt/localize-constexpr.ll
    llvm/test/Transforms/GlobalOpt/malloc-promote-1-no-null-opt.ll
    llvm/test/Transforms/GlobalOpt/malloc-promote-1.ll
    llvm/test/Transforms/GlobalOpt/malloc-promote-2-no-null-opt.ll
    llvm/test/Transforms/GlobalOpt/malloc-promote-2.ll
    llvm/test/Transforms/GlobalOpt/malloc-promote-3.ll
    llvm/test/Transforms/GlobalOpt/malloc-promote-4.ll
    llvm/test/Transforms/GlobalOpt/memcpy.ll
    llvm/test/Transforms/GlobalOpt/memset-null.ll
    llvm/test/Transforms/GlobalOpt/memset.ll
    llvm/test/Transforms/GlobalOpt/metadata.ll
    llvm/test/Transforms/GlobalOpt/musttail_cc.ll
    llvm/test/Transforms/GlobalOpt/naked_functions.ll
    llvm/test/Transforms/GlobalOpt/new-promote.ll
    llvm/test/Transforms/GlobalOpt/null-check-global-value.ll
    llvm/test/Transforms/GlobalOpt/null-check-is-use-pr35760.ll
    llvm/test/Transforms/GlobalOpt/null-check-not-use-pr35760.ll
    llvm/test/Transforms/GlobalOpt/phi-select.ll
    llvm/test/Transforms/GlobalOpt/pr21191.ll
    llvm/test/Transforms/GlobalOpt/pr33686.ll
    llvm/test/Transforms/GlobalOpt/preallocated.ll
    llvm/test/Transforms/GlobalOpt/preserve-comdats.ll
    llvm/test/Transforms/GlobalOpt/shrink-address-to-bool.ll
    llvm/test/Transforms/GlobalOpt/shrink-global-to-bool-check-debug.ll
    llvm/test/Transforms/GlobalOpt/static-const-bitcast.ll
    llvm/test/Transforms/GlobalOpt/store-struct-element.ll
    llvm/test/Transforms/GlobalOpt/storepointer-compare-no-null-opt.ll
    llvm/test/Transforms/GlobalOpt/storepointer-compare.ll
    llvm/test/Transforms/GlobalOpt/storepointer-no-null-opt.ll
    llvm/test/Transforms/GlobalOpt/storepointer.ll
    llvm/test/Transforms/GlobalOpt/tls.ll
    llvm/test/Transforms/GlobalOpt/trivialstore.ll
    llvm/test/Transforms/GlobalOpt/undef-init.ll
    llvm/test/Transforms/GlobalOpt/unnamed-addr.ll
    llvm/test/Transforms/GlobalOpt/zeroinitializer-gep-load.ll
    llvm/test/Transforms/SCCP/2002-05-02-MissSecondInst.ll
    llvm/test/Transforms/SCCP/2002-05-20-MissedIncomingValue.ll
    llvm/test/Transforms/SCCP/2002-08-30-GetElementPtrTest.ll
    llvm/test/Transforms/SCCP/2003-08-26-InvokeHandling.ll
    llvm/test/Transforms/SCCP/2004-11-16-DeadInvoke.ll
    llvm/test/Transforms/SCCP/2004-12-10-UndefBranchBug.ll
    llvm/test/Transforms/SCCP/2006-10-23-IPSCCP-Crash.ll
    llvm/test/Transforms/SCCP/2006-12-04-PackedType.ll
    llvm/test/Transforms/SCCP/2006-12-19-UndefBug.ll
    llvm/test/Transforms/SCCP/2007-05-16-InvokeCrash.ll
    llvm/test/Transforms/SCCP/2008-01-27-UndefCorrelate.ll
    llvm/test/Transforms/SCCP/2008-04-22-multiple-ret-sccp.ll
    llvm/test/Transforms/SCCP/2008-05-23-UndefCallFold.ll
    llvm/test/Transforms/SCCP/2008-06-09-WeakProp.ll
    llvm/test/Transforms/SCCP/2009-01-14-IPSCCP-Invoke.ll
    llvm/test/Transforms/SCCP/2009-05-27-VectorOperandZero.ll
    llvm/test/Transforms/SCCP/2009-09-24-byval-ptr.ll
    llvm/test/Transforms/SCCP/PR16052.ll
    llvm/test/Transforms/SCCP/PR26044.ll
    llvm/test/Transforms/SCCP/PR43857.ll
    llvm/test/Transforms/SCCP/apfloat-basictest.ll
    llvm/test/Transforms/SCCP/apint-array.ll
    llvm/test/Transforms/SCCP/apint-basictest.ll
    llvm/test/Transforms/SCCP/apint-basictest2.ll
    llvm/test/Transforms/SCCP/apint-basictest3.ll
    llvm/test/Transforms/SCCP/apint-basictest4.ll
    llvm/test/Transforms/SCCP/apint-bigarray.ll
    llvm/test/Transforms/SCCP/apint-bigint.ll
    llvm/test/Transforms/SCCP/apint-bigint2.ll
    llvm/test/Transforms/SCCP/apint-ipsccp1.ll
    llvm/test/Transforms/SCCP/apint-ipsccp2.ll
    llvm/test/Transforms/SCCP/apint-ipsccp3.ll
    llvm/test/Transforms/SCCP/apint-ipsccp4.ll
    llvm/test/Transforms/SCCP/apint-load.ll
    llvm/test/Transforms/SCCP/apint-phi.ll
    llvm/test/Transforms/SCCP/apint-select.ll
    llvm/test/Transforms/SCCP/apint-xor.ll
    llvm/test/Transforms/SCCP/arg-count-mismatch.ll
    llvm/test/Transforms/SCCP/arg-type-mismatch.ll
    llvm/test/Transforms/SCCP/assume.ll
    llvm/test/Transforms/SCCP/atomic-load-store.ll
    llvm/test/Transforms/SCCP/atomic.ll
    llvm/test/Transforms/SCCP/binaryops-constexprs.ll
    llvm/test/Transforms/SCCP/binaryops-range-special-cases.ll
    llvm/test/Transforms/SCCP/bitcast.ll
    llvm/test/Transforms/SCCP/clang-arc-rv.ll
    llvm/test/Transforms/SCCP/comdat-ipo.ll
    llvm/test/Transforms/SCCP/conditions-iter-order.ll
    llvm/test/Transforms/SCCP/conditions-ranges-with-undef.ll
    llvm/test/Transforms/SCCP/conditions-ranges.ll
    llvm/test/Transforms/SCCP/constant-range-struct.ll
    llvm/test/Transforms/SCCP/constant-struct.ll
    llvm/test/Transforms/SCCP/crash.ll
    llvm/test/Transforms/SCCP/deadarg.ll
    llvm/test/Transforms/SCCP/definite-initializer.ll
    llvm/test/Transforms/SCCP/domtree-update.ll
    llvm/test/Transforms/SCCP/dont-zap-return.ll
    llvm/test/Transforms/SCCP/float-nan-simplification.ll
    llvm/test/Transforms/SCCP/float-phis.ll
    llvm/test/Transforms/SCCP/fp-bc-icmp-const-fold.ll
    llvm/test/Transforms/SCCP/global-alias-constprop.ll
    llvm/test/Transforms/SCCP/global.ll
    llvm/test/Transforms/SCCP/indirectbr.ll
    llvm/test/Transforms/SCCP/int-phis.ll
    llvm/test/Transforms/SCCP/intrinsics.ll
    llvm/test/Transforms/SCCP/ip-add-range-to-call.ll
    llvm/test/Transforms/SCCP/ip-constant-ranges.ll
    llvm/test/Transforms/SCCP/ip-ranges-binaryops.ll
    llvm/test/Transforms/SCCP/ip-ranges-casts.ll
    llvm/test/Transforms/SCCP/ip-ranges-phis.ll
    llvm/test/Transforms/SCCP/ip-ranges-select.ll
    llvm/test/Transforms/SCCP/ip-ranges-sext.ll
    llvm/test/Transforms/SCCP/ipsccp-addr-taken.ll
    llvm/test/Transforms/SCCP/ipsccp-basic.ll
    llvm/test/Transforms/SCCP/ipsccp-branch-unresolved-undef.ll
    llvm/test/Transforms/SCCP/ipsccp-clear-returned.ll
    llvm/test/Transforms/SCCP/ipsccp-cycles.ll
    llvm/test/Transforms/SCCP/ipsccp-phi-one-pred-dead.ll
    llvm/test/Transforms/SCCP/ipsccp-predinfo-order.ll
    llvm/test/Transforms/SCCP/ipsccp-range-crashes.ll
    llvm/test/Transforms/SCCP/ipsccp-ssa-copy-nested-conds.ll
    llvm/test/Transforms/SCCP/ipscp-drop-argmemonly.ll
    llvm/test/Transforms/SCCP/latticeval-invalidate.ll
    llvm/test/Transforms/SCCP/load-store-range.ll
    llvm/test/Transforms/SCCP/loadtest.ll
    llvm/test/Transforms/SCCP/loadtest2.ll
    llvm/test/Transforms/SCCP/logical-nuke.ll
    llvm/test/Transforms/SCCP/metadata.ll
    llvm/test/Transforms/SCCP/multiple_callbacks.ll
    llvm/test/Transforms/SCCP/musttail-call.ll
    llvm/test/Transforms/SCCP/naked-return.ll
    llvm/test/Transforms/SCCP/openmp_parallel_for.ll
    llvm/test/Transforms/SCCP/overdefined-div.ll
    llvm/test/Transforms/SCCP/overdefined-ext.ll
    llvm/test/Transforms/SCCP/phi-cycle.ll
    llvm/test/Transforms/SCCP/phis.ll
    llvm/test/Transforms/SCCP/pr27712.ll
    llvm/test/Transforms/SCCP/pr35357.ll
    llvm/test/Transforms/SCCP/pr45185-range-predinfo.ll
    llvm/test/Transforms/SCCP/pr49582-iterator-invalidation.ll
    llvm/test/Transforms/SCCP/pr52253.ll
    llvm/test/Transforms/SCCP/predicateinfo-cond.ll
    llvm/test/Transforms/SCCP/preserve-analysis.ll
    llvm/test/Transforms/SCCP/pthreads.ll
    llvm/test/Transforms/SCCP/range-and-ip.ll
    llvm/test/Transforms/SCCP/range-and.ll
    llvm/test/Transforms/SCCP/ranges-sext.ll
    llvm/test/Transforms/SCCP/remove-call-inst.ll
    llvm/test/Transforms/SCCP/replace-dereferenceable-ptr-with-undereferenceable.ll
    llvm/test/Transforms/SCCP/resolvedundefsin-tracked-fn.ll
    llvm/test/Transforms/SCCP/return-argument.ll
    llvm/test/Transforms/SCCP/return-constants.ll
    llvm/test/Transforms/SCCP/return-zapped.ll
    llvm/test/Transforms/SCCP/retvalue-undef.ll
    llvm/test/Transforms/SCCP/sccptest.ll
    llvm/test/Transforms/SCCP/select.ll
    llvm/test/Transforms/SCCP/solve-after-each-resolving-undefs-for-function.ll
    llvm/test/Transforms/SCCP/struct-arg-resolve-undefs.ll
    llvm/test/Transforms/SCCP/switch-constantfold-crash.ll
    llvm/test/Transforms/SCCP/switch-multiple-undef.ll
    llvm/test/Transforms/SCCP/switch-undef-constantfoldterminator.ll
    llvm/test/Transforms/SCCP/switch.ll
    llvm/test/Transforms/SCCP/thread_local_acs.ll
    llvm/test/Transforms/SCCP/ub-shift.ll
    llvm/test/Transforms/SCCP/ubsan_overflow.ll
    llvm/test/Transforms/SCCP/undef-resolve.ll
    llvm/test/Transforms/SCCP/user-with-multiple-uses.ll
    llvm/test/Transforms/SCCP/vector-bitcast.ll
    llvm/test/Transforms/SCCP/widening.ll
    llvm/test/Transforms/TailCallElim/2010-06-26-MultipleReturnValues.ll
    llvm/test/Transforms/TailCallElim/EraseBB.ll
    llvm/test/Transforms/TailCallElim/accum_recursion.ll
    llvm/test/Transforms/TailCallElim/ackermann.ll
    llvm/test/Transforms/TailCallElim/basic.ll
    llvm/test/Transforms/TailCallElim/debugloc.ll
    llvm/test/Transforms/TailCallElim/deopt-bundle.ll
    llvm/test/Transforms/TailCallElim/dont_reorder_load.ll
    llvm/test/Transforms/TailCallElim/dup_tail.ll
    llvm/test/Transforms/TailCallElim/inf-recursion.ll
    llvm/test/Transforms/TailCallElim/notail.ll
    llvm/test/Transforms/TailCallElim/reorder_load.ll
    llvm/test/Transforms/TailCallElim/setjmp.ll
    llvm/test/Transforms/TailCallElim/tre-byval-parameter-2.ll
    llvm/test/Transforms/TailCallElim/tre-byval-parameter.ll
    llvm/test/Transforms/TailCallElim/tre-multiple-exits.ll
    llvm/test/Transforms/TailCallElim/tre-noncapturing-alloca-calls.ll
    llvm/test/Transforms/Util/PredicateInfo/branch-on-same-cond.ll
    llvm/test/Transforms/Util/PredicateInfo/condprop.ll
    llvm/test/Transforms/Util/PredicateInfo/diamond.ll
    llvm/test/Transforms/Util/PredicateInfo/edge.ll
    llvm/test/Transforms/Util/PredicateInfo/ordering.ll
    llvm/test/Transforms/Util/PredicateInfo/pr33456.ll
    llvm/test/Transforms/Util/PredicateInfo/pr33457.ll
    llvm/test/Transforms/Util/PredicateInfo/testandor.ll
    llvm/test/Transforms/Util/PredicateInfo/unnamed-types.ll
    llvm/test/Transforms/Util/PredicateInfo/unreachable.ll

Removed: 
    


################################################################################
diff  --git a/llvm/test/Other/debugcounter-predicateinfo.ll b/llvm/test/Other/debugcounter-predicateinfo.ll
index 90303ab0dabcb..1f2b39dc62955 100644

--- a/llvm/test/Other/debugcounter-predicateinfo.ll
+++ b/llvm/test/Other/debugcounter-predicateinfo.ll
@@ -1,6 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
 ; REQUIRES: asserts
-; RUN: opt -debug-counter=predicateinfo-rename-skip=1,predicateinfo-rename-count=1 -print-predicateinfo < %s 2>&1 | FileCheck %s
+; RUN: opt -debug-counter=predicateinfo-rename-skip=1,predicateinfo-rename-count=1 -passes=print-predicateinfo < %s 2>&1 | FileCheck %s
 ;; Test that, with debug counters on, we don't rename the first info, only the second
 define fastcc void @barney() {
 ; CHECK-LABEL: @barney(

diff  --git a/llvm/test/Transforms/ConstantMerge/2002-09-23-CPR-Update.ll b/llvm/test/Transforms/ConstantMerge/2002-09-23-CPR-Update.ll
index 2e83503af815a..59f511734adfb 100644
--- a/llvm/test/Transforms/ConstantMerge/2002-09-23-CPR-Update.ll
+++ b/llvm/test/Transforms/ConstantMerge/2002-09-23-CPR-Update.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -constmerge > /dev/null
+; RUN: opt < %s -passes=constmerge > /dev/null
 
 @foo.upgrd.1 = internal constant { i32 } { i32 7 }              ; <{ i32 }*> [#uses=1]
 @bar = internal constant { i32 } { i32 7 }              ; <{ i32 }*> [#uses=1]

diff  --git a/llvm/test/Transforms/ConstantMerge/2003-10-28-MergeExternalConstants.ll b/llvm/test/Transforms/ConstantMerge/2003-10-28-MergeExternalConstants.ll
index a415995070e54..f94611c498f5e 100644
--- a/llvm/test/Transforms/ConstantMerge/2003-10-28-MergeExternalConstants.ll
+++ b/llvm/test/Transforms/ConstantMerge/2003-10-28-MergeExternalConstants.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -constmerge < %s | FileCheck %s
+; RUN: opt -S -passes=constmerge < %s | FileCheck %s
 
 ; CHECK: @foo = constant i32 6
 ; CHECK: @bar = constant i32 6

diff  --git a/llvm/test/Transforms/ConstantMerge/2011-01-15-EitherOrder.ll b/llvm/test/Transforms/ConstantMerge/2011-01-15-EitherOrder.ll
index 5aafcfe3d4fb3..1bb9471606ee9 100644
--- a/llvm/test/Transforms/ConstantMerge/2011-01-15-EitherOrder.ll
+++ b/llvm/test/Transforms/ConstantMerge/2011-01-15-EitherOrder.ll
@@ -1,4 +1,4 @@
-; RUN: opt -constmerge -S < %s | FileCheck %s
+; RUN: opt -passes=constmerge -S < %s | FileCheck %s
 ; PR8978
 
 declare i32 @zed(%struct.foobar*, %struct.foobar*)

diff  --git a/llvm/test/Transforms/ConstantMerge/align.ll b/llvm/test/Transforms/ConstantMerge/align.ll
index c1cbcb3c652d2..d8b86a2815eec 100644
--- a/llvm/test/Transforms/ConstantMerge/align.ll
+++ b/llvm/test/Transforms/ConstantMerge/align.ll
@@ -1,4 +1,4 @@
-; RUN: opt -constmerge -S < %s | FileCheck %s
+; RUN: opt -passes=constmerge -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"
 

diff  --git a/llvm/test/Transforms/ConstantMerge/dont-merge.ll b/llvm/test/Transforms/ConstantMerge/dont-merge.ll
index b0dab923d2cb2..73ef45b24cf90 100644
--- a/llvm/test/Transforms/ConstantMerge/dont-merge.ll
+++ b/llvm/test/Transforms/ConstantMerge/dont-merge.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -constmerge -S | FileCheck %s
+; RUN: opt < %s -passes=constmerge -S | FileCheck %s
 
 ; Don't merge constants with specified sections.
 

diff  --git a/llvm/test/Transforms/ConstantMerge/merge-dbg.ll b/llvm/test/Transforms/ConstantMerge/merge-dbg.ll
index 6ea680cfb340e..833130b856e2c 100644
--- a/llvm/test/Transforms/ConstantMerge/merge-dbg.ll
+++ b/llvm/test/Transforms/ConstantMerge/merge-dbg.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -constmerge -S | FileCheck %s
+; RUN: opt < %s -passes=constmerge -S | FileCheck %s
 
 ; CHECK: = constant i32 1, !dbg [[A:![0-9]+]], !dbg [[B:![0-9]+]]
 @a = internal constant i32 1, !dbg !0

diff  --git a/llvm/test/Transforms/ConstantMerge/unnamed-addr.ll b/llvm/test/Transforms/ConstantMerge/unnamed-addr.ll
index aff8540f2cb11..0e309da5dcbc3 100644
--- a/llvm/test/Transforms/ConstantMerge/unnamed-addr.ll
+++ b/llvm/test/Transforms/ConstantMerge/unnamed-addr.ll
@@ -1,4 +1,4 @@
-; RUN: opt -constmerge -S < %s | FileCheck %s
+; RUN: opt -passes=constmerge -S < %s | FileCheck %s
 ; Test which corresponding x and y are merged and that unnamed_addr
 ; is correctly set.
 

diff  --git a/llvm/test/Transforms/ConstraintElimination/add-nuw.ll b/llvm/test/Transforms/ConstraintElimination/add-nuw.ll
index ae47822511d0c..5aaa07f3a28ae 100644
--- a/llvm/test/Transforms/ConstraintElimination/add-nuw.ll
+++ b/llvm/test/Transforms/ConstraintElimination/add-nuw.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -constraint-elimination -S %s | FileCheck %s
+; RUN: opt -passes=constraint-elimination -S %s | FileCheck %s
 
 define void @test.not.uge.ult(i8 %start, i8 %low, i8 %high) {
 ; CHECK-LABEL: @test.not.uge.ult(

diff  --git a/llvm/test/Transforms/ConstraintElimination/add.ll b/llvm/test/Transforms/ConstraintElimination/add.ll
index d57a67d93e9a0..ac8b8cb1d3f38 100644
--- a/llvm/test/Transforms/ConstraintElimination/add.ll
+++ b/llvm/test/Transforms/ConstraintElimination/add.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -constraint-elimination -S %s | FileCheck %s
+; RUN: opt -passes=constraint-elimination -S %s | FileCheck %s
 
 define void @test.not.uge.ult(i8 %start, i8 %low, i8 %high) {
 ; CHECK-LABEL: @test.not.uge.ult(

diff  --git a/llvm/test/Transforms/ConstraintElimination/and.ll b/llvm/test/Transforms/ConstraintElimination/and.ll
index 7d2ab0eb10e61..efab6728eed29 100644
--- a/llvm/test/Transforms/ConstraintElimination/and.ll
+++ b/llvm/test/Transforms/ConstraintElimination/and.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -constraint-elimination -S %s | FileCheck %s
+; RUN: opt -passes=constraint-elimination -S %s | FileCheck %s
 
 declare void @use(i1)
 

diff  --git a/llvm/test/Transforms/ConstraintElimination/assumes.ll b/llvm/test/Transforms/ConstraintElimination/assumes.ll
index 1d1876bce9c4f..f916798188ff8 100644
--- a/llvm/test/Transforms/ConstraintElimination/assumes.ll
+++ b/llvm/test/Transforms/ConstraintElimination/assumes.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -constraint-elimination -S %s | FileCheck %s
+; RUN: opt -passes=constraint-elimination -S %s | FileCheck %s
 
 declare void @llvm.assume(i1)
 

diff  --git a/llvm/test/Transforms/ConstraintElimination/decompose-with-temporary-indices.ll b/llvm/test/Transforms/ConstraintElimination/decompose-with-temporary-indices.ll
index 5a009986d6061..6beece98e8b2e 100644
--- a/llvm/test/Transforms/ConstraintElimination/decompose-with-temporary-indices.ll
+++ b/llvm/test/Transforms/ConstraintElimination/decompose-with-temporary-indices.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -constraint-elimination -S %s | FileCheck %s
+; RUN: opt -passes=constraint-elimination -S %s | FileCheck %s
 
 declare void @use(i1)
 

diff  --git a/llvm/test/Transforms/ConstraintElimination/dom.ll b/llvm/test/Transforms/ConstraintElimination/dom.ll
index 39d6e1d61e07d..965286df5d646 100644
--- a/llvm/test/Transforms/ConstraintElimination/dom.ll
+++ b/llvm/test/Transforms/ConstraintElimination/dom.ll
@@ -1,5 +1,4 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -constraint-elimination -S %s | FileCheck %s
 ; RUN: opt -passes=constraint-elimination -S %s | FileCheck %s
 
 ; Test cases where both the true and false successors reach the same block,

diff  --git a/llvm/test/Transforms/ConstraintElimination/empty-constraint.ll b/llvm/test/Transforms/ConstraintElimination/empty-constraint.ll
index cc30da08f08cc..07e5a20b36eb1 100644
--- a/llvm/test/Transforms/ConstraintElimination/empty-constraint.ll
+++ b/llvm/test/Transforms/ConstraintElimination/empty-constraint.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -constraint-elimination -S %s | FileCheck %s
+; RUN: opt -passes=constraint-elimination -S %s | FileCheck %s
 
 ; Make sure constraints where all variable coefficients are 0 are handled
 ; properly.

diff  --git a/llvm/test/Transforms/ConstraintElimination/eq.ll b/llvm/test/Transforms/ConstraintElimination/eq.ll
index 9f47f9cee1d22..160ee0c7e168f 100644
--- a/llvm/test/Transforms/ConstraintElimination/eq.ll
+++ b/llvm/test/Transforms/ConstraintElimination/eq.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -constraint-elimination -S %s | FileCheck %s
+; RUN: opt -passes=constraint-elimination -S %s | FileCheck %s
 
 define i1 @test_eq_1(i8 %a, i8 %b) {
 ; CHECK-LABEL: @test_eq_1(

diff  --git a/llvm/test/Transforms/ConstraintElimination/gep-arithmetic.ll b/llvm/test/Transforms/ConstraintElimination/gep-arithmetic.ll
index b183e88230b71..ad15431b224ff 100644
--- a/llvm/test/Transforms/ConstraintElimination/gep-arithmetic.ll
+++ b/llvm/test/Transforms/ConstraintElimination/gep-arithmetic.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -constraint-elimination -S %s | FileCheck %s
+; RUN: opt -passes=constraint-elimination -S %s | FileCheck %s
 
 declare void @llvm.assume(i1)
 

diff  --git a/llvm/test/Transforms/ConstraintElimination/geps-inbounds-precondition.ll b/llvm/test/Transforms/ConstraintElimination/geps-inbounds-precondition.ll
index 63e32d29d8fca..06ec0dde40edf 100644
--- a/llvm/test/Transforms/ConstraintElimination/geps-inbounds-precondition.ll
+++ b/llvm/test/Transforms/ConstraintElimination/geps-inbounds-precondition.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -constraint-elimination -S %s | FileCheck %s
+; RUN: opt -passes=constraint-elimination -S %s | FileCheck %s
 
 ; Tests for using inbounds information from GEPs.
 

diff  --git a/llvm/test/Transforms/ConstraintElimination/geps-pointers-to-arrays.ll b/llvm/test/Transforms/ConstraintElimination/geps-pointers-to-arrays.ll
index fe4d3b83a6d86..f21b96ce0d676 100644
--- a/llvm/test/Transforms/ConstraintElimination/geps-pointers-to-arrays.ll
+++ b/llvm/test/Transforms/ConstraintElimination/geps-pointers-to-arrays.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -constraint-elimination -S %s | FileCheck %s
+; RUN: opt -passes=constraint-elimination -S %s | FileCheck %s
 
 define void @pointer.to.array.test.ult.true.due.to.first.dimension([10 x i8]* %start, i8* %high) {
 ; CHECK-LABEL: @pointer.to.array.test.ult.true.due.to.first.dimension(

diff  --git a/llvm/test/Transforms/ConstraintElimination/geps-pointers-to-structs.ll b/llvm/test/Transforms/ConstraintElimination/geps-pointers-to-structs.ll
index 750293b8c26a1..8145fa51517bc 100644
--- a/llvm/test/Transforms/ConstraintElimination/geps-pointers-to-structs.ll
+++ b/llvm/test/Transforms/ConstraintElimination/geps-pointers-to-structs.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -constraint-elimination -S %s | FileCheck %s
+; RUN: opt -passes=constraint-elimination -S %s | FileCheck %s
 
 %struct.1 = type { i32, i64, i8 }
 

diff  --git a/llvm/test/Transforms/ConstraintElimination/geps-precondition-overflow-check.ll b/llvm/test/Transforms/ConstraintElimination/geps-precondition-overflow-check.ll
index 9f4e98f738d0e..13f96119f691a 100644
--- a/llvm/test/Transforms/ConstraintElimination/geps-precondition-overflow-check.ll
+++ b/llvm/test/Transforms/ConstraintElimination/geps-precondition-overflow-check.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -constraint-elimination -S %s | FileCheck %s
+; RUN: opt -passes=constraint-elimination -S %s | FileCheck %s
 
 ; Tests for cases with explicit checks that %ptr + x >= %ptr. The information can
 ; be used to determine that certain GEPs do not overflow.

diff  --git a/llvm/test/Transforms/ConstraintElimination/geps.ll b/llvm/test/Transforms/ConstraintElimination/geps.ll
index 90f4ab5606311..4ac15acfa76bc 100644
--- a/llvm/test/Transforms/ConstraintElimination/geps.ll
+++ b/llvm/test/Transforms/ConstraintElimination/geps.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -constraint-elimination -S %s | FileCheck %s
+; RUN: opt -passes=constraint-elimination -S %s | FileCheck %s
 
 define i32 @test.ult(i32* readonly %src, i32* readnone %min, i32* readnone %max) {
 ; CHECK-LABEL: @test.ult(

diff  --git a/llvm/test/Transforms/ConstraintElimination/i128.ll b/llvm/test/Transforms/ConstraintElimination/i128.ll
index d021db6aa907f..bb5bc5110f124 100644
--- a/llvm/test/Transforms/ConstraintElimination/i128.ll
+++ b/llvm/test/Transforms/ConstraintElimination/i128.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -constraint-elimination -S %s | FileCheck %s
+; RUN: opt -passes=constraint-elimination -S %s | FileCheck %s
 
 declare void @use(i1)
 

diff  --git a/llvm/test/Transforms/ConstraintElimination/large-system-growth.ll b/llvm/test/Transforms/ConstraintElimination/large-system-growth.ll
index e2d603ed74621..db9113defcf9b 100644
--- a/llvm/test/Transforms/ConstraintElimination/large-system-growth.ll
+++ b/llvm/test/Transforms/ConstraintElimination/large-system-growth.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -constraint-elimination -S %s | FileCheck %s
+; RUN: opt -passes=constraint-elimination -S %s | FileCheck %s
 
 ; The system for the function below grows quite large. Check to make sure
 ; we can handle that scenario.

diff  --git a/llvm/test/Transforms/ConstraintElimination/loops-bottom-tested-base.ll b/llvm/test/Transforms/ConstraintElimination/loops-bottom-tested-base.ll
index ca103c23b49f0..0e2cbc4370e93 100644
--- a/llvm/test/Transforms/ConstraintElimination/loops-bottom-tested-base.ll
+++ b/llvm/test/Transforms/ConstraintElimination/loops-bottom-tested-base.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -constraint-elimination -S %s | FileCheck %s
+; RUN: opt -passes=constraint-elimination -S %s | FileCheck %s
 
 declare void @use(i1)
 

diff  --git a/llvm/test/Transforms/ConstraintElimination/loops-bottom-tested-pointer-cmps.ll b/llvm/test/Transforms/ConstraintElimination/loops-bottom-tested-pointer-cmps.ll
index 44d3f458c1187..ca03ceea2eee0 100644
--- a/llvm/test/Transforms/ConstraintElimination/loops-bottom-tested-pointer-cmps.ll
+++ b/llvm/test/Transforms/ConstraintElimination/loops-bottom-tested-pointer-cmps.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -constraint-elimination -S %s | FileCheck %s
+; RUN: opt -passes=constraint-elimination -S %s | FileCheck %s
 
 declare void @use(i1)
 define void @checks_in_loops_removable(i8* %ptr, i8* %lower, i8* %upper, i8 %n) {

diff  --git a/llvm/test/Transforms/ConstraintElimination/loops-header-tested-base.ll b/llvm/test/Transforms/ConstraintElimination/loops-header-tested-base.ll
index b9e8e6f8e864e..dc09d999f50f7 100644
--- a/llvm/test/Transforms/ConstraintElimination/loops-header-tested-base.ll
+++ b/llvm/test/Transforms/ConstraintElimination/loops-header-tested-base.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -constraint-elimination -S %s | FileCheck %s
+; RUN: opt -passes=constraint-elimination -S %s | FileCheck %s
 
 declare void @use(i1)
 

diff  --git a/llvm/test/Transforms/ConstraintElimination/loops-header-tested-pointer-cmps.ll b/llvm/test/Transforms/ConstraintElimination/loops-header-tested-pointer-cmps.ll
index 6a347db138a41..e7f248b1a8ab1 100644
--- a/llvm/test/Transforms/ConstraintElimination/loops-header-tested-pointer-cmps.ll
+++ b/llvm/test/Transforms/ConstraintElimination/loops-header-tested-pointer-cmps.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -constraint-elimination -S %s | FileCheck %s
+; RUN: opt -passes=constraint-elimination -S %s | FileCheck %s
 
 declare void @use(i1)
 

diff  --git a/llvm/test/Transforms/ConstraintElimination/loops-header-tested-pointer-iv.ll b/llvm/test/Transforms/ConstraintElimination/loops-header-tested-pointer-iv.ll
index 081057ee65b70..063fe9d30c466 100644
--- a/llvm/test/Transforms/ConstraintElimination/loops-header-tested-pointer-iv.ll
+++ b/llvm/test/Transforms/ConstraintElimination/loops-header-tested-pointer-iv.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -constraint-elimination -S %s | FileCheck %s
+; RUN: opt -passes=constraint-elimination -S %s | FileCheck %s
 
 declare void @use(i1)
 

diff  --git a/llvm/test/Transforms/ConstraintElimination/loops.ll b/llvm/test/Transforms/ConstraintElimination/loops.ll
index 85c949ed36d48..9c69caa8007e5 100644
--- a/llvm/test/Transforms/ConstraintElimination/loops.ll
+++ b/llvm/test/Transforms/ConstraintElimination/loops.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -constraint-elimination -S %s | FileCheck %s
+; RUN: opt -passes=constraint-elimination -S %s | FileCheck %s
 
 declare void @use(i1)
 

diff  --git a/llvm/test/Transforms/ConstraintElimination/mixed-signed-unsigned-predicates.ll b/llvm/test/Transforms/ConstraintElimination/mixed-signed-unsigned-predicates.ll
index 0cb076f4b4b3d..23ec4dde8dd1f 100644
--- a/llvm/test/Transforms/ConstraintElimination/mixed-signed-unsigned-predicates.ll
+++ b/llvm/test/Transforms/ConstraintElimination/mixed-signed-unsigned-predicates.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -constraint-elimination -S %s | FileCheck %s
+; RUN: opt -passes=constraint-elimination -S %s | FileCheck %s
 
 define i1 @test_add_nuw(i8 %start, i8 %low, i8 %high) {
 ; CHECK-LABEL: @test_add_nuw(

diff  --git a/llvm/test/Transforms/ConstraintElimination/mixed.ll b/llvm/test/Transforms/ConstraintElimination/mixed.ll
index c0fb37883f71f..c52d4ff58c195 100644
--- a/llvm/test/Transforms/ConstraintElimination/mixed.ll
+++ b/llvm/test/Transforms/ConstraintElimination/mixed.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -constraint-elimination -S %s | FileCheck %s
+; RUN: opt -passes=constraint-elimination -S %s | FileCheck %s
 
 ; Make sure we do not incorrectly add variables to the system.
 

diff  --git a/llvm/test/Transforms/ConstraintElimination/ne.ll b/llvm/test/Transforms/ConstraintElimination/ne.ll
index 814bab108e563..084c24ff84c8f 100644
--- a/llvm/test/Transforms/ConstraintElimination/ne.ll
+++ b/llvm/test/Transforms/ConstraintElimination/ne.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --check-attributes
-; RUN: opt -constraint-elimination -S %s | FileCheck %s
+; RUN: opt -passes=constraint-elimination -S %s | FileCheck %s
 
 define i1 @test_eq_ne_0(i8 %a, i8 %b) {
 ; CHECK-LABEL: @test_eq_ne_0(

diff  --git a/llvm/test/Transforms/ConstraintElimination/or.ll b/llvm/test/Transforms/ConstraintElimination/or.ll
index aed6774fdb0f1..58ea13101012f 100644
--- a/llvm/test/Transforms/ConstraintElimination/or.ll
+++ b/llvm/test/Transforms/ConstraintElimination/or.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -constraint-elimination -S %s | FileCheck %s
+; RUN: opt -passes=constraint-elimination -S %s | FileCheck %s
 
 declare void @use(i1)
 

diff  --git a/llvm/test/Transforms/ConstraintElimination/pointercast.ll b/llvm/test/Transforms/ConstraintElimination/pointercast.ll
index acd0fbcdcf9bb..9f141213784b9 100644
--- a/llvm/test/Transforms/ConstraintElimination/pointercast.ll
+++ b/llvm/test/Transforms/ConstraintElimination/pointercast.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -constraint-elimination -S %s | FileCheck %s
+; RUN: opt -passes=constraint-elimination -S %s | FileCheck %s
 
 define i1 @bitcast_and_cmp(i32* readonly %src, i32* readnone %min, i32* readnone %max) {
 ; CHECK-LABEL: @bitcast_and_cmp(

diff  --git a/llvm/test/Transforms/ConstraintElimination/sge.ll b/llvm/test/Transforms/ConstraintElimination/sge.ll
index adb32bf9f5a59..9254191656790 100644
--- a/llvm/test/Transforms/ConstraintElimination/sge.ll
+++ b/llvm/test/Transforms/ConstraintElimination/sge.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -constraint-elimination -S %s | FileCheck %s
+; RUN: opt -passes=constraint-elimination -S %s | FileCheck %s
 
 declare void @use(i1)
 

diff  --git a/llvm/test/Transforms/ConstraintElimination/sub-nuw.ll b/llvm/test/Transforms/ConstraintElimination/sub-nuw.ll
index f233a31d2bdce..bcefc9930f3ca 100644
--- a/llvm/test/Transforms/ConstraintElimination/sub-nuw.ll
+++ b/llvm/test/Transforms/ConstraintElimination/sub-nuw.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -constraint-elimination -S %s | FileCheck %s
+; RUN: opt -passes=constraint-elimination -S %s | FileCheck %s
 
 define void @test.not.uge.ult(i8 %start, i8 %low, i8 %high) {
 ; CHECK-LABEL: @test.not.uge.ult(

diff  --git a/llvm/test/Transforms/ConstraintElimination/sub.ll b/llvm/test/Transforms/ConstraintElimination/sub.ll
index 6705771c883e2..78143dc62883c 100644
--- a/llvm/test/Transforms/ConstraintElimination/sub.ll
+++ b/llvm/test/Transforms/ConstraintElimination/sub.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -constraint-elimination -S %s | FileCheck %s
+; RUN: opt -passes=constraint-elimination -S %s | FileCheck %s
 
 define void @test.not.uge.ult(i8 %start, i8 %low, i8 %high) {
 ; CHECK-LABEL: @test.not.uge.ult(

diff  --git a/llvm/test/Transforms/ConstraintElimination/uge.ll b/llvm/test/Transforms/ConstraintElimination/uge.ll
index 7ff37fc26b344..55419c1022401 100644
--- a/llvm/test/Transforms/ConstraintElimination/uge.ll
+++ b/llvm/test/Transforms/ConstraintElimination/uge.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -constraint-elimination -S %s | FileCheck %s
+; RUN: opt -passes=constraint-elimination -S %s | FileCheck %s
 
 declare void @use(i1)
 

diff  --git a/llvm/test/Transforms/ConstraintElimination/ugt-ule.ll b/llvm/test/Transforms/ConstraintElimination/ugt-ule.ll
index cc9eca9a6605f..f5e418a77c53d 100644
--- a/llvm/test/Transforms/ConstraintElimination/ugt-ule.ll
+++ b/llvm/test/Transforms/ConstraintElimination/ugt-ule.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -constraint-elimination -S %s | FileCheck %s
+; RUN: opt -passes=constraint-elimination -S %s | FileCheck %s
 
 declare void @use(i1)
 

diff  --git a/llvm/test/Transforms/ConstraintElimination/ule.ll b/llvm/test/Transforms/ConstraintElimination/ule.ll
index 69c55f5d45337..20bb1f1bbf28c 100644
--- a/llvm/test/Transforms/ConstraintElimination/ule.ll
+++ b/llvm/test/Transforms/ConstraintElimination/ule.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -constraint-elimination -S %s | FileCheck %s
+; RUN: opt -passes=constraint-elimination -S %s | FileCheck %s
 
 declare void @use(i1)
 

diff  --git a/llvm/test/Transforms/ConstraintElimination/vector-compares.ll b/llvm/test/Transforms/ConstraintElimination/vector-compares.ll
index ea29874458e89..5bc9d6b4aeb5c 100644
--- a/llvm/test/Transforms/ConstraintElimination/vector-compares.ll
+++ b/llvm/test/Transforms/ConstraintElimination/vector-compares.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -constraint-elimination -S %s | FileCheck %s
+; RUN: opt -passes=constraint-elimination -S %s | FileCheck %s
 
 declare void @use(i1)
 

diff  --git a/llvm/test/Transforms/ConstraintElimination/wrapping-math.ll b/llvm/test/Transforms/ConstraintElimination/wrapping-math.ll
index fcab0c80ba966..5fd7bad1bdbbc 100644
--- a/llvm/test/Transforms/ConstraintElimination/wrapping-math.ll
+++ b/llvm/test/Transforms/ConstraintElimination/wrapping-math.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -constraint-elimination -S %s | FileCheck %s
+; RUN: opt -passes=constraint-elimination -S %s | FileCheck %s
 
 define i1 @wrapping_add_unknown_1(i8 %a) {
 ; CHECK-LABEL: @wrapping_add_unknown_1(

diff  --git a/llvm/test/Transforms/ConstraintElimination/zext.ll b/llvm/test/Transforms/ConstraintElimination/zext.ll
index 1393972006669..1b7b79b8f5494 100644
--- a/llvm/test/Transforms/ConstraintElimination/zext.ll
+++ b/llvm/test/Transforms/ConstraintElimination/zext.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -constraint-elimination -S %s | FileCheck %s
+; RUN: opt -passes=constraint-elimination -S %s | FileCheck %s
 
 define i1 @uge_zext(i8 %x, i16 %y) {
 ; CHECK-LABEL: @uge_zext(

diff  --git a/llvm/test/Transforms/CorrelatedValuePropagation/2010-09-02-Trunc.ll b/llvm/test/Transforms/CorrelatedValuePropagation/2010-09-02-Trunc.ll
index 0754f868d249c..e10f8ce5401d9 100644
--- a/llvm/test/Transforms/CorrelatedValuePropagation/2010-09-02-Trunc.ll
+++ b/llvm/test/Transforms/CorrelatedValuePropagation/2010-09-02-Trunc.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S < %s -correlated-propagation | FileCheck %s
+; RUN: opt -S < %s -passes=correlated-propagation | FileCheck %s
 
 ; CHECK-LABEL: @test(
 define i16 @test(i32 %a, i1 %b) {

diff  --git a/llvm/test/Transforms/CorrelatedValuePropagation/abs.ll b/llvm/test/Transforms/CorrelatedValuePropagation/abs.ll
index c8b21a8e3ef1a..e9f41b2a15323 100644
--- a/llvm/test/Transforms/CorrelatedValuePropagation/abs.ll
+++ b/llvm/test/Transforms/CorrelatedValuePropagation/abs.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -correlated-propagation -S | FileCheck %s
+; RUN: opt < %s -passes=correlated-propagation -S | FileCheck %s
 
 declare void @llvm.assume(i1)
 declare i8 @llvm.abs(i8, i1)

diff  --git a/llvm/test/Transforms/CorrelatedValuePropagation/add.ll b/llvm/test/Transforms/CorrelatedValuePropagation/add.ll
index e58a7e2ddf8b1..6c94d4c943916 100644
--- a/llvm/test/Transforms/CorrelatedValuePropagation/add.ll
+++ b/llvm/test/Transforms/CorrelatedValuePropagation/add.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -correlated-propagation -S | FileCheck %s
+; RUN: opt < %s -passes=correlated-propagation -S | FileCheck %s
 
 ; CHECK-LABEL: @test0(
 define void @test0(i32 %a) {

diff  --git a/llvm/test/Transforms/CorrelatedValuePropagation/alloca.ll b/llvm/test/Transforms/CorrelatedValuePropagation/alloca.ll
index 37b27b29445c3..7c2aaa64a0978 100644
--- a/llvm/test/Transforms/CorrelatedValuePropagation/alloca.ll
+++ b/llvm/test/Transforms/CorrelatedValuePropagation/alloca.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -correlated-propagation -debug-only=lazy-value-info <%s 2>&1 | FileCheck %s
+; RUN: opt -S -passes=correlated-propagation -debug-only=lazy-value-info <%s 2>&1 | FileCheck %s
 ; REQUIRES: asserts
 ;
 ; Shortcut in Correlated Value Propagation ensures not to take Lazy Value Info

diff  --git a/llvm/test/Transforms/CorrelatedValuePropagation/and.ll b/llvm/test/Transforms/CorrelatedValuePropagation/and.ll
index 66d73f0da2c6a..cc593783b0449 100644
--- a/llvm/test/Transforms/CorrelatedValuePropagation/and.ll
+++ b/llvm/test/Transforms/CorrelatedValuePropagation/and.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -correlated-propagation -S | FileCheck %s
+; RUN: opt < %s -passes=correlated-propagation -S | FileCheck %s
 
 define i32 @test(i32 %a) {
 ; CHECK-LABEL: @test(

diff  --git a/llvm/test/Transforms/CorrelatedValuePropagation/ashr.ll b/llvm/test/Transforms/CorrelatedValuePropagation/ashr.ll
index 5aa0754cf6a27..7f808079cd8a8 100644
--- a/llvm/test/Transforms/CorrelatedValuePropagation/ashr.ll
+++ b/llvm/test/Transforms/CorrelatedValuePropagation/ashr.ll
@@ -1,8 +1,8 @@
-; RUN: opt < %s -correlated-propagation -S | FileCheck %s
+; RUN: opt < %s -passes=correlated-propagation -S | FileCheck %s
 
 ; Check that debug locations are preserved. For more info see:
 ;   https://llvm.org/docs/SourceLevelDebugging.html#fixing-errors
-; RUN: opt < %s -enable-debugify -correlated-propagation -S 2>&1 | \
+; RUN: opt < %s -enable-debugify -passes=correlated-propagation -S 2>&1 | \
 ; RUN:   FileCheck %s -check-prefix=DEBUG
 ; DEBUG: CheckModuleDebugify: PASS
 

diff  --git a/llvm/test/Transforms/CorrelatedValuePropagation/basic.ll b/llvm/test/Transforms/CorrelatedValuePropagation/basic.ll
index 7cea6ace5df59..29322e3448294 100644
--- a/llvm/test/Transforms/CorrelatedValuePropagation/basic.ll
+++ b/llvm/test/Transforms/CorrelatedValuePropagation/basic.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -correlated-propagation -S | FileCheck %s
+; RUN: opt < %s -passes=correlated-propagation -S | FileCheck %s
 ; PR2581
 
 define i32 @test1(i1 %C) {

diff  --git a/llvm/test/Transforms/CorrelatedValuePropagation/conflict.ll b/llvm/test/Transforms/CorrelatedValuePropagation/conflict.ll
index d9d655328e096..7bba0565d9988 100644
--- a/llvm/test/Transforms/CorrelatedValuePropagation/conflict.ll
+++ b/llvm/test/Transforms/CorrelatedValuePropagation/conflict.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -correlated-propagation -S < %s | FileCheck %s
+; RUN: opt -passes=correlated-propagation -S < %s | FileCheck %s
 
 ; Checks that we don't crash on conflicting facts about a value
 ; (i.e. unreachable code)

diff  --git a/llvm/test/Transforms/CorrelatedValuePropagation/crash.ll b/llvm/test/Transforms/CorrelatedValuePropagation/crash.ll
index 8a6aaed7a7073..8a7a4afb894f4 100644
--- a/llvm/test/Transforms/CorrelatedValuePropagation/crash.ll
+++ b/llvm/test/Transforms/CorrelatedValuePropagation/crash.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -correlated-propagation
+; RUN: opt < %s -passes=correlated-propagation
 
 ; PR8161
 define void @test1() nounwind ssp {

diff  --git a/llvm/test/Transforms/CorrelatedValuePropagation/deopt.ll b/llvm/test/Transforms/CorrelatedValuePropagation/deopt.ll
index 096c5d7e3698c..d5f72d8ab5141 100644
--- a/llvm/test/Transforms/CorrelatedValuePropagation/deopt.ll
+++ b/llvm/test/Transforms/CorrelatedValuePropagation/deopt.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -correlated-propagation -S < %s | FileCheck %s
+; RUN: opt -passes=correlated-propagation -S < %s | FileCheck %s
 
 declare void @use()
 declare void @use_ptr(i8*)

diff  --git a/llvm/test/Transforms/CorrelatedValuePropagation/guards.ll b/llvm/test/Transforms/CorrelatedValuePropagation/guards.ll
index d62e512c52255..f5f74efe5da1e 100644
--- a/llvm/test/Transforms/CorrelatedValuePropagation/guards.ll
+++ b/llvm/test/Transforms/CorrelatedValuePropagation/guards.ll
@@ -1,4 +1,4 @@
-; RUN: opt -correlated-propagation -S < %s | FileCheck %s
+; RUN: opt -passes=correlated-propagation -S < %s | FileCheck %s
 
 declare void @llvm.experimental.guard(i1,...)
 

diff  --git a/llvm/test/Transforms/CorrelatedValuePropagation/icmp.ll b/llvm/test/Transforms/CorrelatedValuePropagation/icmp.ll
index c195dc10dc6b9..4dc9eb34f86ce 100644
--- a/llvm/test/Transforms/CorrelatedValuePropagation/icmp.ll
+++ b/llvm/test/Transforms/CorrelatedValuePropagation/icmp.ll
@@ -1,5 +1,4 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -correlated-propagation -S %s | FileCheck %s
 ; RUN: opt -passes=correlated-propagation -S %s | FileCheck %s
 
 target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"

diff  --git a/llvm/test/Transforms/CorrelatedValuePropagation/merge-range-and-undef.ll b/llvm/test/Transforms/CorrelatedValuePropagation/merge-range-and-undef.ll
index 0630c94aa996f..2aba1f0a99190 100644
--- a/llvm/test/Transforms/CorrelatedValuePropagation/merge-range-and-undef.ll
+++ b/llvm/test/Transforms/CorrelatedValuePropagation/merge-range-and-undef.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -correlated-propagation %s | FileCheck %s
+; RUN: opt -S -passes=correlated-propagation %s | FileCheck %s
 
 ; Test case for PR44949.
 

diff  --git a/llvm/test/Transforms/CorrelatedValuePropagation/min-max.ll b/llvm/test/Transforms/CorrelatedValuePropagation/min-max.ll
index 7fc3755c2630a..705b6e96fe9e3 100644
--- a/llvm/test/Transforms/CorrelatedValuePropagation/min-max.ll
+++ b/llvm/test/Transforms/CorrelatedValuePropagation/min-max.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -correlated-propagation -S | FileCheck %s
+; RUN: opt < %s -passes=correlated-propagation -S | FileCheck %s
 
 declare void @llvm.assume(i1)
 declare i8 @llvm.umin(i8, i8)

diff  --git a/llvm/test/Transforms/CorrelatedValuePropagation/minmaxabs.ll b/llvm/test/Transforms/CorrelatedValuePropagation/minmaxabs.ll
index 5bb34185cde4d..cb0d5f7963136 100644
--- a/llvm/test/Transforms/CorrelatedValuePropagation/minmaxabs.ll
+++ b/llvm/test/Transforms/CorrelatedValuePropagation/minmaxabs.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -correlated-propagation < %s | FileCheck %s
+; RUN: opt -S -passes=correlated-propagation < %s | FileCheck %s
 
 declare i32 @llvm.umin.i32(i32, i32)
 declare i32 @llvm.umax.i32(i32, i32)

diff  --git a/llvm/test/Transforms/CorrelatedValuePropagation/mul.ll b/llvm/test/Transforms/CorrelatedValuePropagation/mul.ll
index b3b579be7654f..d81c1010f683e 100644
--- a/llvm/test/Transforms/CorrelatedValuePropagation/mul.ll
+++ b/llvm/test/Transforms/CorrelatedValuePropagation/mul.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -correlated-propagation -S | FileCheck %s
+; RUN: opt < %s -passes=correlated-propagation -S | FileCheck %s
 
 define i8 @test0(i8 %a) {
 ; CHECK-LABEL: @test0(

diff  --git a/llvm/test/Transforms/CorrelatedValuePropagation/non-null.ll b/llvm/test/Transforms/CorrelatedValuePropagation/non-null.ll
index 672bd170a9321..497fd0653c731 100644
--- a/llvm/test/Transforms/CorrelatedValuePropagation/non-null.ll
+++ b/llvm/test/Transforms/CorrelatedValuePropagation/non-null.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -correlated-propagation -S | FileCheck %s
+; RUN: opt < %s -passes=correlated-propagation -S | FileCheck %s
 
 define void @test1(i8* %ptr) {
 ; CHECK-LABEL: @test1(

diff  --git a/llvm/test/Transforms/CorrelatedValuePropagation/overflow_predicate.ll b/llvm/test/Transforms/CorrelatedValuePropagation/overflow_predicate.ll
index f3943edbd8fc8..e6d6b7c17a929 100644
--- a/llvm/test/Transforms/CorrelatedValuePropagation/overflow_predicate.ll
+++ b/llvm/test/Transforms/CorrelatedValuePropagation/overflow_predicate.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -correlated-propagation < %s | FileCheck %s
+; RUN: opt -S -passes=correlated-propagation < %s | FileCheck %s
 
 declare void @llvm.trap()
 declare {i8, i1} @llvm.uadd.with.overflow(i8, i8)

diff  --git a/llvm/test/Transforms/CorrelatedValuePropagation/overflows.ll b/llvm/test/Transforms/CorrelatedValuePropagation/overflows.ll
index 4db78f52bad8a..76357fb1b23d8 100644
--- a/llvm/test/Transforms/CorrelatedValuePropagation/overflows.ll
+++ b/llvm/test/Transforms/CorrelatedValuePropagation/overflows.ll
@@ -1,9 +1,9 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -correlated-propagation < %s | FileCheck %s
+; RUN: opt -S -passes=correlated-propagation < %s | FileCheck %s
 
 ; Check that debug locations are preserved. For more info see:
 ;   https://llvm.org/docs/SourceLevelDebugging.html#fixing-errors
-; RUN: opt < %s -enable-debugify -correlated-propagation -S 2>&1 | \
+; RUN: opt < %s -enable-debugify -passes=correlated-propagation -S 2>&1 | \
 ; RUN:   FileCheck %s -check-prefix=DEBUG
 ; DEBUG: CheckModuleDebugify: PASS
 

diff  --git a/llvm/test/Transforms/CorrelatedValuePropagation/phi-common-val.ll b/llvm/test/Transforms/CorrelatedValuePropagation/phi-common-val.ll
index d51fd55cfe532..261f9b2e9a802 100644
--- a/llvm/test/Transforms/CorrelatedValuePropagation/phi-common-val.ll
+++ b/llvm/test/Transforms/CorrelatedValuePropagation/phi-common-val.ll
@@ -1,6 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -correlated-propagation -S | FileCheck %s
-; RUN: opt < %s -passes="correlated-propagation" -S | FileCheck %s
+; RUN: opt < %s -passes=correlated-propagation -S | FileCheck %s
 
 define i8* @simplify_phi_common_value_op0(i8* %ptr, i32* %b) {
 ; CHECK-LABEL: @simplify_phi_common_value_op0(

diff  --git a/llvm/test/Transforms/CorrelatedValuePropagation/pointer.ll b/llvm/test/Transforms/CorrelatedValuePropagation/pointer.ll
index 9242d7b8aff14..b5d2b4da4acae 100644
--- a/llvm/test/Transforms/CorrelatedValuePropagation/pointer.ll
+++ b/llvm/test/Transforms/CorrelatedValuePropagation/pointer.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -correlated-propagation -S -o - %s | FileCheck %s
+; RUN: opt -passes=correlated-propagation -S -o - %s | FileCheck %s
 
 ; Testcase that checks that we don't end in a neverending recursion resulting in
 ; a segmentation fault. The checks below verify that nothing is changed.

diff  --git a/llvm/test/Transforms/CorrelatedValuePropagation/pr35807.ll b/llvm/test/Transforms/CorrelatedValuePropagation/pr35807.ll
index a9705caaf3c8e..c1898569b8b07 100644
--- a/llvm/test/Transforms/CorrelatedValuePropagation/pr35807.ll
+++ b/llvm/test/Transforms/CorrelatedValuePropagation/pr35807.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -correlated-propagation -S %s | FileCheck %s
+; RUN: opt -passes=correlated-propagation -S %s | FileCheck %s
 
 target triple = "x86_64-apple-darwin17.4.0"
 

diff  --git a/llvm/test/Transforms/CorrelatedValuePropagation/profmd.ll b/llvm/test/Transforms/CorrelatedValuePropagation/profmd.ll
index 493b4c2273e21..8b7414a7b2dcd 100644
--- a/llvm/test/Transforms/CorrelatedValuePropagation/profmd.ll
+++ b/llvm/test/Transforms/CorrelatedValuePropagation/profmd.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -correlated-propagation -S | FileCheck %s
+; RUN: opt < %s -passes=correlated-propagation -S | FileCheck %s
 
 ; Removed several cases from switch.
 define i32 @switch1(i32 %s) {

diff  --git a/llvm/test/Transforms/CorrelatedValuePropagation/range.ll b/llvm/test/Transforms/CorrelatedValuePropagation/range.ll
index 570b5dcad02f2..82d88992531fa 100644
--- a/llvm/test/Transforms/CorrelatedValuePropagation/range.ll
+++ b/llvm/test/Transforms/CorrelatedValuePropagation/range.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -correlated-propagation -S < %s | FileCheck %s
+; RUN: opt -passes=correlated-propagation -S < %s | FileCheck %s
 
 declare i32 @foo()
 

diff  --git a/llvm/test/Transforms/CorrelatedValuePropagation/sdiv.ll b/llvm/test/Transforms/CorrelatedValuePropagation/sdiv.ll
index 8da9a203be562..1601490b2c1e1 100644
--- a/llvm/test/Transforms/CorrelatedValuePropagation/sdiv.ll
+++ b/llvm/test/Transforms/CorrelatedValuePropagation/sdiv.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -correlated-propagation -S | FileCheck %s
+; RUN: opt < %s -passes=correlated-propagation -S | FileCheck %s
 
 target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 

diff  --git a/llvm/test/Transforms/CorrelatedValuePropagation/select.ll b/llvm/test/Transforms/CorrelatedValuePropagation/select.ll
index 016c3e5d5047b..e7d65ed3e809c 100644
--- a/llvm/test/Transforms/CorrelatedValuePropagation/select.ll
+++ b/llvm/test/Transforms/CorrelatedValuePropagation/select.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -correlated-propagation -S | FileCheck %s
+; RUN: opt < %s -passes=correlated-propagation -S | FileCheck %s
 
 define i8 @simple(i1) {
 ; CHECK-LABEL: @simple(

diff  --git a/llvm/test/Transforms/CorrelatedValuePropagation/sext.ll b/llvm/test/Transforms/CorrelatedValuePropagation/sext.ll
index dff1c1206c4d5..b72b2c806b6e4 100644
--- a/llvm/test/Transforms/CorrelatedValuePropagation/sext.ll
+++ b/llvm/test/Transforms/CorrelatedValuePropagation/sext.ll
@@ -1,9 +1,9 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -correlated-propagation -S | FileCheck %s
+; RUN: opt < %s -passes=correlated-propagation -S | FileCheck %s
 
 ; Check that debug locations are preserved. For more info see:
 ;   https://llvm.org/docs/SourceLevelDebugging.html#fixing-errors
-; RUN: opt < %s -enable-debugify -correlated-propagation -S 2>&1 | \
+; RUN: opt < %s -enable-debugify -passes=correlated-propagation -S 2>&1 | \
 ; RUN:   FileCheck %s -check-prefix=DEBUG
 ; DEBUG: CheckModuleDebugify: PASS
 

diff  --git a/llvm/test/Transforms/CorrelatedValuePropagation/shl.ll b/llvm/test/Transforms/CorrelatedValuePropagation/shl.ll
index 17e65cde1f43c..6a3001dc6b330 100644
--- a/llvm/test/Transforms/CorrelatedValuePropagation/shl.ll
+++ b/llvm/test/Transforms/CorrelatedValuePropagation/shl.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -correlated-propagation -S | FileCheck %s
+; RUN: opt < %s -passes=correlated-propagation -S | FileCheck %s
 
 define i8 @test0(i8 %a, i8 %b) {
 ; CHECK-LABEL: @test0(

diff  --git a/llvm/test/Transforms/CorrelatedValuePropagation/srem.ll b/llvm/test/Transforms/CorrelatedValuePropagation/srem.ll
index c3df87e5969fb..dd2e59671138a 100644
--- a/llvm/test/Transforms/CorrelatedValuePropagation/srem.ll
+++ b/llvm/test/Transforms/CorrelatedValuePropagation/srem.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -correlated-propagation -S | FileCheck %s
+; RUN: opt < %s -passes=correlated-propagation -S | FileCheck %s
 
 target datalayout = "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64"
 target triple = "thumbv7m-arm-none-eabi"

diff  --git a/llvm/test/Transforms/CorrelatedValuePropagation/sub.ll b/llvm/test/Transforms/CorrelatedValuePropagation/sub.ll
index 696665f6e3cb7..1341db196ac9a 100644
--- a/llvm/test/Transforms/CorrelatedValuePropagation/sub.ll
+++ b/llvm/test/Transforms/CorrelatedValuePropagation/sub.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -correlated-propagation -S | FileCheck %s
+; RUN: opt < %s -passes=correlated-propagation -S | FileCheck %s
 
 define void @test0(i32 %a) {
 ; CHECK-LABEL: @test0(

diff  --git a/llvm/test/Transforms/CorrelatedValuePropagation/udiv.ll b/llvm/test/Transforms/CorrelatedValuePropagation/udiv.ll
index a2ac3d7219a53..22e3acb77d5ba 100644
--- a/llvm/test/Transforms/CorrelatedValuePropagation/udiv.ll
+++ b/llvm/test/Transforms/CorrelatedValuePropagation/udiv.ll
@@ -1,8 +1,8 @@
-; RUN: opt < %s -correlated-propagation -S | FileCheck %s
+; RUN: opt < %s -passes=correlated-propagation -S | FileCheck %s
 
 ; Check that debug locations are preserved. For more info see:
 ;   https://llvm.org/docs/SourceLevelDebugging.html#fixing-errors
-; RUN: opt < %s -enable-debugify -correlated-propagation -S 2>&1 | \
+; RUN: opt < %s -enable-debugify -passes=correlated-propagation -S 2>&1 | \
 ; RUN:   FileCheck %s -check-prefix=DEBUG
 ; DEBUG: CheckModuleDebugify: PASS
 

diff  --git a/llvm/test/Transforms/CorrelatedValuePropagation/urem.ll b/llvm/test/Transforms/CorrelatedValuePropagation/urem.ll
index 579643e0d8a28..6f3dc8c141d8a 100644
--- a/llvm/test/Transforms/CorrelatedValuePropagation/urem.ll
+++ b/llvm/test/Transforms/CorrelatedValuePropagation/urem.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -correlated-propagation -S | FileCheck %s
+; RUN: opt < %s -passes=correlated-propagation -S | FileCheck %s
 
 define void @test_nop(i32 %n) {
 ; CHECK-LABEL: @test_nop(

diff  --git a/llvm/test/Transforms/GlobalDCE/2002-07-17-CastRef.ll b/llvm/test/Transforms/GlobalDCE/2002-07-17-CastRef.ll
index 37356f25948d5..ac548404ec922 100644
--- a/llvm/test/Transforms/GlobalDCE/2002-07-17-CastRef.ll
+++ b/llvm/test/Transforms/GlobalDCE/2002-07-17-CastRef.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globaldce
+; RUN: opt < %s -passes=globaldce
 ;
 define internal void @func() {
         ret void

diff  --git a/llvm/test/Transforms/GlobalDCE/2002-07-17-ConstantRef.ll b/llvm/test/Transforms/GlobalDCE/2002-07-17-ConstantRef.ll
index 740f7201a348a..6ed1612917bdd 100644
--- a/llvm/test/Transforms/GlobalDCE/2002-07-17-ConstantRef.ll
+++ b/llvm/test/Transforms/GlobalDCE/2002-07-17-ConstantRef.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globaldce
+; RUN: opt < %s -passes=globaldce
 ;
 
 @X = global void ()* @func              ; <void ()**> [#uses=0]

diff  --git a/llvm/test/Transforms/GlobalDCE/2002-08-17-FunctionDGE.ll b/llvm/test/Transforms/GlobalDCE/2002-08-17-FunctionDGE.ll
index 3da0fd5f14ba4..086e3c10b4886 100644
--- a/llvm/test/Transforms/GlobalDCE/2002-08-17-FunctionDGE.ll
+++ b/llvm/test/Transforms/GlobalDCE/2002-08-17-FunctionDGE.ll
@@ -1,7 +1,7 @@
 ; Make sure that functions are removed successfully if they are referred to by
 ; a global that is dead.  Make sure any globals they refer to die as well.
 
-; RUN: opt < %s -globaldce -S | FileCheck %s
+; RUN: opt < %s -passes=globaldce -S | FileCheck %s
 
 ; CHECK-NOT: foo
 ;; Unused, kills %foo

diff  --git a/llvm/test/Transforms/GlobalDCE/2002-08-17-WorkListTest.ll b/llvm/test/Transforms/GlobalDCE/2002-08-17-WorkListTest.ll
index 4e45e2bb468a1..c1dda1a760f1b 100644
--- a/llvm/test/Transforms/GlobalDCE/2002-08-17-WorkListTest.ll
+++ b/llvm/test/Transforms/GlobalDCE/2002-08-17-WorkListTest.ll
@@ -1,7 +1,7 @@
 ; This testcase tests that a worklist is being used, and that globals can be 
 ; removed if they are the subject of a constexpr and ConstantPointerRef
 
-; RUN: opt < %s -globaldce -S | FileCheck %s
+; RUN: opt < %s -passes=globaldce -S | FileCheck %s
 
 ; CHECK-NOT: global
 

diff  --git a/llvm/test/Transforms/GlobalDCE/2002-09-12-Redeletion.ll b/llvm/test/Transforms/GlobalDCE/2002-09-12-Redeletion.ll
index afa2629f8f6bd..d664357dd5465 100644
--- a/llvm/test/Transforms/GlobalDCE/2002-09-12-Redeletion.ll
+++ b/llvm/test/Transforms/GlobalDCE/2002-09-12-Redeletion.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globaldce
+; RUN: opt < %s -passes=globaldce
 
 ;; Should die when function %foo is killed
 @foo.upgrd.1 = internal global i32 7            ; <i32*> [#uses=3]

diff  --git a/llvm/test/Transforms/GlobalDCE/2003-07-01-SelfReference.ll b/llvm/test/Transforms/GlobalDCE/2003-07-01-SelfReference.ll
index 0b1b2792453e1..ed72946c710fd 100644
--- a/llvm/test/Transforms/GlobalDCE/2003-07-01-SelfReference.ll
+++ b/llvm/test/Transforms/GlobalDCE/2003-07-01-SelfReference.ll
@@ -1,5 +1,5 @@
 ; distilled from 255.vortex
-; RUN: opt < %s -globaldce -S | FileCheck %s
+; RUN: opt < %s -passes=globaldce -S | FileCheck %s
 
 ; CHECK-NOT: testfunc
 

diff  --git a/llvm/test/Transforms/GlobalDCE/2003-10-09-PreserveWeakGlobals.ll b/llvm/test/Transforms/GlobalDCE/2003-10-09-PreserveWeakGlobals.ll
index ded3165972119..2c065eb4840b5 100644
--- a/llvm/test/Transforms/GlobalDCE/2003-10-09-PreserveWeakGlobals.ll
+++ b/llvm/test/Transforms/GlobalDCE/2003-10-09-PreserveWeakGlobals.ll
@@ -1,6 +1,6 @@
 ; Weak variables should be preserved by global DCE!
 
-; RUN: opt < %s -globaldce -S | FileCheck %s
+; RUN: opt < %s -passes=globaldce -S | FileCheck %s
 
 ; CHECK: @A
 @A = weak global i32 54

diff  --git a/llvm/test/Transforms/GlobalDCE/2009-01-05-DeadAliases.ll b/llvm/test/Transforms/GlobalDCE/2009-01-05-DeadAliases.ll
index c62ec10df7909..7d83e860d8c7d 100644
--- a/llvm/test/Transforms/GlobalDCE/2009-01-05-DeadAliases.ll
+++ b/llvm/test/Transforms/GlobalDCE/2009-01-05-DeadAliases.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globaldce -S > %t
+; RUN: opt < %s -passes=globaldce -S > %t
 ; RUN: FileCheck %s < %t
 ; RUN: FileCheck --check-prefix=DEAD %s < %t
 

diff  --git a/llvm/test/Transforms/GlobalDCE/2009-02-17-AliasUsesAliasee.ll b/llvm/test/Transforms/GlobalDCE/2009-02-17-AliasUsesAliasee.ll
index 17474888d79b8..703a3cca36ddd 100644
--- a/llvm/test/Transforms/GlobalDCE/2009-02-17-AliasUsesAliasee.ll
+++ b/llvm/test/Transforms/GlobalDCE/2009-02-17-AliasUsesAliasee.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globaldce
+; RUN: opt < %s -passes=globaldce
 
 @A = internal alias void (), void ()* @F
 define internal void @F() { ret void }

diff  --git a/llvm/test/Transforms/GlobalDCE/call-with-ptrtoint.ll b/llvm/test/Transforms/GlobalDCE/call-with-ptrtoint.ll
index bff769b34f7ca..07508b4dcf13c 100644
--- a/llvm/test/Transforms/GlobalDCE/call-with-ptrtoint.ll
+++ b/llvm/test/Transforms/GlobalDCE/call-with-ptrtoint.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globaldce -S
+; RUN: opt < %s -passes=globaldce -S
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 

diff  --git a/llvm/test/Transforms/GlobalDCE/comdats.ll b/llvm/test/Transforms/GlobalDCE/comdats.ll
index 29ef848a586e0..2f5ac59a68a16 100644
--- a/llvm/test/Transforms/GlobalDCE/comdats.ll
+++ b/llvm/test/Transforms/GlobalDCE/comdats.ll
@@ -1,6 +1,6 @@
 ; Test the behavior of GlobalDCE in conjunction with comdats.
 ;
-; RUN: opt < %s -globaldce -S | FileCheck %s
+; RUN: opt < %s -passes=globaldce -S | FileCheck %s
 
 ; First test checks that if one function in a comdat group is used, both other
 ; functions and other globals even if unused will be preserved.

diff  --git a/llvm/test/Transforms/GlobalDCE/externally_available.ll b/llvm/test/Transforms/GlobalDCE/externally_available.ll
index bc54db38cee01..fc721b2dba143 100644
--- a/llvm/test/Transforms/GlobalDCE/externally_available.ll
+++ b/llvm/test/Transforms/GlobalDCE/externally_available.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globaldce -S | FileCheck %s
+; RUN: opt < %s -passes=globaldce -S | FileCheck %s
 
 ; test_global should not be emitted to the .s file.
 ; CHECK-NOT: @test_global =

diff  --git a/llvm/test/Transforms/GlobalDCE/global-ifunc.ll b/llvm/test/Transforms/GlobalDCE/global-ifunc.ll
index e12cead897f91..e887b3129f8a2 100644
--- a/llvm/test/Transforms/GlobalDCE/global-ifunc.ll
+++ b/llvm/test/Transforms/GlobalDCE/global-ifunc.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -globaldce < %s | FileCheck %s
+; RUN: opt -S -passes=globaldce < %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/GlobalDCE/global_ctors.ll b/llvm/test/Transforms/GlobalDCE/global_ctors.ll
index 37d1c8d37c839..1433c7c92da6c 100644
--- a/llvm/test/Transforms/GlobalDCE/global_ctors.ll
+++ b/llvm/test/Transforms/GlobalDCE/global_ctors.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -globaldce < %s | FileCheck %s
+; RUN: opt -S -passes=globaldce < %s | FileCheck %s
 
 ; Test that the presence of debug intrinsics isn't affecting GlobalDCE.
 ; CHECK: @llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 65535, void ()* @_notremovable, i8* null }]

diff  --git a/llvm/test/Transforms/GlobalDCE/indirectbr.ll b/llvm/test/Transforms/GlobalDCE/indirectbr.ll
index 5671aea943f49..27bcabf709b47 100644
--- a/llvm/test/Transforms/GlobalDCE/indirectbr.ll
+++ b/llvm/test/Transforms/GlobalDCE/indirectbr.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -globaldce < %s | FileCheck %s
+; RUN: opt -S -passes=globaldce < %s | FileCheck %s
 
 @L = internal unnamed_addr constant [3 x i8*] [i8* blockaddress(@test1, %L1), i8* blockaddress(@test1, %L2), i8* null], align 16
 

diff  --git a/llvm/test/Transforms/GlobalDCE/virtual-functions-base-call.ll b/llvm/test/Transforms/GlobalDCE/virtual-functions-base-call.ll
index 1f150ba2c4552..0badf792e8e46 100644
--- a/llvm/test/Transforms/GlobalDCE/virtual-functions-base-call.ll
+++ b/llvm/test/Transforms/GlobalDCE/virtual-functions-base-call.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globaldce -S | FileCheck %s
+; RUN: opt < %s -passes=globaldce -S | FileCheck %s
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 

diff  --git a/llvm/test/Transforms/GlobalDCE/virtual-functions-base-pointer-call.ll b/llvm/test/Transforms/GlobalDCE/virtual-functions-base-pointer-call.ll
index bbee507a68b34..13d97c633815c 100644
--- a/llvm/test/Transforms/GlobalDCE/virtual-functions-base-pointer-call.ll
+++ b/llvm/test/Transforms/GlobalDCE/virtual-functions-base-pointer-call.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globaldce -S | FileCheck %s
+; RUN: opt < %s -passes=globaldce -S | FileCheck %s
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 

diff  --git a/llvm/test/Transforms/GlobalDCE/virtual-functions-derived-call.ll b/llvm/test/Transforms/GlobalDCE/virtual-functions-derived-call.ll
index ac6dd517df987..49573f9f335a3 100644
--- a/llvm/test/Transforms/GlobalDCE/virtual-functions-derived-call.ll
+++ b/llvm/test/Transforms/GlobalDCE/virtual-functions-derived-call.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globaldce -S | FileCheck %s
+; RUN: opt < %s -passes=globaldce -S | FileCheck %s
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 

diff  --git a/llvm/test/Transforms/GlobalDCE/virtual-functions-derived-pointer-call.ll b/llvm/test/Transforms/GlobalDCE/virtual-functions-derived-pointer-call.ll
index c081963414ae1..a11d8d731bcfe 100644
--- a/llvm/test/Transforms/GlobalDCE/virtual-functions-derived-pointer-call.ll
+++ b/llvm/test/Transforms/GlobalDCE/virtual-functions-derived-pointer-call.ll
@@ -1,5 +1,5 @@
 
-; RUN: opt < %s -globaldce -S | FileCheck %s
+; RUN: opt < %s -passes=globaldce -S | FileCheck %s
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 

diff  --git a/llvm/test/Transforms/GlobalDCE/virtual-functions-novfe.ll b/llvm/test/Transforms/GlobalDCE/virtual-functions-novfe.ll
index f9904188eda05..9491a56d6a649 100644
--- a/llvm/test/Transforms/GlobalDCE/virtual-functions-novfe.ll
+++ b/llvm/test/Transforms/GlobalDCE/virtual-functions-novfe.ll
@@ -1,6 +1,6 @@
 ; Tests that VFE is not performed when the Virtual Function Elim metadata set
 ; to 0. This is the same as virtual-functions.ll otherwise.
-; RUN: opt < %s -globaldce -S | FileCheck %s
+; RUN: opt < %s -passes=globaldce -S | FileCheck %s
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 

diff  --git a/llvm/test/Transforms/GlobalDCE/virtual-functions-relative-pointers-bad.ll b/llvm/test/Transforms/GlobalDCE/virtual-functions-relative-pointers-bad.ll
index c386e6c71df64..a62951d01b984 100644
--- a/llvm/test/Transforms/GlobalDCE/virtual-functions-relative-pointers-bad.ll
+++ b/llvm/test/Transforms/GlobalDCE/virtual-functions-relative-pointers-bad.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globaldce -S | FileCheck %s
+; RUN: opt < %s -passes=globaldce -S | FileCheck %s
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 

diff  --git a/llvm/test/Transforms/GlobalDCE/virtual-functions-relative-pointers.ll b/llvm/test/Transforms/GlobalDCE/virtual-functions-relative-pointers.ll
index 685f3754d2da6..57803997a0b6f 100644
--- a/llvm/test/Transforms/GlobalDCE/virtual-functions-relative-pointers.ll
+++ b/llvm/test/Transforms/GlobalDCE/virtual-functions-relative-pointers.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globaldce -S | FileCheck %s
+; RUN: opt < %s -passes=globaldce -S | FileCheck %s
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 

diff  --git a/llvm/test/Transforms/GlobalDCE/virtual-functions-visibility-post-lto.ll b/llvm/test/Transforms/GlobalDCE/virtual-functions-visibility-post-lto.ll
index 3e0a1a960441f..8a450fb6dc0a9 100644
--- a/llvm/test/Transforms/GlobalDCE/virtual-functions-visibility-post-lto.ll
+++ b/llvm/test/Transforms/GlobalDCE/virtual-functions-visibility-post-lto.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globaldce -S | FileCheck %s
+; RUN: opt < %s -passes=globaldce -S | FileCheck %s
 
 ; structs A, B and C have vcall_visibility of public, linkage-unit and
 ; translation-unit respectively. This test is run after LTO linking (the

diff  --git a/llvm/test/Transforms/GlobalDCE/virtual-functions-visibility-pre-lto.ll b/llvm/test/Transforms/GlobalDCE/virtual-functions-visibility-pre-lto.ll
index d9d1f5918ffc8..1378f84e3d6b9 100644
--- a/llvm/test/Transforms/GlobalDCE/virtual-functions-visibility-pre-lto.ll
+++ b/llvm/test/Transforms/GlobalDCE/virtual-functions-visibility-pre-lto.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globaldce -S | FileCheck %s
+; RUN: opt < %s -passes=globaldce -S | FileCheck %s
 
 ; structs A, B and C have vcall_visibility of public, linkage-unit and
 ; translation-unit respectively. This test is run before LTO linking occurs

diff  --git a/llvm/test/Transforms/GlobalDCE/virtual-functions.ll b/llvm/test/Transforms/GlobalDCE/virtual-functions.ll
index f6c43d5c03582..7b349c539aeae 100644
--- a/llvm/test/Transforms/GlobalDCE/virtual-functions.ll
+++ b/llvm/test/Transforms/GlobalDCE/virtual-functions.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globaldce -S | FileCheck %s
+; RUN: opt < %s -passes=globaldce -S | FileCheck %s
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 

diff  --git a/llvm/test/Transforms/GlobalDCE/vtable-rtti.ll b/llvm/test/Transforms/GlobalDCE/vtable-rtti.ll
index 47ca881b51556..49a2a77b33e1f 100644
--- a/llvm/test/Transforms/GlobalDCE/vtable-rtti.ll
+++ b/llvm/test/Transforms/GlobalDCE/vtable-rtti.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globaldce -S | FileCheck %s
+; RUN: opt < %s -passes=globaldce -S | FileCheck %s
 
 ; We currently only use llvm.type.checked.load for virtual function pointers,
 ; not any other part of the vtable, so we can't remove the RTTI pointer even if

diff  --git a/llvm/test/Transforms/GlobalOpt/2005-06-15-LocalizeConstExprCrash.ll b/llvm/test/Transforms/GlobalOpt/2005-06-15-LocalizeConstExprCrash.ll
index 3efbde423416e..9a115cbf26fbd 100644
--- a/llvm/test/Transforms/GlobalOpt/2005-06-15-LocalizeConstExprCrash.ll
+++ b/llvm/test/Transforms/GlobalOpt/2005-06-15-LocalizeConstExprCrash.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -disable-output
+; RUN: opt < %s -passes=globalopt -disable-output
 ; PR579
 
 @g_40507551 = internal global i16 31038         ; <i16*> [#uses=1]

diff  --git a/llvm/test/Transforms/GlobalOpt/2005-09-27-Crash.ll b/llvm/test/Transforms/GlobalOpt/2005-09-27-Crash.ll
index 061c88159dd3b..0d36d5860d928 100644
--- a/llvm/test/Transforms/GlobalOpt/2005-09-27-Crash.ll
+++ b/llvm/test/Transforms/GlobalOpt/2005-09-27-Crash.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -disable-output
+; RUN: opt < %s -passes=globalopt -disable-output
         %RPyString = type { i32, %arraytype.Char }
         %arraytype.Char = type { i32, [0 x i8] }
         %arraytype.Signed = type { i32, [0 x i32] }

diff  --git a/llvm/test/Transforms/GlobalOpt/2006-07-07-InlineAsmCrash.ll b/llvm/test/Transforms/GlobalOpt/2006-07-07-InlineAsmCrash.ll
index d70a7534b5699..b68bf8ee34b76 100644
--- a/llvm/test/Transforms/GlobalOpt/2006-07-07-InlineAsmCrash.ll
+++ b/llvm/test/Transforms/GlobalOpt/2006-07-07-InlineAsmCrash.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -disable-output
+; RUN: opt < %s -passes=globalopt -disable-output
 ; PR820
 target datalayout = "e-p:32:32"
 target triple = "i686-pc-linux-gnu"

diff  --git a/llvm/test/Transforms/GlobalOpt/2006-11-01-ShrinkGlobalPhiCrash.ll b/llvm/test/Transforms/GlobalOpt/2006-11-01-ShrinkGlobalPhiCrash.ll
index 7b62cf08a4b12..240f9ccedaadd 100644
--- a/llvm/test/Transforms/GlobalOpt/2006-11-01-ShrinkGlobalPhiCrash.ll
+++ b/llvm/test/Transforms/GlobalOpt/2006-11-01-ShrinkGlobalPhiCrash.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -disable-output
+; RUN: opt < %s -passes=globalopt -disable-output
 
         %struct._list = type { i32*, %struct._list* }
         %struct._play = type { i32, i32*, %struct._list*, %struct._play* }

diff  --git a/llvm/test/Transforms/GlobalOpt/2007-04-05-Crash.ll b/llvm/test/Transforms/GlobalOpt/2007-04-05-Crash.ll
index f312fbbc9f935..1bcccc4a621f5 100644
--- a/llvm/test/Transforms/GlobalOpt/2007-04-05-Crash.ll
+++ b/llvm/test/Transforms/GlobalOpt/2007-04-05-Crash.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -disable-output
+; RUN: opt < %s -passes=globalopt -disable-output
 
 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"
 target triple = "thumb-apple-darwin8"

diff  --git a/llvm/test/Transforms/GlobalOpt/2007-05-13-Crash.ll b/llvm/test/Transforms/GlobalOpt/2007-05-13-Crash.ll
index bed4fec981efa..f5ff6b5f2dcfa 100644
--- a/llvm/test/Transforms/GlobalOpt/2007-05-13-Crash.ll
+++ b/llvm/test/Transforms/GlobalOpt/2007-05-13-Crash.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s  -globalopt -disable-output
+; RUN: opt < %s  -passes=globalopt -disable-output
 
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64"
 target triple = "i686-apple-darwin8"

diff  --git a/llvm/test/Transforms/GlobalOpt/2007-06-04-PackedStruct.ll b/llvm/test/Transforms/GlobalOpt/2007-06-04-PackedStruct.ll
index 0c9927f680bea..1ef5747dfc5cd 100644
--- a/llvm/test/Transforms/GlobalOpt/2007-06-04-PackedStruct.ll
+++ b/llvm/test/Transforms/GlobalOpt/2007-06-04-PackedStruct.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -disable-output
+; RUN: opt < %s -passes=globalopt -disable-output
 ; PR1491
 
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64"

diff  --git a/llvm/test/Transforms/GlobalOpt/2007-11-09-GEP-GEP-Crash.ll b/llvm/test/Transforms/GlobalOpt/2007-11-09-GEP-GEP-Crash.ll
index f6225cd3ad029..d8feb8347a0a2 100644
--- a/llvm/test/Transforms/GlobalOpt/2007-11-09-GEP-GEP-Crash.ll
+++ b/llvm/test/Transforms/GlobalOpt/2007-11-09-GEP-GEP-Crash.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -disable-output
+; RUN: opt < %s -passes=globalopt -disable-output
 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-f128:64:128"
 target triple = "powerpc-unknown-linux-gnu"
         %struct.empty0 = type {  }

diff  --git a/llvm/test/Transforms/GlobalOpt/2008-01-03-Crash.ll b/llvm/test/Transforms/GlobalOpt/2008-01-03-Crash.ll
index dc41fdb8de46a..ccd0960534d72 100644
--- a/llvm/test/Transforms/GlobalOpt/2008-01-03-Crash.ll
+++ b/llvm/test/Transforms/GlobalOpt/2008-01-03-Crash.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt | llvm-dis
+; RUN: opt < %s -passes=globalopt | llvm-dis
 ; PR1896
 
 @indirect1 = internal global void (i32)* null		; <void (i32)**> [#uses=2]

diff  --git a/llvm/test/Transforms/GlobalOpt/2008-01-13-OutOfRangeSROA.ll b/llvm/test/Transforms/GlobalOpt/2008-01-13-OutOfRangeSROA.ll
index 4adc9607c75bc..af76984f7722e 100644
--- a/llvm/test/Transforms/GlobalOpt/2008-01-13-OutOfRangeSROA.ll
+++ b/llvm/test/Transforms/GlobalOpt/2008-01-13-OutOfRangeSROA.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 
 ; The 'X' indices could be larger than 31.  Do not SROA the outer
 ; indices of this array.

diff  --git a/llvm/test/Transforms/GlobalOpt/2008-01-29-VolatileGlobal.ll b/llvm/test/Transforms/GlobalOpt/2008-01-29-VolatileGlobal.ll
index 7818e5d642c14..9bab3668c329f 100644
--- a/llvm/test/Transforms/GlobalOpt/2008-01-29-VolatileGlobal.ll
+++ b/llvm/test/Transforms/GlobalOpt/2008-01-29-VolatileGlobal.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 ; CHECK: load volatile
 @t0.1441 = internal global double 0x3FD5555555555555, align 8		; <double*> [#uses=1]
 

diff  --git a/llvm/test/Transforms/GlobalOpt/2008-04-26-SROA-Global-Align.ll b/llvm/test/Transforms/GlobalOpt/2008-04-26-SROA-Global-Align.ll
index c3a6d7b57165f..71f44ea2ea4e4 100644
--- a/llvm/test/Transforms/GlobalOpt/2008-04-26-SROA-Global-Align.ll
+++ b/llvm/test/Transforms/GlobalOpt/2008-04-26-SROA-Global-Align.ll
@@ -2,7 +2,7 @@
 ; alignments.  Elements 0 and 2 must be 16-byte aligned, and element 
 ; 1 must be at least 8 byte aligned (but could be more). 
 
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 ; CHECK: @G.0 = internal unnamed_addr global {{.*}}align 16
 ; CHECK: @G.1 = internal unnamed_addr global {{.*}}align 8
 ; CHECK: @G.2 = internal unnamed_addr global {{.*}}align 16

diff  --git a/llvm/test/Transforms/GlobalOpt/2008-07-17-addrspace.ll b/llvm/test/Transforms/GlobalOpt/2008-07-17-addrspace.ll
index b9d2d993240e4..01aa76071c04d 100644
--- a/llvm/test/Transforms/GlobalOpt/2008-07-17-addrspace.ll
+++ b/llvm/test/Transforms/GlobalOpt/2008-07-17-addrspace.ll
@@ -2,7 +2,7 @@
 ; values. This used to crash, because globalopt forgot to put the new var in the
 ; same address space as the old one.
 
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 
 ; Check that the new global values still have their address space
 ; CHECK: addrspace(1) global

diff  --git a/llvm/test/Transforms/GlobalOpt/2008-12-16-HeapSRACrash-2.ll b/llvm/test/Transforms/GlobalOpt/2008-12-16-HeapSRACrash-2.ll
index bd32163e5f9f1..bc0050b84c883 100644
--- a/llvm/test/Transforms/GlobalOpt/2008-12-16-HeapSRACrash-2.ll
+++ b/llvm/test/Transforms/GlobalOpt/2008-12-16-HeapSRACrash-2.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt | llvm-dis
+; RUN: opt < %s -passes=globalopt | 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"
 	%struct.foo = type { i32, i32 }

diff  --git a/llvm/test/Transforms/GlobalOpt/2008-12-16-HeapSRACrash.ll b/llvm/test/Transforms/GlobalOpt/2008-12-16-HeapSRACrash.ll
index e9c16785afae6..24b57e2dfb2c8 100644
--- a/llvm/test/Transforms/GlobalOpt/2008-12-16-HeapSRACrash.ll
+++ b/llvm/test/Transforms/GlobalOpt/2008-12-16-HeapSRACrash.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt | llvm-dis
+; RUN: opt < %s -passes=globalopt | 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"
 	%struct.foo = type { i32, i32 }

diff  --git a/llvm/test/Transforms/GlobalOpt/2009-01-13-phi-user.ll b/llvm/test/Transforms/GlobalOpt/2009-01-13-phi-user.ll
index 7ad24b92a2dae..009b9c1e3c810 100644
--- a/llvm/test/Transforms/GlobalOpt/2009-01-13-phi-user.ll
+++ b/llvm/test/Transforms/GlobalOpt/2009-01-13-phi-user.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 ; CHECK: phi{{.*}}@head
 ; PR3321
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128"

diff  --git a/llvm/test/Transforms/GlobalOpt/2009-02-15-ResolveAlias.ll b/llvm/test/Transforms/GlobalOpt/2009-02-15-ResolveAlias.ll
index 42c243d9d7c0e..c29753385a59c 100644
--- a/llvm/test/Transforms/GlobalOpt/2009-02-15-ResolveAlias.ll
+++ b/llvm/test/Transforms/GlobalOpt/2009-02-15-ResolveAlias.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 
 define internal void @f() {
 ; CHECK-NOT: @f(

diff  --git a/llvm/test/Transforms/GlobalOpt/2009-03-05-dbg.ll b/llvm/test/Transforms/GlobalOpt/2009-03-05-dbg.ll
index 68ea4ffe639d7..d40eea53d9245 100644
--- a/llvm/test/Transforms/GlobalOpt/2009-03-05-dbg.ll
+++ b/llvm/test/Transforms/GlobalOpt/2009-03-05-dbg.ll
@@ -1,5 +1,5 @@
 ; REQUIRES: asserts
-; RUN: opt < %s -globalopt -stats -disable-output 2>&1 | FileCheck %s
+; RUN: opt < %s -passes=globalopt -stats -disable-output 2>&1 | FileCheck %s
 ; CHECK: 1 globalopt - Number of global vars shrunk to booleans
 
 source_filename = "test/Transforms/GlobalOpt/2009-03-05-dbg.ll"

diff  --git a/llvm/test/Transforms/GlobalOpt/2009-03-06-Anonymous.ll b/llvm/test/Transforms/GlobalOpt/2009-03-06-Anonymous.ll
index d5836ea9254a9..f14cfcedf9476 100644
--- a/llvm/test/Transforms/GlobalOpt/2009-03-06-Anonymous.ll
+++ b/llvm/test/Transforms/GlobalOpt/2009-03-06-Anonymous.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 
 @0 = global i32 0
 ; CHECK-DAG: @0 = internal global i32 0

diff  --git a/llvm/test/Transforms/GlobalOpt/2009-03-07-PromotePtrToBool.ll b/llvm/test/Transforms/GlobalOpt/2009-03-07-PromotePtrToBool.ll
index bec4891a496a1..99d3269ca5b58 100644
--- a/llvm/test/Transforms/GlobalOpt/2009-03-07-PromotePtrToBool.ll
+++ b/llvm/test/Transforms/GlobalOpt/2009-03-07-PromotePtrToBool.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -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/GlobalOpt/2009-11-16-BrokenPerformHeapAllocSRoA.ll b/llvm/test/Transforms/GlobalOpt/2009-11-16-BrokenPerformHeapAllocSRoA.ll
index 461c25316e91a..cabb750d19e5f 100644
--- a/llvm/test/Transforms/GlobalOpt/2009-11-16-BrokenPerformHeapAllocSRoA.ll
+++ b/llvm/test/Transforms/GlobalOpt/2009-11-16-BrokenPerformHeapAllocSRoA.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -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-apple-darwin10.0"

diff  --git a/llvm/test/Transforms/GlobalOpt/2009-11-16-MallocSingleStoreToGlobalVar.ll b/llvm/test/Transforms/GlobalOpt/2009-11-16-MallocSingleStoreToGlobalVar.ll
index 25bb9769f49eb..d4deb23262378 100644
--- a/llvm/test/Transforms/GlobalOpt/2009-11-16-MallocSingleStoreToGlobalVar.ll
+++ b/llvm/test/Transforms/GlobalOpt/2009-11-16-MallocSingleStoreToGlobalVar.ll
@@ -2,7 +2,7 @@
 ; GlobalOpt was treating a non-optimizable array malloc as a non-array malloc
 ; and optimizing the global object that the malloc was stored to as a single
 ; element global.  The global object @TOP in this test should not be optimized.
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -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-apple-darwin10.0"

diff  --git a/llvm/test/Transforms/GlobalOpt/2010-02-25-MallocPromote.ll b/llvm/test/Transforms/GlobalOpt/2010-02-25-MallocPromote.ll
index 9f53ce402fd4c..fe18deb165864 100644
--- a/llvm/test/Transforms/GlobalOpt/2010-02-25-MallocPromote.ll
+++ b/llvm/test/Transforms/GlobalOpt/2010-02-25-MallocPromote.ll
@@ -1,5 +1,5 @@
 ; PR6422
-; RUN: opt -globalopt -S < %s
+; RUN: opt -passes=globalopt -S < %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/GlobalOpt/2010-02-26-MallocSROA.ll b/llvm/test/Transforms/GlobalOpt/2010-02-26-MallocSROA.ll
index 12fa341919265..73766aa63a4d7 100644
--- a/llvm/test/Transforms/GlobalOpt/2010-02-26-MallocSROA.ll
+++ b/llvm/test/Transforms/GlobalOpt/2010-02-26-MallocSROA.ll
@@ -1,4 +1,4 @@
-; RUN: opt -globalopt -S < %s
+; RUN: opt -passes=globalopt -S < %s
 ; PR6435
 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/GlobalOpt/2010-10-19-WeakOdr.ll b/llvm/test/Transforms/GlobalOpt/2010-10-19-WeakOdr.ll
index f09ab9a2018fa..4ab20f009629e 100644
--- a/llvm/test/Transforms/GlobalOpt/2010-10-19-WeakOdr.ll
+++ b/llvm/test/Transforms/GlobalOpt/2010-10-19-WeakOdr.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 
 ; PR8389: Globals with weak_odr linkage type must not be modified
 

diff  --git a/llvm/test/Transforms/GlobalOpt/2011-04-09-EmptyGlobalCtors.ll b/llvm/test/Transforms/GlobalOpt/2011-04-09-EmptyGlobalCtors.ll
index 42818d6ccc226..964df298734d7 100644
--- a/llvm/test/Transforms/GlobalOpt/2011-04-09-EmptyGlobalCtors.ll
+++ b/llvm/test/Transforms/GlobalOpt/2011-04-09-EmptyGlobalCtors.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -disable-output
+; RUN: opt < %s -passes=globalopt -disable-output
 
 %0 = type { i32, void ()*, i8* }
 @llvm.global_ctors = appending global [0 x %0] zeroinitializer

diff  --git a/llvm/test/Transforms/GlobalOpt/2012-05-11-blockaddress.ll b/llvm/test/Transforms/GlobalOpt/2012-05-11-blockaddress.ll
index 24213af024f57..6175b6227240b 100644
--- a/llvm/test/Transforms/GlobalOpt/2012-05-11-blockaddress.ll
+++ b/llvm/test/Transforms/GlobalOpt/2012-05-11-blockaddress.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 ; Check that the mere presence of a blockaddress doesn't prevent -globalopt
 ; from promoting @f to fastcc.
 

diff  --git a/llvm/test/Transforms/GlobalOpt/2021-08-02-CastStoreOnceP2I.ll b/llvm/test/Transforms/GlobalOpt/2021-08-02-CastStoreOnceP2I.ll
index a54186b0aa7a5..dcee3a96c76ae 100644
--- a/llvm/test/Transforms/GlobalOpt/2021-08-02-CastStoreOnceP2I.ll
+++ b/llvm/test/Transforms/GlobalOpt/2021-08-02-CastStoreOnceP2I.ll
@@ -1,4 +1,4 @@
-; RUN: opt -globalopt -S < %s | FileCheck %s
+; RUN: opt -passes=globalopt -S < %s | FileCheck %s
 ; RUN: opt -passes=globalopt -S < %s | FileCheck %s
 
 ; This tests the assignemnt of non-pointer to global address

diff  --git a/llvm/test/Transforms/GlobalOpt/2021-08-03-StoreOnceLoadMultiCasts.ll b/llvm/test/Transforms/GlobalOpt/2021-08-03-StoreOnceLoadMultiCasts.ll
index bac59f64acd11..e2c90c3851250 100644
--- a/llvm/test/Transforms/GlobalOpt/2021-08-03-StoreOnceLoadMultiCasts.ll
+++ b/llvm/test/Transforms/GlobalOpt/2021-08-03-StoreOnceLoadMultiCasts.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -globalopt -S < %s | FileCheck %s
+; RUN: opt -passes=globalopt -S < %s | FileCheck %s
 ; RUN: opt -passes=globalopt -S < %s | FileCheck %s
 
 @g = internal global i32* null, align 8

diff  --git a/llvm/test/Transforms/GlobalOpt/GSROA-section.ll b/llvm/test/Transforms/GlobalOpt/GSROA-section.ll
index a439fa0797dee..9e6e1ff998ae2 100644
--- a/llvm/test/Transforms/GlobalOpt/GSROA-section.ll
+++ b/llvm/test/Transforms/GlobalOpt/GSROA-section.ll
@@ -1,7 +1,7 @@
 ; This test lets globalopt split the global struct and array into 
diff erent
 ; values. The pass needs to preserve section attribute.
 
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 ; Check that the new global values still have their section assignment.
 ; CHECK: @struct
 ; CHECK: section ".foo"

diff  --git a/llvm/test/Transforms/GlobalOpt/MallocSROA-section-no-null-opt.ll b/llvm/test/Transforms/GlobalOpt/MallocSROA-section-no-null-opt.ll
index 2b4bbb50af55b..59781ac543ece 100644
--- a/llvm/test/Transforms/GlobalOpt/MallocSROA-section-no-null-opt.ll
+++ b/llvm/test/Transforms/GlobalOpt/MallocSROA-section-no-null-opt.ll
@@ -1,4 +1,4 @@
-; RUN: opt -globalopt -S < %s | FileCheck %s
+; RUN: opt -passes=globalopt -S < %s | FileCheck %s
 ; CHECK: @Y
 ; CHECK: section ".foo"
 

diff  --git a/llvm/test/Transforms/GlobalOpt/MallocSROA-section.ll b/llvm/test/Transforms/GlobalOpt/MallocSROA-section.ll
index 74948a8f0fa89..3925da09efff3 100644
--- a/llvm/test/Transforms/GlobalOpt/MallocSROA-section.ll
+++ b/llvm/test/Transforms/GlobalOpt/MallocSROA-section.ll
@@ -1,4 +1,4 @@
-; RUN: opt -globalopt -S < %s | FileCheck %s
+; RUN: opt -passes=globalopt -S < %s | FileCheck %s
 ; CHECK: @Y = {{.*}} section ".foo"
 
 %struct.xyz = type { double, i32 }

diff  --git a/llvm/test/Transforms/GlobalOpt/PowerPC/coldcc_coldsites.ll b/llvm/test/Transforms/GlobalOpt/PowerPC/coldcc_coldsites.ll
index 8fedf834f409c..2aba30b40ec83 100644
--- a/llvm/test/Transforms/GlobalOpt/PowerPC/coldcc_coldsites.ll
+++ b/llvm/test/Transforms/GlobalOpt/PowerPC/coldcc_coldsites.ll
@@ -1,5 +1,5 @@
-; RUN: opt -globalopt -mtriple=powerpc64le-unknown-linux-gnu -ppc-enable-coldcc -S < %s | FileCheck %s -check-prefix=COLDCC
-; RUN: opt -globalopt -S < %s | FileCheck %s -check-prefix=CHECK
+; RUN: opt -passes=globalopt -mtriple=powerpc64le-unknown-linux-gnu -ppc-enable-coldcc -S < %s | FileCheck %s -check-prefix=COLDCC
+; RUN: opt -passes=globalopt -S < %s | FileCheck %s -check-prefix=CHECK
 
 define signext i32 @caller(i32 signext %a, i32 signext %b, i32 signext %lim, i32 signext %i) local_unnamed_addr #0 !prof !30 {
 entry:

diff  --git a/llvm/test/Transforms/GlobalOpt/SROA-section.ll b/llvm/test/Transforms/GlobalOpt/SROA-section.ll
index 1589608a67aa9..013d056d2e83f 100644
--- a/llvm/test/Transforms/GlobalOpt/SROA-section.ll
+++ b/llvm/test/Transforms/GlobalOpt/SROA-section.ll
@@ -1,5 +1,5 @@
 ; Verify that section assignment is copied during SROA
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 ; CHECK: @G.0
 ; CHECK: section ".foo"
 ; CHECK: @G.1

diff  --git a/llvm/test/Transforms/GlobalOpt/alias-resolve.ll b/llvm/test/Transforms/GlobalOpt/alias-resolve.ll
index 324119ce05999..b4bee769e93d2 100644
--- a/llvm/test/Transforms/GlobalOpt/alias-resolve.ll
+++ b/llvm/test/Transforms/GlobalOpt/alias-resolve.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 
 @foo1 = alias void (), void ()* @foo2
 ; CHECK: @foo1 = alias void (), void ()* @bar2

diff  --git a/llvm/test/Transforms/GlobalOpt/alias-used-address-space.ll b/llvm/test/Transforms/GlobalOpt/alias-used-address-space.ll
index 08081b89ac685..d119bfb305063 100644
--- a/llvm/test/Transforms/GlobalOpt/alias-used-address-space.ll
+++ b/llvm/test/Transforms/GlobalOpt/alias-used-address-space.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -globalopt < %s | FileCheck %s
+; RUN: opt -S -passes=globalopt < %s | FileCheck %s
 
 target datalayout = "p:32:32:32-p1:16:16:16"
 

diff  --git a/llvm/test/Transforms/GlobalOpt/alias-used-section.ll b/llvm/test/Transforms/GlobalOpt/alias-used-section.ll
index a3657dfd16bcd..389d77ae0a339 100644
--- a/llvm/test/Transforms/GlobalOpt/alias-used-section.ll
+++ b/llvm/test/Transforms/GlobalOpt/alias-used-section.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -globalopt < %s | FileCheck %s
+; RUN: opt -S -passes=globalopt < %s | FileCheck %s
 
 @_Z17in_custom_section = internal global i8 42, section "CUSTOM"
 @in_custom_section = internal dllexport alias i8, i8* @_Z17in_custom_section

diff  --git a/llvm/test/Transforms/GlobalOpt/alias-used.ll b/llvm/test/Transforms/GlobalOpt/alias-used.ll
index 91601fb992709..73dd604f2a71d 100644
--- a/llvm/test/Transforms/GlobalOpt/alias-used.ll
+++ b/llvm/test/Transforms/GlobalOpt/alias-used.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 
 @c = global i8 42
 

diff  --git a/llvm/test/Transforms/GlobalOpt/amdgcn-ctor-alloca.ll b/llvm/test/Transforms/GlobalOpt/amdgcn-ctor-alloca.ll
index 6bdcf49e95ec8..86553e4cdf82d 100644
--- a/llvm/test/Transforms/GlobalOpt/amdgcn-ctor-alloca.ll
+++ b/llvm/test/Transforms/GlobalOpt/amdgcn-ctor-alloca.ll
@@ -1,4 +1,4 @@
-; RUN: opt -data-layout=A5 -globalopt %s -S -o - | FileCheck %s
+; RUN: opt -data-layout=A5 -passes=globalopt %s -S -o - | FileCheck %s
 
 ; CHECK-NOT: @g
 @g = internal addrspace(1) global i32* zeroinitializer

diff  --git a/llvm/test/Transforms/GlobalOpt/array-elem-refs.ll b/llvm/test/Transforms/GlobalOpt/array-elem-refs.ll
index c31965b656d3e..ad5fdca611fe2 100644
--- a/llvm/test/Transforms/GlobalOpt/array-elem-refs.ll
+++ b/llvm/test/Transforms/GlobalOpt/array-elem-refs.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -S -globalopt | FileCheck %s
+; RUN: opt < %s -S -passes=globalopt | 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/GlobalOpt/assume.ll b/llvm/test/Transforms/GlobalOpt/assume.ll
index cb41b67e3461f..c88bf3b8a0836 100644
--- a/llvm/test/Transforms/GlobalOpt/assume.ll
+++ b/llvm/test/Transforms/GlobalOpt/assume.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -globalopt < %s | FileCheck %s
+; RUN: opt -S -passes=globalopt < %s | FileCheck %s
 
 ; CHECK: @tmp = local_unnamed_addr global i32 42
 

diff  --git a/llvm/test/Transforms/GlobalOpt/atexit.ll b/llvm/test/Transforms/GlobalOpt/atexit.ll
index 55c2dab1c1d7e..737ff685d2270 100644
--- a/llvm/test/Transforms/GlobalOpt/atexit.ll
+++ b/llvm/test/Transforms/GlobalOpt/atexit.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 
 ; CHECK: ModuleID
 define internal i32 @__cxa_atexit(void (i8*)* nocapture %func, i8* nocapture %arg, i8* nocapture %dso_handle) nounwind readnone optsize noimplicitfloat {

diff  --git a/llvm/test/Transforms/GlobalOpt/atomic.ll b/llvm/test/Transforms/GlobalOpt/atomic.ll
index f49ab52701b5c..074d759a4b3fa 100644
--- a/llvm/test/Transforms/GlobalOpt/atomic.ll
+++ b/llvm/test/Transforms/GlobalOpt/atomic.ll
@@ -1,4 +1,4 @@
-; RUN: opt -globalopt < %s -S -o - | FileCheck %s
+; RUN: opt -passes=globalopt < %s -S -o - | FileCheck %s
 
 @GV1 = internal global i64 1, align 8
 @GV2 = internal global i32 0, align 4

diff  --git a/llvm/test/Transforms/GlobalOpt/available_externally_global_ctors.ll b/llvm/test/Transforms/GlobalOpt/available_externally_global_ctors.ll
index 7092a5ae2226d..eee1e24bbc065 100644
--- a/llvm/test/Transforms/GlobalOpt/available_externally_global_ctors.ll
+++ b/llvm/test/Transforms/GlobalOpt/available_externally_global_ctors.ll
@@ -1,7 +1,7 @@
 target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-apple-macosx10.11.0"
 
-; RUN: opt -S -globalopt < %s | FileCheck %s
+; RUN: opt -S -passes=globalopt < %s | FileCheck %s
 
 ; Verify that the initialization of the available_externally global is not eliminated
 ; CHECK: @llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 65535, void ()* @foo_static_init, i8* null }]

diff  --git a/llvm/test/Transforms/GlobalOpt/basictest.ll b/llvm/test/Transforms/GlobalOpt/basictest.ll
index d5294820abe92..a0734b99c9fb6 100644
--- a/llvm/test/Transforms/GlobalOpt/basictest.ll
+++ b/llvm/test/Transforms/GlobalOpt/basictest.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 ; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 
 ; CHECK-NOT: global

diff  --git a/llvm/test/Transforms/GlobalOpt/blockaddress.ll b/llvm/test/Transforms/GlobalOpt/blockaddress.ll
index 12e09fcd48151..8e22b7b8d09e2 100644
--- a/llvm/test/Transforms/GlobalOpt/blockaddress.ll
+++ b/llvm/test/Transforms/GlobalOpt/blockaddress.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 
 @x = internal global i8* zeroinitializer
 

diff  --git a/llvm/test/Transforms/GlobalOpt/cleanup-pointer-root-users.ll b/llvm/test/Transforms/GlobalOpt/cleanup-pointer-root-users.ll
index 16da5315db0c3..02aa17d4fc537 100644
--- a/llvm/test/Transforms/GlobalOpt/cleanup-pointer-root-users.ll
+++ b/llvm/test/Transforms/GlobalOpt/cleanup-pointer-root-users.ll
@@ -1,4 +1,4 @@
-; RUN: opt -globalopt -S -o - < %s | FileCheck %s
+; RUN: opt -passes=globalopt -S -o - < %s | FileCheck %s
 
 @glbl = internal global i8* null
 

diff  --git a/llvm/test/Transforms/GlobalOpt/coldcc_stress_test.ll b/llvm/test/Transforms/GlobalOpt/coldcc_stress_test.ll
index 80c9366af6f8a..ad289d835a555 100644
--- a/llvm/test/Transforms/GlobalOpt/coldcc_stress_test.ll
+++ b/llvm/test/Transforms/GlobalOpt/coldcc_stress_test.ll
@@ -1,5 +1,5 @@
-; RUN: opt < %s -globalopt -S -enable-coldcc-stress-test -mtriple=powerpc64le-unknown-linux-gnu | FileCheck %s -check-prefix=COLDCC
-; RUN: opt < %s -globalopt -S | FileCheck %s -check-prefix=CHECK
+; RUN: opt < %s -passes=globalopt -S -enable-coldcc-stress-test -mtriple=powerpc64le-unknown-linux-gnu | FileCheck %s -check-prefix=COLDCC
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s -check-prefix=CHECK
 
 define internal i32 @callee_default(i32* %m) {
 ; COLDCC-LABEL: define internal coldcc i32 @callee_default

diff  --git a/llvm/test/Transforms/GlobalOpt/compiler-used.ll b/llvm/test/Transforms/GlobalOpt/compiler-used.ll
index a710d272edc78..e50e17d8df5a9 100644
--- a/llvm/test/Transforms/GlobalOpt/compiler-used.ll
+++ b/llvm/test/Transforms/GlobalOpt/compiler-used.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 
 ; Test that when all members of llvm.compiler.used are found to be redundant
 ; we delete it instead of crashing.

diff  --git a/llvm/test/Transforms/GlobalOpt/const-return-status-atomic.ll b/llvm/test/Transforms/GlobalOpt/const-return-status-atomic.ll
index f52ba05e6c19b..9080fe2abca6f 100644
--- a/llvm/test/Transforms/GlobalOpt/const-return-status-atomic.ll
+++ b/llvm/test/Transforms/GlobalOpt/const-return-status-atomic.ll
@@ -1,4 +1,4 @@
-; RUN: opt -globalopt < %s -S -o - | FileCheck %s
+; RUN: opt -passes=globalopt < %s -S -o - | FileCheck %s
 
 ; When simplifying users of a global variable, the pass could incorrectly
 ; return false if there were still some uses left, and no further optimizations

diff  --git a/llvm/test/Transforms/GlobalOpt/const-return-status.ll b/llvm/test/Transforms/GlobalOpt/const-return-status.ll
index 32c4eb895dc1a..6d4c70b2102ec 100644
--- a/llvm/test/Transforms/GlobalOpt/const-return-status.ll
+++ b/llvm/test/Transforms/GlobalOpt/const-return-status.ll
@@ -1,4 +1,4 @@
-; RUN: opt -globalopt < %s -S -o - | FileCheck %s
+; RUN: opt -passes=globalopt < %s -S -o - | FileCheck %s
 
 ; When simplifying users of a global variable, the pass could incorrectly
 ; return false if there were still some uses left, and no further optimizations

diff  --git a/llvm/test/Transforms/GlobalOpt/constantfold-initializers.ll b/llvm/test/Transforms/GlobalOpt/constantfold-initializers.ll
index 9f57abcb16f03..eb9dad15088a1 100644
--- a/llvm/test/Transforms/GlobalOpt/constantfold-initializers.ll
+++ b/llvm/test/Transforms/GlobalOpt/constantfold-initializers.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -S -globalopt | FileCheck %s
+; RUN: opt < %s -S -passes=globalopt | 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"
 

diff  --git a/llvm/test/Transforms/GlobalOpt/crash-2.ll b/llvm/test/Transforms/GlobalOpt/crash-2.ll
index 748fb027c7d73..3aabb6994a197 100644
--- a/llvm/test/Transforms/GlobalOpt/crash-2.ll
+++ b/llvm/test/Transforms/GlobalOpt/crash-2.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -globalopt -disable-output
+; RUN: llvm-as < %s | opt -passes=globalopt -disable-output
 ; NOTE: This needs to run through 'llvm-as' first to reproduce the error!
 ; PR15440
 

diff  --git a/llvm/test/Transforms/GlobalOpt/crash.ll b/llvm/test/Transforms/GlobalOpt/crash.ll
index e9ad7e0d043ba..89200681087b2 100644
--- a/llvm/test/Transforms/GlobalOpt/crash.ll
+++ b/llvm/test/Transforms/GlobalOpt/crash.ll
@@ -1,4 +1,4 @@
-; RUN: opt -globalopt -disable-output < %s
+; RUN: opt -passes=globalopt -disable-output < %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-n8:16:32"
 target triple = "i386-apple-darwin9.8"
 

diff  --git a/llvm/test/Transforms/GlobalOpt/ctor-list-opt-constexpr.ll b/llvm/test/Transforms/GlobalOpt/ctor-list-opt-constexpr.ll
index bc9ac5b787216..62403dff60a98 100644
--- a/llvm/test/Transforms/GlobalOpt/ctor-list-opt-constexpr.ll
+++ b/llvm/test/Transforms/GlobalOpt/ctor-list-opt-constexpr.ll
@@ -1,4 +1,4 @@
-; RUN: opt -globalopt -S < %s | FileCheck %s
+; RUN: opt -passes=globalopt -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-darwin10.0.0"
 

diff  --git a/llvm/test/Transforms/GlobalOpt/ctor-list-opt-inbounds.ll b/llvm/test/Transforms/GlobalOpt/ctor-list-opt-inbounds.ll
index d581f535f897c..94982e5c20e53 100644
--- a/llvm/test/Transforms/GlobalOpt/ctor-list-opt-inbounds.ll
+++ b/llvm/test/Transforms/GlobalOpt/ctor-list-opt-inbounds.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 
 ; Don't get fooled by the inbounds keyword; it doesn't change
 ; the computed address.

diff  --git a/llvm/test/Transforms/GlobalOpt/ctor-list-opt.ll b/llvm/test/Transforms/GlobalOpt/ctor-list-opt.ll
index 95e7d4d1ab5b0..0e932cc1acb7a 100644
--- a/llvm/test/Transforms/GlobalOpt/ctor-list-opt.ll
+++ b/llvm/test/Transforms/GlobalOpt/ctor-list-opt.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 ; CHECK-NOT: CTOR
 %ini = type { i32, void()*, i8* }
 @llvm.global_ctors = appending global [11 x %ini] [

diff  --git a/llvm/test/Transforms/GlobalOpt/dead-store-status.ll b/llvm/test/Transforms/GlobalOpt/dead-store-status.ll
index afd1f9f6cabfd..ed73ca7d9448d 100644
--- a/llvm/test/Transforms/GlobalOpt/dead-store-status.ll
+++ b/llvm/test/Transforms/GlobalOpt/dead-store-status.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 
 ; When removing the store to @global in @foo, the pass would incorrectly return
 ; false. This was caught by the pass return status check that is hidden under

diff  --git a/llvm/test/Transforms/GlobalOpt/deaddeclaration.ll b/llvm/test/Transforms/GlobalOpt/deaddeclaration.ll
index 942f2e1bf6bb2..491f1dcdfcbdf 100644
--- a/llvm/test/Transforms/GlobalOpt/deaddeclaration.ll
+++ b/llvm/test/Transforms/GlobalOpt/deaddeclaration.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 
 ; CHECK-NOT: aa
 ; CHECK-NOT: bb

diff  --git a/llvm/test/Transforms/GlobalOpt/deadfunction.ll b/llvm/test/Transforms/GlobalOpt/deadfunction.ll
index 5771c4ccfb750..c8b8e6e9f050a 100644
--- a/llvm/test/Transforms/GlobalOpt/deadfunction.ll
+++ b/llvm/test/Transforms/GlobalOpt/deadfunction.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 
 ; CHECK-NOT: test
 

diff  --git a/llvm/test/Transforms/GlobalOpt/deadglobal-2.ll b/llvm/test/Transforms/GlobalOpt/deadglobal-2.ll
index 92c0f994f3679..74c51fb8c4836 100644
--- a/llvm/test/Transforms/GlobalOpt/deadglobal-2.ll
+++ b/llvm/test/Transforms/GlobalOpt/deadglobal-2.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 ; This is a harder case to delete as the GEP has a variable index.
 
 ; CHECK-NOT: internal

diff  --git a/llvm/test/Transforms/GlobalOpt/deadglobal-diarglist-use.ll b/llvm/test/Transforms/GlobalOpt/deadglobal-diarglist-use.ll
index b6b64a524c9ea..635030e608d51 100644
--- a/llvm/test/Transforms/GlobalOpt/deadglobal-diarglist-use.ll
+++ b/llvm/test/Transforms/GlobalOpt/deadglobal-diarglist-use.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | llvm-as | llvm-dis | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | llvm-as | llvm-dis | FileCheck %s
 
 ; The %struct.S type would not get emitted after @s was removed, resulting in
 ; llvm-as failing to parse the dbg.value intrinsic using that type. The

diff  --git a/llvm/test/Transforms/GlobalOpt/deadglobal.ll b/llvm/test/Transforms/GlobalOpt/deadglobal.ll
index f5eed44cbb6ed..4947f4212ac62 100644
--- a/llvm/test/Transforms/GlobalOpt/deadglobal.ll
+++ b/llvm/test/Transforms/GlobalOpt/deadglobal.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 
 @G1 = internal global i32 123            ; <i32*> [#uses=1]
 @A1 = internal alias i32, i32* @G1

diff  --git a/llvm/test/Transforms/GlobalOpt/evaluate-bitcast-2.ll b/llvm/test/Transforms/GlobalOpt/evaluate-bitcast-2.ll
index 50c7b15c7201f..b429f8919fde6 100644
--- a/llvm/test/Transforms/GlobalOpt/evaluate-bitcast-2.ll
+++ b/llvm/test/Transforms/GlobalOpt/evaluate-bitcast-2.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 
 ; Test the evaluation of a store and a load via a bitcast, and check
 ; that globals are constant folded to the correct value.

diff  --git a/llvm/test/Transforms/GlobalOpt/evaluate-bitcast-3.ll b/llvm/test/Transforms/GlobalOpt/evaluate-bitcast-3.ll
index dae89cd23ffb0..eb96cc4f4fb5f 100644
--- a/llvm/test/Transforms/GlobalOpt/evaluate-bitcast-3.ll
+++ b/llvm/test/Transforms/GlobalOpt/evaluate-bitcast-3.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 
 ; Test the evaluation of a load via a bitcast and a store via a GEP.
 ; Check that globals are constant folded to the correct value.

diff  --git a/llvm/test/Transforms/GlobalOpt/evaluate-bitcast-4.ll b/llvm/test/Transforms/GlobalOpt/evaluate-bitcast-4.ll
index 1e7c89894d2aa..ac1fd34a2679b 100644
--- a/llvm/test/Transforms/GlobalOpt/evaluate-bitcast-4.ll
+++ b/llvm/test/Transforms/GlobalOpt/evaluate-bitcast-4.ll
@@ -1,5 +1,5 @@
 ; PR48055. Check that this does not crash.
-; RUN: opt -globalopt %s -disable-output
+; RUN: opt -passes=globalopt %s -disable-output
 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/GlobalOpt/externally-initialized-aggregate.ll b/llvm/test/Transforms/GlobalOpt/externally-initialized-aggregate.ll
index 2434f20e92b2f..eca0f8a7d9341 100644
--- a/llvm/test/Transforms/GlobalOpt/externally-initialized-aggregate.ll
+++ b/llvm/test/Transforms/GlobalOpt/externally-initialized-aggregate.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -S -globalopt | FileCheck %s
+; RUN: opt < %s -S -passes=globalopt | FileCheck %s
 
 ; This global is externally_initialized, so if we split it into scalars we
 ; should keep that flag set on all of the new globals. This will prevent the

diff  --git a/llvm/test/Transforms/GlobalOpt/externally-initialized-global-ctr.ll b/llvm/test/Transforms/GlobalOpt/externally-initialized-global-ctr.ll
index f9f7535c37656..efa3cf4923b2a 100644
--- a/llvm/test/Transforms/GlobalOpt/externally-initialized-global-ctr.ll
+++ b/llvm/test/Transforms/GlobalOpt/externally-initialized-global-ctr.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 ; rdar://12580965.
 ; ObjC++ test case.
 

diff  --git a/llvm/test/Transforms/GlobalOpt/externally-initialized.ll b/llvm/test/Transforms/GlobalOpt/externally-initialized.ll
index c01ba10f49c96..29ed13e38ef26 100644
--- a/llvm/test/Transforms/GlobalOpt/externally-initialized.ll
+++ b/llvm/test/Transforms/GlobalOpt/externally-initialized.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -S -globalopt | FileCheck %s
+; RUN: opt < %s -S -passes=globalopt | FileCheck %s
 
 ; This global is externally_initialized, which may modify the value between
 ; it's static initializer and any code in this module being run, so the only

diff  --git a/llvm/test/Transforms/GlobalOpt/fastcc.ll b/llvm/test/Transforms/GlobalOpt/fastcc.ll
index 0278d83d209f3..e5af216be71b6 100644
--- a/llvm/test/Transforms/GlobalOpt/fastcc.ll
+++ b/llvm/test/Transforms/GlobalOpt/fastcc.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 
 declare token @llvm.call.preallocated.setup(i32)
 declare i8* @llvm.call.preallocated.arg(token, i32)

diff  --git a/llvm/test/Transforms/GlobalOpt/global-demotion.ll b/llvm/test/Transforms/GlobalOpt/global-demotion.ll
index 7965cb896208b..ec70acf469eeb 100644
--- a/llvm/test/Transforms/GlobalOpt/global-demotion.ll
+++ b/llvm/test/Transforms/GlobalOpt/global-demotion.ll
@@ -1,4 +1,4 @@
-; RUN: opt -globalopt -S < %s | FileCheck %s
+; RUN: opt -passes=globalopt -S < %s | FileCheck %s
 
 @G1 = internal global i32 5
 @G2 = internal global i32 5

diff  --git a/llvm/test/Transforms/GlobalOpt/globalsra-align.ll b/llvm/test/Transforms/GlobalOpt/globalsra-align.ll
index f9f5b444bd48f..2390499df04ec 100644
--- a/llvm/test/Transforms/GlobalOpt/globalsra-align.ll
+++ b/llvm/test/Transforms/GlobalOpt/globalsra-align.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 = "p:16:32:64" ; 16-bit pointers with 32-bit ABI alignment and 64-bit preferred alignmentt
 

diff  --git a/llvm/test/Transforms/GlobalOpt/globalsra-multigep.ll b/llvm/test/Transforms/GlobalOpt/globalsra-multigep.ll
index 87a8486d8818a..c926489b9d7f7 100644
--- a/llvm/test/Transforms/GlobalOpt/globalsra-multigep.ll
+++ b/llvm/test/Transforms/GlobalOpt/globalsra-multigep.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -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/GlobalOpt/globalsra-partial.ll b/llvm/test/Transforms/GlobalOpt/globalsra-partial.ll
index 141ee1bb5a8c0..0998dff2f9cde 100644
--- a/llvm/test/Transforms/GlobalOpt/globalsra-partial.ll
+++ b/llvm/test/Transforms/GlobalOpt/globalsra-partial.ll
@@ -1,6 +1,6 @@
 ; In this case, the global cannot be merged as i may be out of range
 
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 target datalayout = "E-p:64:64:64-a0:0:8-f32:32:32-f64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-v64:64:64-v128:128:128"
 
 @G = internal global { i32, [4 x float] } zeroinitializer               ; <{ i32, [4 x float] }*> [#uses=3]

diff  --git a/llvm/test/Transforms/GlobalOpt/globalsra-unknown-index.ll b/llvm/test/Transforms/GlobalOpt/globalsra-unknown-index.ll
index 4607373ab2c7c..972bab5d8b83b 100644
--- a/llvm/test/Transforms/GlobalOpt/globalsra-unknown-index.ll
+++ b/llvm/test/Transforms/GlobalOpt/globalsra-unknown-index.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 
 ; globalopt should not sra the global, because it can't see the index.
 

diff  --git a/llvm/test/Transforms/GlobalOpt/globalsra.ll b/llvm/test/Transforms/GlobalOpt/globalsra.ll
index 8098ec84b2e71..bf7249ba31a63 100644
--- a/llvm/test/Transforms/GlobalOpt/globalsra.ll
+++ b/llvm/test/Transforms/GlobalOpt/globalsra.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 ; CHECK-NOT: global
 target datalayout = "E-p:64:64:64-a0:0:8-f32:32:32-f64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-v64:64:64-v128:128:128"
 

diff  --git a/llvm/test/Transforms/GlobalOpt/heap-sra-1-no-null-opt.ll b/llvm/test/Transforms/GlobalOpt/heap-sra-1-no-null-opt.ll
index 95ee0b74a9fa2..af50c9b392bb5 100644
--- a/llvm/test/Transforms/GlobalOpt/heap-sra-1-no-null-opt.ll
+++ b/llvm/test/Transforms/GlobalOpt/heap-sra-1-no-null-opt.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 target datalayout = "E-p:64:64:64-a0:0:8-f32:32:32-f64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-v64:64:64-v128:128:128"
 
 %struct.foo = type { i32, i32 }

diff  --git a/llvm/test/Transforms/GlobalOpt/heap-sra-1.ll b/llvm/test/Transforms/GlobalOpt/heap-sra-1.ll
index 42e46e2dc8733..d760f1a4851e4 100644
--- a/llvm/test/Transforms/GlobalOpt/heap-sra-1.ll
+++ b/llvm/test/Transforms/GlobalOpt/heap-sra-1.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 target datalayout = "E-p:64:64:64-a0:0:8-f32:32:32-f64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-v64:64:64-v128:128:128"
 
 ;; Heap SROA has been removed. This tests we don't perform heap SROA.

diff  --git a/llvm/test/Transforms/GlobalOpt/heap-sra-2-no-null-opt.ll b/llvm/test/Transforms/GlobalOpt/heap-sra-2-no-null-opt.ll
index a8456ea75eae5..ed46fee7a0806 100644
--- a/llvm/test/Transforms/GlobalOpt/heap-sra-2-no-null-opt.ll
+++ b/llvm/test/Transforms/GlobalOpt/heap-sra-2-no-null-opt.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 target datalayout = "E-p:64:64:64-a0:0:8-f32:32:32-f64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-v64:64:64-v128:128:128"
 
 %struct.foo = type { i32, i32 }

diff  --git a/llvm/test/Transforms/GlobalOpt/heap-sra-2.ll b/llvm/test/Transforms/GlobalOpt/heap-sra-2.ll
index 75ca53546fca1..4c8d690de65f9 100644
--- a/llvm/test/Transforms/GlobalOpt/heap-sra-2.ll
+++ b/llvm/test/Transforms/GlobalOpt/heap-sra-2.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 target datalayout = "E-p:64:64:64-a0:0:8-f32:32:32-f64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-v64:64:64-v128:128:128"
 
 ;; Heap SROA has been removed. This tests we don't perform heap SROA.

diff  --git a/llvm/test/Transforms/GlobalOpt/heap-sra-phi-no-null-opt.ll b/llvm/test/Transforms/GlobalOpt/heap-sra-phi-no-null-opt.ll
index a942fb351b9b2..2f700c014dda3 100644
--- a/llvm/test/Transforms/GlobalOpt/heap-sra-phi-no-null-opt.ll
+++ b/llvm/test/Transforms/GlobalOpt/heap-sra-phi-no-null-opt.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 target datalayout = "E-p:64:64:64-a0:0:8-f32:32:32-f64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-v64:64:64-v128:128:128"
 
 %struct.foo = type { i32, i32 }

diff  --git a/llvm/test/Transforms/GlobalOpt/heap-sra-phi.ll b/llvm/test/Transforms/GlobalOpt/heap-sra-phi.ll
index ffe0c5ad10f15..cd9154a585c5b 100644
--- a/llvm/test/Transforms/GlobalOpt/heap-sra-phi.ll
+++ b/llvm/test/Transforms/GlobalOpt/heap-sra-phi.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 
 target datalayout = "E-p:64:64:64-a0:0:8-f32:32:32-f64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-v64:64:64-v128:128:128"
 

diff  --git a/llvm/test/Transforms/GlobalOpt/int_sideeffect.ll b/llvm/test/Transforms/GlobalOpt/int_sideeffect.ll
index 49198cf695a35..c85a4d5aed3ad 100644
--- a/llvm/test/Transforms/GlobalOpt/int_sideeffect.ll
+++ b/llvm/test/Transforms/GlobalOpt/int_sideeffect.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S < %s -globalopt | FileCheck %s
+; RUN: opt -S < %s -passes=globalopt | FileCheck %s
 
 ; Static evaluation across a @llvm.sideeffect.
 

diff  --git a/llvm/test/Transforms/GlobalOpt/integer-bool-dwarf.ll b/llvm/test/Transforms/GlobalOpt/integer-bool-dwarf.ll
index 64fee228fed89..8778eb6f17984 100644
--- a/llvm/test/Transforms/GlobalOpt/integer-bool-dwarf.ll
+++ b/llvm/test/Transforms/GlobalOpt/integer-bool-dwarf.ll
@@ -1,4 +1,4 @@
-;RUN: opt -S -globalopt -f %s | FileCheck %s
+;RUN: opt -S -passes=globalopt -f %s | FileCheck %s
 
 ;CHECK: @foo = internal unnamed_addr global i1 false, align 4, !dbg ![[VAR:.*]]
 ;CHECK: ![[VAR]] = !DIGlobalVariableExpression(var: !1, expr:

diff  --git a/llvm/test/Transforms/GlobalOpt/invariant-nodatalayout.ll b/llvm/test/Transforms/GlobalOpt/invariant-nodatalayout.ll
index bb0b9e9143a88..d5bc271069194 100644
--- a/llvm/test/Transforms/GlobalOpt/invariant-nodatalayout.ll
+++ b/llvm/test/Transforms/GlobalOpt/invariant-nodatalayout.ll
@@ -1,4 +1,4 @@
-; RUN: opt -globalopt -S -o - < %s | FileCheck %s
+; RUN: opt -passes=globalopt -S -o - < %s | FileCheck %s
 ; The check here is that it doesn't crash.
 
 declare {}* @llvm.invariant.start.p0i8(i64 %size, i8* nocapture %ptr)

diff  --git a/llvm/test/Transforms/GlobalOpt/invariant.group.ll b/llvm/test/Transforms/GlobalOpt/invariant.group.ll
index 6d192939a5e04..d758d58d5c731 100644
--- a/llvm/test/Transforms/GlobalOpt/invariant.group.ll
+++ b/llvm/test/Transforms/GlobalOpt/invariant.group.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -globalopt < %s | FileCheck %s
+; RUN: opt -S -passes=globalopt < %s | FileCheck %s
 
 ; CHECK: @llvm.global_ctors = appending global [1 x {{.*}}@_GLOBAL__I_c
 @llvm.global_ctors = appending global [3 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 65535, void ()* @_GLOBAL__I_a, i8* null }, { i32, void ()*, i8* } { i32 65535, void ()* @_GLOBAL__I_b, i8* null }, { i32, void ()*, i8* } { i32 65535, void ()* @_GLOBAL__I_c, i8* null }]

diff  --git a/llvm/test/Transforms/GlobalOpt/invariant.ll b/llvm/test/Transforms/GlobalOpt/invariant.ll
index 309562b17ffe2..1604eaf1a5ac7 100644
--- a/llvm/test/Transforms/GlobalOpt/invariant.ll
+++ b/llvm/test/Transforms/GlobalOpt/invariant.ll
@@ -1,4 +1,4 @@
-; RUN: opt -globalopt -S -o - < %s | FileCheck %s
+; RUN: opt -passes=globalopt -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/GlobalOpt/invoke.ll b/llvm/test/Transforms/GlobalOpt/invoke.ll
index c54c7aad924b2..212d909cf11cb 100644
--- a/llvm/test/Transforms/GlobalOpt/invoke.ll
+++ b/llvm/test/Transforms/GlobalOpt/invoke.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -globalopt < %s | FileCheck %s
+; RUN: opt -S -passes=globalopt < %s | FileCheck %s
 ; rdar://11022897
 
 ; Globalopt should be able to evaluate an invoke.

diff  --git a/llvm/test/Transforms/GlobalOpt/iterate.ll b/llvm/test/Transforms/GlobalOpt/iterate.ll
index 8c6543b685d32..79f0750324e5e 100644
--- a/llvm/test/Transforms/GlobalOpt/iterate.ll
+++ b/llvm/test/Transforms/GlobalOpt/iterate.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 ; CHECK-NOT: %G
 
 @G = internal global i32 0              ; <i32*> [#uses=1]

diff  --git a/llvm/test/Transforms/GlobalOpt/large-int-crash.ll b/llvm/test/Transforms/GlobalOpt/large-int-crash.ll
index 7584554b97814..0efdfdaf70096 100644
--- a/llvm/test/Transforms/GlobalOpt/large-int-crash.ll
+++ b/llvm/test/Transforms/GlobalOpt/large-int-crash.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
 
 @X = internal global i128 0
 

diff  --git a/llvm/test/Transforms/GlobalOpt/load-store-global-no-null-opt.ll b/llvm/test/Transforms/GlobalOpt/load-store-global-no-null-opt.ll
index a1011c68c37a5..60d97cf06c9c0 100644
--- a/llvm/test/Transforms/GlobalOpt/load-store-global-no-null-opt.ll
+++ b/llvm/test/Transforms/GlobalOpt/load-store-global-no-null-opt.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 
 @a = internal global i64* null, align 8
 ; CHECK: @a

diff  --git a/llvm/test/Transforms/GlobalOpt/load-store-global.ll b/llvm/test/Transforms/GlobalOpt/load-store-global.ll
index e01358e8ed387..a02469f930ea3 100644
--- a/llvm/test/Transforms/GlobalOpt/load-store-global.ll
+++ b/llvm/test/Transforms/GlobalOpt/load-store-global.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 
 @G = internal global i32 17             ; <i32*> [#uses=3]
 ; CHECK-NOT: @G

diff  --git a/llvm/test/Transforms/GlobalOpt/localize-constexpr-debuginfo.ll b/llvm/test/Transforms/GlobalOpt/localize-constexpr-debuginfo.ll
index e5f0eea801342..96ae7700ead89 100644
--- a/llvm/test/Transforms/GlobalOpt/localize-constexpr-debuginfo.ll
+++ b/llvm/test/Transforms/GlobalOpt/localize-constexpr-debuginfo.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S < %s -globalopt | FileCheck %s
+; RUN: opt -S < %s -passes=globalopt | 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/GlobalOpt/localize-constexpr.ll b/llvm/test/Transforms/GlobalOpt/localize-constexpr.ll
index 3fa7db89b04bd..e1a06b58364a0 100644
--- a/llvm/test/Transforms/GlobalOpt/localize-constexpr.ll
+++ b/llvm/test/Transforms/GlobalOpt/localize-constexpr.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S < %s -globalopt | FileCheck %s
+; RUN: opt -S < %s -passes=globalopt | FileCheck %s
 
 @G = internal global i32 42
 

diff  --git a/llvm/test/Transforms/GlobalOpt/malloc-promote-1-no-null-opt.ll b/llvm/test/Transforms/GlobalOpt/malloc-promote-1-no-null-opt.ll
index 81d24e4c561b0..998cd551f8224 100644
--- a/llvm/test/Transforms/GlobalOpt/malloc-promote-1-no-null-opt.ll
+++ b/llvm/test/Transforms/GlobalOpt/malloc-promote-1-no-null-opt.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 target datalayout = "E-p:64:64:64-a0:0:8-f32:32:32-f64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-v64:64:64-v128:128:128"
 
 @G = internal global i32* null          ; <i32**> [#uses=3]

diff  --git a/llvm/test/Transforms/GlobalOpt/malloc-promote-1.ll b/llvm/test/Transforms/GlobalOpt/malloc-promote-1.ll
index 51f06b12a8439..8ab81cd586fdf 100644
--- a/llvm/test/Transforms/GlobalOpt/malloc-promote-1.ll
+++ b/llvm/test/Transforms/GlobalOpt/malloc-promote-1.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 target datalayout = "E-p:64:64:64-a0:0:8-f32:32:32-f64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-v64:64:64-v128:128:128"
 
 @G = internal global i32* null          ; <i32**> [#uses=4]

diff  --git a/llvm/test/Transforms/GlobalOpt/malloc-promote-2-no-null-opt.ll b/llvm/test/Transforms/GlobalOpt/malloc-promote-2-no-null-opt.ll
index c3e958d5a38fa..9114d69129a65 100644
--- a/llvm/test/Transforms/GlobalOpt/malloc-promote-2-no-null-opt.ll
+++ b/llvm/test/Transforms/GlobalOpt/malloc-promote-2-no-null-opt.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 target datalayout = "E-p:64:64:64-a0:0:8-f32:32:32-f64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-v64:64:64-v128:128:128"
 
 @G = internal global i32* null

diff  --git a/llvm/test/Transforms/GlobalOpt/malloc-promote-2.ll b/llvm/test/Transforms/GlobalOpt/malloc-promote-2.ll
index 5e8d7d47de8f1..2cb6c26cf27d0 100644
--- a/llvm/test/Transforms/GlobalOpt/malloc-promote-2.ll
+++ b/llvm/test/Transforms/GlobalOpt/malloc-promote-2.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 target datalayout = "E-p:64:64:64-a0:0:8-f32:32:32-f64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-v64:64:64-v128:128:128"
 
 @G = internal global i32* null

diff  --git a/llvm/test/Transforms/GlobalOpt/malloc-promote-3.ll b/llvm/test/Transforms/GlobalOpt/malloc-promote-3.ll
index 1e42c3b89a603..9a8bdd8171521 100644
--- a/llvm/test/Transforms/GlobalOpt/malloc-promote-3.ll
+++ b/llvm/test/Transforms/GlobalOpt/malloc-promote-3.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 target datalayout = "E-p:64:64:64-a0:0:8-f32:32:32-f64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-v64:64:64-v128:128:128"
 
 @G = internal global i32* null

diff  --git a/llvm/test/Transforms/GlobalOpt/malloc-promote-4.ll b/llvm/test/Transforms/GlobalOpt/malloc-promote-4.ll
index c3194a5036e32..909d7557ec7b8 100644
--- a/llvm/test/Transforms/GlobalOpt/malloc-promote-4.ll
+++ b/llvm/test/Transforms/GlobalOpt/malloc-promote-4.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -globalopt -o - < %s | FileCheck %s
+; RUN: opt -S -passes=globalopt -o - < %s | FileCheck %s
 
 ; CHECK: [[G_INIT:@.*]] = internal unnamed_addr global i1 false
 @g = internal global i32* null, align 8

diff  --git a/llvm/test/Transforms/GlobalOpt/memcpy.ll b/llvm/test/Transforms/GlobalOpt/memcpy.ll
index 0e65f381c1c67..c0700e5567f91 100644
--- a/llvm/test/Transforms/GlobalOpt/memcpy.ll
+++ b/llvm/test/Transforms/GlobalOpt/memcpy.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 ; CHECK: G1 = internal unnamed_addr constant
 
 @G1 = internal global [58 x i8] c"asdlfkajsdlfkajsd;lfkajds;lfkjasd;flkajsd;lkfja;sdlkfjasd\00"         ; <[58 x i8]*> [#uses=1]

diff  --git a/llvm/test/Transforms/GlobalOpt/memset-null.ll b/llvm/test/Transforms/GlobalOpt/memset-null.ll
index fb2c5104a6c01..9000b98056028 100644
--- a/llvm/test/Transforms/GlobalOpt/memset-null.ll
+++ b/llvm/test/Transforms/GlobalOpt/memset-null.ll
@@ -1,4 +1,4 @@
-; RUN: opt -globalopt -S < %s | FileCheck %s
+; RUN: opt -passes=globalopt -S < %s | FileCheck %s
 ; PR10047
 
 %0 = type { i32, void ()*, i8* }

diff  --git a/llvm/test/Transforms/GlobalOpt/memset.ll b/llvm/test/Transforms/GlobalOpt/memset.ll
index 90a3db8cb7b4d..9248b239624cd 100644
--- a/llvm/test/Transforms/GlobalOpt/memset.ll
+++ b/llvm/test/Transforms/GlobalOpt/memset.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -globalopt < %s | FileCheck %s
+; RUN: opt -S -passes=globalopt < %s | FileCheck %s
 
 ; CHECK-NOT: internal
 

diff  --git a/llvm/test/Transforms/GlobalOpt/metadata.ll b/llvm/test/Transforms/GlobalOpt/metadata.ll
index b766349d506ba..c420235d9cfb6 100644
--- a/llvm/test/Transforms/GlobalOpt/metadata.ll
+++ b/llvm/test/Transforms/GlobalOpt/metadata.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -globalopt < %s | FileCheck %s
+; RUN: opt -S -passes=globalopt < %s | FileCheck %s
 
 ; PR6112 - When globalopt does RAUW(@G, %G), the metadata reference should drop
 ; to null.  Function local metadata that references @G from a 
diff erent function

diff  --git a/llvm/test/Transforms/GlobalOpt/musttail_cc.ll b/llvm/test/Transforms/GlobalOpt/musttail_cc.ll
index fc927ea91dd8f..d4434426656d7 100644
--- a/llvm/test/Transforms/GlobalOpt/musttail_cc.ll
+++ b/llvm/test/Transforms/GlobalOpt/musttail_cc.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 ; PR36546
 
 ; Check that musttail callee preserves its calling convention

diff  --git a/llvm/test/Transforms/GlobalOpt/naked_functions.ll b/llvm/test/Transforms/GlobalOpt/naked_functions.ll
index 8dd63699ab5a0..1174070b32176 100644
--- a/llvm/test/Transforms/GlobalOpt/naked_functions.ll
+++ b/llvm/test/Transforms/GlobalOpt/naked_functions.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 
 ; Check that naked functions don't get marked with fast calling conventions
 

diff  --git a/llvm/test/Transforms/GlobalOpt/new-promote.ll b/llvm/test/Transforms/GlobalOpt/new-promote.ll
index 7320443eb65c0..20063e21e930b 100644
--- a/llvm/test/Transforms/GlobalOpt/new-promote.ll
+++ b/llvm/test/Transforms/GlobalOpt/new-promote.ll
@@ -1,4 +1,4 @@
-; RUN: opt -globalopt -S < %s | FileCheck %s
+; RUN: opt -passes=globalopt -S < %s | FileCheck %s
 ; RUN: opt -passes=globalopt -S < %s | FileCheck %s
 
 %s = type { i32 }

diff  --git a/llvm/test/Transforms/GlobalOpt/null-check-global-value.ll b/llvm/test/Transforms/GlobalOpt/null-check-global-value.ll
index 0958440e765ba..e75df2343c4d5 100644
--- a/llvm/test/Transforms/GlobalOpt/null-check-global-value.ll
+++ b/llvm/test/Transforms/GlobalOpt/null-check-global-value.ll
@@ -1,4 +1,4 @@
-; RUN: opt -globalopt -S < %s | FileCheck %s
+; RUN: opt -passes=globalopt -S < %s | FileCheck %s
 
 %sometype = type { i8* }
 

diff  --git a/llvm/test/Transforms/GlobalOpt/null-check-is-use-pr35760.ll b/llvm/test/Transforms/GlobalOpt/null-check-is-use-pr35760.ll
index 70b4da405dc63..3e158798057d7 100644
--- a/llvm/test/Transforms/GlobalOpt/null-check-is-use-pr35760.ll
+++ b/llvm/test/Transforms/GlobalOpt/null-check-is-use-pr35760.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -globalopt -o - < %s | FileCheck %s
+; RUN: opt -S -passes=globalopt -o - < %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/GlobalOpt/null-check-not-use-pr35760.ll b/llvm/test/Transforms/GlobalOpt/null-check-not-use-pr35760.ll
index 4ea6645596ec4..4a15870d6f0ad 100644
--- a/llvm/test/Transforms/GlobalOpt/null-check-not-use-pr35760.ll
+++ b/llvm/test/Transforms/GlobalOpt/null-check-not-use-pr35760.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -globalopt -o - < %s | FileCheck %s
+; RUN: opt -S -passes=globalopt -o - < %s | FileCheck %s
 
 ; No malloc promotion with non-null check.
 

diff  --git a/llvm/test/Transforms/GlobalOpt/phi-select.ll b/llvm/test/Transforms/GlobalOpt/phi-select.ll
index 86b017c9cb34d..c9cd5c2ba640f 100644
--- a/llvm/test/Transforms/GlobalOpt/phi-select.ll
+++ b/llvm/test/Transforms/GlobalOpt/phi-select.ll
@@ -1,7 +1,7 @@
 ; Test that PHI nodes and select instructions do not necessarily make stuff
 ; non-constant.
 
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 ; CHECK-NOT: global
 
 @X = internal global i32 4              ; <i32*> [#uses=2]

diff  --git a/llvm/test/Transforms/GlobalOpt/pr21191.ll b/llvm/test/Transforms/GlobalOpt/pr21191.ll
index 9e201b888be35..1131ad3c5a9bd 100644
--- a/llvm/test/Transforms/GlobalOpt/pr21191.ll
+++ b/llvm/test/Transforms/GlobalOpt/pr21191.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 
 $c = comdat any
 ; CHECK: $c = comdat any

diff  --git a/llvm/test/Transforms/GlobalOpt/pr33686.ll b/llvm/test/Transforms/GlobalOpt/pr33686.ll
index d6bb98735f4e8..6f09ba62dcbb1 100644
--- a/llvm/test/Transforms/GlobalOpt/pr33686.ll
+++ b/llvm/test/Transforms/GlobalOpt/pr33686.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
 
 @glob = external global i16, align 1
 

diff  --git a/llvm/test/Transforms/GlobalOpt/preallocated.ll b/llvm/test/Transforms/GlobalOpt/preallocated.ll
index 972ce81779284..0d2572621ff4f 100644
--- a/llvm/test/Transforms/GlobalOpt/preallocated.ll
+++ b/llvm/test/Transforms/GlobalOpt/preallocated.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 
 declare token @llvm.call.preallocated.setup(i32)
 declare i8* @llvm.call.preallocated.arg(token, i32)

diff  --git a/llvm/test/Transforms/GlobalOpt/preserve-comdats.ll b/llvm/test/Transforms/GlobalOpt/preserve-comdats.ll
index 0148f0024b9dd..b8fbb70413fd7 100644
--- a/llvm/test/Transforms/GlobalOpt/preserve-comdats.ll
+++ b/llvm/test/Transforms/GlobalOpt/preserve-comdats.ll
@@ -1,4 +1,4 @@
-; RUN: opt -globalopt -S < %s | FileCheck %s
+; RUN: opt -passes=globalopt -S < %s | FileCheck %s
 
 $comdat_global = comdat any
 

diff  --git a/llvm/test/Transforms/GlobalOpt/shrink-address-to-bool.ll b/llvm/test/Transforms/GlobalOpt/shrink-address-to-bool.ll
index 1a298b04e9b97..8084876872425 100644
--- a/llvm/test/Transforms/GlobalOpt/shrink-address-to-bool.ll
+++ b/llvm/test/Transforms/GlobalOpt/shrink-address-to-bool.ll
@@ -1,4 +1,4 @@
-;RUN: opt -S -globalopt -f %s | FileCheck %s
+;RUN: opt -S -passes=globalopt -f %s | FileCheck %s
 
 ;CHECK: @foo = {{.*}}, !dbg !0
 @foo = global i64 ptrtoint ([1 x i64]* @baa to i64), align 8, !dbg !0

diff  --git a/llvm/test/Transforms/GlobalOpt/shrink-global-to-bool-check-debug.ll b/llvm/test/Transforms/GlobalOpt/shrink-global-to-bool-check-debug.ll
index efe7b0a6f8a4c..da396363547fd 100644
--- a/llvm/test/Transforms/GlobalOpt/shrink-global-to-bool-check-debug.ll
+++ b/llvm/test/Transforms/GlobalOpt/shrink-global-to-bool-check-debug.ll
@@ -1,4 +1,4 @@
-;RUN: opt -S -debugify -globalopt -f %s | FileCheck %s
+; RUN: opt -S -passes=debugify,globalopt -f %s | FileCheck %s
 
 @foo = internal global i32 0, align 4
 

diff  --git a/llvm/test/Transforms/GlobalOpt/static-const-bitcast.ll b/llvm/test/Transforms/GlobalOpt/static-const-bitcast.ll
index 52da721b55f0a..27e4ade2b5c4c 100644
--- a/llvm/test/Transforms/GlobalOpt/static-const-bitcast.ll
+++ b/llvm/test/Transforms/GlobalOpt/static-const-bitcast.ll
@@ -1,4 +1,4 @@
-; RUN: opt -globalopt %s -S -o - | FileCheck %s
+; RUN: opt -passes=globalopt %s -S -o - | 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/GlobalOpt/store-struct-element.ll b/llvm/test/Transforms/GlobalOpt/store-struct-element.ll
index 71f0ce2df912b..29d242d36c5d4 100644
--- a/llvm/test/Transforms/GlobalOpt/store-struct-element.ll
+++ b/llvm/test/Transforms/GlobalOpt/store-struct-element.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S -o - | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S -o - | FileCheck %s
 
 %class.Class = type { i8, i8, i8, i8 }
 @A = local_unnamed_addr global %class.Class undef, align 4

diff  --git a/llvm/test/Transforms/GlobalOpt/storepointer-compare-no-null-opt.ll b/llvm/test/Transforms/GlobalOpt/storepointer-compare-no-null-opt.ll
index 179e83bfd80c6..7a777e41b7fee 100644
--- a/llvm/test/Transforms/GlobalOpt/storepointer-compare-no-null-opt.ll
+++ b/llvm/test/Transforms/GlobalOpt/storepointer-compare-no-null-opt.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 ; CHECK: global
 
 @G = internal global void ()* null              ; <void ()**> [#uses=2]

diff  --git a/llvm/test/Transforms/GlobalOpt/storepointer-compare.ll b/llvm/test/Transforms/GlobalOpt/storepointer-compare.ll
index 969443569c20d..fdb3b131a8c98 100644
--- a/llvm/test/Transforms/GlobalOpt/storepointer-compare.ll
+++ b/llvm/test/Transforms/GlobalOpt/storepointer-compare.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 ; CHECK: call void @Actual
 
 ; Check that a comparison does not prevent an indirect call from being made 

diff  --git a/llvm/test/Transforms/GlobalOpt/storepointer-no-null-opt.ll b/llvm/test/Transforms/GlobalOpt/storepointer-no-null-opt.ll
index 1ffab8074e232..db8b050b9275a 100644
--- a/llvm/test/Transforms/GlobalOpt/storepointer-no-null-opt.ll
+++ b/llvm/test/Transforms/GlobalOpt/storepointer-no-null-opt.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 
 @G = internal global void ()* null              ; <void ()**> [#uses=2]
 ; CHECK: global

diff  --git a/llvm/test/Transforms/GlobalOpt/storepointer.ll b/llvm/test/Transforms/GlobalOpt/storepointer.ll
index 8edaa64a62be9..64e5d7f9da0ac 100644
--- a/llvm/test/Transforms/GlobalOpt/storepointer.ll
+++ b/llvm/test/Transforms/GlobalOpt/storepointer.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 ; CHECK-NOT: global
 
 @G = internal global void ()* null              ; <void ()**> [#uses=2]

diff  --git a/llvm/test/Transforms/GlobalOpt/tls.ll b/llvm/test/Transforms/GlobalOpt/tls.ll
index d010b96188f19..add7b2224dc12 100644
--- a/llvm/test/Transforms/GlobalOpt/tls.ll
+++ b/llvm/test/Transforms/GlobalOpt/tls.ll
@@ -1,5 +1,5 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
-; RUN: opt -emulated-tls < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
+; RUN: opt -emulated-tls < %s -passes=globalopt -S | FileCheck %s
 
 declare void @wait()
 declare void @signal()

diff  --git a/llvm/test/Transforms/GlobalOpt/trivialstore.ll b/llvm/test/Transforms/GlobalOpt/trivialstore.ll
index 9a490879a41fe..87efe5d60561b 100644
--- a/llvm/test/Transforms/GlobalOpt/trivialstore.ll
+++ b/llvm/test/Transforms/GlobalOpt/trivialstore.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 ; CHECK-NOT: G
 
 @G = internal global i32 17             ; <i32*> [#uses=3]

diff  --git a/llvm/test/Transforms/GlobalOpt/undef-init.ll b/llvm/test/Transforms/GlobalOpt/undef-init.ll
index 421a0657ec753..fb0029158ba8e 100644
--- a/llvm/test/Transforms/GlobalOpt/undef-init.ll
+++ b/llvm/test/Transforms/GlobalOpt/undef-init.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt < %s -passes=globalopt -S | FileCheck %s
 ; CHECK-NOT: store
 
 @llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [ { i32, void ()*, i8* } { i32 65535, void ()* @_GLOBAL__I__Z3foov, i8* null } ]          ; <[1 x { i32, void ()*, i8* }]*> [#uses=0]

diff  --git a/llvm/test/Transforms/GlobalOpt/unnamed-addr.ll b/llvm/test/Transforms/GlobalOpt/unnamed-addr.ll
index 352dbac8f210d..c954ccf5bf446 100644
--- a/llvm/test/Transforms/GlobalOpt/unnamed-addr.ll
+++ b/llvm/test/Transforms/GlobalOpt/unnamed-addr.ll
@@ -1,4 +1,4 @@
-; RUN: opt -globalopt -S < %s | FileCheck %s
+; RUN: opt -passes=globalopt -S < %s | FileCheck %s
 
 @a = internal global i32 0, align 4
 @b = internal global i32 0, align 4

diff  --git a/llvm/test/Transforms/GlobalOpt/zeroinitializer-gep-load.ll b/llvm/test/Transforms/GlobalOpt/zeroinitializer-gep-load.ll
index 51feb480e3bf0..514e6fde620bb 100644
--- a/llvm/test/Transforms/GlobalOpt/zeroinitializer-gep-load.ll
+++ b/llvm/test/Transforms/GlobalOpt/zeroinitializer-gep-load.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -S -globalopt | FileCheck %s
+; RUN: opt < %s -S -passes=globalopt | FileCheck %s
 
 @zero = internal global [10 x i32] zeroinitializer
 

diff  --git a/llvm/test/Transforms/SCCP/2002-05-02-MissSecondInst.ll b/llvm/test/Transforms/SCCP/2002-05-02-MissSecondInst.ll
index bb5b51d1bbb19..1632426a1f2af 100644
--- a/llvm/test/Transforms/SCCP/2002-05-02-MissSecondInst.ll
+++ b/llvm/test/Transforms/SCCP/2002-05-02-MissSecondInst.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -sccp -S | not grep sub
+; RUN: opt < %s -passes=sccp -S | not grep sub
 
 define void @test3(i32, i32) {
 	add i32 0, 0		; <i32>:3 [#uses=0]

diff  --git a/llvm/test/Transforms/SCCP/2002-05-20-MissedIncomingValue.ll b/llvm/test/Transforms/SCCP/2002-05-20-MissedIncomingValue.ll
index f6198025b80b5..c2a2040d9e19a 100644
--- a/llvm/test/Transforms/SCCP/2002-05-20-MissedIncomingValue.ll
+++ b/llvm/test/Transforms/SCCP/2002-05-20-MissedIncomingValue.ll
@@ -1,7 +1,7 @@
 ; This test shows a case where SCCP is incorrectly eliminating the PHI node
 ; because it thinks it has a constant 0 value, when it really doesn't.
 
-; RUN: opt < %s -sccp -S | grep phi
+; RUN: opt < %s -passes=sccp -S | grep phi
 
 define i32 @test(i32 %A, i1 %c) {
 bb1:

diff  --git a/llvm/test/Transforms/SCCP/2002-08-30-GetElementPtrTest.ll b/llvm/test/Transforms/SCCP/2002-08-30-GetElementPtrTest.ll
index 7b88a669ffba8..50a5321bb8a14 100644
--- a/llvm/test/Transforms/SCCP/2002-08-30-GetElementPtrTest.ll
+++ b/llvm/test/Transforms/SCCP/2002-08-30-GetElementPtrTest.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -sccp -S | not grep %X
+; RUN: opt < %s -passes=sccp -S | not grep %X
 
 @G = external global [40 x i32]		; <[40 x i32]*> [#uses=1]
 

diff  --git a/llvm/test/Transforms/SCCP/2003-08-26-InvokeHandling.ll b/llvm/test/Transforms/SCCP/2003-08-26-InvokeHandling.ll
index eb308afc0e6d0..7b5df4f6bc19a 100644
--- a/llvm/test/Transforms/SCCP/2003-08-26-InvokeHandling.ll
+++ b/llvm/test/Transforms/SCCP/2003-08-26-InvokeHandling.ll
@@ -1,5 +1,5 @@
 ; The PHI cannot be eliminated from this testcase, SCCP is mishandling invoke's!
-; RUN: opt < %s -sccp -S | grep phi
+; RUN: opt < %s -passes=sccp -S | grep phi
 
 declare void @foo()
 

diff  --git a/llvm/test/Transforms/SCCP/2004-11-16-DeadInvoke.ll b/llvm/test/Transforms/SCCP/2004-11-16-DeadInvoke.ll
index 47d9d835656e3..cc50a6a9f5b31 100644
--- a/llvm/test/Transforms/SCCP/2004-11-16-DeadInvoke.ll
+++ b/llvm/test/Transforms/SCCP/2004-11-16-DeadInvoke.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -sccp -disable-output
+; RUN: opt < %s -passes=sccp -disable-output
 
 declare i32 @foo()
 

diff  --git a/llvm/test/Transforms/SCCP/2004-12-10-UndefBranchBug.ll b/llvm/test/Transforms/SCCP/2004-12-10-UndefBranchBug.ll
index 24fecf8a46985..90bc147107063 100644
--- a/llvm/test/Transforms/SCCP/2004-12-10-UndefBranchBug.ll
+++ b/llvm/test/Transforms/SCCP/2004-12-10-UndefBranchBug.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -sccp -S | grep "ret i32 %X"
+; RUN: opt < %s -passes=sccp -S | grep "ret i32 %X"
 
 ; This function definitely returns 1, even if we don't know the direction
 ; of the branch.

diff  --git a/llvm/test/Transforms/SCCP/2006-10-23-IPSCCP-Crash.ll b/llvm/test/Transforms/SCCP/2006-10-23-IPSCCP-Crash.ll
index 30b7325dcdcb6..18861a259847c 100644
--- a/llvm/test/Transforms/SCCP/2006-10-23-IPSCCP-Crash.ll
+++ b/llvm/test/Transforms/SCCP/2006-10-23-IPSCCP-Crash.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -sccp -disable-output
+; RUN: opt < %s -passes=sccp -disable-output
 ; END.
 target datalayout = "E-p:32:32"
 target triple = "powerpc-unknown-linux-gnu"

diff  --git a/llvm/test/Transforms/SCCP/2006-12-04-PackedType.ll b/llvm/test/Transforms/SCCP/2006-12-04-PackedType.ll
index e077efdf6b1ad..40f634846b976 100644
--- a/llvm/test/Transforms/SCCP/2006-12-04-PackedType.ll
+++ b/llvm/test/Transforms/SCCP/2006-12-04-PackedType.ll
@@ -1,7 +1,7 @@
 ; Test VectorType handling by SCCP.
 ; SCCP ignores VectorTypes until PR 1034 is fixed
 ;
-; RUN: opt < %s -sccp
+; RUN: opt < %s -passes=sccp
 ; END.
 
 target datalayout = "E-p:32:32"

diff  --git a/llvm/test/Transforms/SCCP/2006-12-19-UndefBug.ll b/llvm/test/Transforms/SCCP/2006-12-19-UndefBug.ll
index 4bd096e0a6565..0f3eea9aee144 100644
--- a/llvm/test/Transforms/SCCP/2006-12-19-UndefBug.ll
+++ b/llvm/test/Transforms/SCCP/2006-12-19-UndefBug.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -sccp -S | FileCheck %s
+; RUN: opt < %s -passes=sccp -S | FileCheck %s
 
 define i1 @foo() {
 ; CHECK-LABEL: @foo(

diff  --git a/llvm/test/Transforms/SCCP/2007-05-16-InvokeCrash.ll b/llvm/test/Transforms/SCCP/2007-05-16-InvokeCrash.ll
index 7d29f6cabcb3c..cc2a71ea1f0ae 100644
--- a/llvm/test/Transforms/SCCP/2007-05-16-InvokeCrash.ll
+++ b/llvm/test/Transforms/SCCP/2007-05-16-InvokeCrash.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -sccp -disable-output
+; RUN: opt < %s -passes=sccp -disable-output
 ; PR1431
 
 define void @_ada_bench() personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) {

diff  --git a/llvm/test/Transforms/SCCP/2008-01-27-UndefCorrelate.ll b/llvm/test/Transforms/SCCP/2008-01-27-UndefCorrelate.ll
index aa613dca5d11b..ed2dfb3fe6f5f 100644
--- a/llvm/test/Transforms/SCCP/2008-01-27-UndefCorrelate.ll
+++ b/llvm/test/Transforms/SCCP/2008-01-27-UndefCorrelate.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -sccp -S | grep undef | count 1
+; RUN: opt < %s -passes=sccp -S | grep undef | count 1
 ; PR1938
 
 define i32 @main() {

diff  --git a/llvm/test/Transforms/SCCP/2008-04-22-multiple-ret-sccp.ll b/llvm/test/Transforms/SCCP/2008-04-22-multiple-ret-sccp.ll
index e7168dda0891c..86fb198e08cb2 100644
--- a/llvm/test/Transforms/SCCP/2008-04-22-multiple-ret-sccp.ll
+++ b/llvm/test/Transforms/SCCP/2008-04-22-multiple-ret-sccp.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -sccp -S | grep "ret i32 %Z"
+; RUN: opt < %s -passes=sccp -S | grep "ret i32 %Z"
 ; rdar://5778210
 
 declare {i32, i32} @bar(i32 %A) 

diff  --git a/llvm/test/Transforms/SCCP/2008-05-23-UndefCallFold.ll b/llvm/test/Transforms/SCCP/2008-05-23-UndefCallFold.ll
index 4688643ebd545..803912c8be094 100644
--- a/llvm/test/Transforms/SCCP/2008-05-23-UndefCallFold.ll
+++ b/llvm/test/Transforms/SCCP/2008-05-23-UndefCallFold.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -sccp -S | not grep "ret i32 undef"
+; RUN: opt < %s -passes=sccp -S | not grep "ret i32 undef"
 ; PR2358
 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/SCCP/2008-06-09-WeakProp.ll b/llvm/test/Transforms/SCCP/2008-06-09-WeakProp.ll
index b6c5299ae7dc4..652221efd0961 100644
--- a/llvm/test/Transforms/SCCP/2008-06-09-WeakProp.ll
+++ b/llvm/test/Transforms/SCCP/2008-06-09-WeakProp.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -ipsccp -S | FileCheck %s
+; RUN: opt < %s -passes=ipsccp -S | FileCheck %s
 ; Should not propagate the result of a weak function.
 ; PR2411
 

diff  --git a/llvm/test/Transforms/SCCP/2009-01-14-IPSCCP-Invoke.ll b/llvm/test/Transforms/SCCP/2009-01-14-IPSCCP-Invoke.ll
index f3e54804f306a..2cc9e3edc52e7 100644
--- a/llvm/test/Transforms/SCCP/2009-01-14-IPSCCP-Invoke.ll
+++ b/llvm/test/Transforms/SCCP/2009-01-14-IPSCCP-Invoke.ll
@@ -1,5 +1,5 @@
-; RUN: opt < %s -ipsccp -S | grep "ret i32 42"
-; RUN: opt < %s -ipsccp -S | grep "ret i32 undef"
+; RUN: opt < %s -passes=ipsccp -S | grep "ret i32 42"
+; RUN: opt < %s -passes=ipsccp -S | grep "ret i32 undef"
 ; PR3325
 
 define i32 @main() personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) {

diff  --git a/llvm/test/Transforms/SCCP/2009-05-27-VectorOperandZero.ll b/llvm/test/Transforms/SCCP/2009-05-27-VectorOperandZero.ll
index 1ac6bcd8b4ecf..e07390baeffd5 100644
--- a/llvm/test/Transforms/SCCP/2009-05-27-VectorOperandZero.ll
+++ b/llvm/test/Transforms/SCCP/2009-05-27-VectorOperandZero.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -sccp -disable-output
+; RUN: opt < %s -passes=sccp -disable-output
 ; PR4277
 
 define i32 @main() nounwind {

diff  --git a/llvm/test/Transforms/SCCP/2009-09-24-byval-ptr.ll b/llvm/test/Transforms/SCCP/2009-09-24-byval-ptr.ll
index e491e04122853..750ebe234d119 100644
--- a/llvm/test/Transforms/SCCP/2009-09-24-byval-ptr.ll
+++ b/llvm/test/Transforms/SCCP/2009-09-24-byval-ptr.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -ipsccp -S | FileCheck %s
+; RUN: opt < %s -passes=ipsccp -S | FileCheck %s
 ; Don't constant-propagate byval pointers, since they are not pointers!
 ; PR5038
 %struct.MYstr = type { i8, i32 }

diff  --git a/llvm/test/Transforms/SCCP/PR16052.ll b/llvm/test/Transforms/SCCP/PR16052.ll
index a16067fe278af..04f9ceeb07fa3 100644
--- a/llvm/test/Transforms/SCCP/PR16052.ll
+++ b/llvm/test/Transforms/SCCP/PR16052.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --function-signature --scrub-attributes
-; RUN: opt < %s -S -ipsccp | FileCheck %s
+; RUN: opt < %s -S -passes=ipsccp | 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/SCCP/PR26044.ll b/llvm/test/Transforms/SCCP/PR26044.ll
index 6e63d24716840..3a903d62603ea 100644
--- a/llvm/test/Transforms/SCCP/PR26044.ll
+++ b/llvm/test/Transforms/SCCP/PR26044.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --function-signature --scrub-attributes
-; RUN: opt < %s -S -ipsccp | FileCheck %s
+; RUN: opt < %s -S -passes=ipsccp | 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/SCCP/PR43857.ll b/llvm/test/Transforms/SCCP/PR43857.ll
index efe4bca4f514c..51ad214e77667 100644
--- a/llvm/test/Transforms/SCCP/PR43857.ll
+++ b/llvm/test/Transforms/SCCP/PR43857.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -S -ipsccp | FileCheck %s
+; RUN: opt < %s -S -passes=ipsccp | FileCheck %s
 
 %struct.wobble = type { i32 }
 %struct.zot = type { %struct.wobble, %struct.wobble, %struct.wobble }

diff  --git a/llvm/test/Transforms/SCCP/apfloat-basictest.ll b/llvm/test/Transforms/SCCP/apfloat-basictest.ll
index f33dd45b5c842..c980f3f6b36d1 100644
--- a/llvm/test/Transforms/SCCP/apfloat-basictest.ll
+++ b/llvm/test/Transforms/SCCP/apfloat-basictest.ll
@@ -1,7 +1,7 @@
 ; This is a basic correctness check for constant propagation. The fneg
 ; instruction should be eliminated.
 
-; RUN: opt < %s -sccp -S | FileCheck %s
+; RUN: opt < %s -passes=sccp -S | FileCheck %s
 
 define double @test(i1 %B) {
 	br i1 %B, label %BB1, label %BB2

diff  --git a/llvm/test/Transforms/SCCP/apint-array.ll b/llvm/test/Transforms/SCCP/apint-array.ll
index eff6cc997e35f..4aa87b74bbeb5 100644
--- a/llvm/test/Transforms/SCCP/apint-array.ll
+++ b/llvm/test/Transforms/SCCP/apint-array.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -sccp -S | grep "ret i101 12"
+; RUN: opt < %s -passes=sccp -S | grep "ret i101 12"
 
 @Y = constant [6 x i101] [ i101 12, i101 123456789000000, i101 -12,i101 
 -123456789000000, i101 0,i101 9123456789000000]

diff  --git a/llvm/test/Transforms/SCCP/apint-basictest.ll b/llvm/test/Transforms/SCCP/apint-basictest.ll
index 958714f61854f..a3141c773155b 100644
--- a/llvm/test/Transforms/SCCP/apint-basictest.ll
+++ b/llvm/test/Transforms/SCCP/apint-basictest.ll
@@ -1,7 +1,7 @@
 ; This is a basic correctness check for constant propagation.  The add
 ; instruction should be eliminated.
 
-; RUN: opt < %s -sccp -S | not grep add
+; RUN: opt < %s -passes=sccp -S | not grep add
 
 define i128 @test(i1 %B) {
 	br i1 %B, label %BB1, label %BB2

diff  --git a/llvm/test/Transforms/SCCP/apint-basictest2.ll b/llvm/test/Transforms/SCCP/apint-basictest2.ll
index 2ee5b3d57f6d4..6d4a7524e51ea 100644
--- a/llvm/test/Transforms/SCCP/apint-basictest2.ll
+++ b/llvm/test/Transforms/SCCP/apint-basictest2.ll
@@ -1,8 +1,8 @@
 ; This is a basic correctness check for constant propagation.  The add
 ; instruction and phi instruction should be eliminated.
 
-; RUN: opt < %s -sccp -S | not grep phi
-; RUN: opt < %s -sccp -S | not grep add
+; RUN: opt < %s -passes=sccp -S | not grep phi
+; RUN: opt < %s -passes=sccp -S | not grep add
 
 define i128 @test(i1 %B) {
 	br i1 %B, label %BB1, label %BB2

diff  --git a/llvm/test/Transforms/SCCP/apint-basictest3.ll b/llvm/test/Transforms/SCCP/apint-basictest3.ll
index eb31ff038630a..47aa1b5677acd 100644
--- a/llvm/test/Transforms/SCCP/apint-basictest3.ll
+++ b/llvm/test/Transforms/SCCP/apint-basictest3.ll
@@ -2,8 +2,8 @@
 ; basic arithmetic operations.
 
 
-; RUN: opt < %s -sccp -S | not grep mul
-; RUN: opt < %s -sccp -S | not grep umod
+; RUN: opt < %s -passes=sccp -S | not grep mul
+; RUN: opt < %s -passes=sccp -S | not grep umod
 
 define i128 @test(i1 %B) {
 	br i1 %B, label %BB1, label %BB2

diff  --git a/llvm/test/Transforms/SCCP/apint-basictest4.ll b/llvm/test/Transforms/SCCP/apint-basictest4.ll
index 9e265aaf4fbfd..08990b2c92ff0 100644
--- a/llvm/test/Transforms/SCCP/apint-basictest4.ll
+++ b/llvm/test/Transforms/SCCP/apint-basictest4.ll
@@ -2,9 +2,9 @@
 ; basic logic operations.
 
 
-; RUN: opt < %s -sccp -S | not grep and
-; RUN: opt < %s -sccp -S | not grep trunc
-; RUN: opt < %s -sccp -S | grep "ret i100 -1"
+; RUN: opt < %s -passes=sccp -S | not grep and
+; RUN: opt < %s -passes=sccp -S | not grep trunc
+; RUN: opt < %s -passes=sccp -S | grep "ret i100 -1"
 
 define i100 @test(i133 %A) {
         %B = and i133 0, %A

diff  --git a/llvm/test/Transforms/SCCP/apint-bigarray.ll b/llvm/test/Transforms/SCCP/apint-bigarray.ll
index e0231997f1bf4..de4379bf3b5e2 100644
--- a/llvm/test/Transforms/SCCP/apint-bigarray.ll
+++ b/llvm/test/Transforms/SCCP/apint-bigarray.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -sccp -S | not grep %X
+; RUN: opt < %s -passes=sccp -S | not grep %X
 
 @G =  global [1000000 x i10000] zeroinitializer
 

diff  --git a/llvm/test/Transforms/SCCP/apint-bigint.ll b/llvm/test/Transforms/SCCP/apint-bigint.ll
index 36a96c335715b..2df55de5cc633 100644
--- a/llvm/test/Transforms/SCCP/apint-bigint.ll
+++ b/llvm/test/Transforms/SCCP/apint-bigint.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -sccp -S | not grep xor
+; RUN: opt < %s -passes=sccp -S | not grep xor
 
 define i11129 @test1() {
         %B = shl i11129 1, 11128 

diff  --git a/llvm/test/Transforms/SCCP/apint-bigint2.ll b/llvm/test/Transforms/SCCP/apint-bigint2.ll
index 3639d13268984..45b6a068b45d5 100644
--- a/llvm/test/Transforms/SCCP/apint-bigint2.ll
+++ b/llvm/test/Transforms/SCCP/apint-bigint2.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -sccp -S | FileCheck %s
+; RUN: opt < %s -passes=sccp -S | FileCheck %s
 
 @Y = constant [6 x i101] [ i101 12, i101 123456789000000, i101 -12,
   i101 -123456789000000, i101 0,i101 9123456789000000]

diff  --git a/llvm/test/Transforms/SCCP/apint-ipsccp1.ll b/llvm/test/Transforms/SCCP/apint-ipsccp1.ll
index f6f18fe66f893..6fcb50f6b2a64 100644
--- a/llvm/test/Transforms/SCCP/apint-ipsccp1.ll
+++ b/llvm/test/Transforms/SCCP/apint-ipsccp1.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -ipsccp -S | grep -v "ret i512 undef" | \
+; RUN: opt < %s -passes=ipsccp -S | grep -v "ret i512 undef" | \
 ; RUN:   grep "ret i8 2"
 
 define internal i512 @test(i1 %B) {

diff  --git a/llvm/test/Transforms/SCCP/apint-ipsccp2.ll b/llvm/test/Transforms/SCCP/apint-ipsccp2.ll
index 834cca488484e..7f41d863f66fc 100644
--- a/llvm/test/Transforms/SCCP/apint-ipsccp2.ll
+++ b/llvm/test/Transforms/SCCP/apint-ipsccp2.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -ipsccp -S | grep -v "ret i101 0" | \
+; RUN: opt < %s -passes=ipsccp -S | grep -v "ret i101 0" | \
 ; RUN:    grep -v "ret i101 undef" | not grep ret
 
 

diff  --git a/llvm/test/Transforms/SCCP/apint-ipsccp3.ll b/llvm/test/Transforms/SCCP/apint-ipsccp3.ll
index 4ba1f8db30ba9..c06adc0401d32 100644
--- a/llvm/test/Transforms/SCCP/apint-ipsccp3.ll
+++ b/llvm/test/Transforms/SCCP/apint-ipsccp3.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -ipsccp -S | FileCheck %s
+; RUN: opt < %s -passes=ipsccp -S | FileCheck %s
 
 @G = internal global i66 undef
 

diff  --git a/llvm/test/Transforms/SCCP/apint-ipsccp4.ll b/llvm/test/Transforms/SCCP/apint-ipsccp4.ll
index be06d03f39141..1eb0770ecf107 100644
--- a/llvm/test/Transforms/SCCP/apint-ipsccp4.ll
+++ b/llvm/test/Transforms/SCCP/apint-ipsccp4.ll
@@ -1,8 +1,8 @@
 ; This test makes sure that these instructions are properly constant propagated.
 
-; RUN: opt < %s -ipsccp -S | not grep load
-; RUN: opt < %s -ipsccp -S | not grep add
-; RUN: opt < %s -ipsccp -S | not grep phi
+; RUN: opt < %s -passes=ipsccp -S | not grep load
+; RUN: opt < %s -passes=ipsccp -S | not grep add
+; RUN: opt < %s -passes=ipsccp -S | not grep phi
 
 
 @Y = constant [2 x { i212, float }] [ { i212, float } { i212 12, float 1.0 }, 

diff  --git a/llvm/test/Transforms/SCCP/apint-load.ll b/llvm/test/Transforms/SCCP/apint-load.ll
index 17506fc043cc4..c2835880e149a 100644
--- a/llvm/test/Transforms/SCCP/apint-load.ll
+++ b/llvm/test/Transforms/SCCP/apint-load.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that these instructions are properly constant propagated.
 
-; RUN: opt < %s -ipsccp -S | not grep load
-; RUN: opt < %s -ipsccp -S | not grep fdiv
+; RUN: opt < %s -passes=ipsccp -S | not grep load
+; RUN: opt < %s -passes=ipsccp -S | not grep fdiv
 
 @X = constant i212 42
 @Y = constant [2 x { i212, float }] [ { i212, float } { i212 12, float 1.0 }, 

diff  --git a/llvm/test/Transforms/SCCP/apint-phi.ll b/llvm/test/Transforms/SCCP/apint-phi.ll
index 50f0d1aeccbdf..f17d4a73a8125 100644
--- a/llvm/test/Transforms/SCCP/apint-phi.ll
+++ b/llvm/test/Transforms/SCCP/apint-phi.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -sccp -S | not grep phi
+; RUN: opt < %s -passes=sccp -S | not grep phi
 
 define i999 @test(i999%A, i1 %c) {
 bb1:

diff  --git a/llvm/test/Transforms/SCCP/apint-select.ll b/llvm/test/Transforms/SCCP/apint-select.ll
index d797c7a4d43c5..fae261ab26519 100644
--- a/llvm/test/Transforms/SCCP/apint-select.ll
+++ b/llvm/test/Transforms/SCCP/apint-select.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -sccp -S | FileCheck %s
+; RUN: opt < %s -passes=sccp -S | FileCheck %s
 
 @A = constant i32 10
 

diff  --git a/llvm/test/Transforms/SCCP/apint-xor.ll b/llvm/test/Transforms/SCCP/apint-xor.ll
index 26d31d77ac716..1fc2e5e127c28 100644
--- a/llvm/test/Transforms/SCCP/apint-xor.ll
+++ b/llvm/test/Transforms/SCCP/apint-xor.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -sccp -S | FileCheck %s
+; RUN: opt < %s -passes=sccp -S | FileCheck %s
 
 ; Test some XOR simplifications / range propagation.
 define void at xor1(i1 %cmp) {

diff  --git a/llvm/test/Transforms/SCCP/arg-count-mismatch.ll b/llvm/test/Transforms/SCCP/arg-count-mismatch.ll
index ba5f1a6d83f72..c51fd01c77287 100644
--- a/llvm/test/Transforms/SCCP/arg-count-mismatch.ll
+++ b/llvm/test/Transforms/SCCP/arg-count-mismatch.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -ipsccp -S -o - | FileCheck %s
+; RUN: opt < %s -passes=ipsccp -S -o - | FileCheck %s
 
 ; The original C source looked like this:
 ;

diff  --git a/llvm/test/Transforms/SCCP/arg-type-mismatch.ll b/llvm/test/Transforms/SCCP/arg-type-mismatch.ll
index 9a9da52174c2a..dac64daa4f7cc 100644
--- a/llvm/test/Transforms/SCCP/arg-type-mismatch.ll
+++ b/llvm/test/Transforms/SCCP/arg-type-mismatch.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -ipsccp -S -o - | FileCheck %s
+; RUN: opt < %s -passes=ipsccp -S -o - | FileCheck %s
 
 ; This test is just to verify that we do not crash/assert due to mismatch in
 ; argument type between the caller and callee.

diff  --git a/llvm/test/Transforms/SCCP/assume.ll b/llvm/test/Transforms/SCCP/assume.ll
index ce47877e9e3c5..ffa3c5d5ba2d1 100644
--- a/llvm/test/Transforms/SCCP/assume.ll
+++ b/llvm/test/Transforms/SCCP/assume.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -ipsccp -S | FileCheck %s
+; RUN: opt < %s -passes=ipsccp -S | FileCheck %s
 
 declare void @use(i1)
 declare void @llvm.assume(i1)

diff  --git a/llvm/test/Transforms/SCCP/atomic-load-store.ll b/llvm/test/Transforms/SCCP/atomic-load-store.ll
index 45b5d7c80feb3..21d4a9f8b0b98 100644
--- a/llvm/test/Transforms/SCCP/atomic-load-store.ll
+++ b/llvm/test/Transforms/SCCP/atomic-load-store.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -ipsccp -S | FileCheck %s
+; RUN: opt < %s -passes=ipsccp -S | FileCheck %s
 
 ; This transformation is safe for atomic loads and stores; check that it works.
 

diff  --git a/llvm/test/Transforms/SCCP/atomic.ll b/llvm/test/Transforms/SCCP/atomic.ll
index 60d4896ec2b02..109fcf239e344 100644
--- a/llvm/test/Transforms/SCCP/atomic.ll
+++ b/llvm/test/Transforms/SCCP/atomic.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -sccp -S | FileCheck %s
+; RUN: opt < %s -passes=sccp -S | FileCheck %s
 
 define i1 @test_cmpxchg(i32* %addr, i32 %desired, i32 %new) {
 ; CHECK-LABEL: @test_cmpxchg

diff  --git a/llvm/test/Transforms/SCCP/binaryops-constexprs.ll b/llvm/test/Transforms/SCCP/binaryops-constexprs.ll
index d3e7bee54fcf9..e87b04c2f1880 100644
--- a/llvm/test/Transforms/SCCP/binaryops-constexprs.ll
+++ b/llvm/test/Transforms/SCCP/binaryops-constexprs.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -sccp -S | FileCheck %s
+; RUN: opt < %s -passes=sccp -S | FileCheck %s
 
 declare void @use.i32(i32)
 declare void @use.i1(i1)

diff  --git a/llvm/test/Transforms/SCCP/binaryops-range-special-cases.ll b/llvm/test/Transforms/SCCP/binaryops-range-special-cases.ll
index ad4ab37dfc60f..985974515fdca 100644
--- a/llvm/test/Transforms/SCCP/binaryops-range-special-cases.ll
+++ b/llvm/test/Transforms/SCCP/binaryops-range-special-cases.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -ipsccp -S | FileCheck %s
+; RUN: opt < %s -passes=ipsccp -S | FileCheck %s
 
 declare void @use(i1)
 define void @sdiv1_cmp_constants(i32 %x) {

diff  --git a/llvm/test/Transforms/SCCP/bitcast.ll b/llvm/test/Transforms/SCCP/bitcast.ll
index 285823512e579..fec3a518b2ec4 100644
--- a/llvm/test/Transforms/SCCP/bitcast.ll
+++ b/llvm/test/Transforms/SCCP/bitcast.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -ipsccp -S | FileCheck %s
+; RUN: opt < %s -passes=ipsccp -S | FileCheck %s
 
 define i128 @vector_to_int_cast() {
   %A = bitcast <4 x i32> <i32 1073741824, i32 1073741824, i32 1073741824, i32 1073741824> to i128

diff  --git a/llvm/test/Transforms/SCCP/clang-arc-rv.ll b/llvm/test/Transforms/SCCP/clang-arc-rv.ll
index 7ac2eb0ae3bbd..a986019d38752 100644
--- a/llvm/test/Transforms/SCCP/clang-arc-rv.ll
+++ b/llvm/test/Transforms/SCCP/clang-arc-rv.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -ipsccp -S | FileCheck %s
+; RUN: opt < %s -passes=ipsccp -S | FileCheck %s
 ; Return value can't be zapped if there is a call that has operand bundle
 ; "clang.arc.attachedcall".
 

diff  --git a/llvm/test/Transforms/SCCP/comdat-ipo.ll b/llvm/test/Transforms/SCCP/comdat-ipo.ll
index fc715f45406f3..6f2ace6890fba 100644
--- a/llvm/test/Transforms/SCCP/comdat-ipo.ll
+++ b/llvm/test/Transforms/SCCP/comdat-ipo.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -ipsccp -S | FileCheck %s
+; RUN: opt < %s -passes=ipsccp -S | FileCheck %s
 
 ; See PR26774
 

diff  --git a/llvm/test/Transforms/SCCP/conditions-iter-order.ll b/llvm/test/Transforms/SCCP/conditions-iter-order.ll
index 5e7e4f31b4c2d..a9187b76d9193 100644
--- a/llvm/test/Transforms/SCCP/conditions-iter-order.ll
+++ b/llvm/test/Transforms/SCCP/conditions-iter-order.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -ipsccp -S %s | FileCheck %s
+; RUN: opt -passes=ipsccp -S %s | FileCheck %s
 
 declare noalias i8* @malloc(i64)
 

diff  --git a/llvm/test/Transforms/SCCP/conditions-ranges-with-undef.ll b/llvm/test/Transforms/SCCP/conditions-ranges-with-undef.ll
index f142a426cc13f..ea45bc1906575 100644
--- a/llvm/test/Transforms/SCCP/conditions-ranges-with-undef.ll
+++ b/llvm/test/Transforms/SCCP/conditions-ranges-with-undef.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -ipsccp -S | FileCheck %s
+; RUN: opt < %s -passes=ipsccp -S | FileCheck %s
 
 declare void @use(i1)
 

diff  --git a/llvm/test/Transforms/SCCP/conditions-ranges.ll b/llvm/test/Transforms/SCCP/conditions-ranges.ll
index cf0e6177432e8..519724c767b62 100644
--- a/llvm/test/Transforms/SCCP/conditions-ranges.ll
+++ b/llvm/test/Transforms/SCCP/conditions-ranges.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -ipsccp -S | FileCheck %s
+; RUN: opt < %s -passes=ipsccp -S | FileCheck %s
 
 declare void @use(i1)
 

diff  --git a/llvm/test/Transforms/SCCP/constant-range-struct.ll b/llvm/test/Transforms/SCCP/constant-range-struct.ll
index 290437d386aaf..7a399df11fb13 100644
--- a/llvm/test/Transforms/SCCP/constant-range-struct.ll
+++ b/llvm/test/Transforms/SCCP/constant-range-struct.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt %s -ipsccp -S | FileCheck %s
+; RUN: opt %s -passes=ipsccp -S | FileCheck %s
 
 declare i1 @cond()
 declare void @use(i1)

diff  --git a/llvm/test/Transforms/SCCP/constant-struct.ll b/llvm/test/Transforms/SCCP/constant-struct.ll
index 2b33d56916785..7fd7437b5f15c 100644
--- a/llvm/test/Transforms/SCCP/constant-struct.ll
+++ b/llvm/test/Transforms/SCCP/constant-struct.ll
@@ -1,5 +1,5 @@
 ; Test that constant structs are folded.
-; RUN: opt %s -sccp -S | FileCheck %s
+; RUN: opt %s -passes=sccp -S | FileCheck %s
 
 define internal {i64} @struct1() {
   %a = insertvalue {i64} undef, i64 24, 0

diff  --git a/llvm/test/Transforms/SCCP/crash.ll b/llvm/test/Transforms/SCCP/crash.ll
index 3ec1fd21745e3..933db0593ae80 100644
--- a/llvm/test/Transforms/SCCP/crash.ll
+++ b/llvm/test/Transforms/SCCP/crash.ll
@@ -1,4 +1,4 @@
-; RUN: opt -sccp -S < %s
+; RUN: opt -passes=sccp -S < %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-apple-darwin10.0"
 

diff  --git a/llvm/test/Transforms/SCCP/deadarg.ll b/llvm/test/Transforms/SCCP/deadarg.ll
index 1117acc7d0137..6cd414a4bef7a 100644
--- a/llvm/test/Transforms/SCCP/deadarg.ll
+++ b/llvm/test/Transforms/SCCP/deadarg.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -ipsccp -disable-output
+; RUN: opt < %s -passes=ipsccp -disable-output
 define internal void @foo(i32 %X) {
   call void @foo( i32 %X )
   ret void

diff  --git a/llvm/test/Transforms/SCCP/definite-initializer.ll b/llvm/test/Transforms/SCCP/definite-initializer.ll
index a2c4521e07cac..c09750c7b4bc9 100644
--- a/llvm/test/Transforms/SCCP/definite-initializer.ll
+++ b/llvm/test/Transforms/SCCP/definite-initializer.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -ipsccp < %s | FileCheck %s
+; RUN: opt -S -passes=ipsccp < %s | FileCheck %s
 @d = internal externally_initialized global i32 0, section ".openbsd.randomdata", align 4
 
 ; CHECK-LABEL: @test1(

diff  --git a/llvm/test/Transforms/SCCP/domtree-update.ll b/llvm/test/Transforms/SCCP/domtree-update.ll
index 32adbde300e88..76f575c4e9c6d 100644
--- a/llvm/test/Transforms/SCCP/domtree-update.ll
+++ b/llvm/test/Transforms/SCCP/domtree-update.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -ipsccp < %s | FileCheck %s
+; RUN: opt -S -passes=ipsccp < %s | FileCheck %s
 ; RUN: opt -S -passes='ipsccp,function(verify<domtree>)' < %s | FileCheck %s
 
 ; DTU should not crash.

diff  --git a/llvm/test/Transforms/SCCP/dont-zap-return.ll b/llvm/test/Transforms/SCCP/dont-zap-return.ll
index c5345309cea31..3dca821e25b94 100644
--- a/llvm/test/Transforms/SCCP/dont-zap-return.ll
+++ b/llvm/test/Transforms/SCCP/dont-zap-return.ll
@@ -1,4 +1,4 @@
-; RUN: opt -ipsccp < %s -S | FileCheck %s
+; RUN: opt -passes=ipsccp < %s -S | FileCheck %s
 
 define internal {i32, i32} @identity(i32 %patatino) {
   %foo = insertvalue {i32, i32} {i32 1, i32 undef}, i32 %patatino, 1

diff  --git a/llvm/test/Transforms/SCCP/float-nan-simplification.ll b/llvm/test/Transforms/SCCP/float-nan-simplification.ll
index 1cedbaa69e44a..5a97518b8d137 100644
--- a/llvm/test/Transforms/SCCP/float-nan-simplification.ll
+++ b/llvm/test/Transforms/SCCP/float-nan-simplification.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -sccp -S %s | FileCheck %s
+; RUN: opt -passes=sccp -S %s | FileCheck %s
 
 ; When marking the edge from bb2 -> exit as executable first, %p will be NaN
 ; first and %v.1 will simplify to NaN. But when marking bb1 -> exit executable,

diff  --git a/llvm/test/Transforms/SCCP/float-phis.ll b/llvm/test/Transforms/SCCP/float-phis.ll
index 8eef7fa5e0ffe..208fc1dc4e1a6 100644
--- a/llvm/test/Transforms/SCCP/float-phis.ll
+++ b/llvm/test/Transforms/SCCP/float-phis.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -sccp -S | FileCheck %s
+; RUN: opt < %s -passes=sccp -S | FileCheck %s
 
 declare void @use(i1)
 

diff  --git a/llvm/test/Transforms/SCCP/fp-bc-icmp-const-fold.ll b/llvm/test/Transforms/SCCP/fp-bc-icmp-const-fold.ll
index 20c44384504e2..8061a0396ee4c 100644
--- a/llvm/test/Transforms/SCCP/fp-bc-icmp-const-fold.ll
+++ b/llvm/test/Transforms/SCCP/fp-bc-icmp-const-fold.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -ipsccp < %s | FileCheck %s
+; RUN: opt -S -passes=ipsccp < %s | FileCheck %s
 target datalayout = "E-m:e-i64:64-n32:64"
 target triple = "powerpc64le-unknown-linux"
 

diff  --git a/llvm/test/Transforms/SCCP/global-alias-constprop.ll b/llvm/test/Transforms/SCCP/global-alias-constprop.ll
index 8eac3ac180593..abb8bc2ebc76e 100644
--- a/llvm/test/Transforms/SCCP/global-alias-constprop.ll
+++ b/llvm/test/Transforms/SCCP/global-alias-constprop.ll
@@ -1,4 +1,3 @@
-; RUN: opt < %s -sccp -S | FileCheck %s
 ; RUN: opt < %s -passes=sccp -S | FileCheck %s
 
 @0 = private unnamed_addr constant [2 x i32] [i32 -1, i32 1]

diff  --git a/llvm/test/Transforms/SCCP/global.ll b/llvm/test/Transforms/SCCP/global.ll
index 5e34696d56629..bd058e92d656c 100644
--- a/llvm/test/Transforms/SCCP/global.ll
+++ b/llvm/test/Transforms/SCCP/global.ll
@@ -1,5 +1,4 @@
 ; RUN: opt < %s -S -passes=ipsccp | FileCheck %s
-; RUN: opt < %s -S -ipsccp | FileCheck %s
 
 @_ZL6test1g = internal global i32 42, align 4
 

diff  --git a/llvm/test/Transforms/SCCP/indirectbr.ll b/llvm/test/Transforms/SCCP/indirectbr.ll
index 6889282e3874f..8e7ab25f40d87 100644
--- a/llvm/test/Transforms/SCCP/indirectbr.ll
+++ b/llvm/test/Transforms/SCCP/indirectbr.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -ipsccp < %s | FileCheck %s
+; RUN: opt -S -passes=ipsccp < %s | FileCheck %s
 
 declare void @BB0_f()
 declare void @BB1_f()

diff  --git a/llvm/test/Transforms/SCCP/int-phis.ll b/llvm/test/Transforms/SCCP/int-phis.ll
index 64dddeb2d6bdb..b261e72d3c06c 100644
--- a/llvm/test/Transforms/SCCP/int-phis.ll
+++ b/llvm/test/Transforms/SCCP/int-phis.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -sccp -S | FileCheck %s
+; RUN: opt < %s -passes=sccp -S | FileCheck %s
 
 declare void @use(i1)
 

diff  --git a/llvm/test/Transforms/SCCP/intrinsics.ll b/llvm/test/Transforms/SCCP/intrinsics.ll
index e261a59d3d6bc..68d18e3588555 100644
--- a/llvm/test/Transforms/SCCP/intrinsics.ll
+++ b/llvm/test/Transforms/SCCP/intrinsics.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -ipsccp -S %s | FileCheck %s
+; RUN: opt -passes=ipsccp -S %s | FileCheck %s
 
 declare i8 @llvm.abs.i8(i8, i1)
 declare <2 x i8> @llvm.abs.v2i8(<2 x i8>, i1)

diff  --git a/llvm/test/Transforms/SCCP/ip-add-range-to-call.ll b/llvm/test/Transforms/SCCP/ip-add-range-to-call.ll
index c12e2b5af1f97..288e5bed5184c 100644
--- a/llvm/test/Transforms/SCCP/ip-add-range-to-call.ll
+++ b/llvm/test/Transforms/SCCP/ip-add-range-to-call.ll
@@ -1,4 +1,4 @@
-; RUN: opt -ipsccp -S %s | FileCheck %s
+; RUN: opt -passes=ipsccp -S %s | FileCheck %s
 
 ; Test 1.
 ; Both arguments and return value of @callee can be tracked. The inferred range

diff  --git a/llvm/test/Transforms/SCCP/ip-constant-ranges.ll b/llvm/test/Transforms/SCCP/ip-constant-ranges.ll
index f6b98ef0903df..572f07137b9ab 100644
--- a/llvm/test/Transforms/SCCP/ip-constant-ranges.ll
+++ b/llvm/test/Transforms/SCCP/ip-constant-ranges.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -ipsccp -S | FileCheck %s
+; RUN: opt < %s -passes=ipsccp -S | FileCheck %s
 
 ; Constant range for %a is [1, 48) and for %b is [301, 1000)
 ; CHECK-LABEL: f1

diff  --git a/llvm/test/Transforms/SCCP/ip-ranges-binaryops.ll b/llvm/test/Transforms/SCCP/ip-ranges-binaryops.ll
index cef41bbdb584b..7fa4807802fdd 100644
--- a/llvm/test/Transforms/SCCP/ip-ranges-binaryops.ll
+++ b/llvm/test/Transforms/SCCP/ip-ranges-binaryops.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -ipsccp -S | FileCheck %s
+; RUN: opt < %s -passes=ipsccp -S | FileCheck %s
 
 ; x = [10, 21), y = [100, 201)
 ; x + y = [110, 221)

diff  --git a/llvm/test/Transforms/SCCP/ip-ranges-casts.ll b/llvm/test/Transforms/SCCP/ip-ranges-casts.ll
index 3004aae538cef..c042cd8b47e78 100644
--- a/llvm/test/Transforms/SCCP/ip-ranges-casts.ll
+++ b/llvm/test/Transforms/SCCP/ip-ranges-casts.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -ipsccp -S | FileCheck %s
+; RUN: opt < %s -passes=ipsccp -S | FileCheck %s
 
 ; x = [100, 301)
 define internal i1 @f.trunc(i32 %x) {

diff  --git a/llvm/test/Transforms/SCCP/ip-ranges-phis.ll b/llvm/test/Transforms/SCCP/ip-ranges-phis.ll
index a4a59d9c0f816..6372d3c58af56 100644
--- a/llvm/test/Transforms/SCCP/ip-ranges-phis.ll
+++ b/llvm/test/Transforms/SCCP/ip-ranges-phis.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -ipsccp -S | FileCheck %s
+; RUN: opt < %s -passes=ipsccp -S | FileCheck %s
 
 define internal i32 @f1(i32 %x) {
 ; CHECK-LABEL: define internal i32 @f1(

diff  --git a/llvm/test/Transforms/SCCP/ip-ranges-select.ll b/llvm/test/Transforms/SCCP/ip-ranges-select.ll
index c2996ffb1121a..bedfeca8c4305 100644
--- a/llvm/test/Transforms/SCCP/ip-ranges-select.ll
+++ b/llvm/test/Transforms/SCCP/ip-ranges-select.ll
@@ -1,4 +1,4 @@
-; RUN: opt -ipsccp -S %s -o -| FileCheck %s
+; RUN: opt -passes=ipsccp -S %s -o -| FileCheck %s
 
 define void @caller.1(i8* %arg) {
 ; CHECK-LABEL: define void @caller.1(i8* %arg) {

diff  --git a/llvm/test/Transforms/SCCP/ip-ranges-sext.ll b/llvm/test/Transforms/SCCP/ip-ranges-sext.ll
index aef562cfdb519..e76490bf7ca6e 100644
--- a/llvm/test/Transforms/SCCP/ip-ranges-sext.ll
+++ b/llvm/test/Transforms/SCCP/ip-ranges-sext.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -ipsccp -S %s -o -| FileCheck %s
+; RUN: opt -passes=ipsccp -S %s -o -| FileCheck %s
 
 define i64 @test1(i32 %x) {
 ; CHECK-LABEL: @test1(

diff  --git a/llvm/test/Transforms/SCCP/ipsccp-addr-taken.ll b/llvm/test/Transforms/SCCP/ipsccp-addr-taken.ll
index ca586a009b33c..cfa3d413b2c88 100644
--- a/llvm/test/Transforms/SCCP/ipsccp-addr-taken.ll
+++ b/llvm/test/Transforms/SCCP/ipsccp-addr-taken.ll
@@ -1,4 +1,4 @@
-; RUN: opt -ipsccp -S < %s | FileCheck %s
+; RUN: opt -passes=ipsccp -S < %s | FileCheck %s
 ; PR7876
 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-darwin10.0.0"

diff  --git a/llvm/test/Transforms/SCCP/ipsccp-basic.ll b/llvm/test/Transforms/SCCP/ipsccp-basic.ll
index 795a73f1d9071..d6a102ee54b21 100644
--- a/llvm/test/Transforms/SCCP/ipsccp-basic.ll
+++ b/llvm/test/Transforms/SCCP/ipsccp-basic.ll
@@ -1,5 +1,5 @@
-; RUN: opt < %s -ipsccp -S | FileCheck %s
-; RUN: opt < %s -enable-debugify -ipsccp -debugify-quiet -disable-output
+; RUN: opt < %s -passes=ipsccp -S | FileCheck %s
+; RUN: opt < %s -enable-debugify -passes=ipsccp -debugify-quiet -disable-output
 
 ;;======================== test1
 

diff  --git a/llvm/test/Transforms/SCCP/ipsccp-branch-unresolved-undef.ll b/llvm/test/Transforms/SCCP/ipsccp-branch-unresolved-undef.ll
index 7092b8d587aa9..38809ea4733fa 100644
--- a/llvm/test/Transforms/SCCP/ipsccp-branch-unresolved-undef.ll
+++ b/llvm/test/Transforms/SCCP/ipsccp-branch-unresolved-undef.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -S -ipsccp | FileCheck %s
+; RUN: opt < %s -S -passes=ipsccp | FileCheck %s
 
 define void @main() {
 ; CHECK-LABEL: @main(

diff  --git a/llvm/test/Transforms/SCCP/ipsccp-clear-returned.ll b/llvm/test/Transforms/SCCP/ipsccp-clear-returned.ll
index d8b5fbff4e628..753978b5a4e92 100644
--- a/llvm/test/Transforms/SCCP/ipsccp-clear-returned.ll
+++ b/llvm/test/Transforms/SCCP/ipsccp-clear-returned.ll
@@ -2,7 +2,7 @@
 ; then the "returned" attribute of input arguments
 ; should be cleared.
 
-; RUN: opt < %s -ipsccp -S | FileCheck %s
+; RUN: opt < %s -passes=ipsccp -S | FileCheck %s
 define i32 @main() {
 ; CHECK-LABEL: @main
 entry:

diff  --git a/llvm/test/Transforms/SCCP/ipsccp-cycles.ll b/llvm/test/Transforms/SCCP/ipsccp-cycles.ll
index e4b81fbb607b2..cacfb30721fcd 100644
--- a/llvm/test/Transforms/SCCP/ipsccp-cycles.ll
+++ b/llvm/test/Transforms/SCCP/ipsccp-cycles.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -ipsccp -S | FileCheck %s
+; RUN: opt < %s -passes=ipsccp -S | FileCheck %s
 
 define internal i32 @test1a(i32 %A, i32 %b) {
 ; CHECK-LABEL: @test1a(

diff  --git a/llvm/test/Transforms/SCCP/ipsccp-phi-one-pred-dead.ll b/llvm/test/Transforms/SCCP/ipsccp-phi-one-pred-dead.ll
index 07637bd8bdb16..9e718a0638b94 100644
--- a/llvm/test/Transforms/SCCP/ipsccp-phi-one-pred-dead.ll
+++ b/llvm/test/Transforms/SCCP/ipsccp-phi-one-pred-dead.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -S -ipsccp | FileCheck %s
+; RUN: opt < %s -S -passes=ipsccp | FileCheck %s
 target triple = "x86_64-unknown-linux-gnu"
 
 define void @test() {

diff  --git a/llvm/test/Transforms/SCCP/ipsccp-predinfo-order.ll b/llvm/test/Transforms/SCCP/ipsccp-predinfo-order.ll
index 2474a19b09786..6e1f72f6bb3ff 100644
--- a/llvm/test/Transforms/SCCP/ipsccp-predinfo-order.ll
+++ b/llvm/test/Transforms/SCCP/ipsccp-predinfo-order.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -ipsccp -S %s | FileCheck %s
+; RUN: opt -passes=ipsccp -S %s | FileCheck %s
 
 declare i32 @hoge()
 

diff  --git a/llvm/test/Transforms/SCCP/ipsccp-range-crashes.ll b/llvm/test/Transforms/SCCP/ipsccp-range-crashes.ll
index 117eed78064ee..1b33ff31a095e 100644
--- a/llvm/test/Transforms/SCCP/ipsccp-range-crashes.ll
+++ b/llvm/test/Transforms/SCCP/ipsccp-range-crashes.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -ipsccp -S %s | FileCheck %s
+; RUN: opt -passes=ipsccp -S %s | FileCheck %s
 
 ; A few test cases exposing crashes with the initial range implementation.
 

diff  --git a/llvm/test/Transforms/SCCP/ipsccp-ssa-copy-nested-conds.ll b/llvm/test/Transforms/SCCP/ipsccp-ssa-copy-nested-conds.ll
index a976c1603bdb7..2c1361694755e 100644
--- a/llvm/test/Transforms/SCCP/ipsccp-ssa-copy-nested-conds.ll
+++ b/llvm/test/Transforms/SCCP/ipsccp-ssa-copy-nested-conds.ll
@@ -1,5 +1,4 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -ipsccp -S | FileCheck %s
 ; RUN: opt < %s -passes=ipsccp -S | FileCheck %s
 
 ; Test for PR39772

diff  --git a/llvm/test/Transforms/SCCP/ipscp-drop-argmemonly.ll b/llvm/test/Transforms/SCCP/ipscp-drop-argmemonly.ll
index 2e3a35779a15c..6a6f52afb0be4 100644
--- a/llvm/test/Transforms/SCCP/ipscp-drop-argmemonly.ll
+++ b/llvm/test/Transforms/SCCP/ipscp-drop-argmemonly.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --check-attributes
-; RUN: opt -ipsccp -S %s | FileCheck %s
+; RUN: opt -passes=ipsccp -S %s | FileCheck %s
 
 ; Test cases to ensure argmemonly/inaccessiblemem_or_argmemonly attributes are
 ; dropped, if a function argument is replaced by a constant.

diff  --git a/llvm/test/Transforms/SCCP/latticeval-invalidate.ll b/llvm/test/Transforms/SCCP/latticeval-invalidate.ll
index 19ea425312f68..2a35a02d99fb1 100644
--- a/llvm/test/Transforms/SCCP/latticeval-invalidate.ll
+++ b/llvm/test/Transforms/SCCP/latticeval-invalidate.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -sccp %s
+; RUN: opt -S -passes=sccp %s
 
 @A = external constant i32
 

diff  --git a/llvm/test/Transforms/SCCP/load-store-range.ll b/llvm/test/Transforms/SCCP/load-store-range.ll
index b54820fca5f57..a57e42d1f7e20 100644
--- a/llvm/test/Transforms/SCCP/load-store-range.ll
+++ b/llvm/test/Transforms/SCCP/load-store-range.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -ipsccp -S | FileCheck %s
+; RUN: opt < %s -passes=ipsccp -S | FileCheck %s
 
 declare void @use(i1)
 

diff  --git a/llvm/test/Transforms/SCCP/loadtest.ll b/llvm/test/Transforms/SCCP/loadtest.ll
index 6c43cd267317f..a2276b50ed7f7 100644
--- a/llvm/test/Transforms/SCCP/loadtest.ll
+++ b/llvm/test/Transforms/SCCP/loadtest.ll
@@ -1,8 +1,8 @@
 ; This test makes sure that these instructions are properly constant propagated.
 
-; RUN: opt < %s -data-layout="e-p:32:32" -debugify -sccp -S | FileCheck %s
-; RUN: opt < %s -data-layout="E-p:32:32" -debugify -sccp -S | FileCheck %s
-; RUN: opt < %s -data-layout="E-p:32:32" -debugify -ipsccp -S | FileCheck %s
+; RUN: opt < %s -data-layout="e-p:32:32" -passes=debugify,sccp -S | FileCheck %s
+; RUN: opt < %s -data-layout="E-p:32:32" -passes=debugify,sccp -S | FileCheck %s
+; RUN: opt < %s -data-layout="E-p:32:32" -passes=debugify,ipsccp -S | FileCheck %s
 
 @X = constant i32 42		; <i32*> [#uses=1]
 @Y = constant [2 x { i32, float }] [ { i32, float } { i32 12, float 1.000000e+00 }, { i32, float } { i32 37, float 0x3FF3B2FEC0000000 } ]		; <[2 x { i32, float }]*> [#uses=2]

diff  --git a/llvm/test/Transforms/SCCP/loadtest2.ll b/llvm/test/Transforms/SCCP/loadtest2.ll
index ab7eeac5fbc6b..ae2935caff0ad 100644
--- a/llvm/test/Transforms/SCCP/loadtest2.ll
+++ b/llvm/test/Transforms/SCCP/loadtest2.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -data-layout="E-p:32:32" -ipsccp -S | FileCheck %s
+; RUN: opt < %s -data-layout="E-p:32:32" -passes=ipsccp -S | FileCheck %s
 
 @j = internal global i32 undef, align 4
 

diff  --git a/llvm/test/Transforms/SCCP/logical-nuke.ll b/llvm/test/Transforms/SCCP/logical-nuke.ll
index 5152e126e8fae..c42ecc660995f 100644
--- a/llvm/test/Transforms/SCCP/logical-nuke.ll
+++ b/llvm/test/Transforms/SCCP/logical-nuke.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -sccp -S | FileCheck %s
+; RUN: opt < %s -passes=sccp -S | FileCheck %s
 
 ; Test that SCCP has basic knowledge of when and/or/mul nuke overdefined values.
 

diff  --git a/llvm/test/Transforms/SCCP/metadata.ll b/llvm/test/Transforms/SCCP/metadata.ll
index f32dca231196b..baaf213e1e7ac 100644
--- a/llvm/test/Transforms/SCCP/metadata.ll
+++ b/llvm/test/Transforms/SCCP/metadata.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -ipsccp -S | FileCheck %s
+; RUN: opt < %s -passes=ipsccp -S | FileCheck %s
 
 declare void @use(i1)
 declare i32 @get_i32()

diff  --git a/llvm/test/Transforms/SCCP/multiple_callbacks.ll b/llvm/test/Transforms/SCCP/multiple_callbacks.ll
index 3d196f86e4a1c..b3092e4ceed9f 100644
--- a/llvm/test/Transforms/SCCP/multiple_callbacks.ll
+++ b/llvm/test/Transforms/SCCP/multiple_callbacks.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --check-attributes
-; RUN: opt -ipsccp -S %s | FileCheck %s
+; RUN: opt -passes=ipsccp -S %s | FileCheck %s
 ;
 ;
 ;                            /---------------------------------------|

diff  --git a/llvm/test/Transforms/SCCP/musttail-call.ll b/llvm/test/Transforms/SCCP/musttail-call.ll
index cc2f14d807f7c..ec346c0d7302b 100644
--- a/llvm/test/Transforms/SCCP/musttail-call.ll
+++ b/llvm/test/Transforms/SCCP/musttail-call.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --function-signature
-; RUN: opt < %s -ipsccp -S | FileCheck %s
+; RUN: opt < %s -passes=ipsccp -S | FileCheck %s
 ; PR36485
 ; musttail call result can\'t be replaced with a constant, unless the call
 ; can be removed

diff  --git a/llvm/test/Transforms/SCCP/naked-return.ll b/llvm/test/Transforms/SCCP/naked-return.ll
index daeb176b09972..50dba56114196 100644
--- a/llvm/test/Transforms/SCCP/naked-return.ll
+++ b/llvm/test/Transforms/SCCP/naked-return.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -ipsccp -S %s | FileCheck %s
+; RUN: opt -passes=ipsccp -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-msvc19.0.24215"

diff  --git a/llvm/test/Transforms/SCCP/openmp_parallel_for.ll b/llvm/test/Transforms/SCCP/openmp_parallel_for.ll
index 27831c6e66196..7bc48e63290ef 100644
--- a/llvm/test/Transforms/SCCP/openmp_parallel_for.ll
+++ b/llvm/test/Transforms/SCCP/openmp_parallel_for.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -ipsccp < %s | FileCheck %s
+; RUN: opt -S -passes=ipsccp < %s | FileCheck %s
 ;
 ;    void bar(int, float, double);
 ;

diff  --git a/llvm/test/Transforms/SCCP/overdefined-div.ll b/llvm/test/Transforms/SCCP/overdefined-div.ll
index f0b16155c1787..1c0d64587f59d 100644
--- a/llvm/test/Transforms/SCCP/overdefined-div.ll
+++ b/llvm/test/Transforms/SCCP/overdefined-div.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -sccp -S | FileCheck %s
+; RUN: opt < %s -passes=sccp -S | FileCheck %s
 
 ; Test that SCCP has basic knowledge of when div can nuke overdefined values.
 

diff  --git a/llvm/test/Transforms/SCCP/overdefined-ext.ll b/llvm/test/Transforms/SCCP/overdefined-ext.ll
index eafd2090fd2e4..217daa750cc1d 100644
--- a/llvm/test/Transforms/SCCP/overdefined-ext.ll
+++ b/llvm/test/Transforms/SCCP/overdefined-ext.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -sccp -S | FileCheck %s
+; RUN: opt < %s -passes=sccp -S | FileCheck %s
 
 define i32 @zext_lshr(i1 %t0) {
 ; CHECK-LABEL: @zext_lshr(

diff  --git a/llvm/test/Transforms/SCCP/phi-cycle.ll b/llvm/test/Transforms/SCCP/phi-cycle.ll
index 59c0ca2a6ff50..814fe174d4b39 100644
--- a/llvm/test/Transforms/SCCP/phi-cycle.ll
+++ b/llvm/test/Transforms/SCCP/phi-cycle.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -ipsccp -S %s | FileCheck %s
+; RUN: opt -passes=ipsccp -S %s | FileCheck %s
 
 declare i1 @cond()
 

diff  --git a/llvm/test/Transforms/SCCP/phis.ll b/llvm/test/Transforms/SCCP/phis.ll
index dac8273ab2d1d..21d97c41388aa 100644
--- a/llvm/test/Transforms/SCCP/phis.ll
+++ b/llvm/test/Transforms/SCCP/phis.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -sccp -S | FileCheck %s
+; RUN: opt < %s -passes=sccp -S | FileCheck %s
 
 define i1 @float.1(i1 %cmp) {
 ; CHECK-LABEL: define i1 @float.1(i1 %cmp) {

diff  --git a/llvm/test/Transforms/SCCP/pr27712.ll b/llvm/test/Transforms/SCCP/pr27712.ll
index b41c3981d53ad..d6b32afccd454 100644
--- a/llvm/test/Transforms/SCCP/pr27712.ll
+++ b/llvm/test/Transforms/SCCP/pr27712.ll
@@ -1,4 +1,4 @@
-; RUN: opt -sccp -S < %s | FileCheck %s
+; RUN: opt -passes=sccp -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/SCCP/pr35357.ll b/llvm/test/Transforms/SCCP/pr35357.ll
index fda123b76f74f..bca4cb150bf02 100644
--- a/llvm/test/Transforms/SCCP/pr35357.ll
+++ b/llvm/test/Transforms/SCCP/pr35357.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S %s -ipsccp | FileCheck %s
+; RUN: opt -S %s -passes=ipsccp | FileCheck %s
 
 @a = internal global i32 2
 

diff  --git a/llvm/test/Transforms/SCCP/pr45185-range-predinfo.ll b/llvm/test/Transforms/SCCP/pr45185-range-predinfo.ll
index b264ca0558ca5..24382c7d062a2 100644
--- a/llvm/test/Transforms/SCCP/pr45185-range-predinfo.ll
+++ b/llvm/test/Transforms/SCCP/pr45185-range-predinfo.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -ipsccp -S %s | FileCheck %s
+; RUN: opt -passes=ipsccp -S %s | FileCheck %s
 
 ;Test for PR45185.
 

diff  --git a/llvm/test/Transforms/SCCP/pr49582-iterator-invalidation.ll b/llvm/test/Transforms/SCCP/pr49582-iterator-invalidation.ll
index 6d5b2e1841b47..b6dfc155ae121 100644
--- a/llvm/test/Transforms/SCCP/pr49582-iterator-invalidation.ll
+++ b/llvm/test/Transforms/SCCP/pr49582-iterator-invalidation.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -ipsccp -disable-output
+; RUN: opt < %s -passes=ipsccp -disable-output
 ; PR49582: This test checks for an iterator invalidation issue, which only gets
 ; exposed on a large-enough test case. We intentionally do not check the output.
 

diff  --git a/llvm/test/Transforms/SCCP/pr52253.ll b/llvm/test/Transforms/SCCP/pr52253.ll
index 8cef4f8bcd2ef..c55d1ee59b44c 100644
--- a/llvm/test/Transforms/SCCP/pr52253.ll
+++ b/llvm/test/Transforms/SCCP/pr52253.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -sccp -S | FileCheck %s
+; RUN: opt < %s -passes=sccp -S | FileCheck %s
 
 define i1 @foo(i32 %t4, i32 %t10) {
 ; CHECK-LABEL: @foo(

diff  --git a/llvm/test/Transforms/SCCP/predicateinfo-cond.ll b/llvm/test/Transforms/SCCP/predicateinfo-cond.ll
index 1443cc72c2ef8..a0ca096175af1 100644
--- a/llvm/test/Transforms/SCCP/predicateinfo-cond.ll
+++ b/llvm/test/Transforms/SCCP/predicateinfo-cond.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -ipsccp < %s | FileCheck %s
+; RUN: opt -S -passes=ipsccp < %s | FileCheck %s
 
 ; Test that information about the true/false value of conditions themselves
 ; is also used, not information implied by comparisions.

diff  --git a/llvm/test/Transforms/SCCP/preserve-analysis.ll b/llvm/test/Transforms/SCCP/preserve-analysis.ll
index 2ae07767ba2e2..a332e73d2524a 100644
--- a/llvm/test/Transforms/SCCP/preserve-analysis.ll
+++ b/llvm/test/Transforms/SCCP/preserve-analysis.ll
@@ -1,19 +1,8 @@
-; RUN: opt < %s -debug-pass=Structure -globals-aa -loop-vectorize -sccp -loop-vectorize -globals-aa -enable-new-pm=0 2>&1 -S | FileCheck %s
 ; RUN: opt < %s -debug-pass-manager -passes='loop-vectorize,sccp,loop-vectorize' 2>&1 -S | FileCheck --check-prefix=NEW-PM %s
 
 ; Check CFG-only analysis are preserved by SCCP by running it between 2
 ; loop-vectorize runs.
 
-; CHECK: Globals Alias Analysis
-; CHECK: Dominator Tree Construction
-; CHECK: Natural Loop Information
-; CHECK: Sparse Conditional Constant Propagation
-; CHECK: Post-Dominator Tree Construction
-; CHECK-NOT: Dominator Tree Construction
-; CHECK-NOT: Natural Loop Information
-; CHECK-NOT: Globals Alias Analysis
-; CHECK: Loop Vectorization
-
 ; NEW-PM-DAG: Running analysis: LoopAnalysis on test
 ; NEW-PM-DAG: Running analysis: DominatorTreeAnalysis on test
 ; NEW-PM-DAG: Running analysis: AssumptionAnalysis on test

diff  --git a/llvm/test/Transforms/SCCP/pthreads.ll b/llvm/test/Transforms/SCCP/pthreads.ll
index a9d2b942c1a5a..fa4d7311f3b49 100644
--- a/llvm/test/Transforms/SCCP/pthreads.ll
+++ b/llvm/test/Transforms/SCCP/pthreads.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -ipsccp -S < %s | FileCheck %s
+; RUN: opt -passes=ipsccp -S < %s | FileCheck %s
 ;
 ;    #include <pthread.h>
 ;

diff  --git a/llvm/test/Transforms/SCCP/range-and-ip.ll b/llvm/test/Transforms/SCCP/range-and-ip.ll
index c9f9e765b4e26..7caea5d2cc330 100644
--- a/llvm/test/Transforms/SCCP/range-and-ip.ll
+++ b/llvm/test/Transforms/SCCP/range-and-ip.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -ipsccp %s | FileCheck %s
+; RUN: opt -S -passes=ipsccp %s | FileCheck %s
 
 ; Make sure IPSCCP does not assume %r < 256 for @f1. Undef is passed at a call
 ; site, which won't be eliminated.

diff  --git a/llvm/test/Transforms/SCCP/range-and.ll b/llvm/test/Transforms/SCCP/range-and.ll
index 0bdc36f79f49e..2dd6231d0c205 100644
--- a/llvm/test/Transforms/SCCP/range-and.ll
+++ b/llvm/test/Transforms/SCCP/range-and.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --verbose
-; RUN: opt -S -sccp %s | FileCheck %s
+; RUN: opt -S -passes=sccp %s | FileCheck %s
 
 declare void @use(i1)
 

diff  --git a/llvm/test/Transforms/SCCP/ranges-sext.ll b/llvm/test/Transforms/SCCP/ranges-sext.ll
index 75e070b01621c..b5b6c2c9776e7 100644
--- a/llvm/test/Transforms/SCCP/ranges-sext.ll
+++ b/llvm/test/Transforms/SCCP/ranges-sext.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -sccp -S %s -o -| FileCheck %s
+; RUN: opt -passes=sccp -S %s -o -| FileCheck %s
 
 define i64 @test1_sext_op_can_be_undef(i1 %c.1, i1 %c.2) {
 ; CHECK-LABEL: @test1_sext_op_can_be_undef(

diff  --git a/llvm/test/Transforms/SCCP/remove-call-inst.ll b/llvm/test/Transforms/SCCP/remove-call-inst.ll
index 081999acae8c3..b4ab128bffa28 100644
--- a/llvm/test/Transforms/SCCP/remove-call-inst.ll
+++ b/llvm/test/Transforms/SCCP/remove-call-inst.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -S -ipsccp | FileCheck %s
+; RUN: opt < %s -S -passes=ipsccp | FileCheck %s
 ; PR5596
 
 ; IPSCCP should propagate the 0 argument, eliminate the switch, and propagate

diff  --git a/llvm/test/Transforms/SCCP/replace-dereferenceable-ptr-with-undereferenceable.ll b/llvm/test/Transforms/SCCP/replace-dereferenceable-ptr-with-undereferenceable.ll
index 5857ce2d30b72..2da20d53878ee 100644
--- a/llvm/test/Transforms/SCCP/replace-dereferenceable-ptr-with-undereferenceable.ll
+++ b/llvm/test/Transforms/SCCP/replace-dereferenceable-ptr-with-undereferenceable.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -ipsccp -S %s | FileCheck %s
+; RUN: opt -passes=ipsccp -S %s | FileCheck %s
 
 @y = common global [1 x i32] zeroinitializer, align 4
 @x = common global [1 x i32] zeroinitializer, align 4

diff  --git a/llvm/test/Transforms/SCCP/resolvedundefsin-tracked-fn.ll b/llvm/test/Transforms/SCCP/resolvedundefsin-tracked-fn.ll
index 7c8bc16fd67bf..f56b4cad149cc 100644
--- a/llvm/test/Transforms/SCCP/resolvedundefsin-tracked-fn.ll
+++ b/llvm/test/Transforms/SCCP/resolvedundefsin-tracked-fn.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --function-signature
-; RUN: opt -ipsccp -S %s | FileCheck %s
+; RUN: opt -passes=ipsccp -S %s | FileCheck %s
 
 %t1 = type opaque
 

diff  --git a/llvm/test/Transforms/SCCP/return-argument.ll b/llvm/test/Transforms/SCCP/return-argument.ll
index 764b4898c9616..1bfd9b7e25cb4 100644
--- a/llvm/test/Transforms/SCCP/return-argument.ll
+++ b/llvm/test/Transforms/SCCP/return-argument.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -ipsccp -S | FileCheck %s
+; RUN: opt < %s -passes=ipsccp -S | FileCheck %s
 
 ;; This function returns its second argument on all return statements
 define internal i32* @incdec(i1 %C, i32* %V) {

diff  --git a/llvm/test/Transforms/SCCP/return-constants.ll b/llvm/test/Transforms/SCCP/return-constants.ll
index cbf178d2efcaf..70a41860ba6ce 100644
--- a/llvm/test/Transforms/SCCP/return-constants.ll
+++ b/llvm/test/Transforms/SCCP/return-constants.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -ipsccp -S | FileCheck %s
+; RUN: opt < %s -passes=ipsccp -S | FileCheck %s
 
 %0 = type { i32, i32 }
 

diff  --git a/llvm/test/Transforms/SCCP/return-zapped.ll b/llvm/test/Transforms/SCCP/return-zapped.ll
index 1cdf9076821f5..98376a5835d71 100644
--- a/llvm/test/Transforms/SCCP/return-zapped.ll
+++ b/llvm/test/Transforms/SCCP/return-zapped.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -S -ipsccp | FileCheck %s
+; RUN: opt < %s -S -passes=ipsccp | FileCheck %s
 
 ; After the first round of Solver.Solve(), the return value of @testf still
 ; undefined as we hit a branch on undef. Therefore the conditional branch on

diff  --git a/llvm/test/Transforms/SCCP/retvalue-undef.ll b/llvm/test/Transforms/SCCP/retvalue-undef.ll
index f0e9e676cc044..bf3a48c1ee0f5 100644
--- a/llvm/test/Transforms/SCCP/retvalue-undef.ll
+++ b/llvm/test/Transforms/SCCP/retvalue-undef.ll
@@ -1,4 +1,4 @@
-; RUN: opt -ipsccp -S < %s | FileCheck %s
+; RUN: opt -passes=ipsccp -S < %s | FileCheck %s
 ; PR6414
 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/SCCP/sccptest.ll b/llvm/test/Transforms/SCCP/sccptest.ll
index 412fc044c21ca..b3233dcaf9cf5 100644
--- a/llvm/test/Transforms/SCCP/sccptest.ll
+++ b/llvm/test/Transforms/SCCP/sccptest.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -sccp -S | FileCheck %s
+; RUN: opt < %s -passes=sccp -S | FileCheck %s
 
 ; This is a basic correctness check for constant propagation.  The add
 ; instruction should be eliminated.

diff  --git a/llvm/test/Transforms/SCCP/select.ll b/llvm/test/Transforms/SCCP/select.ll
index 9cd700760ec76..fac3740299066 100644
--- a/llvm/test/Transforms/SCCP/select.ll
+++ b/llvm/test/Transforms/SCCP/select.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -sccp -S | FileCheck %s
+; RUN: opt < %s -passes=sccp -S | FileCheck %s
 
 define i32 @test1(i1 %C) {
 ; CHECK-LABEL: define i32 @test1(

diff  --git a/llvm/test/Transforms/SCCP/solve-after-each-resolving-undefs-for-function.ll b/llvm/test/Transforms/SCCP/solve-after-each-resolving-undefs-for-function.ll
index b7b3e7191b98a..130a96994a32f 100644
--- a/llvm/test/Transforms/SCCP/solve-after-each-resolving-undefs-for-function.ll
+++ b/llvm/test/Transforms/SCCP/solve-after-each-resolving-undefs-for-function.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -ipsccp -S | FileCheck %s
+; RUN: opt < %s -passes=ipsccp -S | FileCheck %s
 
 ; CHECK-LABEL: @testf(
 ; CHECK:         ret i32 undef

diff  --git a/llvm/test/Transforms/SCCP/struct-arg-resolve-undefs.ll b/llvm/test/Transforms/SCCP/struct-arg-resolve-undefs.ll
index 9f62e71d9275b..7ac29b8a9a8df 100644
--- a/llvm/test/Transforms/SCCP/struct-arg-resolve-undefs.ll
+++ b/llvm/test/Transforms/SCCP/struct-arg-resolve-undefs.ll
@@ -1,4 +1,4 @@
-; RUN: opt -ipsccp -S %s | FileCheck %s
+; RUN: opt -passes=ipsccp -S %s | FileCheck %s
 
 %struct.S = type { i32 }
 

diff  --git a/llvm/test/Transforms/SCCP/switch-constantfold-crash.ll b/llvm/test/Transforms/SCCP/switch-constantfold-crash.ll
index 17b37f000407c..eb727fc54c03d 100644
--- a/llvm/test/Transforms/SCCP/switch-constantfold-crash.ll
+++ b/llvm/test/Transforms/SCCP/switch-constantfold-crash.ll
@@ -1,5 +1,4 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -ipsccp < %s -S | FileCheck %s
 ; RUN: opt -passes=ipsccp < %s -S | FileCheck %s
 
 define void @barney() {

diff  --git a/llvm/test/Transforms/SCCP/switch-multiple-undef.ll b/llvm/test/Transforms/SCCP/switch-multiple-undef.ll
index df99e4eee7d2d..243d85ee00eb0 100644
--- a/llvm/test/Transforms/SCCP/switch-multiple-undef.ll
+++ b/llvm/test/Transforms/SCCP/switch-multiple-undef.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -ipsccp < %s | FileCheck %s
+; RUN: opt -S -passes=ipsccp < %s | FileCheck %s
 
 declare void @foo()
 declare void @goo()

diff  --git a/llvm/test/Transforms/SCCP/switch-undef-constantfoldterminator.ll b/llvm/test/Transforms/SCCP/switch-undef-constantfoldterminator.ll
index 169f0e83f1f28..62f15855e9988 100644
--- a/llvm/test/Transforms/SCCP/switch-undef-constantfoldterminator.ll
+++ b/llvm/test/Transforms/SCCP/switch-undef-constantfoldterminator.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -ipsccp -S | FileCheck %s
+; RUN: opt < %s -passes=ipsccp -S | FileCheck %s
 
 ; This test case used to end up like this:
 ;

diff  --git a/llvm/test/Transforms/SCCP/switch.ll b/llvm/test/Transforms/SCCP/switch.ll
index 17653014b090d..20067cc6f6c1e 100644
--- a/llvm/test/Transforms/SCCP/switch.ll
+++ b/llvm/test/Transforms/SCCP/switch.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -ipsccp < %s | FileCheck %s
+; RUN: opt -S -passes=ipsccp < %s | FileCheck %s
 
 ; Make sure we always consider the default edge executable for a switch
 ; with no cases.

diff  --git a/llvm/test/Transforms/SCCP/thread_local_acs.ll b/llvm/test/Transforms/SCCP/thread_local_acs.ll
index 69c0cfeec163e..769991fc41481 100644
--- a/llvm/test/Transforms/SCCP/thread_local_acs.ll
+++ b/llvm/test/Transforms/SCCP/thread_local_acs.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -ipsccp -S < %s | FileCheck %s
+; RUN: opt -passes=ipsccp -S < %s | FileCheck %s
 ;
 ;    #include <threads.h>
 ;    thread_local int gtl = 0;

diff  --git a/llvm/test/Transforms/SCCP/ub-shift.ll b/llvm/test/Transforms/SCCP/ub-shift.ll
index fbcaef422870e..c338043cb3113 100644
--- a/llvm/test/Transforms/SCCP/ub-shift.ll
+++ b/llvm/test/Transforms/SCCP/ub-shift.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -sccp -S | FileCheck %s
+; RUN: opt < %s -passes=sccp -S | FileCheck %s
 
 define void @shift_undef_64(i64* %p) {
 ; CHECK-LABEL: @shift_undef_64(

diff  --git a/llvm/test/Transforms/SCCP/ubsan_overflow.ll b/llvm/test/Transforms/SCCP/ubsan_overflow.ll
index a207e979a476b..299c1e757e238 100644
--- a/llvm/test/Transforms/SCCP/ubsan_overflow.ll
+++ b/llvm/test/Transforms/SCCP/ubsan_overflow.ll
@@ -1,4 +1,4 @@
-; RUN: opt -sccp -S %s | FileCheck %s
+; RUN: opt -passes=sccp -S %s | FileCheck %s
 
 @0 = private unnamed_addr constant [16 x i8] c"\01\00\00\00\01\01\00\00\01\01\01\00\01\01\01\01"
 

diff  --git a/llvm/test/Transforms/SCCP/undef-resolve.ll b/llvm/test/Transforms/SCCP/undef-resolve.ll
index 9e91def341020..1216ae1773e85 100644
--- a/llvm/test/Transforms/SCCP/undef-resolve.ll
+++ b/llvm/test/Transforms/SCCP/undef-resolve.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -sccp -S < %s | FileCheck %s
+; RUN: opt -passes=sccp -S < %s | FileCheck %s
 
 
 ; PR6940

diff  --git a/llvm/test/Transforms/SCCP/user-with-multiple-uses.ll b/llvm/test/Transforms/SCCP/user-with-multiple-uses.ll
index 92e1f34230184..deacc2bbcf39b 100644
--- a/llvm/test/Transforms/SCCP/user-with-multiple-uses.ll
+++ b/llvm/test/Transforms/SCCP/user-with-multiple-uses.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -S -ipsccp | FileCheck %s
+; RUN: opt < %s -S -passes=ipsccp | FileCheck %s
 ; PR5596
 
 ; IPSCCP should propagate the 0 argument, eliminate the switch, and propagate

diff  --git a/llvm/test/Transforms/SCCP/vector-bitcast.ll b/llvm/test/Transforms/SCCP/vector-bitcast.ll
index 3cfa014421e4e..ab27c29b14fe1 100644
--- a/llvm/test/Transforms/SCCP/vector-bitcast.ll
+++ b/llvm/test/Transforms/SCCP/vector-bitcast.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -sccp -S < %s | FileCheck %s
+; RUN: opt -passes=sccp -S < %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-n8:16:32-S128"
 

diff  --git a/llvm/test/Transforms/SCCP/widening.ll b/llvm/test/Transforms/SCCP/widening.ll
index 23a88c35a93ea..db4f62fd1938d 100644
--- a/llvm/test/Transforms/SCCP/widening.ll
+++ b/llvm/test/Transforms/SCCP/widening.ll
@@ -1,6 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt %s -sccp -S | FileCheck --check-prefix=SCCP %s
-; RUN: opt %s -ipsccp -S | FileCheck --check-prefix=IPSCCP %s
+; RUN: opt %s -passes=sccp -S | FileCheck --check-prefix=SCCP %s
+; RUN: opt %s -passes=ipsccp -S | FileCheck --check-prefix=IPSCCP %s
 
 ; Test 
diff erent widening scenarios.
 

diff  --git a/llvm/test/Transforms/TailCallElim/2010-06-26-MultipleReturnValues.ll b/llvm/test/Transforms/TailCallElim/2010-06-26-MultipleReturnValues.ll
index 4e0346c14c345..0cd8d8a5edf25 100644
--- a/llvm/test/Transforms/TailCallElim/2010-06-26-MultipleReturnValues.ll
+++ b/llvm/test/Transforms/TailCallElim/2010-06-26-MultipleReturnValues.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
 ; PR7328
 ; PR7506
 define i32 @test1_constants(i32 %x) {

diff  --git a/llvm/test/Transforms/TailCallElim/EraseBB.ll b/llvm/test/Transforms/TailCallElim/EraseBB.ll
index b10d2ed65e5b6..14ebf06097fa5 100644
--- a/llvm/test/Transforms/TailCallElim/EraseBB.ll
+++ b/llvm/test/Transforms/TailCallElim/EraseBB.ll
@@ -1,4 +1,4 @@
-; RUN: opt -tailcallelim -verify-dom-info -S < %s 2>&1 | FileCheck %s
+; RUN: opt -passes=tailcallelim -verify-dom-info -S < %s 2>&1 | FileCheck %s
 
 ; CHECK: add nsw i32
 ; CHECK-NEXT: br label

diff  --git a/llvm/test/Transforms/TailCallElim/accum_recursion.ll b/llvm/test/Transforms/TailCallElim/accum_recursion.ll
index 88cc320ec2f2c..856d064ebbb2d 100644
--- a/llvm/test/Transforms/TailCallElim/accum_recursion.ll
+++ b/llvm/test/Transforms/TailCallElim/accum_recursion.ll
@@ -1,4 +1,3 @@
-; RUN: opt < %s -tailcallelim -verify-dom-info -S | FileCheck %s
 ; RUN: opt < %s -passes=tailcallelim -verify-dom-info -S | FileCheck %s
 
 define i32 @test1_factorial(i32 %x) {

diff  --git a/llvm/test/Transforms/TailCallElim/ackermann.ll b/llvm/test/Transforms/TailCallElim/ackermann.ll
index b6fbbf7d168a3..a91874d10d128 100644
--- a/llvm/test/Transforms/TailCallElim/ackermann.ll
+++ b/llvm/test/Transforms/TailCallElim/ackermann.ll
@@ -1,6 +1,6 @@
 ; REQUIRES: asserts
 ; This function contains two tail calls, which should be eliminated
-; RUN: opt < %s -tailcallelim -verify-dom-info -stats -disable-output 2>&1 | grep "2 tailcallelim"
+; RUN: opt < %s -passes=tailcallelim -verify-dom-info -stats -disable-output 2>&1 | grep "2 tailcallelim"
 
 define i32 @Ack(i32 %M.1, i32 %N.1) {
 entry:

diff  --git a/llvm/test/Transforms/TailCallElim/basic.ll b/llvm/test/Transforms/TailCallElim/basic.ll
index f65cd9c777c6d..5ddb54e38e688 100644
--- a/llvm/test/Transforms/TailCallElim/basic.ll
+++ b/llvm/test/Transforms/TailCallElim/basic.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
 
 declare void @noarg()
 declare void @use(i32*)

diff  --git a/llvm/test/Transforms/TailCallElim/debugloc.ll b/llvm/test/Transforms/TailCallElim/debugloc.ll
index 412dd04b621ae..39e29d8a524f0 100644
--- a/llvm/test/Transforms/TailCallElim/debugloc.ll
+++ b/llvm/test/Transforms/TailCallElim/debugloc.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -debugify -tailcallelim -S | FileCheck %s
+; RUN: opt < %s -passes=debugify,tailcallelim -S | FileCheck %s
 
 define void @foo() {
 entry:

diff  --git a/llvm/test/Transforms/TailCallElim/deopt-bundle.ll b/llvm/test/Transforms/TailCallElim/deopt-bundle.ll
index 310ecc1a8ee17..72186df3eef2a 100644
--- a/llvm/test/Transforms/TailCallElim/deopt-bundle.ll
+++ b/llvm/test/Transforms/TailCallElim/deopt-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
 
 define i32 @f_1(i32 %x) {
 ; CHECK-LABEL: @f_1(

diff  --git a/llvm/test/Transforms/TailCallElim/dont_reorder_load.ll b/llvm/test/Transforms/TailCallElim/dont_reorder_load.ll
index b10936310a2cb..782f98cf92366 100644
--- a/llvm/test/Transforms/TailCallElim/dont_reorder_load.ll
+++ b/llvm/test/Transforms/TailCallElim/dont_reorder_load.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -tailcallelim -verify-dom-info -S | grep call | count 4
+; RUN: opt < %s -passes=tailcallelim -verify-dom-info -S | grep call | count 4
 ; PR4323
 
 ; Several cases where tail call elimination should not move the load above the

diff  --git a/llvm/test/Transforms/TailCallElim/dup_tail.ll b/llvm/test/Transforms/TailCallElim/dup_tail.ll
index 36eb99a54407a..3aa09cac6313b 100644
--- a/llvm/test/Transforms/TailCallElim/dup_tail.ll
+++ b/llvm/test/Transforms/TailCallElim/dup_tail.ll
@@ -1,6 +1,6 @@
 ; REQUIRES: asserts
 ; Duplicate the return into if.end to enable TCE.
-; RUN: opt -tailcallelim -verify-dom-info -stats -disable-output < %s 2>&1 | FileCheck %s
+; RUN: opt -passes=tailcallelim -verify-dom-info -stats -disable-output < %s 2>&1 | FileCheck %s
 
 ; CHECK: Number of return duplicated
 

diff  --git a/llvm/test/Transforms/TailCallElim/inf-recursion.ll b/llvm/test/Transforms/TailCallElim/inf-recursion.ll
index 650ac48823dfc..d224349562a7a 100644
--- a/llvm/test/Transforms/TailCallElim/inf-recursion.ll
+++ b/llvm/test/Transforms/TailCallElim/inf-recursion.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
 
 ; Don't turn this into an infinite loop, this is probably the implementation
 ; of fabs and we expect the codegen to lower fabs.

diff  --git a/llvm/test/Transforms/TailCallElim/notail.ll b/llvm/test/Transforms/TailCallElim/notail.ll
index d84e1a1525fe5..7b15848223660 100644
--- a/llvm/test/Transforms/TailCallElim/notail.ll
+++ b/llvm/test/Transforms/TailCallElim/notail.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: tail call void @callee0()
 ; CHECK: notail call void @callee1()

diff  --git a/llvm/test/Transforms/TailCallElim/reorder_load.ll b/llvm/test/Transforms/TailCallElim/reorder_load.ll
index 30341b78a29eb..068232577da6f 100644
--- a/llvm/test/Transforms/TailCallElim/reorder_load.ll
+++ b/llvm/test/Transforms/TailCallElim/reorder_load.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -tailcallelim -verify-dom-info -S | FileCheck %s
+; RUN: opt < %s -passes=tailcallelim -verify-dom-info -S | FileCheck %s
 ; PR4323
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"

diff  --git a/llvm/test/Transforms/TailCallElim/setjmp.ll b/llvm/test/Transforms/TailCallElim/setjmp.ll
index 8af4bf13a118a..ee082c85c25a1 100644
--- a/llvm/test/Transforms/TailCallElim/setjmp.ll
+++ b/llvm/test/Transforms/TailCallElim/setjmp.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
 
 ; Test that we don't tail call in a functions that calls returns_twice
 ; functions.

diff  --git a/llvm/test/Transforms/TailCallElim/tre-byval-parameter-2.ll b/llvm/test/Transforms/TailCallElim/tre-byval-parameter-2.ll
index 6f45a23c1cdb4..ab74c23d2fe8a 100644
--- a/llvm/test/Transforms/TailCallElim/tre-byval-parameter-2.ll
+++ b/llvm/test/Transforms/TailCallElim/tre-byval-parameter-2.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -tailcallelim -verify-dom-info -S | FileCheck %s
+; RUN: opt < %s -passes=tailcallelim -verify-dom-info -S | FileCheck %s
 
 ; the test was generated from the following C++ source:
 ;

diff  --git a/llvm/test/Transforms/TailCallElim/tre-byval-parameter.ll b/llvm/test/Transforms/TailCallElim/tre-byval-parameter.ll
index 1925ca91e1e06..dedac6ac52864 100644
--- a/llvm/test/Transforms/TailCallElim/tre-byval-parameter.ll
+++ b/llvm/test/Transforms/TailCallElim/tre-byval-parameter.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -tailcallelim -verify-dom-info -S | FileCheck %s
+; RUN: opt < %s -passes=tailcallelim -verify-dom-info -S | FileCheck %s
 
 ; the test was generated from the following C++ source:
 ;

diff  --git a/llvm/test/Transforms/TailCallElim/tre-multiple-exits.ll b/llvm/test/Transforms/TailCallElim/tre-multiple-exits.ll
index 8f69087dd879d..ba3a4862046e4 100644
--- a/llvm/test/Transforms/TailCallElim/tre-multiple-exits.ll
+++ b/llvm/test/Transforms/TailCallElim/tre-multiple-exits.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -tailcallelim -verify-dom-info -S | FileCheck %s
+; RUN: opt < %s -passes=tailcallelim -verify-dom-info -S | FileCheck %s
 
 ; This test checks that TRE would be done for only one recursive call.
 ; The test_multiple_exits function has three recursive calls.

diff  --git a/llvm/test/Transforms/TailCallElim/tre-noncapturing-alloca-calls.ll b/llvm/test/Transforms/TailCallElim/tre-noncapturing-alloca-calls.ll
index 2168437fc5706..406ce4f247d2c 100644
--- a/llvm/test/Transforms/TailCallElim/tre-noncapturing-alloca-calls.ll
+++ b/llvm/test/Transforms/TailCallElim/tre-noncapturing-alloca-calls.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -tailcallelim -verify-dom-info -S | FileCheck %s
+; RUN: opt < %s -passes=tailcallelim -verify-dom-info -S | FileCheck %s
 
 ; IR for that test was generated from the following C++ source:
 ;

diff  --git a/llvm/test/Transforms/Util/PredicateInfo/branch-on-same-cond.ll b/llvm/test/Transforms/Util/PredicateInfo/branch-on-same-cond.ll
index 7cf52d1bed3c7..e4232cf928bd1 100644
--- a/llvm/test/Transforms/Util/PredicateInfo/branch-on-same-cond.ll
+++ b/llvm/test/Transforms/Util/PredicateInfo/branch-on-same-cond.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -print-predicateinfo < %s 2>&1 >/dev/null | FileCheck %s
+; RUN: opt -S -passes=print-predicateinfo < %s 2>&1 >/dev/null | FileCheck %s
 
 ; FIXME:  RenamedOp should be %cmp or %x in all cases here,
 ; which is the value used in the condition.

diff  --git a/llvm/test/Transforms/Util/PredicateInfo/condprop.ll b/llvm/test/Transforms/Util/PredicateInfo/condprop.ll
index 9400e60c81ffc..87301606a5f0e 100644
--- a/llvm/test/Transforms/Util/PredicateInfo/condprop.ll
+++ b/llvm/test/Transforms/Util/PredicateInfo/condprop.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -print-predicateinfo -disable-output < %s 2>&1 | FileCheck %s
+; RUN: opt -passes=print-predicateinfo -disable-output < %s 2>&1 | FileCheck %s
 
 @a = external global i32		; <i32*> [#uses=7]
 

diff  --git a/llvm/test/Transforms/Util/PredicateInfo/diamond.ll b/llvm/test/Transforms/Util/PredicateInfo/diamond.ll
index e3f56d88caf0e..17a2c62782546 100644
--- a/llvm/test/Transforms/Util/PredicateInfo/diamond.ll
+++ b/llvm/test/Transforms/Util/PredicateInfo/diamond.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -print-predicateinfo < %s 2>&1 | FileCheck %s
+; RUN: opt -passes=print-predicateinfo < %s 2>&1 | FileCheck %s
 define i1 @f(i32 %x, i1 %y) {
 ; CHECK-LABEL: @f(
 ; CHECK-NEXT:    br i1 [[Y:%.*]], label [[BB0:%.*]], label [[BB1:%.*]]

diff  --git a/llvm/test/Transforms/Util/PredicateInfo/edge.ll b/llvm/test/Transforms/Util/PredicateInfo/edge.ll
index 2b88e32fd4503..58674c22002a4 100644
--- a/llvm/test/Transforms/Util/PredicateInfo/edge.ll
+++ b/llvm/test/Transforms/Util/PredicateInfo/edge.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -print-predicateinfo < %s 2>&1 | FileCheck %s
+; RUN: opt -passes=print-predicateinfo < %s 2>&1 | FileCheck %s
 
 define i32 @f1(i32 %x) {
 ; CHECK-LABEL: @f1(

diff  --git a/llvm/test/Transforms/Util/PredicateInfo/ordering.ll b/llvm/test/Transforms/Util/PredicateInfo/ordering.ll
index 994ea49e1ba11..8d55c1ae687e6 100644
--- a/llvm/test/Transforms/Util/PredicateInfo/ordering.ll
+++ b/llvm/test/Transforms/Util/PredicateInfo/ordering.ll
@@ -1,4 +1,4 @@
-; REQUIRES: assert
+; REQUIRES: assert-but-this-is-misspelled-and-should-say-asserts-but-then-the-test-case-will-fail
 ; RUN: opt -passes=print-predicateinfo -debug < %s 2>&1 | FileCheck %s
 
 declare void @use(i32)

diff  --git a/llvm/test/Transforms/Util/PredicateInfo/pr33456.ll b/llvm/test/Transforms/Util/PredicateInfo/pr33456.ll
index 99e168acde465..c99928d7dc392 100644
--- a/llvm/test/Transforms/Util/PredicateInfo/pr33456.ll
+++ b/llvm/test/Transforms/Util/PredicateInfo/pr33456.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -print-predicateinfo < %s 2>&1 | FileCheck %s
+; RUN: opt -passes=print-predicateinfo < %s 2>&1 | FileCheck %s
 ; Don't insert predicate info for conditions with a single target.
 @a = global i32 1, align 4
 @d = common global i32 0, align 4

diff  --git a/llvm/test/Transforms/Util/PredicateInfo/pr33457.ll b/llvm/test/Transforms/Util/PredicateInfo/pr33457.ll
index 4db0675bd80e1..1eabea74dc697 100644
--- a/llvm/test/Transforms/Util/PredicateInfo/pr33457.ll
+++ b/llvm/test/Transforms/Util/PredicateInfo/pr33457.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -print-predicateinfo < %s 2>&1 | FileCheck %s
+; RUN: opt -passes=print-predicateinfo < %s 2>&1 | FileCheck %s
 ; Don't insert predicate info for conditions with a single target.
 @a = global i32 6, align 4
 @c = global i32 -1, align 4

diff  --git a/llvm/test/Transforms/Util/PredicateInfo/testandor.ll b/llvm/test/Transforms/Util/PredicateInfo/testandor.ll
index 9c765fe72b89f..4f6488982b94f 100644
--- a/llvm/test/Transforms/Util/PredicateInfo/testandor.ll
+++ b/llvm/test/Transforms/Util/PredicateInfo/testandor.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -print-predicateinfo -disable-output < %s 2>&1 | FileCheck %s
+; RUN: opt -passes=print-predicateinfo -disable-output < %s 2>&1 | FileCheck %s
 
 declare void @foo(i1)
 declare void @bar(i32)

diff  --git a/llvm/test/Transforms/Util/PredicateInfo/unnamed-types.ll b/llvm/test/Transforms/Util/PredicateInfo/unnamed-types.ll
index 13575e7caa66a..e826de049487b 100644
--- a/llvm/test/Transforms/Util/PredicateInfo/unnamed-types.ll
+++ b/llvm/test/Transforms/Util/PredicateInfo/unnamed-types.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -print-predicateinfo 2>&1 | FileCheck %s
+; RUN: opt < %s -passes=print-predicateinfo 2>&1 | FileCheck %s
 
 %1 = type opaque
 %0 = type opaque

diff  --git a/llvm/test/Transforms/Util/PredicateInfo/unreachable.ll b/llvm/test/Transforms/Util/PredicateInfo/unreachable.ll
index 010172debd2ff..00f1063f6b40a 100644
--- a/llvm/test/Transforms/Util/PredicateInfo/unreachable.ll
+++ b/llvm/test/Transforms/Util/PredicateInfo/unreachable.ll
@@ -1,4 +1,4 @@
-; RUN: opt -print-predicateinfo < %s 2>&1 | FileCheck %s
+; RUN: opt -passes=print-predicateinfo < %s 2>&1 | FileCheck %s
 
 declare void @foo()
 declare void @llvm.assume(i1)


        
