[clang] b1a9584 - [opt] Disincentivize new tests from using old pass syntax

Roman Lebedev via cfe-commits cfe-commits at lists.llvm.org
Thu Dec 8 12:54:30 PST 2022


Author: Roman Lebedev
Date: 2022-12-08T23:54:03+03:00
New Revision: b1a95848180e66758f7a6d5bd172ced11a2e8914

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

LOG: [opt] Disincentivize new tests from using old pass syntax

Over the past day or so, i've took a large swing at our tests,
and reduced the number of tests that were still using the old syntax
from ~1800 to just 200.

Left to handle: (as it is seen in this patch)
* Transforms/LSR
* Transforms/CGP
* Transforms/TypePromotion
* Transforms/HardwareLoops
* Analysis/*
* some misc.

I think this is the right point to start actively refusing
to honor the old syntax, except for the old tests,
to prevent the old syntax from creeping back in.

Thus, let's add temporary default-off flag,
and if it is not passed refuse to accept old syntax.
The tests that still need porting are annotated with this flag.

Reviewed By: aeubanks

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

Added: 
    

Modified: 
    clang/test/CodeGen/arm-neon-vcadd.c
    clang/test/CodeGen/memcmp-inline-builtin-to-asm.c
    clang/test/CodeGenCXX/attr-musttail.cpp
    llvm/test/Analysis/AliasSet/unknown-inst-tracking.ll
    llvm/test/Analysis/CallGraph/2008-09-09-DirectCall.ll
    llvm/test/Analysis/CallGraph/2008-09-09-UsedByGlobal.ll
    llvm/test/Analysis/CallGraph/callback-calls.ll
    llvm/test/Analysis/CallGraph/ignore-assumelike-calls.ll
    llvm/test/Analysis/CallGraph/ignore-callback-uses.ll
    llvm/test/Analysis/CallGraph/llvm-used.ll
    llvm/test/Analysis/CallGraph/no-intrinsics.ll
    llvm/test/Analysis/CallGraph/non-leaf-intrinsics.ll
    llvm/test/Analysis/Dominators/2007-07-11-SplitBlock.ll
    llvm/test/Analysis/Dominators/2007-07-12-SplitBlock.ll
    llvm/test/Analysis/Dominators/invoke.ll
    llvm/test/Analysis/GlobalsModRef/pr12351.ll
    llvm/test/Analysis/LazyValueAnalysis/lvi-after-jumpthreading.ll
    llvm/test/Analysis/LazyValueAnalysis/lvi-for-ashr.ll
    llvm/test/Analysis/LoopAccessAnalysis/interleave-innermost.ll
    llvm/test/Analysis/LoopAccessAnalysis/memcheck-ni.ll
    llvm/test/Analysis/LoopAccessAnalysis/scalable-vector-regression-tests.ll
    llvm/test/Analysis/MemorySSA/debugvalue.ll
    llvm/test/Analysis/MemorySSA/loop-rotate-inv-template.ll
    llvm/test/Analysis/MemorySSA/loop-rotate-simplified-clone.ll
    llvm/test/Analysis/MemorySSA/loop-rotate-valuemap.ll
    llvm/test/Analysis/MemorySSA/loop-unswitch.ll
    llvm/test/Analysis/MemorySSA/nondeterminism.ll
    llvm/test/Analysis/MemorySSA/pr40037.ll
    llvm/test/Analysis/MemorySSA/pr40749_2.ll
    llvm/test/Analysis/MemorySSA/pr42294.ll
    llvm/test/Analysis/MemorySSA/pr43044.ll
    llvm/test/Analysis/MemorySSA/pr43641.ll
    llvm/test/Analysis/MemorySSA/pr44029.ll
    llvm/test/Analysis/MemorySSA/pr46574.ll
    llvm/test/Analysis/MemorySSA/simple_loop_unswitch_nontrivial.ll
    llvm/test/Analysis/MustExecute/const-cond.ll
    llvm/test/Analysis/MustExecute/infinite_loops.ll
    llvm/test/Analysis/MustExecute/loop-header.ll
    llvm/test/Analysis/MustExecute/pr57780.ll
    llvm/test/Analysis/ScalarEvolution/2007-08-06-MisinterpretBranch.ll
    llvm/test/Analysis/ScalarEvolution/2012-03-26-LoadConstant.ll
    llvm/test/Analysis/ScalarEvolution/2012-05-29-MulAddRec.ll
    llvm/test/Analysis/ScalarEvolution/avoid-assume-hang.ll
    llvm/test/Analysis/ScalarEvolution/scev-expander-existing-value-offset.ll
    llvm/test/Analysis/ScalarEvolution/scev-expander-reuse-unroll.ll
    llvm/test/Analysis/ScalarEvolution/scev-expander-reuse-vect.ll
    llvm/test/Analysis/ScalarEvolution/scev-invalid.ll
    llvm/test/Bitcode/compatibility-6.0.ll
    llvm/test/Bitcode/extractelement.ll
    llvm/test/Bitcode/infer_dso_local.ll
    llvm/test/CodeGen/AArch64/llvm-masked-gather-legal-for-sve.ll
    llvm/test/CodeGen/AArch64/llvm-masked-scatter-legal-for-sve.ll
    llvm/test/CodeGen/AArch64/sve-ptest-removal-cmple.ll
    llvm/test/CodeGen/AMDGPU/amdgpu-unroll-threshold.ll
    llvm/test/CodeGen/AMDGPU/force-alwaysinline-lds-global-address.ll
    llvm/test/CodeGen/AMDGPU/inline-maxbb.ll
    llvm/test/CodeGen/AMDGPU/loop-idiom.ll
    llvm/test/CodeGen/AMDGPU/opencl-printf-and-hostcall.ll
    llvm/test/CodeGen/AMDGPU/opencl-printf.ll
    llvm/test/CodeGen/AMDGPU/propagate-attributes-function-pointer-argument.ll
    llvm/test/CodeGen/AMDGPU/r600.alu-limits.ll
    llvm/test/CodeGen/AMDGPU/reqd-work-group-size.ll
    llvm/test/CodeGen/AMDGPU/simplify-libcalls2.ll
    llvm/test/CodeGen/AMDGPU/speculative-execution-freecasts.ll
    llvm/test/CodeGen/AMDGPU/stress-calls.ll
    llvm/test/CodeGen/AMDGPU/tti-unroll-prefs.ll
    llvm/test/CodeGen/AMDGPU/unify-metadata.ll
    llvm/test/CodeGen/AMDGPU/vectorize-buffer-fat-pointer.ll
    llvm/test/CodeGen/ARM/bit-reverse-to-rbit.ll
    llvm/test/CodeGen/Generic/overloaded-intrinsic-name.ll
    llvm/test/CodeGen/NVPTX/access-non-generic.ll
    llvm/test/CodeGen/NVPTX/intrinsic-old.ll
    llvm/test/CodeGen/NVPTX/math-intrins-sm80-ptx70-instcombine.ll
    llvm/test/CodeGen/NVPTX/nvvm-reflect-module-flag.ll
    llvm/test/CodeGen/NVPTX/speculative-execution-divergent-target.ll
    llvm/test/CodeGen/PowerPC/ppc64-P9-mod.ll
    llvm/test/CodeGen/PowerPC/vec_shuffle.ll
    llvm/test/CodeGen/PowerPC/vperm-instcombine.ll
    llvm/test/CodeGen/SystemZ/inline-thresh-adjust.ll
    llvm/test/CodeGen/Thumb/consthoist-few-dependents.ll
    llvm/test/CodeGen/Thumb2/mve-intrinsics/predicates.ll
    llvm/test/CodeGen/Thumb2/mve-intrinsics/vadc-multiple.ll
    llvm/test/CodeGen/Thumb2/mve-vpt-from-intrinsics.ll
    llvm/test/CodeGen/WinEH/wineh-intrinsics.ll
    llvm/test/CodeGen/X86/GC/deadargelim.ll
    llvm/test/CodeGen/X86/GC/inline.ll
    llvm/test/CodeGen/X86/GC/inline2.ll
    llvm/test/CodeGen/X86/block-placement.ll
    llvm/test/CodeGen/X86/constant-hoisting-bfi.ll
    llvm/test/CodeGen/X86/deopt-intrinsic-cconv.ll
    llvm/test/CodeGen/X86/frame-order.ll
    llvm/test/CodeGen/X86/loadStore_vectorizer.ll
    llvm/test/CodeGen/X86/masked_gather_scatter.ll
    llvm/test/CodeGen/X86/no-plt-libcalls.ll
    llvm/test/CodeGen/X86/pointer-vector.ll
    llvm/test/CodeGen/X86/pr38762.ll
    llvm/test/CodeGen/X86/pr38763.ll
    llvm/test/CodeGen/X86/pr39243.ll
    llvm/test/CodeGen/X86/tls-loads-control2.ll
    llvm/test/CodeGen/X86/vector-gep.ll
    llvm/test/DebugInfo/AArch64/ir-outliner.ll
    llvm/test/DebugInfo/ARM/lowerbdgdeclare_vla.ll
    llvm/test/DebugInfo/Generic/2010-03-19-DbgDeclare.ll
    llvm/test/DebugInfo/Generic/PR37395.ll
    llvm/test/DebugInfo/Generic/assignment-tracking/dse/dse-after-memcpyopt-merge.ll
    llvm/test/DebugInfo/Generic/assignment-tracking/dse/shorten.ll
    llvm/test/DebugInfo/Generic/assignment-tracking/licm/merge.ll
    llvm/test/DebugInfo/Generic/assignment-tracking/licm/multi-exit.ll
    llvm/test/DebugInfo/Generic/assignment-tracking/memcpyopt/merge-stores.ll
    llvm/test/DebugInfo/Generic/assignment-tracking/parse-and-verify/instruction-type.ll
    llvm/test/DebugInfo/Generic/assignment-tracking/parse-and-verify/roundtrip.ll
    llvm/test/DebugInfo/Generic/assignment-tracking/parse-and-verify/verify.ll
    llvm/test/DebugInfo/Generic/callsite-attr-invalid.ll
    llvm/test/DebugInfo/Generic/debug-info-always-inline.ll
    llvm/test/DebugInfo/Generic/debug_value_list.ll
    llvm/test/DebugInfo/Generic/global-sra-array.ll
    llvm/test/DebugInfo/Generic/global-sra-single-member.ll
    llvm/test/DebugInfo/Generic/global-sra-struct-fwd-decl.ll
    llvm/test/DebugInfo/Generic/global-sra-struct-zero-length.ll
    llvm/test/DebugInfo/Generic/global-sra-struct.ll
    llvm/test/DebugInfo/Generic/indvar-discriminator.ll
    llvm/test/DebugInfo/Generic/inline-debug-info-multiret.ll
    llvm/test/DebugInfo/Generic/inline-debug-info.ll
    llvm/test/DebugInfo/Generic/inline-debug-loc.ll
    llvm/test/DebugInfo/Generic/inline-no-debug-info.ll
    llvm/test/DebugInfo/Generic/licm-hoist-debug-loc.ll
    llvm/test/DebugInfo/Generic/licm-hoist-intrinsic-debug-loc.ll
    llvm/test/DebugInfo/Generic/simplifycfg_sink_last_inst.ll
    llvm/test/DebugInfo/Generic/volatile-alloca.ll
    llvm/test/DebugInfo/X86/clone-module-2.ll
    llvm/test/DebugInfo/X86/clone-module.ll
    llvm/test/DebugInfo/X86/dbg-value-dropped-instcombine.ll
    llvm/test/DebugInfo/X86/dbgloc-insert-extract-val-instrs.ll
    llvm/test/DebugInfo/X86/dead-store-elimination-marks-undef.ll
    llvm/test/DebugInfo/X86/global-sra-fp80-array.ll
    llvm/test/DebugInfo/X86/global-sra-fp80-struct.ll
    llvm/test/DebugInfo/X86/global-sra-struct-fit-segment.ll
    llvm/test/DebugInfo/X86/instcombine-demanded-bits-salvage.ll
    llvm/test/DebugInfo/X86/licm-undef-dbg-value.ll
    llvm/test/DebugInfo/X86/undef-type-md.ll
    llvm/test/DebugInfo/check-debugify-preserves-analyses.ll
    llvm/test/DebugInfo/debugify-bogus-dbg-value.ll
    llvm/test/DebugInfo/debugify-export.ll
    llvm/test/DebugInfo/debugify-ignore-phi.ll
    llvm/test/DebugInfo/debugify-original-no-dbg-info.ll
    llvm/test/DebugInfo/debugify-report-missing-locs-only.ll
    llvm/test/DebugInfo/debugify.ll
    llvm/test/DebugInfo/duplicate_dbgvalue.ll
    llvm/test/DebugInfo/limit-arglist-size.ll
    llvm/test/DebugInfo/pr34672.ll
    llvm/test/DebugInfo/return-same-line-merge.ll
    llvm/test/DebugInfo/salvage-duplicate-values.ll
    llvm/test/DebugInfo/salvage-gep.ll
    llvm/test/DebugInfo/salvage-limit-expr-size.ll
    llvm/test/DebugInfo/salvage-nonconst-binop.ll
    llvm/test/DebugInfo/simplify-cfg-preserve-dbg-values.ll
    llvm/test/DebugInfo/unrolled-loop-remainder.ll
    llvm/test/DebugInfo/verify-di-preserve.ll
    llvm/test/Feature/OperandBundles/inliner-conservative.ll
    llvm/test/Feature/OperandBundles/inliner-funclet-wineh.ll
    llvm/test/Feature/OperandBundles/merge-func.ll
    llvm/test/Feature/global_pv.ll
    llvm/test/LTO/X86/keep-used-puts-during-instcombine.ll
    llvm/test/Other/2002-02-24-InlineBrokePHINodes.ll
    llvm/test/Other/2007-09-10-PassManager.ll
    llvm/test/Other/2008-02-14-PassManager.ll
    llvm/test/Other/2008-06-04-FieldSizeInPacked.ll
    llvm/test/Other/2008-10-06-RemoveDeadPass.ll
    llvm/test/Other/2009-06-05-no-implicit-float.ll
    llvm/test/Other/X86/debugcounter-divrempairs.ll
    llvm/test/Other/X86/debugcounter-partiallyinlinelibcalls.ll
    llvm/test/Other/cfg-printer-branch-weights-percent.ll
    llvm/test/Other/cfg-printer-branch-weights.ll
    llvm/test/Other/cfg-printer-filter.ll
    llvm/test/Other/cfg_deopt_unreach.ll
    llvm/test/Other/constant-fold-gep.ll
    llvm/test/Other/copy-metadata-of-declaration.ll
    llvm/test/Other/debugcounter-dce.ll
    llvm/test/Other/debugcounter-newgvn.ll
    llvm/test/Other/heat-colors-graphs.ll
    llvm/test/Other/heat-colors-multigraph.ll
    llvm/test/Other/module-pass-printer.ll
    llvm/test/Other/opt-legacy-syntax-deprecation.ll
    llvm/test/Other/optimization-remarks-inline.ll
    llvm/test/Other/pr32085.ll
    llvm/test/Other/print-debug-counter.ll
    llvm/test/Other/scalable-vector-struct-intrinsic.ll
    llvm/test/Other/scalable-vectors-core-ir.ll
    llvm/test/Transforms/HardwareLoops/ARM/structure.ll
    llvm/test/Transforms/LoadStoreVectorizer/X86/codegenprepare-produced-address-math.ll
    llvm/test/Verifier/dbg-invalid-vector.ll
    llvm/test/Verifier/di-subroutine-localvar.ll
    llvm/test/Verifier/fp-intrinsics.ll
    llvm/test/Verifier/non-integral-pointers.ll
    llvm/test/Verifier/preallocated-valid.ll
    llvm/test/Verifier/recursive-struct-param.ll
    llvm/test/Verifier/statepoint.ll
    llvm/test/Verifier/swifttailcc-musttail-valid.ll
    llvm/test/Verifier/tbaa.ll
    llvm/test/Verifier/vp-intrinsics.ll
    llvm/test/Verifier/weak-dllimport.ll
    llvm/test/tools/UpdateTestChecks/update_analyze_test_checks/Inputs/x86-loopvectorize-costmodel.ll
    llvm/test/tools/UpdateTestChecks/update_analyze_test_checks/Inputs/x86-loopvectorize-costmodel.ll.expected
    llvm/test/tools/llvm-reduce/remove-function-bodies-comdat.ll
    llvm/tools/opt/opt.cpp

Removed: 
    


################################################################################
diff  --git a/clang/test/CodeGen/arm-neon-vcadd.c b/clang/test/CodeGen/arm-neon-vcadd.c
index 00b4641b5a087..9280d0b184d5f 100644
--- a/clang/test/CodeGen/arm-neon-vcadd.c
+++ b/clang/test/CodeGen/arm-neon-vcadd.c
@@ -1,7 +1,7 @@
 // REQUIRES: arm-registered-target
 // RUN: %clang_cc1 -triple armv8.3a-arm-none-eabi -target-cpu generic \
 // RUN: -target-feature +fullfp16 -mfloat-abi soft -S -emit-llvm -o - %s | \
-// RUN: opt -S -sroa -o - | FileCheck %s
+// RUN: opt -S -passes=sroa -o - | FileCheck %s
 
 #include <arm_neon.h>
 

diff  --git a/clang/test/CodeGen/memcmp-inline-builtin-to-asm.c b/clang/test/CodeGen/memcmp-inline-builtin-to-asm.c
index 964bba96dc15d..169acfad64909 100644
--- a/clang/test/CodeGen/memcmp-inline-builtin-to-asm.c
+++ b/clang/test/CodeGen/memcmp-inline-builtin-to-asm.c
@@ -1,6 +1,6 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py
 
-// RUN: %clang_cc1 -triple x86_64 -S -emit-llvm -o - %s | opt -S -verify | FileCheck %s
+// RUN: %clang_cc1 -triple x86_64 -S -emit-llvm -o - %s | opt -S -passes=verify | FileCheck %s
 //
 // Verifies that clang detects memcmp inline version and uses it instead of the builtin.
 

diff  --git a/clang/test/CodeGenCXX/attr-musttail.cpp b/clang/test/CodeGenCXX/attr-musttail.cpp
index 668641c93cd45..c51750669a2f0 100644
--- a/clang/test/CodeGenCXX/attr-musttail.cpp
+++ b/clang/test/CodeGenCXX/attr-musttail.cpp
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -no-opaque-pointers -fno-elide-constructors -S -emit-llvm %s -triple x86_64-unknown-linux-gnu -o - | FileCheck %s
-// RUN: %clang_cc1 -no-opaque-pointers -fno-elide-constructors -S -emit-llvm %s -triple x86_64-unknown-linux-gnu -o - | opt -verify
+// RUN: %clang_cc1 -no-opaque-pointers -fno-elide-constructors -S -emit-llvm %s -triple x86_64-unknown-linux-gnu -o - | opt -passes=verify
 // FIXME: remove the call to "opt" once the tests are running the Clang verifier automatically again.
 
 int Bar(int);

diff  --git a/llvm/test/Analysis/AliasSet/unknown-inst-tracking.ll b/llvm/test/Analysis/AliasSet/unknown-inst-tracking.ll
index 291126b75ff4c..20005099938ad 100644
--- a/llvm/test/Analysis/AliasSet/unknown-inst-tracking.ll
+++ b/llvm/test/Analysis/AliasSet/unknown-inst-tracking.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -licm -simple-loop-unswitch < %s | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -S -licm -simple-loop-unswitch < %s | FileCheck %s
 
 ; This test checks for a crash.  See PR32587.
 

diff  --git a/llvm/test/Analysis/CallGraph/2008-09-09-DirectCall.ll b/llvm/test/Analysis/CallGraph/2008-09-09-DirectCall.ll
index a8dbfdfc0b4d2..65003c2e66f92 100644
--- a/llvm/test/Analysis/CallGraph/2008-09-09-DirectCall.ll
+++ b/llvm/test/Analysis/CallGraph/2008-09-09-DirectCall.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -print-callgraph -disable-output 2>&1 | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -print-callgraph -disable-output 2>&1 | FileCheck %s
 
 ; CHECK: Call graph node <<null function>>
 ; CHECK:  CS<{{.*}}> calls function 'callee'

diff  --git a/llvm/test/Analysis/CallGraph/2008-09-09-UsedByGlobal.ll b/llvm/test/Analysis/CallGraph/2008-09-09-UsedByGlobal.ll
index e6aaab95a41ab..a2192cc21fb40 100644
--- a/llvm/test/Analysis/CallGraph/2008-09-09-UsedByGlobal.ll
+++ b/llvm/test/Analysis/CallGraph/2008-09-09-UsedByGlobal.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -print-callgraph -disable-output 2>&1 | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -print-callgraph -disable-output 2>&1 | FileCheck %s
 
 @a = global ptr @f		; <ptr> [#uses=0]
 

diff  --git a/llvm/test/Analysis/CallGraph/callback-calls.ll b/llvm/test/Analysis/CallGraph/callback-calls.ll
index b5d61c7067c4c..4f0f406dc56fa 100644
--- a/llvm/test/Analysis/CallGraph/callback-calls.ll
+++ b/llvm/test/Analysis/CallGraph/callback-calls.ll
@@ -1,5 +1,5 @@
-; RUN: opt < %s -print-callgraph -disable-output 2>&1 | FileCheck %s
-; RUN: opt < %s -passes=print-callgraph -disable-output 2>&1 | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -print-callgraph -disable-output 2>&1 | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -passes=print-callgraph -disable-output 2>&1 | FileCheck %s
 
 ; CHECK: Call graph node for function: 'caller'
 ; CHECK-NEXT:   CS<{{.*}}> calls function 'broker'

diff  --git a/llvm/test/Analysis/CallGraph/ignore-assumelike-calls.ll b/llvm/test/Analysis/CallGraph/ignore-assumelike-calls.ll
index 1c559f2345447..9c6ed2a8801ac 100644
--- a/llvm/test/Analysis/CallGraph/ignore-assumelike-calls.ll
+++ b/llvm/test/Analysis/CallGraph/ignore-assumelike-calls.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -print-callgraph -disable-output 2>&1 | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -print-callgraph -disable-output 2>&1 | FileCheck %s
 ; CHECK: Call graph node <<null function>><<{{.*}}>>  #uses=0
 ; CHECK-NEXT:   CS<None> calls function 'other_intrinsic_use'
 ; CHECK-NEXT:   CS<None> calls function 'other_cast_intrinsic_use'

diff  --git a/llvm/test/Analysis/CallGraph/ignore-callback-uses.ll b/llvm/test/Analysis/CallGraph/ignore-callback-uses.ll
index 796391d00c7e2..ea2bdab7e0027 100644
--- a/llvm/test/Analysis/CallGraph/ignore-callback-uses.ll
+++ b/llvm/test/Analysis/CallGraph/ignore-callback-uses.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -print-callgraph -disable-output 2>&1 | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -print-callgraph -disable-output 2>&1 | FileCheck %s
 ; CHECK: Call graph node <<null function>><<{{.*}}>>  #uses=0
 ; CHECK-NEXT:   CS<{{.*}}> calls function 'f'
 ; CHECK-NEXT:   CS<{{.*}}> calls function '__kmpc_fork_call'

diff  --git a/llvm/test/Analysis/CallGraph/llvm-used.ll b/llvm/test/Analysis/CallGraph/llvm-used.ll
index 89f82b9d0d123..b75d4b07817c2 100644
--- a/llvm/test/Analysis/CallGraph/llvm-used.ll
+++ b/llvm/test/Analysis/CallGraph/llvm-used.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -print-callgraph -disable-output 2>&1 | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -print-callgraph -disable-output 2>&1 | FileCheck %s
 
 ; The test will report used1 and used2 functions as used on the grounds
 ; of llvm.*.used references. Passing IgnoreLLVMUsed = true into the

diff  --git a/llvm/test/Analysis/CallGraph/no-intrinsics.ll b/llvm/test/Analysis/CallGraph/no-intrinsics.ll
index a94c91e73a798..7a955ecc1f9dc 100644
--- a/llvm/test/Analysis/CallGraph/no-intrinsics.ll
+++ b/llvm/test/Analysis/CallGraph/no-intrinsics.ll
@@ -1,5 +1,5 @@
-; RUN: opt < %s -print-callgraph -disable-output 2>&1 | FileCheck %s
-; RUN: opt < %s -passes=print-callgraph -disable-output 2>&1 | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -print-callgraph -disable-output 2>&1 | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -passes=print-callgraph -disable-output 2>&1 | FileCheck %s
 
 ; Check that intrinsics aren't added to the call graph
 

diff  --git a/llvm/test/Analysis/CallGraph/non-leaf-intrinsics.ll b/llvm/test/Analysis/CallGraph/non-leaf-intrinsics.ll
index 55f24964f9d6d..8ec0d6a42f6d5 100644
--- a/llvm/test/Analysis/CallGraph/non-leaf-intrinsics.ll
+++ b/llvm/test/Analysis/CallGraph/non-leaf-intrinsics.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -print-callgraph -disable-output < %s 2>&1 | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -S -print-callgraph -disable-output < %s 2>&1 | FileCheck %s
 
 declare void @llvm.experimental.patchpoint.void(i64, i32, ptr, i32, ...)
 declare token @llvm.experimental.gc.statepoint.p0(i64, i32, ptr, i32, i32, ...)

diff  --git a/llvm/test/Analysis/Dominators/2007-07-11-SplitBlock.ll b/llvm/test/Analysis/Dominators/2007-07-11-SplitBlock.ll
index 3e8b9de6e6d96..06c9bbb0388d9 100644
--- a/llvm/test/Analysis/Dominators/2007-07-11-SplitBlock.ll
+++ b/llvm/test/Analysis/Dominators/2007-07-11-SplitBlock.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -loop-rotate -simple-loop-unswitch -disable-output
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -loop-rotate -simple-loop-unswitch -disable-output
 
 define i32 @stringSearch_Clib(i32 %count) {
 entry:

diff  --git a/llvm/test/Analysis/Dominators/2007-07-12-SplitBlock.ll b/llvm/test/Analysis/Dominators/2007-07-12-SplitBlock.ll
index 9cbc8377b564b..77ea8e00acd00 100644
--- a/llvm/test/Analysis/Dominators/2007-07-12-SplitBlock.ll
+++ b/llvm/test/Analysis/Dominators/2007-07-12-SplitBlock.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -loop-rotate -licm -simple-loop-unswitch -disable-output
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -loop-rotate -licm -simple-loop-unswitch -disable-output
 
 define i32 @main(i32 %argc, i8** %argv) {
 entry:

diff  --git a/llvm/test/Analysis/Dominators/invoke.ll b/llvm/test/Analysis/Dominators/invoke.ll
index ab0afd4354a76..9487d6a782ff9 100644
--- a/llvm/test/Analysis/Dominators/invoke.ll
+++ b/llvm/test/Analysis/Dominators/invoke.ll
@@ -1,4 +1,4 @@
-; RUN: opt -verify -disable-output < %s
+; RUN: opt -temporarily-allow-old-pass-syntax -verify -disable-output < %s
 ; This tests that we handle unreachable blocks correctly
 
 define void @f() personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) {

diff  --git a/llvm/test/Analysis/GlobalsModRef/pr12351.ll b/llvm/test/Analysis/GlobalsModRef/pr12351.ll
index 98148ebf7a356..b5e09fef88ebe 100644
--- a/llvm/test/Analysis/GlobalsModRef/pr12351.ll
+++ b/llvm/test/Analysis/GlobalsModRef/pr12351.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -aa-pipeline=basic-aa,globals-aa -gvn -S -disable-verify | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -aa-pipeline=basic-aa,globals-aa -gvn -S -disable-verify | FileCheck %s
 
 declare void @llvm.memcpy.p0i8.p0i8.i32(i8*, i8*, i32, i1)
 define void @foo(i8* %x, i8* %y) {

diff  --git a/llvm/test/Analysis/LazyValueAnalysis/lvi-after-jumpthreading.ll b/llvm/test/Analysis/LazyValueAnalysis/lvi-after-jumpthreading.ll
index c25114bb5dcc1..cd36a8df44036 100644
--- a/llvm/test/Analysis/LazyValueAnalysis/lvi-after-jumpthreading.ll
+++ b/llvm/test/Analysis/LazyValueAnalysis/lvi-after-jumpthreading.ll
@@ -1,5 +1,5 @@
-; RUN: opt < %s -jump-threading -print-lvi-after-jump-threading -disable-output 2>&1 | FileCheck %s
-; RUN: opt < %s -passes=jump-threading -print-lvi-after-jump-threading -disable-output 2>&1 | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -jump-threading -print-lvi-after-jump-threading -disable-output 2>&1 | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -passes=jump-threading -print-lvi-after-jump-threading -disable-output 2>&1 | FileCheck %s
 
 ; Testing LVI cache after jump-threading
 

diff  --git a/llvm/test/Analysis/LazyValueAnalysis/lvi-for-ashr.ll b/llvm/test/Analysis/LazyValueAnalysis/lvi-for-ashr.ll
index cdc27e4d0b3cc..c7b4065faa64b 100644
--- a/llvm/test/Analysis/LazyValueAnalysis/lvi-for-ashr.ll
+++ b/llvm/test/Analysis/LazyValueAnalysis/lvi-for-ashr.ll
@@ -1,4 +1,4 @@
-; RUN: opt -correlated-propagation -S %s | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -correlated-propagation -S %s | FileCheck %s
 ; CHECK-LABEL: @test-ashr
 ; CHECK: bb_then
 ; CHECK:  %. = select i1 true, i32 3, i32 2

diff  --git a/llvm/test/Analysis/LoopAccessAnalysis/interleave-innermost.ll b/llvm/test/Analysis/LoopAccessAnalysis/interleave-innermost.ll
index 6d8288e8ce36f..c8504c7ea72e8 100644
--- a/llvm/test/Analysis/LoopAccessAnalysis/interleave-innermost.ll
+++ b/llvm/test/Analysis/LoopAccessAnalysis/interleave-innermost.ll
@@ -1,4 +1,4 @@
-; RUN: opt -loop-vectorize -force-vector-interleave=1 -S < %s | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -loop-vectorize -force-vector-interleave=1 -S < %s | FileCheck %s
 ; CHECK-LABEL: TestFoo
 ; CHECK-NOT: %wide.vec
 

diff  --git a/llvm/test/Analysis/LoopAccessAnalysis/memcheck-ni.ll b/llvm/test/Analysis/LoopAccessAnalysis/memcheck-ni.ll
index a08632f38d19c..ac4cdb1cccc08 100644
--- a/llvm/test/Analysis/LoopAccessAnalysis/memcheck-ni.ll
+++ b/llvm/test/Analysis/LoopAccessAnalysis/memcheck-ni.ll
@@ -1,4 +1,4 @@
-; RUN: opt -loop-versioning -S < %s | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -loop-versioning -S < %s | FileCheck %s
 
 ; NB: addrspaces 10-13 are non-integral
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128-ni:10:11:12:13"
@@ -10,7 +10,7 @@ define void @"japi1_permutedims!_33509"(%jl_value_t addrspace(10)**) {
 ; CHECK: [[CMP:%[^ ]*]] = icmp ult double addrspace(13)* [[A:%[^ ]*]], [[B:%[^ ]*]]
 ; CHECK: [[SELECT:%[^ ]*]] = select i1 %18, double addrspace(13)* [[A]], double addrspace(13)* [[B]]
 top:
-  %1 = alloca [3 x i64], align 8 
+  %1 = alloca [3 x i64], align 8
   %2 = load %jl_value_t addrspace(10)*, %jl_value_t addrspace(10)** %0, align 8
   %3 = getelementptr inbounds %jl_value_t addrspace(10)*, %jl_value_t addrspace(10)** %0, i64 1
   %4 = load %jl_value_t addrspace(10)*, %jl_value_t addrspace(10)** %3, align 8
@@ -46,5 +46,5 @@ L74:
   br i1 %24, label %L94, label %L74
 
 L94:
-  ret void 
+  ret void
 }

diff  --git a/llvm/test/Analysis/LoopAccessAnalysis/scalable-vector-regression-tests.ll b/llvm/test/Analysis/LoopAccessAnalysis/scalable-vector-regression-tests.ll
index 8c9e86ef2c8e7..5b3c8bcc307cb 100644
--- a/llvm/test/Analysis/LoopAccessAnalysis/scalable-vector-regression-tests.ll
+++ b/llvm/test/Analysis/LoopAccessAnalysis/scalable-vector-regression-tests.ll
@@ -1,9 +1,9 @@
-; RUN: opt -loop-load-elim -mtriple=aarch64 -mattr=+sve -S -debug < %s 2>&1 | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -loop-load-elim -mtriple=aarch64 -mattr=+sve -S -debug < %s 2>&1 | FileCheck %s
 ; REQUIRES: asserts
 
 ; Regression tests verifying "assumption that TypeSize is not scalable" and
 ; "Invalid size request on a scalable vector." are not produced by
-; -load-loop-elim (this would cause the test to fail because opt would exit with
+; -load-loop-elim (this would cause the test to fail because opt -temporarily-allow-old-pass-syntax would exit with
 ; a non-zero exit status).
 
 ; No output checked for this one, but causes a fatal error if the regression is present.

diff  --git a/llvm/test/Analysis/MemorySSA/debugvalue.ll b/llvm/test/Analysis/MemorySSA/debugvalue.ll
index 7d8e87a2d8404..d098139e5bf75 100644
--- a/llvm/test/Analysis/MemorySSA/debugvalue.ll
+++ b/llvm/test/Analysis/MemorySSA/debugvalue.ll
@@ -1,4 +1,4 @@
-; RUN: opt -disable-basic-aa -loop-rotate -verify-memoryssa -S %s | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -disable-basic-aa -loop-rotate -verify-memoryssa -S %s | FileCheck %s
 ; REQUIRES: asserts
 
 ; CHECK-LABEL: @f_w4_i2

diff  --git a/llvm/test/Analysis/MemorySSA/loop-rotate-inv-template.ll b/llvm/test/Analysis/MemorySSA/loop-rotate-inv-template.ll
index f302f86bf4bf8..8be2fff7ac00d 100644
--- a/llvm/test/Analysis/MemorySSA/loop-rotate-inv-template.ll
+++ b/llvm/test/Analysis/MemorySSA/loop-rotate-inv-template.ll
@@ -1,4 +1,4 @@
-; RUN: opt -disable-output -loop-rotate -verify-memoryssa %s
+; RUN: opt -temporarily-allow-old-pass-syntax -disable-output -loop-rotate -verify-memoryssa %s
 ; REQUIRES: asserts
 
 ; Function Attrs: nounwind

diff  --git a/llvm/test/Analysis/MemorySSA/loop-rotate-simplified-clone.ll b/llvm/test/Analysis/MemorySSA/loop-rotate-simplified-clone.ll
index aab65955a2854..f839e3ac62f6c 100644
--- a/llvm/test/Analysis/MemorySSA/loop-rotate-simplified-clone.ll
+++ b/llvm/test/Analysis/MemorySSA/loop-rotate-simplified-clone.ll
@@ -1,4 +1,4 @@
-; RUN: opt -verify-memoryssa -loop-rotate %s -S | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -verify-memoryssa -loop-rotate %s -S | FileCheck %s
 ; REQUIRES: asserts
 
 ; CHECK-LABEL: @test()

diff  --git a/llvm/test/Analysis/MemorySSA/loop-rotate-valuemap.ll b/llvm/test/Analysis/MemorySSA/loop-rotate-valuemap.ll
index c4679e00d4fc9..d8204b2fd8835 100644
--- a/llvm/test/Analysis/MemorySSA/loop-rotate-valuemap.ll
+++ b/llvm/test/Analysis/MemorySSA/loop-rotate-valuemap.ll
@@ -1,4 +1,4 @@
-; RUN: opt -loop-rotate %s -S | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -loop-rotate %s -S | FileCheck %s
 ; REQUIRES: asserts
 
 ; Check that loop rotate keeps proper mapping between cloned instructions,

diff  --git a/llvm/test/Analysis/MemorySSA/loop-unswitch.ll b/llvm/test/Analysis/MemorySSA/loop-unswitch.ll
index 9a02ea7334c1c..dfc9b81b7d9dd 100644
--- a/llvm/test/Analysis/MemorySSA/loop-unswitch.ll
+++ b/llvm/test/Analysis/MemorySSA/loop-unswitch.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -simple-loop-unswitch -disable-basic-aa -verify-memoryssa < %s | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -S -simple-loop-unswitch -disable-basic-aa -verify-memoryssa < %s | FileCheck %s
 ; REQUIRES: asserts
 
 target triple = "x86_64-unknown-linux-gnu"

diff  --git a/llvm/test/Analysis/MemorySSA/nondeterminism.ll b/llvm/test/Analysis/MemorySSA/nondeterminism.ll
index b1e3e55d363c9..d777310651233 100644
--- a/llvm/test/Analysis/MemorySSA/nondeterminism.ll
+++ b/llvm/test/Analysis/MemorySSA/nondeterminism.ll
@@ -1,4 +1,4 @@
-; RUN: opt -simplifycfg -S --preserve-ll-uselistorder %s | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -simplifycfg -S --preserve-ll-uselistorder %s | FileCheck %s
 ; REQUIRES: x86-registered-target
 ; CHECK-LABEL: @n
 ; CHECK: uselistorder i16 0, { 3, 2, 4, 1, 5, 0, 6 }

diff  --git a/llvm/test/Analysis/MemorySSA/pr40037.ll b/llvm/test/Analysis/MemorySSA/pr40037.ll
index 6962eef4c3f10..1a631290b3c6f 100644
--- a/llvm/test/Analysis/MemorySSA/pr40037.ll
+++ b/llvm/test/Analysis/MemorySSA/pr40037.ll
@@ -1,5 +1,5 @@
 ; REQUIRES: asserts
-; RUN: opt -S -simple-loop-unswitch -verify-memoryssa  < %s | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -S -simple-loop-unswitch -verify-memoryssa  < %s | FileCheck %s
 
 target datalayout = "E-m:e-i1:8:16-i8:8:16-i64:64-f128:64-v128:64-a:8:16-n32:64"
 target triple = "s390x-ibm-linux"

diff  --git a/llvm/test/Analysis/MemorySSA/pr40749_2.ll b/llvm/test/Analysis/MemorySSA/pr40749_2.ll
index 666c9dce1c87f..0ebdb37eb7a39 100644
--- a/llvm/test/Analysis/MemorySSA/pr40749_2.ll
+++ b/llvm/test/Analysis/MemorySSA/pr40749_2.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -licm -simple-loop-unswitch -verify-memoryssa %s | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -S -licm -simple-loop-unswitch -verify-memoryssa %s | FileCheck %s
 ; REQUIRES: asserts
 target datalayout = "E-m:e-i1:8:16-i8:8:16-i64:64-f128:64-v128:64-a:8:16-n32:64"
 target triple = "s390x-ibm-linux"

diff  --git a/llvm/test/Analysis/MemorySSA/pr42294.ll b/llvm/test/Analysis/MemorySSA/pr42294.ll
index 6bc06cd377c25..63388f18bb7ec 100644
--- a/llvm/test/Analysis/MemorySSA/pr42294.ll
+++ b/llvm/test/Analysis/MemorySSA/pr42294.ll
@@ -1,6 +1,6 @@
 ; REQUIRES: asserts
-; RUN: opt -loop-rotate -licm %s -disable-output -debug-only=licm 2>&1 | FileCheck %s -check-prefix=LICM
-; RUN: opt -loop-rotate -licm %s -S  | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -loop-rotate -licm %s -disable-output -debug-only=licm 2>&1 | FileCheck %s -check-prefix=LICM
+; RUN: opt -temporarily-allow-old-pass-syntax -loop-rotate -licm %s -S  | FileCheck %s
 
 ; LICM-NOT: LICM sinking instruction:   %.pre = load i8, ptr %arrayidx.phi.trans.insert
 

diff  --git a/llvm/test/Analysis/MemorySSA/pr43044.ll b/llvm/test/Analysis/MemorySSA/pr43044.ll
index 3b89b1936605f..d542cf31e627d 100644
--- a/llvm/test/Analysis/MemorySSA/pr43044.ll
+++ b/llvm/test/Analysis/MemorySSA/pr43044.ll
@@ -1,4 +1,4 @@
-; RUN: opt -loop-rotate -licm -verify-memoryssa %s -S | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -loop-rotate -licm -verify-memoryssa %s -S | FileCheck %s
 ; REQUIRES: asserts
 
 target datalayout = "E-m:e-i1:8:16-i8:8:16-i64:64-f128:64-v128:64-a:8:16-n32:64"

diff  --git a/llvm/test/Analysis/MemorySSA/pr43641.ll b/llvm/test/Analysis/MemorySSA/pr43641.ll
index 4629bc6a47b7a..b8dd2c942a49e 100644
--- a/llvm/test/Analysis/MemorySSA/pr43641.ll
+++ b/llvm/test/Analysis/MemorySSA/pr43641.ll
@@ -1,4 +1,4 @@
-; RUN: opt -simple-loop-unswitch -enable-nontrivial-unswitch -verify-memoryssa -S < %s | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -simple-loop-unswitch -enable-nontrivial-unswitch -verify-memoryssa -S < %s | FileCheck %s
 ; REQUIRES: asserts
 
 ; CHECK-LABEL: @c

diff  --git a/llvm/test/Analysis/MemorySSA/pr44029.ll b/llvm/test/Analysis/MemorySSA/pr44029.ll
index f8dd427b535c7..a110320c902cd 100644
--- a/llvm/test/Analysis/MemorySSA/pr44029.ll
+++ b/llvm/test/Analysis/MemorySSA/pr44029.ll
@@ -1,4 +1,4 @@
-; RUN: opt -loop-simplifycfg -verify-memoryssa -S < %s | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -loop-simplifycfg -verify-memoryssa -S < %s | FileCheck %s
 ; REQUIRES: asserts
 
 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/Analysis/MemorySSA/pr46574.ll b/llvm/test/Analysis/MemorySSA/pr46574.ll
index efd71bc5dc069..17289e8862e45 100644
--- a/llvm/test/Analysis/MemorySSA/pr46574.ll
+++ b/llvm/test/Analysis/MemorySSA/pr46574.ll
@@ -1,4 +1,4 @@
-; RUN: opt -loop-instsimplify -loop-simplifycfg -licm -simple-loop-unswitch -enable-nontrivial-unswitch %s -disable-output
+; RUN: opt -temporarily-allow-old-pass-syntax -loop-instsimplify -loop-simplifycfg -licm -simple-loop-unswitch -enable-nontrivial-unswitch %s -disable-output
 ; REQUIRES: asserts
 
 %0 = type { i24, i32, i32, i8 }

diff  --git a/llvm/test/Analysis/MemorySSA/simple_loop_unswitch_nontrivial.ll b/llvm/test/Analysis/MemorySSA/simple_loop_unswitch_nontrivial.ll
index 7d1022519f458..a9e6fd488dc92 100644
--- a/llvm/test/Analysis/MemorySSA/simple_loop_unswitch_nontrivial.ll
+++ b/llvm/test/Analysis/MemorySSA/simple_loop_unswitch_nontrivial.ll
@@ -1,4 +1,4 @@
-; RUN: opt -simple-loop-unswitch -enable-nontrivial-unswitch -verify-memoryssa -S %s | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -simple-loop-unswitch -enable-nontrivial-unswitch -verify-memoryssa -S %s | FileCheck %s
 ; REQUIRES: asserts
 
 target triple = "x86_64-unknown-linux-gnu"

diff  --git a/llvm/test/Analysis/MustExecute/const-cond.ll b/llvm/test/Analysis/MustExecute/const-cond.ll
index 36ef73180cd0c..2af6ae0f5916c 100644
--- a/llvm/test/Analysis/MustExecute/const-cond.ll
+++ b/llvm/test/Analysis/MustExecute/const-cond.ll
@@ -1,6 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -disable-output -print-mustexecute %s 2>&1 | FileCheck %s
-; RUN: opt -disable-output -passes=print-mustexecute %s 2>&1 | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -disable-output -print-mustexecute %s 2>&1 | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -disable-output -passes=print-mustexecute %s 2>&1 | FileCheck %s
 
 ; In general the CFG below is easily simplified but this is useful for
 ; pass ordering issue elimination.

diff  --git a/llvm/test/Analysis/MustExecute/infinite_loops.ll b/llvm/test/Analysis/MustExecute/infinite_loops.ll
index c9dc609b326d9..1471e31c2c2d3 100644
--- a/llvm/test/Analysis/MustExecute/infinite_loops.ll
+++ b/llvm/test/Analysis/MustExecute/infinite_loops.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -disable-output -print-mustexecute %s 2>&1 | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -disable-output -print-mustexecute %s 2>&1 | FileCheck %s
 
 ; Infinite loop.
 ; Make sure that the backedge is mustexec.

diff  --git a/llvm/test/Analysis/MustExecute/loop-header.ll b/llvm/test/Analysis/MustExecute/loop-header.ll
index 80aadff37009f..0a7985025e342 100644
--- a/llvm/test/Analysis/MustExecute/loop-header.ll
+++ b/llvm/test/Analysis/MustExecute/loop-header.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -disable-output -print-mustexecute %s 2>&1 | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -disable-output -print-mustexecute %s 2>&1 | FileCheck %s
 
 define i1 @header_with_icf(ptr noalias %p, i32 %high) {
 ; CHECK-LABEL: @header_with_icf(
@@ -67,7 +67,7 @@ entry:
 loop:
   %iv = phi i32 [0, %entry], [%iv.next, %next]
   br label %inner_loop
-  
+
 inner_loop:
   %v = load i32, ptr %p
   %inner.test = icmp eq i32 %v, 0

diff  --git a/llvm/test/Analysis/MustExecute/pr57780.ll b/llvm/test/Analysis/MustExecute/pr57780.ll
index b044408a8b8a3..4b394125ddcf0 100644
--- a/llvm/test/Analysis/MustExecute/pr57780.ll
+++ b/llvm/test/Analysis/MustExecute/pr57780.ll
@@ -1,4 +1,4 @@
-; RUN: opt -disable-output -print-mustexecute < %s 2>&1 | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -disable-output -print-mustexecute < %s 2>&1 | FileCheck %s
 
 @c = global i16 0, align 2
 

diff  --git a/llvm/test/Analysis/ScalarEvolution/2007-08-06-MisinterpretBranch.ll b/llvm/test/Analysis/ScalarEvolution/2007-08-06-MisinterpretBranch.ll
index 9b60efd0edabe..90acf9d5132d8 100644
--- a/llvm/test/Analysis/ScalarEvolution/2007-08-06-MisinterpretBranch.ll
+++ b/llvm/test/Analysis/ScalarEvolution/2007-08-06-MisinterpretBranch.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -indvars -adce -simplifycfg -S | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -indvars -adce -simplifycfg -S | FileCheck %s
 ; PR1598
 
 define i32 @f(i32 %a, i32 %b, i32 %x, i32 %y) {

diff  --git a/llvm/test/Analysis/ScalarEvolution/2012-03-26-LoadConstant.ll b/llvm/test/Analysis/ScalarEvolution/2012-03-26-LoadConstant.ll
index d6d1194cc117c..786b44e190b73 100644
--- a/llvm/test/Analysis/ScalarEvolution/2012-03-26-LoadConstant.ll
+++ b/llvm/test/Analysis/ScalarEvolution/2012-03-26-LoadConstant.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -instcombine -loop-rotate -licm -instcombine -indvars -loop-deletion -constmerge -S | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -globalopt -temporarily-allow-old-pass-syntax -instcombine -loop-rotate -licm -instcombine -indvars -loop-deletion -constmerge -S | FileCheck %s
 ; PR11882: ComputeLoadConstantCompareExitLimit crash.
 ;
 ; for.body is deleted leaving a loop-invariant load.

diff  --git a/llvm/test/Analysis/ScalarEvolution/2012-05-29-MulAddRec.ll b/llvm/test/Analysis/ScalarEvolution/2012-05-29-MulAddRec.ll
index f395059ba5cc4..d854df37f62ce 100644
--- a/llvm/test/Analysis/ScalarEvolution/2012-05-29-MulAddRec.ll
+++ b/llvm/test/Analysis/ScalarEvolution/2012-05-29-MulAddRec.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -S -indvars -loop-unroll | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -S -indvars -loop-unroll | FileCheck %s
 ;
 ; loop-unroll fully unrolls the inner loop, creating an interesting
 ; chain of multiplication. indvars forces SCEV to run again on the

diff  --git a/llvm/test/Analysis/ScalarEvolution/avoid-assume-hang.ll b/llvm/test/Analysis/ScalarEvolution/avoid-assume-hang.ll
index 4a855bc23e70e..7bb30e131db53 100644
--- a/llvm/test/Analysis/ScalarEvolution/avoid-assume-hang.ll
+++ b/llvm/test/Analysis/ScalarEvolution/avoid-assume-hang.ll
@@ -1,5 +1,5 @@
-; RUN: opt %s -always-inline | opt -passes='print<scalar-evolution>'
-; There was optimization bug in ScalarEvolution, that causes too long 
+; RUN: opt -temporarily-allow-old-pass-syntax %s -always-inline | opt -temporarily-allow-old-pass-syntax -passes='print<scalar-evolution>'
+; There was optimization bug in ScalarEvolution, that causes too long
 ; compute time and stack overflow crash.
 
 declare void @body(i32)

diff  --git a/llvm/test/Analysis/ScalarEvolution/scev-expander-existing-value-offset.ll b/llvm/test/Analysis/ScalarEvolution/scev-expander-existing-value-offset.ll
index 20f822e1ad2c3..c1d929349ac0c 100644
--- a/llvm/test/Analysis/ScalarEvolution/scev-expander-existing-value-offset.ll
+++ b/llvm/test/Analysis/ScalarEvolution/scev-expander-existing-value-offset.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -loop-vectorize -force-vector-interleave=1 -force-vector-width=4 -S |FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -loop-vectorize -force-vector-interleave=1 -force-vector-width=4 -S |FileCheck %s
 ; SCEV expansion uses existing value or value + offset to reduce duplicate code expansion so foo should only generate one select inst after loop vectorization.
 ; CHECK-LABEL: @foo(
 ; CHECK: select

diff  --git a/llvm/test/Analysis/ScalarEvolution/scev-expander-reuse-unroll.ll b/llvm/test/Analysis/ScalarEvolution/scev-expander-reuse-unroll.ll
index d50d550327195..90ce36045d91b 100644
--- a/llvm/test/Analysis/ScalarEvolution/scev-expander-reuse-unroll.ll
+++ b/llvm/test/Analysis/ScalarEvolution/scev-expander-reuse-unroll.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -loop-unroll -unroll-runtime -unroll-count=2 -verify-scev-maps -S | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -loop-unroll -unroll-runtime -unroll-count=2 -verify-scev-maps -S | FileCheck %s
 
 ; Check SCEV expansion uses existing value when unrolling an inner loop with runtime trip count in a loop nest.
 ; The outer loop gets unrolled twice, so we see 2 selects in the outer loop blocks.

diff  --git a/llvm/test/Analysis/ScalarEvolution/scev-expander-reuse-vect.ll b/llvm/test/Analysis/ScalarEvolution/scev-expander-reuse-vect.ll
index a818b47523e5b..f8b7170fe7b34 100644
--- a/llvm/test/Analysis/ScalarEvolution/scev-expander-reuse-vect.ll
+++ b/llvm/test/Analysis/ScalarEvolution/scev-expander-reuse-vect.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -loop-vectorize -force-vector-width=4 -verify-scev-maps -S |FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -loop-vectorize -force-vector-width=4 -verify-scev-maps -S |FileCheck %s
 
 ; SCEV expansion uses existing value when the SCEV has no AddRec expr.
 ; CHECK-LABEL: @foo(

diff  --git a/llvm/test/Analysis/ScalarEvolution/scev-invalid.ll b/llvm/test/Analysis/ScalarEvolution/scev-invalid.ll
index aac0d319ae84c..05d77977d3972 100644
--- a/llvm/test/Analysis/ScalarEvolution/scev-invalid.ll
+++ b/llvm/test/Analysis/ScalarEvolution/scev-invalid.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -S -indvars -loop-unroll | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -S -indvars -loop-unroll | FileCheck %s
 ;
 ; PR15570: SEGV: SCEV back-edge info invalid after dead code removal.
 ;

diff  --git a/llvm/test/Bitcode/compatibility-6.0.ll b/llvm/test/Bitcode/compatibility-6.0.ll
index 4d9c33f6ef472..f17e6215dff8b 100644
--- a/llvm/test/Bitcode/compatibility-6.0.ll
+++ b/llvm/test/Bitcode/compatibility-6.0.ll
@@ -3,7 +3,7 @@
 ; N.b: This is 6.0-compatible IR. The CHECK lines occasionally 
diff er from
 ;      the IR used to generate the bitcode, and may need to be updated.
 
-; RUN: opt -verify -disable-output < %s.bc
+; RUN: opt -temporarily-allow-old-pass-syntax -verify -disable-output < %s.bc
 ; RUN: llvm-dis < %s.bc | FileCheck %s
 
 target datalayout = "E"

diff  --git a/llvm/test/Bitcode/extractelement.ll b/llvm/test/Bitcode/extractelement.ll
index 10858a6dd30a5..57f755ddf2535 100644
--- a/llvm/test/Bitcode/extractelement.ll
+++ b/llvm/test/Bitcode/extractelement.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instsimplify | llvm-dis -disable-output
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -instsimplify | llvm-dis -disable-output
 ; RUN: verify-uselistorder < %s
 ; PR3465
 

diff  --git a/llvm/test/Bitcode/infer_dso_local.ll b/llvm/test/Bitcode/infer_dso_local.ll
index 26b7212b908e4..5fe20d1a02026 100644
--- a/llvm/test/Bitcode/infer_dso_local.ll
+++ b/llvm/test/Bitcode/infer_dso_local.ll
@@ -1,3 +1,3 @@
-; RUN: opt -verify %S/Inputs/infer_dso_local.bc | llvm-dis | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -verify %S/Inputs/infer_dso_local.bc | llvm-dis | FileCheck %s
 
 ; CHECK: define linkonce_odr hidden void @test()

diff  --git a/llvm/test/CodeGen/AArch64/llvm-masked-gather-legal-for-sve.ll b/llvm/test/CodeGen/AArch64/llvm-masked-gather-legal-for-sve.ll
index 650682a2a1065..7388e03f3748f 100644
--- a/llvm/test/CodeGen/AArch64/llvm-masked-gather-legal-for-sve.ll
+++ b/llvm/test/CodeGen/AArch64/llvm-masked-gather-legal-for-sve.ll
@@ -1,4 +1,4 @@
-; RUN: opt -mtriple=aarch64-linux-gnu -mattr=+sve -scalarize-masked-mem-intrin -S < %s | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -mtriple=aarch64-linux-gnu -mattr=+sve -scalarize-masked-mem-intrin -S < %s | FileCheck %s
 
 ; Testing that masked gathers operating on scalable vectors that are
 ; packed in SVE registers are not scalarized.

diff  --git a/llvm/test/CodeGen/AArch64/llvm-masked-scatter-legal-for-sve.ll b/llvm/test/CodeGen/AArch64/llvm-masked-scatter-legal-for-sve.ll
index 866ac1a8a6efb..6105b47f95748 100644
--- a/llvm/test/CodeGen/AArch64/llvm-masked-scatter-legal-for-sve.ll
+++ b/llvm/test/CodeGen/AArch64/llvm-masked-scatter-legal-for-sve.ll
@@ -1,4 +1,4 @@
-; RUN: opt -mtriple=aarch64-linux-gnu -mattr=+sve -scalarize-masked-mem-intrin -S < %s | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -mtriple=aarch64-linux-gnu -mattr=+sve -scalarize-masked-mem-intrin -S < %s | FileCheck %s
 
 ; Testing that masked scatters operating on scalable vectors that are
 ; packed in SVE registers are not scalarized.

diff  --git a/llvm/test/CodeGen/AArch64/sve-ptest-removal-cmple.ll b/llvm/test/CodeGen/AArch64/sve-ptest-removal-cmple.ll
index 9cd9c30d3865d..865164b2e8186 100644
--- a/llvm/test/CodeGen/AArch64/sve-ptest-removal-cmple.ll
+++ b/llvm/test/CodeGen/AArch64/sve-ptest-removal-cmple.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
-; RUN: opt -instcombine -S %s | llc -mtriple=aarch64--linux-gnu -mattr=+sve -o - | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -instcombine -S %s | llc -mtriple=aarch64--linux-gnu -mattr=+sve -o - | FileCheck %s
 
 target triple = "aarch64-unknown-linux-gnu"
 

diff  --git a/llvm/test/CodeGen/AMDGPU/amdgpu-unroll-threshold.ll b/llvm/test/CodeGen/AMDGPU/amdgpu-unroll-threshold.ll
index f48ff77abf9a2..7a22f661899a7 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-unroll-threshold.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-unroll-threshold.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -S -mtriple=amdgcn-- -loop-unroll | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -S -mtriple=amdgcn-- -loop-unroll | FileCheck %s
 
 ; Check that the loop in unroll_default is not fully unrolled using the default
 ; unroll threshold

diff  --git a/llvm/test/CodeGen/AMDGPU/force-alwaysinline-lds-global-address.ll b/llvm/test/CodeGen/AMDGPU/force-alwaysinline-lds-global-address.ll
index a11a5c674cf1b..d66a1a30a860f 100644
--- a/llvm/test/CodeGen/AMDGPU/force-alwaysinline-lds-global-address.ll
+++ b/llvm/test/CodeGen/AMDGPU/force-alwaysinline-lds-global-address.ll
@@ -1,7 +1,7 @@
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -amdgpu-always-inline -amdgpu-enable-lower-module-lds=false %s | FileCheck --check-prefix=ALL %s
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -passes=amdgpu-always-inline -amdgpu-enable-lower-module-lds=false %s | FileCheck --check-prefix=ALL %s
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -amdgpu-stress-function-calls -amdgpu-always-inline -amdgpu-enable-lower-module-lds=false %s | FileCheck --check-prefix=ALL %s
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -amdgpu-stress-function-calls -passes=amdgpu-always-inline -amdgpu-enable-lower-module-lds=false %s | FileCheck --check-prefix=ALL %s
+; RUN: opt -temporarily-allow-old-pass-syntax -S -mtriple=amdgcn-amd-amdhsa -amdgpu-always-inline -amdgpu-enable-lower-module-lds=false %s | FileCheck --check-prefix=ALL %s
+; RUN: opt -temporarily-allow-old-pass-syntax -S -mtriple=amdgcn-amd-amdhsa -passes=amdgpu-always-inline -amdgpu-enable-lower-module-lds=false %s | FileCheck --check-prefix=ALL %s
+; RUN: opt -temporarily-allow-old-pass-syntax -S -mtriple=amdgcn-amd-amdhsa -amdgpu-stress-function-calls -amdgpu-always-inline -amdgpu-enable-lower-module-lds=false %s | FileCheck --check-prefix=ALL %s
+; RUN: opt -temporarily-allow-old-pass-syntax -S -mtriple=amdgcn-amd-amdhsa -amdgpu-stress-function-calls -passes=amdgpu-always-inline -amdgpu-enable-lower-module-lds=false %s | FileCheck --check-prefix=ALL %s
 
 target datalayout = "e-p:64:64-p1:64:64-p2:32:32-p3:32:32-p4:64:64-p5:32:32-p6:32:32-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-v2048:2048-n32:64-S32-A5"
 

diff  --git a/llvm/test/CodeGen/AMDGPU/inline-maxbb.ll b/llvm/test/CodeGen/AMDGPU/inline-maxbb.ll
index 993bfdff52243..429db4d13404f 100644
--- a/llvm/test/CodeGen/AMDGPU/inline-maxbb.ll
+++ b/llvm/test/CodeGen/AMDGPU/inline-maxbb.ll
@@ -1,7 +1,7 @@
-; RUN: opt -mtriple=amdgcn-- -inline -S -amdgpu-inline-max-bb=2 %s | FileCheck %s --check-prefix=NOINL
-; RUN: opt -mtriple=amdgcn-- -inline -S -amdgpu-inline-max-bb=3 %s | FileCheck %s --check-prefix=INL
-; RUN: opt -mtriple=amdgcn-- -passes=inline -S -amdgpu-inline-max-bb=2 %s | FileCheck %s --check-prefix=NOINL
-; RUN: opt -mtriple=amdgcn-- -passes=inline -S -amdgpu-inline-max-bb=3 %s | FileCheck %s --check-prefix=INL
+; RUN: opt -temporarily-allow-old-pass-syntax -mtriple=amdgcn-- -inline -S -amdgpu-inline-max-bb=2 %s | FileCheck %s --check-prefix=NOINL
+; RUN: opt -temporarily-allow-old-pass-syntax -mtriple=amdgcn-- -inline -S -amdgpu-inline-max-bb=3 %s | FileCheck %s --check-prefix=INL
+; RUN: opt -temporarily-allow-old-pass-syntax -mtriple=amdgcn-- -passes=inline -S -amdgpu-inline-max-bb=2 %s | FileCheck %s --check-prefix=NOINL
+; RUN: opt -temporarily-allow-old-pass-syntax -mtriple=amdgcn-- -passes=inline -S -amdgpu-inline-max-bb=3 %s | FileCheck %s --check-prefix=INL
 
 define i32 @callee(i32 %x) {
 entry:

diff  --git a/llvm/test/CodeGen/AMDGPU/loop-idiom.ll b/llvm/test/CodeGen/AMDGPU/loop-idiom.ll
index 70cfb7ed86f06..d97974eeefb74 100644
--- a/llvm/test/CodeGen/AMDGPU/loop-idiom.ll
+++ b/llvm/test/CodeGen/AMDGPU/loop-idiom.ll
@@ -1,6 +1,6 @@
-; RUN: opt -loop-idiom -S < %s -march=r600 -mcpu=redwood | FileCheck --check-prefix=R600 --check-prefix=FUNC %s
-; RUN: opt -loop-idiom -S < %s -march=amdgcn -mcpu=tahiti -verify-machineinstrs| FileCheck --check-prefix=SI --check-prefix=FUNC %s
-; RUN: opt -loop-idiom -S < %s -march=amdgcn -mcpu=tonga -verify-machineinstrs| FileCheck --check-prefix=SI --check-prefix=FUNC %s
+; RUN: opt -temporarily-allow-old-pass-syntax -loop-idiom -S < %s -march=r600 -mcpu=redwood | FileCheck --check-prefix=R600 --check-prefix=FUNC %s
+; RUN: opt -temporarily-allow-old-pass-syntax -loop-idiom -S < %s -march=amdgcn -mcpu=tahiti -verify-machineinstrs| FileCheck --check-prefix=SI --check-prefix=FUNC %s
+; RUN: opt -temporarily-allow-old-pass-syntax -loop-idiom -S < %s -march=amdgcn -mcpu=tonga -verify-machineinstrs| FileCheck --check-prefix=SI --check-prefix=FUNC %s
 
 target datalayout = "e-p:64:64-p1:64:64-p2:32:32-p3:32:32-p4:64:64-p5:32:32-p6:32:32-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-v2048:2048-n32:64-S32-A5"
 

diff  --git a/llvm/test/CodeGen/AMDGPU/opencl-printf-and-hostcall.ll b/llvm/test/CodeGen/AMDGPU/opencl-printf-and-hostcall.ll
index d4c656941d238..6cdbeee89dad5 100644
--- a/llvm/test/CodeGen/AMDGPU/opencl-printf-and-hostcall.ll
+++ b/llvm/test/CodeGen/AMDGPU/opencl-printf-and-hostcall.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mtriple=amdgcn-unknown-unknown -amdgpu-printf-runtime-binding < %s 2>&1 | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -S -mtriple=amdgcn-unknown-unknown -amdgpu-printf-runtime-binding < %s 2>&1 | FileCheck %s
 
 @.str = private unnamed_addr addrspace(4) constant [6 x i8] c"%s:%d\00", align 1
 

diff  --git a/llvm/test/CodeGen/AMDGPU/opencl-printf.ll b/llvm/test/CodeGen/AMDGPU/opencl-printf.ll
index 4bf3dbd4dc75e..786c822f66146 100644
--- a/llvm/test/CodeGen/AMDGPU/opencl-printf.ll
+++ b/llvm/test/CodeGen/AMDGPU/opencl-printf.ll
@@ -1,7 +1,7 @@
-; RUN: opt -mtriple=r600-- -amdgpu-printf-runtime-binding -mcpu=r600 -S < %s | FileCheck --check-prefix=FUNC --check-prefix=R600 %s
-; RUN: opt -mtriple=amdgcn-- -amdgpu-printf-runtime-binding -mcpu=fiji -S < %s | FileCheck --check-prefix=FUNC --check-prefix=GCN %s
-; RUN: opt -mtriple=amdgcn--amdhsa -amdgpu-printf-runtime-binding -mcpu=fiji -S < %s | FileCheck --check-prefix=FUNC --check-prefix=GCN %s
-; RUN: opt -mtriple=amdgcn--amdhsa -passes=amdgpu-printf-runtime-binding -mcpu=fiji -S < %s | FileCheck --check-prefix=FUNC --check-prefix=GCN %s
+; RUN: opt -temporarily-allow-old-pass-syntax -mtriple=r600-- -amdgpu-printf-runtime-binding -mcpu=r600 -S < %s | FileCheck --check-prefix=FUNC --check-prefix=R600 %s
+; RUN: opt -temporarily-allow-old-pass-syntax -mtriple=amdgcn-- -amdgpu-printf-runtime-binding -mcpu=fiji -S < %s | FileCheck --check-prefix=FUNC --check-prefix=GCN %s
+; RUN: opt -temporarily-allow-old-pass-syntax -mtriple=amdgcn--amdhsa -amdgpu-printf-runtime-binding -mcpu=fiji -S < %s | FileCheck --check-prefix=FUNC --check-prefix=GCN %s
+; RUN: opt -temporarily-allow-old-pass-syntax -mtriple=amdgcn--amdhsa -passes=amdgpu-printf-runtime-binding -mcpu=fiji -S < %s | FileCheck --check-prefix=FUNC --check-prefix=GCN %s
 
 ; FUNC-LABEL: @test_kernel(
 ; R600-LABEL: entry

diff  --git a/llvm/test/CodeGen/AMDGPU/propagate-attributes-function-pointer-argument.ll b/llvm/test/CodeGen/AMDGPU/propagate-attributes-function-pointer-argument.ll
index 7b05864f7a4a1..cdf636be77c6a 100644
--- a/llvm/test/CodeGen/AMDGPU/propagate-attributes-function-pointer-argument.ll
+++ b/llvm/test/CodeGen/AMDGPU/propagate-attributes-function-pointer-argument.ll
@@ -8,7 +8,7 @@
 ; `call void @g(ptr @g.1)`
 ; which is invalid IR.
 
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -amdgpu-propagate-attributes-late %s | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -S -mtriple=amdgcn-amd-amdhsa -amdgpu-propagate-attributes-late %s | FileCheck %s
 
 ; CHECK-LABEL: define amdgpu_kernel void @thiswasabug() #0
 ; CHECK-NOT: call void @g(ptr @g.1)

diff  --git a/llvm/test/CodeGen/AMDGPU/r600.alu-limits.ll b/llvm/test/CodeGen/AMDGPU/r600.alu-limits.ll
index acac5c321dfd6..5706e925bc1d5 100644
--- a/llvm/test/CodeGen/AMDGPU/r600.alu-limits.ll
+++ b/llvm/test/CodeGen/AMDGPU/r600.alu-limits.ll
@@ -1,4 +1,4 @@
-; RUN: opt -loop-unroll -unroll-threshold=2000 -S < %s | llc -march=r600 -mcpu=cypress | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -loop-unroll -unroll-threshold=2000 -S < %s | llc -march=r600 -mcpu=cypress | FileCheck %s
 ; REQUIRES: asserts
 
 ; CHECK: {{^}}alu_limits:

diff  --git a/llvm/test/CodeGen/AMDGPU/reqd-work-group-size.ll b/llvm/test/CodeGen/AMDGPU/reqd-work-group-size.ll
index 0211bdac2fe68..3b911eb850bcb 100644
--- a/llvm/test/CodeGen/AMDGPU/reqd-work-group-size.ll
+++ b/llvm/test/CodeGen/AMDGPU/reqd-work-group-size.ll
@@ -1,5 +1,5 @@
-; RUN: opt -mtriple=amdgcn-amd-amdhsa -S -amdgpu-lower-kernel-attributes -instcombine %s | FileCheck -enable-var-scope %s
-; RUN: opt -mtriple=amdgcn-amd-amdhsa -S -passes=amdgpu-lower-kernel-attributes,instcombine %s | FileCheck -enable-var-scope %s
+; RUN: opt -temporarily-allow-old-pass-syntax -mtriple=amdgcn-amd-amdhsa -S -amdgpu-lower-kernel-attributes -instcombine %s | FileCheck -enable-var-scope %s
+; RUN: opt -temporarily-allow-old-pass-syntax -mtriple=amdgcn-amd-amdhsa -S -passes=amdgpu-lower-kernel-attributes,instcombine %s | FileCheck -enable-var-scope %s
 
 target datalayout = "n32"
 

diff  --git a/llvm/test/CodeGen/AMDGPU/simplify-libcalls2.ll b/llvm/test/CodeGen/AMDGPU/simplify-libcalls2.ll
index c1a25b678897c..e9952f03e4ecf 100644
--- a/llvm/test/CodeGen/AMDGPU/simplify-libcalls2.ll
+++ b/llvm/test/CodeGen/AMDGPU/simplify-libcalls2.ll
@@ -1,6 +1,6 @@
 ; REQUIRES: asserts
-; RUN: opt -S -amdgpu-simplifylib -debug-only=amdgpu-simplifylib -mtriple=amdgcn-unknown-amdhsa -disable-output < %s 2>&1 | FileCheck %s
-; RUN: opt -S -passes=amdgpu-simplifylib -debug-only=amdgpu-simplifylib -mtriple=amdgcn-unknown-amdhsa -disable-output < %s 2>&1 | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -S -amdgpu-simplifylib -debug-only=amdgpu-simplifylib -mtriple=amdgcn-unknown-amdhsa -disable-output < %s 2>&1 | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -S -passes=amdgpu-simplifylib -debug-only=amdgpu-simplifylib -mtriple=amdgcn-unknown-amdhsa -disable-output < %s 2>&1 | FileCheck %s
 
 ; CHECK-NOT: AMDIC: try folding   call void @llvm.lifetime.start.p0
 ; CHECK-NOT: AMDIC: try folding   call void @llvm.lifetime.end.p0

diff  --git a/llvm/test/CodeGen/AMDGPU/speculative-execution-freecasts.ll b/llvm/test/CodeGen/AMDGPU/speculative-execution-freecasts.ll
index 602207b692840..247801ed39a46 100644
--- a/llvm/test/CodeGen/AMDGPU/speculative-execution-freecasts.ll
+++ b/llvm/test/CodeGen/AMDGPU/speculative-execution-freecasts.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -S -mtriple=amdgcn-unknown-amdhsa -speculative-execution \
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -S -mtriple=amdgcn-unknown-amdhsa -speculative-execution \
 ; RUN:   -spec-exec-max-speculation-cost 1 -spec-exec-max-not-hoisted 1 \
 ; RUN:   | FileCheck %s
 

diff  --git a/llvm/test/CodeGen/AMDGPU/stress-calls.ll b/llvm/test/CodeGen/AMDGPU/stress-calls.ll
index 6c6f81f0922d5..ffb3a1d01c2ed 100644
--- a/llvm/test/CodeGen/AMDGPU/stress-calls.ll
+++ b/llvm/test/CodeGen/AMDGPU/stress-calls.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -amdgpu-stress-function-calls -amdgpu-always-inline %s | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -S -mtriple=amdgcn-amd-amdhsa -amdgpu-stress-function-calls -amdgpu-always-inline %s | FileCheck %s
 
 ; CHECK: define internal fastcc i32 @alwaysinline_func(i32 %a) #0 {
 define internal fastcc i32 @alwaysinline_func(i32 %a) alwaysinline {

diff  --git a/llvm/test/CodeGen/AMDGPU/tti-unroll-prefs.ll b/llvm/test/CodeGen/AMDGPU/tti-unroll-prefs.ll
index f8d27fc22d568..37215029a5a0e 100644
--- a/llvm/test/CodeGen/AMDGPU/tti-unroll-prefs.ll
+++ b/llvm/test/CodeGen/AMDGPU/tti-unroll-prefs.ll
@@ -1,4 +1,4 @@
-; RUN: opt -loop-unroll -S -mtriple=amdgcn-- -mcpu=tahiti %s | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -loop-unroll -S -mtriple=amdgcn-- -mcpu=tahiti %s | FileCheck %s
 
 ; This IR comes from this OpenCL C code:
 ;

diff  --git a/llvm/test/CodeGen/AMDGPU/unify-metadata.ll b/llvm/test/CodeGen/AMDGPU/unify-metadata.ll
index ecf18cc18e493..9ee6d4d77df75 100644
--- a/llvm/test/CodeGen/AMDGPU/unify-metadata.ll
+++ b/llvm/test/CodeGen/AMDGPU/unify-metadata.ll
@@ -1,5 +1,5 @@
-; RUN: opt -mtriple=amdgcn--amdhsa -amdgpu-unify-metadata -S < %s | FileCheck -check-prefix=ALL %s
-; RUN: opt -mtriple=amdgcn--amdhsa -passes=amdgpu-unify-metadata -S < %s | FileCheck -check-prefix=ALL %s
+; RUN: opt -temporarily-allow-old-pass-syntax -mtriple=amdgcn--amdhsa -amdgpu-unify-metadata -S < %s | FileCheck -check-prefix=ALL %s
+; RUN: opt -temporarily-allow-old-pass-syntax -mtriple=amdgcn--amdhsa -passes=amdgpu-unify-metadata -S < %s | FileCheck -check-prefix=ALL %s
 
 ; This test check that we have a singe metadata value after linking several
 ; modules for records such as opencl.ocl.version, llvm.ident and similar.

diff  --git a/llvm/test/CodeGen/AMDGPU/vectorize-buffer-fat-pointer.ll b/llvm/test/CodeGen/AMDGPU/vectorize-buffer-fat-pointer.ll
index 7822b1da9f606..cc3ad36833582 100644
--- a/llvm/test/CodeGen/AMDGPU/vectorize-buffer-fat-pointer.ll
+++ b/llvm/test/CodeGen/AMDGPU/vectorize-buffer-fat-pointer.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mtriple=amdgcn-- -load-store-vectorizer < %s | FileCheck -check-prefix=OPT %s
+; RUN: opt -temporarily-allow-old-pass-syntax -S -mtriple=amdgcn-- -load-store-vectorizer < %s | FileCheck -check-prefix=OPT %s
 
 ; OPT-LABEL: @func(
 define void @func(i32 addrspace(7)* %out) {

diff  --git a/llvm/test/CodeGen/ARM/bit-reverse-to-rbit.ll b/llvm/test/CodeGen/ARM/bit-reverse-to-rbit.ll
index 8482cbf69f2e0..3ec36d117be17 100644
--- a/llvm/test/CodeGen/ARM/bit-reverse-to-rbit.ll
+++ b/llvm/test/CodeGen/ARM/bit-reverse-to-rbit.ll
@@ -1,9 +1,9 @@
-;RUN: opt -instcombine -S < %s | llc -mtriple=armv5e--linux-gnueabi | FileCheck %s
-;RUN: opt -instcombine -S < %s | llc -mtriple=thumbv4t--linux-gnueabi | FileCheck %s
-;RUN: opt -instcombine -S < %s | llc -mtriple=armv6--linux-gnueabi | FileCheck %s
+;RUN: opt -temporarily-allow-old-pass-syntax -instcombine -S < %s | llc -mtriple=armv5e--linux-gnueabi | FileCheck %s
+;RUN: opt -temporarily-allow-old-pass-syntax -instcombine -S < %s | llc -mtriple=thumbv4t--linux-gnueabi | FileCheck %s
+;RUN: opt -temporarily-allow-old-pass-syntax -instcombine -S < %s | llc -mtriple=armv6--linux-gnueabi | FileCheck %s
 
-;RUN: opt -instcombine -S < %s | llc -mtriple=armv7--linux-gnueabi | FileCheck %s --check-prefix=RBIT
-;RUN: opt -instcombine -S < %s | llc -mtriple=thumbv8--linux-gnueabi | FileCheck %s --check-prefix=RBIT
+;RUN: opt -temporarily-allow-old-pass-syntax -instcombine -S < %s | llc -mtriple=armv7--linux-gnueabi | FileCheck %s --check-prefix=RBIT
+;RUN: opt -temporarily-allow-old-pass-syntax -instcombine -S < %s | llc -mtriple=thumbv8--linux-gnueabi | FileCheck %s --check-prefix=RBIT
 
 ;CHECK-NOT: rbit
 ;RBIT: rbit

diff  --git a/llvm/test/CodeGen/Generic/overloaded-intrinsic-name.ll b/llvm/test/CodeGen/Generic/overloaded-intrinsic-name.ll
index ef786db2aea1c..d03d2b64f826b 100644
--- a/llvm/test/CodeGen/Generic/overloaded-intrinsic-name.ll
+++ b/llvm/test/CodeGen/Generic/overloaded-intrinsic-name.ll
@@ -1,4 +1,4 @@
-; RUN: opt -verify -S < %s | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -verify -S < %s | FileCheck %s
 
 ; Tests the name mangling performed by the codepath following
 ; getMangledTypeStr(). Only tests that code with the various manglings

diff  --git a/llvm/test/CodeGen/NVPTX/access-non-generic.ll b/llvm/test/CodeGen/NVPTX/access-non-generic.ll
index 6ce56f3c9cb27..10f57ceac1259 100644
--- a/llvm/test/CodeGen/NVPTX/access-non-generic.ll
+++ b/llvm/test/CodeGen/NVPTX/access-non-generic.ll
@@ -1,7 +1,7 @@
 ; RUN: llc < %s -march=nvptx -mcpu=sm_20 | FileCheck %s --check-prefix PTX
 ; RUN: llc < %s -march=nvptx64 -mcpu=sm_20 | FileCheck %s --check-prefix PTX
-; RUN: opt -mtriple=nvptx-- < %s -S -infer-address-spaces | FileCheck %s --check-prefix IR
-; RUN: opt -mtriple=nvptx64-- < %s -S -infer-address-spaces | FileCheck %s --check-prefix IR
+; RUN: opt -temporarily-allow-old-pass-syntax -mtriple=nvptx-- < %s -S -infer-address-spaces | FileCheck %s --check-prefix IR
+; RUN: opt -temporarily-allow-old-pass-syntax -mtriple=nvptx64-- < %s -S -infer-address-spaces | FileCheck %s --check-prefix IR
 ; RUN: %if ptxas %{ llc < %s -march=nvptx -mcpu=sm_20 | %ptxas-verify %}
 ; RUN: %if ptxas %{ llc < %s -march=nvptx64 -mcpu=sm_20 | %ptxas-verify %}
 

diff  --git a/llvm/test/CodeGen/NVPTX/intrinsic-old.ll b/llvm/test/CodeGen/NVPTX/intrinsic-old.ll
index b9fed160168d4..678f50c153976 100644
--- a/llvm/test/CodeGen/NVPTX/intrinsic-old.ll
+++ b/llvm/test/CodeGen/NVPTX/intrinsic-old.ll
@@ -1,13 +1,13 @@
 ; RUN: llc < %s -march=nvptx -mcpu=sm_20 | FileCheck -allow-deprecated-dag-overlap %s
 ; RUN: llc < %s -march=nvptx64 -mcpu=sm_20 | FileCheck -allow-deprecated-dag-overlap %s
-; RUN: opt < %s -S -mtriple=nvptx-nvidia-cuda -nvvm-intr-range \
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -S -mtriple=nvptx-nvidia-cuda -nvvm-intr-range \
 ; RUN:   | FileCheck -allow-deprecated-dag-overlap --check-prefix=RANGE --check-prefix=RANGE_20 %s
-; RUN: opt < %s -S -mtriple=nvptx-nvidia-cuda -passes=nvvm-intr-range \
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -S -mtriple=nvptx-nvidia-cuda -passes=nvvm-intr-range \
 ; RUN:   | FileCheck -allow-deprecated-dag-overlap --check-prefix=RANGE --check-prefix=RANGE_20 %s
-; RUN: opt < %s -S -mtriple=nvptx-nvidia-cuda \
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -S -mtriple=nvptx-nvidia-cuda \
 ; RUN:    -nvvm-intr-range -nvvm-intr-range-sm=30 \
 ; RUN:   | FileCheck -allow-deprecated-dag-overlap --check-prefix=RANGE --check-prefix=RANGE_30 %s
-; RUN: opt < %s -S -mtriple=nvptx-nvidia-cuda \
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -S -mtriple=nvptx-nvidia-cuda \
 ; RUN:    -passes=nvvm-intr-range -nvvm-intr-range-sm=30 \
 ; RUN:   | FileCheck -allow-deprecated-dag-overlap --check-prefix=RANGE --check-prefix=RANGE_30 %s
 ; RUN: %if ptxas %{ llc < %s -march=nvptx -mcpu=sm_20 | %ptxas-verify %}

diff  --git a/llvm/test/CodeGen/NVPTX/math-intrins-sm80-ptx70-instcombine.ll b/llvm/test/CodeGen/NVPTX/math-intrins-sm80-ptx70-instcombine.ll
index 772ab2bd4f329..75425d597146d 100644
--- a/llvm/test/CodeGen/NVPTX/math-intrins-sm80-ptx70-instcombine.ll
+++ b/llvm/test/CodeGen/NVPTX/math-intrins-sm80-ptx70-instcombine.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S -mtriple=nvptx-nvidia-cuda -march=nvptx64 \
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -instcombine -S -mtriple=nvptx-nvidia-cuda -march=nvptx64 \
 ; RUN:    -mcpu=sm_80 -mattr=+ptx70 | \
 ; RUN: FileCheck %s
 

diff  --git a/llvm/test/CodeGen/NVPTX/nvvm-reflect-module-flag.ll b/llvm/test/CodeGen/NVPTX/nvvm-reflect-module-flag.ll
index 57ab33798709a..e79fa8a4d1554 100644
--- a/llvm/test/CodeGen/NVPTX/nvvm-reflect-module-flag.ll
+++ b/llvm/test/CodeGen/NVPTX/nvvm-reflect-module-flag.ll
@@ -1,5 +1,5 @@
-; RUN: opt < %s -S -mtriple=nvptx-nvidia-cuda -nvvm-reflect | FileCheck %s
-; RUN: opt < %s -S -mtriple=nvptx-nvidia-cuda -passes=nvvm-reflect | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -S -mtriple=nvptx-nvidia-cuda -nvvm-reflect | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -S -mtriple=nvptx-nvidia-cuda -passes=nvvm-reflect | FileCheck %s
 
 declare i32 @__nvvm_reflect(i8*)
 @str = private unnamed_addr addrspace(1) constant [11 x i8] c"__CUDA_FTZ\00"

diff  --git a/llvm/test/CodeGen/NVPTX/speculative-execution-divergent-target.ll b/llvm/test/CodeGen/NVPTX/speculative-execution-divergent-target.ll
index 128e9e9ba2a3d..89597a945b2fb 100644
--- a/llvm/test/CodeGen/NVPTX/speculative-execution-divergent-target.ll
+++ b/llvm/test/CodeGen/NVPTX/speculative-execution-divergent-target.ll
@@ -1,12 +1,12 @@
 ; Checks that speculative-execution only runs on divergent targets, if you pass
 ; -spec-exec-only-if-divergent-target.
 
-; RUN: opt < %s -S -mtriple=nvptx-nvidia-cuda -speculative-execution | \
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -S -mtriple=nvptx-nvidia-cuda -speculative-execution | \
 ; RUN:   FileCheck --check-prefix=ON %s
-; RUN: opt < %s -S -mtriple=nvptx-nvidia-cuda -speculative-execution \
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -S -mtriple=nvptx-nvidia-cuda -speculative-execution \
 ; RUN:   -spec-exec-only-if-divergent-target | \
 ; RUN:   FileCheck --check-prefix=ON %s
-; RUN: opt < %s -S -speculative-execution -spec-exec-only-if-divergent-target | \
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -S -speculative-execution -spec-exec-only-if-divergent-target | \
 ; RUN:   FileCheck --check-prefix=OFF %s
 
 ; Hoist in if-then pattern.

diff  --git a/llvm/test/CodeGen/PowerPC/ppc64-P9-mod.ll b/llvm/test/CodeGen/PowerPC/ppc64-P9-mod.ll
index 090ab99956235..a0ea71897aab5 100644
--- a/llvm/test/CodeGen/PowerPC/ppc64-P9-mod.ll
+++ b/llvm/test/CodeGen/PowerPC/ppc64-P9-mod.ll
@@ -1,11 +1,11 @@
 ; RUN: llc < %s -mtriple=powerpc64le-unknown-linux-gnu -mcpu=pwr9 -verify-machineinstrs | FileCheck %s
 ; RUN: llc < %s -mtriple=powerpc64-unknown-linux-gnu -mcpu=pwr9 -verify-machineinstrs | FileCheck %s
 ; RUN: llc < %s -mtriple=powerpc64le-unknown-linux-gnu -mcpu=pwr8 | FileCheck %s -check-prefix=CHECK-PWR8 -implicit-check-not mod[us][wd]
-; RUN: opt < %s -div-rem-pairs -mtriple=powerpc64le-unknown-linux-gnu -mcpu=pwr9 | \
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -div-rem-pairs -mtriple=powerpc64le-unknown-linux-gnu -mcpu=pwr9 | \
 ; RUN:   llc -verify-machineinstrs | FileCheck %s -check-prefix=CHECK-DRP
-; RUN: opt < %s -div-rem-pairs -mtriple=powerpc64-unknown-linux-gnu -mcpu=pwr9 | \
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -div-rem-pairs -mtriple=powerpc64-unknown-linux-gnu -mcpu=pwr9 | \
 ; RUN:   llc -verify-machineinstrs | FileCheck %s -check-prefix=CHECK-DRP
-; RUN: opt < %s -div-rem-pairs -mtriple=powerpc64le-unknown-linux-gnu -mcpu=pwr8 | \
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -div-rem-pairs -mtriple=powerpc64le-unknown-linux-gnu -mcpu=pwr8 | \
 ; RUN:   llc -verify-machineinstrs | FileCheck %s -check-prefix=CHECK-PWR8 -implicit-check-not mod[us][wd]
 
 @mod_resultsw = local_unnamed_addr global i32 0, align 4

diff  --git a/llvm/test/CodeGen/PowerPC/vec_shuffle.ll b/llvm/test/CodeGen/PowerPC/vec_shuffle.ll
index 7d4941dd2f55f..dee5a9048420b 100644
--- a/llvm/test/CodeGen/PowerPC/vec_shuffle.ll
+++ b/llvm/test/CodeGen/PowerPC/vec_shuffle.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
-; RUN: opt -mtriple=powerpc-unknown-linux-gnu < %s -instcombine | \
+; RUN: opt -temporarily-allow-old-pass-syntax -mtriple=powerpc-unknown-linux-gnu < %s -instcombine | \
 ; RUN:   llc -mtriple=ppc32-- -mcpu=g5 | not grep vperm
 ; RUN: llc -verify-machineinstrs < %s -mtriple=ppc32-- -mcpu=g5 | FileCheck %s
 

diff  --git a/llvm/test/CodeGen/PowerPC/vperm-instcombine.ll b/llvm/test/CodeGen/PowerPC/vperm-instcombine.ll
index d9084c8bb5952..0ee240203911e 100644
--- a/llvm/test/CodeGen/PowerPC/vperm-instcombine.ll
+++ b/llvm/test/CodeGen/PowerPC/vperm-instcombine.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -instcombine -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-v128:128:128-n32:64"
 target triple = "powerpc64le-unknown-linux-gnu"

diff  --git a/llvm/test/CodeGen/SystemZ/inline-thresh-adjust.ll b/llvm/test/CodeGen/SystemZ/inline-thresh-adjust.ll
index f60626f4f36c4..e5ed26aeaf249 100644
--- a/llvm/test/CodeGen/SystemZ/inline-thresh-adjust.ll
+++ b/llvm/test/CodeGen/SystemZ/inline-thresh-adjust.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -mtriple=systemz-unknown -mcpu=z15 -inline -disable-output \
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -mtriple=systemz-unknown -mcpu=z15 -inline -disable-output \
 ; RUN:   -debug-only=inline,systemztti 2>&1 | FileCheck %s
 ; REQUIRES: asserts
 ;

diff  --git a/llvm/test/CodeGen/Thumb/consthoist-few-dependents.ll b/llvm/test/CodeGen/Thumb/consthoist-few-dependents.ll
index 72f085afdff9e..f96b588cb18ac 100644
--- a/llvm/test/CodeGen/Thumb/consthoist-few-dependents.ll
+++ b/llvm/test/CodeGen/Thumb/consthoist-few-dependents.ll
@@ -1,7 +1,7 @@
-; RUN: opt -consthoist -S %s -o - | FileCheck %s --check-prefix=OPT
-; RUN: opt -consthoist -S -consthoist-min-num-to-rebase=1 %s -o - | FileCheck %s --check-prefix=OPT --check-prefix=OPT-1
-; RUN: opt -consthoist -S -consthoist-min-num-to-rebase=2 %s -o - | FileCheck %s --check-prefix=OPT --check-prefix=OPT-2
-; RUN: opt -consthoist -S -consthoist-min-num-to-rebase=3 %s -o - | FileCheck %s --check-prefix=OPT --check-prefix=OPT-3
+; RUN: opt -temporarily-allow-old-pass-syntax -consthoist -S %s -o - | FileCheck %s --check-prefix=OPT
+; RUN: opt -temporarily-allow-old-pass-syntax -consthoist -S -consthoist-min-num-to-rebase=1 %s -o - | FileCheck %s --check-prefix=OPT --check-prefix=OPT-1
+; RUN: opt -temporarily-allow-old-pass-syntax -consthoist -S -consthoist-min-num-to-rebase=2 %s -o - | FileCheck %s --check-prefix=OPT --check-prefix=OPT-2
+; RUN: opt -temporarily-allow-old-pass-syntax -consthoist -S -consthoist-min-num-to-rebase=3 %s -o - | FileCheck %s --check-prefix=OPT --check-prefix=OPT-3
 
 ; RUN: llc -consthoist-min-num-to-rebase=2 %s -o - | FileCheck %s --check-prefix=LLC
 

diff  --git a/llvm/test/CodeGen/Thumb2/mve-intrinsics/predicates.ll b/llvm/test/CodeGen/Thumb2/mve-intrinsics/predicates.ll
index 0e4966a697670..f6efdbd85771f 100644
--- a/llvm/test/CodeGen/Thumb2/mve-intrinsics/predicates.ll
+++ b/llvm/test/CodeGen/Thumb2/mve-intrinsics/predicates.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
-; RUN: opt -instcombine -mtriple=thumbv8.1m.main %s | llc -mtriple=thumbv8.1m.main -mattr=+mve.fp -verify-machineinstrs -o - | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -instcombine -mtriple=thumbv8.1m.main %s | llc -mtriple=thumbv8.1m.main -mattr=+mve.fp -verify-machineinstrs -o - | FileCheck %s
 
 declare <16 x i1> @llvm.arm.mve.vctp8(i32)
 declare <8 x i1> @llvm.arm.mve.vctp16(i32)

diff  --git a/llvm/test/CodeGen/Thumb2/mve-intrinsics/vadc-multiple.ll b/llvm/test/CodeGen/Thumb2/mve-intrinsics/vadc-multiple.ll
index 118861ccbb138..e16a7a04a7bbc 100644
--- a/llvm/test/CodeGen/Thumb2/mve-intrinsics/vadc-multiple.ll
+++ b/llvm/test/CodeGen/Thumb2/mve-intrinsics/vadc-multiple.ll
@@ -1,6 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
-; RUN: opt -instcombine -mtriple=thumbv8.1m.main -S %s | FileCheck --check-prefix=IR %s
-; RUN: opt -instcombine -mtriple=thumbv8.1m.main    %s | llc -mtriple=thumbv8.1m.main -mattr=+mve.fp -verify-machineinstrs -O3 -o - | FileCheck --check-prefix=ASM %s
+; RUN: opt -temporarily-allow-old-pass-syntax -instcombine -mtriple=thumbv8.1m.main -S %s | FileCheck --check-prefix=IR %s
+; RUN: opt -temporarily-allow-old-pass-syntax -instcombine -mtriple=thumbv8.1m.main    %s | llc -mtriple=thumbv8.1m.main -mattr=+mve.fp -verify-machineinstrs -O3 -o - | FileCheck --check-prefix=ASM %s
 
 %struct.foo = type { [2 x <4 x i32>] }
 

diff  --git a/llvm/test/CodeGen/Thumb2/mve-vpt-from-intrinsics.ll b/llvm/test/CodeGen/Thumb2/mve-vpt-from-intrinsics.ll
index 1303c3f3d30b3..80f9f375b9de8 100644
--- a/llvm/test/CodeGen/Thumb2/mve-vpt-from-intrinsics.ll
+++ b/llvm/test/CodeGen/Thumb2/mve-vpt-from-intrinsics.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
-; RUN: opt -instcombine -mtriple=thumbv8.1m.main-none-eabi %s | llc -mtriple=thumbv8.1m.main-none-eabi -mattr=+mve --verify-machineinstrs -o - | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -instcombine -mtriple=thumbv8.1m.main-none-eabi %s | llc -mtriple=thumbv8.1m.main-none-eabi -mattr=+mve --verify-machineinstrs -o - | FileCheck %s
 
 target datalayout = "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64"
 

diff  --git a/llvm/test/CodeGen/WinEH/wineh-intrinsics.ll b/llvm/test/CodeGen/WinEH/wineh-intrinsics.ll
index 3658792a38436..39223dd8e41b6 100644
--- a/llvm/test/CodeGen/WinEH/wineh-intrinsics.ll
+++ b/llvm/test/CodeGen/WinEH/wineh-intrinsics.ll
@@ -1,4 +1,4 @@
-; RUN: opt -lint -disable-output < %s
+; RUN: opt -temporarily-allow-old-pass-syntax -lint -disable-output < %s
 
 ; This test is meant to prove that the verifier does not report errors for correct
 ; use of the llvm.eh.exceptionpointer intrinsic.

diff  --git a/llvm/test/CodeGen/X86/GC/deadargelim.ll b/llvm/test/CodeGen/X86/GC/deadargelim.ll
index b6de719896630..115e15634000c 100644
--- a/llvm/test/CodeGen/X86/GC/deadargelim.ll
+++ b/llvm/test/CodeGen/X86/GC/deadargelim.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -deadargelim
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -deadargelim
 
 declare void @llvm.gcroot(ptr, ptr)
 

diff  --git a/llvm/test/CodeGen/X86/GC/inline.ll b/llvm/test/CodeGen/X86/GC/inline.ll
index d8f63babb5960..b0d0a69a6ef43 100644
--- a/llvm/test/CodeGen/X86/GC/inline.ll
+++ b/llvm/test/CodeGen/X86/GC/inline.ll
@@ -1,8 +1,8 @@
-; RUN: opt < %s -inline -S | grep example
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -inline -S | grep example
 
 	%IntArray = type { i32, [0 x ptr] }
 
-declare void @llvm.gcroot(ptr, ptr) nounwind 
+declare void @llvm.gcroot(ptr, ptr) nounwind
 
 define i32 @f() {
 	%x = call i32 @g( )		; <i32> [#uses=1]

diff  --git a/llvm/test/CodeGen/X86/GC/inline2.ll b/llvm/test/CodeGen/X86/GC/inline2.ll
index 114884dbb77f2..17b4395472fd2 100644
--- a/llvm/test/CodeGen/X86/GC/inline2.ll
+++ b/llvm/test/CodeGen/X86/GC/inline2.ll
@@ -1,9 +1,9 @@
-; RUN: opt < %s -inline -S | grep sample
-; RUN: opt < %s -inline -S | grep example
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -inline -S | grep sample
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -inline -S | grep example
 
 	%IntArray = type { i32, [0 x ptr] }
 
-declare void @llvm.gcroot(ptr, ptr) nounwind 
+declare void @llvm.gcroot(ptr, ptr) nounwind
 
 define i32 @f() gc "sample" {
 	%x = call i32 @g( )		; <i32> [#uses=1]

diff  --git a/llvm/test/CodeGen/X86/block-placement.ll b/llvm/test/CodeGen/X86/block-placement.ll
index acc4b7e138118..51148e6efb68c 100644
--- a/llvm/test/CodeGen/X86/block-placement.ll
+++ b/llvm/test/CodeGen/X86/block-placement.ll
@@ -1,5 +1,5 @@
 ; RUN: llc -mtriple=i686-linux -pre-RA-sched=source < %s | FileCheck %s
-; RUN: opt -disable-output -debugify < %s
+; RUN: opt -temporarily-allow-old-pass-syntax -disable-output -debugify < %s
 
 declare void @error(i32 %i, i32 %a, i32 %b)
 

diff  --git a/llvm/test/CodeGen/X86/constant-hoisting-bfi.ll b/llvm/test/CodeGen/X86/constant-hoisting-bfi.ll
index 68db642426d37..a41092f833920 100644
--- a/llvm/test/CodeGen/X86/constant-hoisting-bfi.ll
+++ b/llvm/test/CodeGen/X86/constant-hoisting-bfi.ll
@@ -1,4 +1,4 @@
-; RUN: opt -consthoist -mtriple=x86_64-unknown-linux-gnu -consthoist-with-block-frequency=true -S < %s | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -consthoist -mtriple=x86_64-unknown-linux-gnu -consthoist-with-block-frequency=true -S < %s | FileCheck %s
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 

diff  --git a/llvm/test/CodeGen/X86/deopt-intrinsic-cconv.ll b/llvm/test/CodeGen/X86/deopt-intrinsic-cconv.ll
index 903378416ce0c..521aad627c810 100644
--- a/llvm/test/CodeGen/X86/deopt-intrinsic-cconv.ll
+++ b/llvm/test/CodeGen/X86/deopt-intrinsic-cconv.ll
@@ -1,6 +1,6 @@
 ; RUN: llc < %s | FileCheck %s
 ; RUN: llc -debug-only=stackmaps < %s 2>&1 | FileCheck --check-prefix=STACKMAPS %s
-; RUN: opt -disable-output -debugify < %s
+; RUN: opt -temporarily-allow-old-pass-syntax -disable-output -debugify < %s
 ; REQUIRES: asserts
 
 target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"

diff  --git a/llvm/test/CodeGen/X86/frame-order.ll b/llvm/test/CodeGen/X86/frame-order.ll
index 9ae1e2c3e0dcc..791ce15257e67 100644
--- a/llvm/test/CodeGen/X86/frame-order.ll
+++ b/llvm/test/CodeGen/X86/frame-order.ll
@@ -1,5 +1,5 @@
 ; RUN: llc -mtriple=x86_64-linux-gnueabi -disable-debug-info-print < %s | FileCheck %s
-; RUN: opt -strip -S < %s | llc -mtriple=x86_64-linux-gnueabi -disable-debug-info-print | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -strip -S < %s | llc -mtriple=x86_64-linux-gnueabi -disable-debug-info-print | FileCheck %s
 
 ; This test checks if the code is generated correctly with and without debug info.
 

diff  --git a/llvm/test/CodeGen/X86/loadStore_vectorizer.ll b/llvm/test/CodeGen/X86/loadStore_vectorizer.ll
index 9fce752ef8ad7..1e8af1117ebdf 100644
--- a/llvm/test/CodeGen/X86/loadStore_vectorizer.ll
+++ b/llvm/test/CodeGen/X86/loadStore_vectorizer.ll
@@ -1,4 +1,4 @@
-; RUN: opt -mtriple x86_64-- -load-store-vectorizer < %s -S | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -mtriple x86_64-- -load-store-vectorizer < %s -S | FileCheck %s
 
 %struct_render_pipeline_state = type opaque
 

diff  --git a/llvm/test/CodeGen/X86/masked_gather_scatter.ll b/llvm/test/CodeGen/X86/masked_gather_scatter.ll
index 7da53c86b42c3..37690864e75ba 100644
--- a/llvm/test/CodeGen/X86/masked_gather_scatter.ll
+++ b/llvm/test/CodeGen/X86/masked_gather_scatter.ll
@@ -4,8 +4,8 @@
 ; RUN: llc -mtriple=x86_64-unknown-linux-gnu  -mattr=+avx512vl -mattr=+avx512dq < %s | FileCheck %s --check-prefix=ALL --check-prefix=SKX --check-prefix=SKX_SMALL
 ; RUN: llc -mtriple=x86_64-unknown-linux-gnu  -mattr=+avx512vl -mattr=+avx512dq -code-model=large < %s | FileCheck %s --check-prefix=ALL --check-prefix=SKX --check-prefix=SKX_LARGE
 ; RUN: llc -mtriple=i386-unknown-linux-gnu  -mattr=+avx512vl -mattr=+avx512dq < %s | FileCheck %s --check-prefix=ALL --check-prefix=SKX_32
-; RUN: opt -mtriple=x86_64-apple-darwin -scalarize-masked-mem-intrin -mcpu=corei7-avx -S < %s | FileCheck %s -check-prefix=SCALAR
-; RUN: opt -mtriple=x86_64-apple-darwin -passes=scalarize-masked-mem-intrin -mcpu=corei7-avx -S < %s | FileCheck %s -check-prefix=SCALAR
+; RUN: opt -temporarily-allow-old-pass-syntax -mtriple=x86_64-apple-darwin -scalarize-masked-mem-intrin -mcpu=corei7-avx -S < %s | FileCheck %s -check-prefix=SCALAR
+; RUN: opt -temporarily-allow-old-pass-syntax -mtriple=x86_64-apple-darwin -passes=scalarize-masked-mem-intrin -mcpu=corei7-avx -S < %s | FileCheck %s -check-prefix=SCALAR
 ; RUN: llc -O0 -mtriple=x86_64-unknown-linux-gnu -mcpu=skx < %s -o /dev/null
 
 @glob_array = internal unnamed_addr constant [16 x i32] [i32 1, i32 1, i32 2, i32 3, i32 5, i32 8, i32 13, i32 21, i32 34, i32 55, i32 89, i32 144, i32 233, i32 377, i32 610, i32 987], align 16

diff  --git a/llvm/test/CodeGen/X86/no-plt-libcalls.ll b/llvm/test/CodeGen/X86/no-plt-libcalls.ll
index 2be5ffdde653e..b0642ce025a51 100644
--- a/llvm/test/CodeGen/X86/no-plt-libcalls.ll
+++ b/llvm/test/CodeGen/X86/no-plt-libcalls.ll
@@ -1,6 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
 ; Check if "RtLibUseGOT" works correctly when lib calls are simplified.
-; RUN: opt < %s -instcombine -S | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -instcombine -S | FileCheck %s
 
 @percent_s = constant [4 x i8] c"%s\0A\00"
 @hello_world = constant [13 x i8] c"hello world\0A\00"

diff  --git a/llvm/test/CodeGen/X86/pointer-vector.ll b/llvm/test/CodeGen/X86/pointer-vector.ll
index 4b807fe2b834a..d2ddc5354478a 100644
--- a/llvm/test/CodeGen/X86/pointer-vector.ll
+++ b/llvm/test/CodeGen/X86/pointer-vector.ll
@@ -1,6 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
 ; RUN: llc < %s -mtriple=i686-linux -mcpu=corei7 | FileCheck %s
-; RUN: opt -instsimplify -disable-output < %s
+; RUN: opt -temporarily-allow-old-pass-syntax -instsimplify -disable-output < %s
 
 define <8 x ptr> @SHUFF0(<4 x ptr> %ptrv) nounwind {
 ; CHECK-LABEL: SHUFF0:

diff  --git a/llvm/test/CodeGen/X86/pr38762.ll b/llvm/test/CodeGen/X86/pr38762.ll
index 6316b25bfb038..813c85d520dfc 100644
--- a/llvm/test/CodeGen/X86/pr38762.ll
+++ b/llvm/test/CodeGen/X86/pr38762.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -S -simplifycfg | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -S -simplifycfg | FileCheck %s
 
 ; Note: This patch is a complement to pr38763.
 ;
@@ -18,12 +18,12 @@
 ;   volatile int foo = 0;
 ;   int read1 = foo;
 ;   int brains = foo;
-; 
+;
 ;   if (read1 > 3) {
 ;     brains *= 2;
 ;     brains += 1;
 ;   }
-; 
+;
 ;   return brains;
 ; }
 

diff  --git a/llvm/test/CodeGen/X86/pr38763.ll b/llvm/test/CodeGen/X86/pr38763.ll
index 87fd51d089058..a801b8cc7b064 100644
--- a/llvm/test/CodeGen/X86/pr38763.ll
+++ b/llvm/test/CodeGen/X86/pr38763.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -S -simplifycfg | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -S -simplifycfg | FileCheck %s
 
 ; When SimplifyCFG changes the PHI node into a select instruction, the debug
 ; information becomes ambiguous. It causes the debugger to display wrong
@@ -15,14 +15,14 @@
 ;   volatile int foo = 4;
 ;   int read = foo;
 ;   int read1 = foo;
-; 
+;
 ;   int result = 0;
 ;   if (read == 4) {
 ;     result = read1 + 2;
 ;   } else {
 ;     result = read1 - 2;
 ;   }
-; 
+;
 ;   return result;
 ; }
 

diff  --git a/llvm/test/CodeGen/X86/pr39243.ll b/llvm/test/CodeGen/X86/pr39243.ll
index 7aa5783cd53b2..0559cf2cca04f 100644
--- a/llvm/test/CodeGen/X86/pr39243.ll
+++ b/llvm/test/CodeGen/X86/pr39243.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -S -simplifycfg | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -S -simplifycfg | FileCheck %s
 
 ; Note: This patch fixes the regression introduced by pr38762.
 ;

diff  --git a/llvm/test/CodeGen/X86/tls-loads-control2.ll b/llvm/test/CodeGen/X86/tls-loads-control2.ll
index 9cb53206de9d8..17cd940fdb05b 100644
--- a/llvm/test/CodeGen/X86/tls-loads-control2.ll
+++ b/llvm/test/CodeGen/X86/tls-loads-control2.ll
@@ -1,5 +1,5 @@
-; RUN: opt -S -mtriple=x86_64-unknown-unknown -tlshoist --relocation-model=pic --tls-load-hoist=true -o - %s | FileCheck %s --check-prefix=HOIST0
-; RUN: opt -S -mtriple=x86_64-unknown-unknown -tlshoist --relocation-model=pic -o - %s | FileCheck %s --check-prefix=HOIST2
+; RUN: opt -temporarily-allow-old-pass-syntax -S -mtriple=x86_64-unknown-unknown -tlshoist --relocation-model=pic --tls-load-hoist=true -o - %s | FileCheck %s --check-prefix=HOIST0
+; RUN: opt -temporarily-allow-old-pass-syntax -S -mtriple=x86_64-unknown-unknown -tlshoist --relocation-model=pic -o - %s | FileCheck %s --check-prefix=HOIST2
 
 $_ZTW5thl_x = comdat any
 

diff  --git a/llvm/test/CodeGen/X86/vector-gep.ll b/llvm/test/CodeGen/X86/vector-gep.ll
index 8bbb264593856..f7141c7b35180 100644
--- a/llvm/test/CodeGen/X86/vector-gep.ll
+++ b/llvm/test/CodeGen/X86/vector-gep.ll
@@ -1,6 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
 ; RUN: llc < %s -mtriple=i686-linux -mcpu=corei7-avx | FileCheck %s
-; RUN: opt -instsimplify -disable-output < %s
+; RUN: opt -temporarily-allow-old-pass-syntax -instsimplify -disable-output < %s
 
 define <4 x ptr> @AGEP0(ptr %ptr) nounwind {
 ; CHECK-LABEL: AGEP0:

diff  --git a/llvm/test/DebugInfo/AArch64/ir-outliner.ll b/llvm/test/DebugInfo/AArch64/ir-outliner.ll
index 4648c3c6dc4b2..3b17115f50662 100644
--- a/llvm/test/DebugInfo/AArch64/ir-outliner.ll
+++ b/llvm/test/DebugInfo/AArch64/ir-outliner.ll
@@ -1,8 +1,8 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --include-generated-funcs
-; RUN: opt -verify -iroutliner -ir-outlining-no-cost < %s | \
+; RUN: opt -temporarily-allow-old-pass-syntax -verify -iroutliner -ir-outlining-no-cost < %s | \
 ; RUN: llc -filetype=obj -mtriple=aarch64-- | llvm-dwarfdump - | FileCheck %s
 
-; RUN: opt -S -verify -iroutliner -ir-outlining-no-cost < %s | FileCheck -check-prefix=IRDEBUG %s
+; RUN: opt -temporarily-allow-old-pass-syntax -S -verify -iroutliner -ir-outlining-no-cost < %s | FileCheck -check-prefix=IRDEBUG %s
 
 ; Ensure that the IR Outliner produces valid DWARF debug information when
 ; creating outlined functions.

diff  --git a/llvm/test/DebugInfo/ARM/lowerbdgdeclare_vla.ll b/llvm/test/DebugInfo/ARM/lowerbdgdeclare_vla.ll
index dd3cf9b4a7292..699c32246cfdd 100644
--- a/llvm/test/DebugInfo/ARM/lowerbdgdeclare_vla.ll
+++ b/llvm/test/DebugInfo/ARM/lowerbdgdeclare_vla.ll
@@ -1,4 +1,4 @@
-; RUN: opt  -instcombine %s -S | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax  -instcombine %s -S | FileCheck %s
 ;
 ; Generate me from:
 ; clang -cc1 -triple thumbv7-apple-ios7.0.0 -S -target-abi apcs-gnu -gdwarf-2 -Os test.c -o test.ll -emit-llvm

diff  --git a/llvm/test/DebugInfo/Generic/2010-03-19-DbgDeclare.ll b/llvm/test/DebugInfo/Generic/2010-03-19-DbgDeclare.ll
index 711945d43ebf1..77d7b83d561f9 100644
--- a/llvm/test/DebugInfo/Generic/2010-03-19-DbgDeclare.ll
+++ b/llvm/test/DebugInfo/Generic/2010-03-19-DbgDeclare.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -verify -S | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -verify -S | FileCheck %s
 
 ; CHECK: DW_LANG_Mips_Assembler
 

diff  --git a/llvm/test/DebugInfo/Generic/PR37395.ll b/llvm/test/DebugInfo/Generic/PR37395.ll
index 107908324ecf7..01cbc14273631 100644
--- a/llvm/test/DebugInfo/Generic/PR37395.ll
+++ b/llvm/test/DebugInfo/Generic/PR37395.ll
@@ -1,4 +1,4 @@
-; RUN: opt -lcssa -S %s | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -lcssa -S %s | FileCheck %s
 source_filename = "small.c"
 
 @a = common dso_local global i32 0, align 4, !dbg !0

diff  --git a/llvm/test/DebugInfo/Generic/assignment-tracking/dse/dse-after-memcpyopt-merge.ll b/llvm/test/DebugInfo/Generic/assignment-tracking/dse/dse-after-memcpyopt-merge.ll
index 87e99a9e40603..18e861921b184 100644
--- a/llvm/test/DebugInfo/Generic/assignment-tracking/dse/dse-after-memcpyopt-merge.ll
+++ b/llvm/test/DebugInfo/Generic/assignment-tracking/dse/dse-after-memcpyopt-merge.ll
@@ -1,6 +1,6 @@
-; RUN: opt %s -S -dse -o - -experimental-assignment-tracking | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax %s -S -dse -o - -experimental-assignment-tracking | FileCheck %s
 
-;; Observed in the wild, but test is created by running memcpyopt on
+;; Observed in the wild, but test is created by running memcpyopt -temporarily-allow-old-pass-syntax on
 ;; assignment-tracking/memcpyopt/merge-stores.ll then manually inserting
 ;; two stores that overwrite each end of the memset.
 ;;

diff  --git a/llvm/test/DebugInfo/Generic/assignment-tracking/dse/shorten.ll b/llvm/test/DebugInfo/Generic/assignment-tracking/dse/shorten.ll
index 9843c094ee3d8..b6bbda0349bbc 100644
--- a/llvm/test/DebugInfo/Generic/assignment-tracking/dse/shorten.ll
+++ b/llvm/test/DebugInfo/Generic/assignment-tracking/dse/shorten.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -S -dse -o - -experimental-assignment-tracking | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax %s -S -dse -o - -experimental-assignment-tracking | FileCheck %s
 
 ;; $ cat test.cpp
 ;; void esc(int*);

diff  --git a/llvm/test/DebugInfo/Generic/assignment-tracking/licm/merge.ll b/llvm/test/DebugInfo/Generic/assignment-tracking/licm/merge.ll
index a80f767def4bb..f48f1783c7800 100644
--- a/llvm/test/DebugInfo/Generic/assignment-tracking/licm/merge.ll
+++ b/llvm/test/DebugInfo/Generic/assignment-tracking/licm/merge.ll
@@ -1,4 +1,4 @@
-; RUN: opt -licm %s -S -experimental-assignment-tracking | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -licm %s -S -experimental-assignment-tracking | FileCheck %s
 
 ;; Ensure that we correctly merge the DIAssignID's from the sunk stores, add it
 ;; to the new new store instruction, and update the dbg.assign intrinsics using
@@ -12,7 +12,7 @@
 ;;   ;
 ;; }
 ;; $ clang -O2 -Xclang -disable-llvm-passes -g -emit-llvm -S -o a.ll
-;; $ opt -passes=declare-to-assign,sroa,instcombine,simplifycfg,loop-simplify,lcssa,loop-rotate a.ll
+;; $ opt -temporarily-allow-old-pass-syntax -passes=declare-to-assign,sroa,instcombine,simplifycfg,loop-simplify,lcssa,loop-rotate a.ll
 
 ; CHECK-LABEL: for.inc:
 ;; Check that the stores have actually been removed from this block, otherwise

diff  --git a/llvm/test/DebugInfo/Generic/assignment-tracking/licm/multi-exit.ll b/llvm/test/DebugInfo/Generic/assignment-tracking/licm/multi-exit.ll
index ef39d66e6dec8..ecbfe63303e87 100644
--- a/llvm/test/DebugInfo/Generic/assignment-tracking/licm/multi-exit.ll
+++ b/llvm/test/DebugInfo/Generic/assignment-tracking/licm/multi-exit.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -S -licm -o - -experimental-assignment-tracking | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax %s -S -licm -o - -experimental-assignment-tracking | FileCheck %s
 
 ;; $ cat test.c
 ;; int b, c, d;

diff  --git a/llvm/test/DebugInfo/Generic/assignment-tracking/memcpyopt/merge-stores.ll b/llvm/test/DebugInfo/Generic/assignment-tracking/memcpyopt/merge-stores.ll
index db75777bfb968..58f38ce9d804e 100644
--- a/llvm/test/DebugInfo/Generic/assignment-tracking/memcpyopt/merge-stores.ll
+++ b/llvm/test/DebugInfo/Generic/assignment-tracking/memcpyopt/merge-stores.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -S -memcpyopt -o - -experimental-assignment-tracking | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax %s -S -memcpyopt -temporarily-allow-old-pass-syntax -o - -experimental-assignment-tracking | FileCheck %s
 
 ;; $ cat test.cpp
 ;; struct v {
@@ -16,10 +16,10 @@
 ;;   v g(0);
 ;;   esc(&g);
 ;; }
-;; IR grabbed before memcpyopt in:
+;; IR grabbed before memcpyopt -temporarily-allow-old-pass-syntax in:
 ;; clang++ -Xclang -fexperimental-assignment-tracking -g -c -O2 test.cpp
 
-;; Check that the memset that memcpyopt creates to merge 4 stores merges the
+;; Check that the memset that memcpyopt -temporarily-allow-old-pass-syntax creates to merge 4 stores merges the
 ;; DIASsignIDs from the stores.
 
 ; CHECK: call void @llvm.dbg.assign(metadata float 0.000000e+00, metadata ![[VAR:[0-9]+]], metadata !DIExpression(DW_OP_LLVM_fragment, 64, 32), metadata ![[ID:[0-9]+]], metadata ptr %arrayidx.i, metadata !DIExpression())

diff  --git a/llvm/test/DebugInfo/Generic/assignment-tracking/parse-and-verify/instruction-type.ll b/llvm/test/DebugInfo/Generic/assignment-tracking/parse-and-verify/instruction-type.ll
index d0f447ee200b6..9612497d9a750 100644
--- a/llvm/test/DebugInfo/Generic/assignment-tracking/parse-and-verify/instruction-type.ll
+++ b/llvm/test/DebugInfo/Generic/assignment-tracking/parse-and-verify/instruction-type.ll
@@ -1,7 +1,7 @@
-; RUN: opt -S %s -verify -experimental-assignment-tracking 2>&1 \
+; RUN: opt -temporarily-allow-old-pass-syntax -S %s -verify -experimental-assignment-tracking 2>&1 \
 ; RUN: | FileCheck %s
 
-;; NOTE: Expect opt to return zero because the badly formed debug info
+;; NOTE: Expect opt -temporarily-allow-old-pass-syntax to return zero because the badly formed debug info
 ;; is going to be stripped.
 
 ;; Check that badly formed assignment tracking metadata is caught either

diff  --git a/llvm/test/DebugInfo/Generic/assignment-tracking/parse-and-verify/roundtrip.ll b/llvm/test/DebugInfo/Generic/assignment-tracking/parse-and-verify/roundtrip.ll
index 808636a1a0e58..84d26dac39d2f 100644
--- a/llvm/test/DebugInfo/Generic/assignment-tracking/parse-and-verify/roundtrip.ll
+++ b/llvm/test/DebugInfo/Generic/assignment-tracking/parse-and-verify/roundtrip.ll
@@ -1,5 +1,5 @@
-; RUN: opt %s -verify -experimental-assignment-tracking   \
-; RUN: | opt -verify -S -experimental-assignment-tracking \
+; RUN: opt -temporarily-allow-old-pass-syntax %s -verify -experimental-assignment-tracking   \
+; RUN: | opt -temporarily-allow-old-pass-syntax -verify -S -experimental-assignment-tracking \
 ; RUN: | FileCheck %s
 
 ;; Roundtrip test (text -> bitcode -> text) for DIAssignID metadata and

diff  --git a/llvm/test/DebugInfo/Generic/assignment-tracking/parse-and-verify/verify.ll b/llvm/test/DebugInfo/Generic/assignment-tracking/parse-and-verify/verify.ll
index 9fa17e7f06ee1..cbdcc73888e94 100644
--- a/llvm/test/DebugInfo/Generic/assignment-tracking/parse-and-verify/verify.ll
+++ b/llvm/test/DebugInfo/Generic/assignment-tracking/parse-and-verify/verify.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -S -verify -experimental-assignment-tracking 2>&1 \
+; RUN: opt -temporarily-allow-old-pass-syntax %s -S -verify -experimental-assignment-tracking 2>&1 \
 ; RUN: | FileCheck %s
 
 ;; Check that badly formed assignment tracking metadata is caught either

diff  --git a/llvm/test/DebugInfo/Generic/callsite-attr-invalid.ll b/llvm/test/DebugInfo/Generic/callsite-attr-invalid.ll
index b8ddd8d609b05..6cbbc3a7a61ef 100644
--- a/llvm/test/DebugInfo/Generic/callsite-attr-invalid.ll
+++ b/llvm/test/DebugInfo/Generic/callsite-attr-invalid.ll
@@ -1,4 +1,4 @@
-; RUN: opt -verify < %s 2>&1 | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -verify < %s 2>&1 | FileCheck %s
 
 ; CHECK: DIFlagAllCallsDescribed must be attached to a definition
 ; CHECK: warning: ignoring invalid debug info

diff  --git a/llvm/test/DebugInfo/Generic/debug-info-always-inline.ll b/llvm/test/DebugInfo/Generic/debug-info-always-inline.ll
index bc1c023a04527..f00cb97ed245d 100644
--- a/llvm/test/DebugInfo/Generic/debug-info-always-inline.ll
+++ b/llvm/test/DebugInfo/Generic/debug-info-always-inline.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -always-inline -S | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -always-inline -S | FileCheck %s
 ;
 ; Generated from the following C++ source with:
 ; clang -cc1 -disable-llvm-optzns -emit-llvm -g -stack-protector 2 test.cpp
@@ -11,9 +11,9 @@
 ;    int sum = 4;
 ;    return sum;
 ; }
-; 
+;
 ; extern void bar();
-; 
+;
 ; int main()
 ; {
 ;   bar();
@@ -23,8 +23,8 @@
 ; /* END SOURCE */
 
 ; The patch that includes this test case, is addressing the following issue:
-; 
-; When functions are inlined, instructions without debug information 
+;
+; When functions are inlined, instructions without debug information
 ; are attributed with the call site's DebugLoc. After inlining, inlined static
 ; allocas are moved to the caller's entry block, adjacent to the caller's original
 ; static alloca instructions. By retaining the call site's DebugLoc, these instructions
@@ -33,7 +33,7 @@
 ;
 ; In the offending case stack protection inserts an instruction at the caller's
 ; entry block, which inadvertently picks up the inlined call's DebugLoc, because
-; the entry block's first instruction is the recently moved inlined alloca instruction. 
+; the entry block's first instruction is the recently moved inlined alloca instruction.
 ;
 ; The stack protection instruction then becomes part of the function prologue, with the
 ; result that the line number that is associated with the stack protection instruction
@@ -47,9 +47,9 @@
 
 
 ; The selected solution is to not attribute static allocas with the call site's
-; DebugLoc. 
+; DebugLoc.
 
-; At some point in the future, it may be desirable to describe the inlining 
+; At some point in the future, it may be desirable to describe the inlining
 ; in the alloca instructions, but then the code that handles prologues must
 ; be able to handle this correctly, including the late insertion of instructions
 ; into it.

diff  --git a/llvm/test/DebugInfo/Generic/debug_value_list.ll b/llvm/test/DebugInfo/Generic/debug_value_list.ll
index 2a186549a6add..2bcfcf6694bb0 100644
--- a/llvm/test/DebugInfo/Generic/debug_value_list.ll
+++ b/llvm/test/DebugInfo/Generic/debug_value_list.ll
@@ -1,4 +1,4 @@
-; RUN: opt -verify < %s | opt -verify -S | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -verify < %s | opt -temporarily-allow-old-pass-syntax -verify -S | FileCheck %s
 
 ; Simple IR-BC-IR round-trip test for a @llvm.dbg.value that uses !DIArgList
 ; and DW_OP_LLVM_arg.

diff  --git a/llvm/test/DebugInfo/Generic/global-sra-array.ll b/llvm/test/DebugInfo/Generic/global-sra-array.ll
index d988c22adb4dd..c5a1a67af2bdb 100644
--- a/llvm/test/DebugInfo/Generic/global-sra-array.ll
+++ b/llvm/test/DebugInfo/Generic/global-sra-array.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -globalopt < %s | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -S -globalopt -temporarily-allow-old-pass-syntax < %s | FileCheck %s
 source_filename = "test.c"
 target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-apple-macosx10.12.0"

diff  --git a/llvm/test/DebugInfo/Generic/global-sra-single-member.ll b/llvm/test/DebugInfo/Generic/global-sra-single-member.ll
index 82e0f40f5351f..6b9f4e4a1167a 100644
--- a/llvm/test/DebugInfo/Generic/global-sra-single-member.ll
+++ b/llvm/test/DebugInfo/Generic/global-sra-single-member.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -globalopt < %s | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -S -globalopt -temporarily-allow-old-pass-syntax < %s | FileCheck %s
 ; struct {
 ;   int f0;
 ; } static a;

diff  --git a/llvm/test/DebugInfo/Generic/global-sra-struct-fwd-decl.ll b/llvm/test/DebugInfo/Generic/global-sra-struct-fwd-decl.ll
index caef2dd4ef78f..091373fca9240 100644
--- a/llvm/test/DebugInfo/Generic/global-sra-struct-fwd-decl.ll
+++ b/llvm/test/DebugInfo/Generic/global-sra-struct-fwd-decl.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -globalopt < %s | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -S -globalopt -temporarily-allow-old-pass-syntax < %s | FileCheck %s
 ; Generated at -O2 -g from:
 ; typedef struct {} a;
 ; static struct {

diff  --git a/llvm/test/DebugInfo/Generic/global-sra-struct-zero-length.ll b/llvm/test/DebugInfo/Generic/global-sra-struct-zero-length.ll
index 35b9953ffd513..3ca9c639a00cd 100644
--- a/llvm/test/DebugInfo/Generic/global-sra-struct-zero-length.ll
+++ b/llvm/test/DebugInfo/Generic/global-sra-struct-zero-length.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -globalopt < %s | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -S -globalopt -temporarily-allow-old-pass-syntax < %s | FileCheck %s
 ; Generated at -O2 -g from:
 ; typedef struct {
 ; } a;

diff  --git a/llvm/test/DebugInfo/Generic/global-sra-struct.ll b/llvm/test/DebugInfo/Generic/global-sra-struct.ll
index 8030b2a390684..59cd5da12e9ce 100644
--- a/llvm/test/DebugInfo/Generic/global-sra-struct.ll
+++ b/llvm/test/DebugInfo/Generic/global-sra-struct.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -globalopt < %s | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -S -globalopt -temporarily-allow-old-pass-syntax < %s | FileCheck %s
 source_filename = "test.c"
 target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-apple-macosx10.12.0"

diff  --git a/llvm/test/DebugInfo/Generic/indvar-discriminator.ll b/llvm/test/DebugInfo/Generic/indvar-discriminator.ll
index c85e00e8c58cc..9918c4c00c0ff 100644
--- a/llvm/test/DebugInfo/Generic/indvar-discriminator.ll
+++ b/llvm/test/DebugInfo/Generic/indvar-discriminator.ll
@@ -1,4 +1,4 @@
-; RUN: opt -indvars -S < %s | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -indvars -S < %s | FileCheck %s
 ;
 ; When the induction variable is widened by indvars, check that the debug loc
 ; associated with the loop increment is correctly propagated.

diff  --git a/llvm/test/DebugInfo/Generic/inline-debug-info-multiret.ll b/llvm/test/DebugInfo/Generic/inline-debug-info-multiret.ll
index 67c3c2ec7d388..bb7086ff97528 100644
--- a/llvm/test/DebugInfo/Generic/inline-debug-info-multiret.ll
+++ b/llvm/test/DebugInfo/Generic/inline-debug-info-multiret.ll
@@ -1,4 +1,4 @@
-; RUN: opt -inline -S < %s | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -inline -S < %s | FileCheck %s
 ;
 ; A hand-edited version of inline-debug-info.ll to test inlining of a
 ; function with multiple returns.

diff  --git a/llvm/test/DebugInfo/Generic/inline-debug-info.ll b/llvm/test/DebugInfo/Generic/inline-debug-info.ll
index 9b8f536552860..8f23b549a69b6 100644
--- a/llvm/test/DebugInfo/Generic/inline-debug-info.ll
+++ b/llvm/test/DebugInfo/Generic/inline-debug-info.ll
@@ -1,4 +1,4 @@
-; RUN: opt -inline -S < %s | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -inline -S < %s | FileCheck %s
 
 ; Created from source
 ;

diff  --git a/llvm/test/DebugInfo/Generic/inline-debug-loc.ll b/llvm/test/DebugInfo/Generic/inline-debug-loc.ll
index 1e526013ff7c6..c003075d82ad4 100644
--- a/llvm/test/DebugInfo/Generic/inline-debug-loc.ll
+++ b/llvm/test/DebugInfo/Generic/inline-debug-loc.ll
@@ -1,4 +1,4 @@
-; RUN: opt -inline -S < %s | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -inline -S < %s | FileCheck %s
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 

diff  --git a/llvm/test/DebugInfo/Generic/inline-no-debug-info.ll b/llvm/test/DebugInfo/Generic/inline-no-debug-info.ll
index e921a542d1597..434f9c2eb38c6 100644
--- a/llvm/test/DebugInfo/Generic/inline-no-debug-info.ll
+++ b/llvm/test/DebugInfo/Generic/inline-no-debug-info.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -inline -S | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -inline -S | FileCheck %s
 
 ; This was generated from the following source:
 ; int a, b;

diff  --git a/llvm/test/DebugInfo/Generic/licm-hoist-debug-loc.ll b/llvm/test/DebugInfo/Generic/licm-hoist-debug-loc.ll
index 1843b11616ebc..d4e372b114711 100644
--- a/llvm/test/DebugInfo/Generic/licm-hoist-debug-loc.ll
+++ b/llvm/test/DebugInfo/Generic/licm-hoist-debug-loc.ll
@@ -1,10 +1,10 @@
-; RUN: opt -S -licm %s | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -S -licm %s | FileCheck %s
 ;
 ; LICM should null out debug locations when it hoists instructions out of a loop.
 ;
 ; Generated with
 ; clang -O0 -S -emit-llvm test.cpp -g -gline-tables-only -o t.ll
-; opt -S -sroa -adce -simplifycfg -reassociate -domtree -loops \
+; opt -temporarily-allow-old-pass-syntax -S -sroa -adce -simplifycfg -reassociate -domtree -loops \
 ;     -loop-simplify -lcssa -aa -scalar-evolution -loop-rotate t.ll > test.ll
 ;
 ; void bar(int *);

diff  --git a/llvm/test/DebugInfo/Generic/licm-hoist-intrinsic-debug-loc.ll b/llvm/test/DebugInfo/Generic/licm-hoist-intrinsic-debug-loc.ll
index 50cba7c5b2825..11209cb621401 100644
--- a/llvm/test/DebugInfo/Generic/licm-hoist-intrinsic-debug-loc.ll
+++ b/llvm/test/DebugInfo/Generic/licm-hoist-intrinsic-debug-loc.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -licm %s | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -S -licm %s | FileCheck %s
 ;
 ; LICM should null out debug locations when it hoists intrinsics that won't lower to function calls out of a loop.
 ; CHECK: define float @foo
@@ -43,4 +43,4 @@ attributes #0 = { nofree nosync nounwind readnone speculatable willreturn }
 !3 = !DILocation(line: 4, column: 17, scope: !2)
 !4 = !DISubroutineType(types: !5)
 !5 = !{}
-!6 = !{i32 2, !"Debug Info Version", i32 3}
\ No newline at end of file
+!6 = !{i32 2, !"Debug Info Version", i32 3}

diff  --git a/llvm/test/DebugInfo/Generic/simplifycfg_sink_last_inst.ll b/llvm/test/DebugInfo/Generic/simplifycfg_sink_last_inst.ll
index f6ebd6fa1792c..66c02e78843e6 100644
--- a/llvm/test/DebugInfo/Generic/simplifycfg_sink_last_inst.ll
+++ b/llvm/test/DebugInfo/Generic/simplifycfg_sink_last_inst.ll
@@ -1,4 +1,4 @@
-; RUN: opt -simplifycfg -sink-common-insts -S < %s | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -simplifycfg -sink-common-insts -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"
@@ -13,7 +13,7 @@ target triple = "x86_64-unknown-linux-gnu"
 
 ; extern int foo(void);
 ; extern int bar(void);
-; 
+;
 ; int test(int a, int b) {
 ;   if(a)
 ;     b -= foo();

diff  --git a/llvm/test/DebugInfo/Generic/volatile-alloca.ll b/llvm/test/DebugInfo/Generic/volatile-alloca.ll
index 5e7600d49768e..b6d293abf38e6 100644
--- a/llvm/test/DebugInfo/Generic/volatile-alloca.ll
+++ b/llvm/test/DebugInfo/Generic/volatile-alloca.ll
@@ -1,4 +1,4 @@
-; RUN: opt -mem2reg -instcombine %s -o - -S | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -mem2reg -instcombine %s -o - -S | FileCheck %s
 ;
 ; Test that a dbg.declare describing am alloca with volatile
 ; load/stores is not lowered into a dbg.value, since the alloca won't

diff  --git a/llvm/test/DebugInfo/X86/clone-module-2.ll b/llvm/test/DebugInfo/X86/clone-module-2.ll
index 320557c01a2e6..a5d4266a7f8f8 100644
--- a/llvm/test/DebugInfo/X86/clone-module-2.ll
+++ b/llvm/test/DebugInfo/X86/clone-module-2.ll
@@ -1,4 +1,4 @@
-; RUN: opt -run-twice -verify -S -o - %s | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -run-twice -verify -S -o - %s | FileCheck %s
 
 ; If a module contains a DISubprogram referenced only indirectly from
 ; instruction-level debug info metadata, but not attached to any Function

diff  --git a/llvm/test/DebugInfo/X86/clone-module.ll b/llvm/test/DebugInfo/X86/clone-module.ll
index 8c7fd52a549d4..340339bcae6e8 100644
--- a/llvm/test/DebugInfo/X86/clone-module.ll
+++ b/llvm/test/DebugInfo/X86/clone-module.ll
@@ -1,4 +1,4 @@
-; RUN: opt -run-twice -verify -S -o - %s | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -run-twice -verify -S -o - %s | FileCheck %s
 
 ; The ValueMap shared between CloneFunctionInto calls within CloneModule needs
 ; to contain identity mappings for all of the DISubprogram's to prevent them

diff  --git a/llvm/test/DebugInfo/X86/dbg-value-dropped-instcombine.ll b/llvm/test/DebugInfo/X86/dbg-value-dropped-instcombine.ll
index 46f940e11c63e..8eb5a983af8bf 100644
--- a/llvm/test/DebugInfo/X86/dbg-value-dropped-instcombine.ll
+++ b/llvm/test/DebugInfo/X86/dbg-value-dropped-instcombine.ll
@@ -1,10 +1,10 @@
-; RUN: opt -instcombine -S %s -o - | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -instcombine -S %s -o - | FileCheck %s
 
 ; In pr40648 one of two dbg.values used to describe the variable bumble was
 ; being dropped by instcombine. Test that both dbg.values survive instcombine.
 
 ; $ clang -O0 -Xclang -disable-O0-optnone -g bees.c -emit-llvm -S -o - \
-;   | opt -opt-bisect-limit=10 -O2 -o -
+;   | opt -temporarily-allow-old-pass-syntax -opt-bisect-limit=10 -O2 -o -
 ; $ cat bees.c
 ; struct bees {
 ;  int a;

diff  --git a/llvm/test/DebugInfo/X86/dbgloc-insert-extract-val-instrs.ll b/llvm/test/DebugInfo/X86/dbgloc-insert-extract-val-instrs.ll
index 7a21e884a5a32..1841f66ac25c2 100644
--- a/llvm/test/DebugInfo/X86/dbgloc-insert-extract-val-instrs.ll
+++ b/llvm/test/DebugInfo/X86/dbgloc-insert-extract-val-instrs.ll
@@ -1,7 +1,7 @@
 ;; Check that every instruction inserted by -deadargelim has a debug location.
 ;; The test was generated by using -debugify option.
 
-; RUN: opt < %s -deadargelim -S 2>&1 | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -deadargelim -S 2>&1 | FileCheck %s
 
 ; CHECK-LABEL: fn
 ; CHECK: %oldret = extractvalue { i32, i32, i16 } %z, 0, !dbg ![[LOC:.*]]

diff  --git a/llvm/test/DebugInfo/X86/dead-store-elimination-marks-undef.ll b/llvm/test/DebugInfo/X86/dead-store-elimination-marks-undef.ll
index 5f9e67653d966..3be694a19db38 100644
--- a/llvm/test/DebugInfo/X86/dead-store-elimination-marks-undef.ll
+++ b/llvm/test/DebugInfo/X86/dead-store-elimination-marks-undef.ll
@@ -1,5 +1,5 @@
-; RUN: opt -mtriple=x86_64-- -S --dse %s  -o - | FileCheck %s
-; Ensure that we can mark a value as undefined when performing dead 
+; RUN: opt -temporarily-allow-old-pass-syntax -mtriple=x86_64-- -S --dse %s  -o - | FileCheck %s
+; Ensure that we can mark a value as undefined when performing dead
 ; store elimination.
 ; Bugzilla #45080
 

diff  --git a/llvm/test/DebugInfo/X86/global-sra-fp80-array.ll b/llvm/test/DebugInfo/X86/global-sra-fp80-array.ll
index 00004178c9824..a5a61b2cc2345 100644
--- a/llvm/test/DebugInfo/X86/global-sra-fp80-array.ll
+++ b/llvm/test/DebugInfo/X86/global-sra-fp80-array.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -globalopt < %s | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -S -globalopt -temporarily-allow-old-pass-syntax < %s | FileCheck %s
 source_filename = "array.c"
 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/DebugInfo/X86/global-sra-fp80-struct.ll b/llvm/test/DebugInfo/X86/global-sra-fp80-struct.ll
index 847dee30cc905..457e114f27bb5 100644
--- a/llvm/test/DebugInfo/X86/global-sra-fp80-struct.ll
+++ b/llvm/test/DebugInfo/X86/global-sra-fp80-struct.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -globalopt < %s | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -S -globalopt -temporarily-allow-old-pass-syntax < %s | FileCheck %s
 source_filename = "struct.c"
 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/DebugInfo/X86/global-sra-struct-fit-segment.ll b/llvm/test/DebugInfo/X86/global-sra-struct-fit-segment.ll
index d3c67c9c91653..ea83ba095ac88 100644
--- a/llvm/test/DebugInfo/X86/global-sra-struct-fit-segment.ll
+++ b/llvm/test/DebugInfo/X86/global-sra-struct-fit-segment.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -globalopt < %s | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -S -globalopt -temporarily-allow-old-pass-syntax < %s | FileCheck %s
 
 ;; Generated at -g from:
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

diff  --git a/llvm/test/DebugInfo/X86/instcombine-demanded-bits-salvage.ll b/llvm/test/DebugInfo/X86/instcombine-demanded-bits-salvage.ll
index 814a3bb8dc881..807863575ccdf 100644
--- a/llvm/test/DebugInfo/X86/instcombine-demanded-bits-salvage.ll
+++ b/llvm/test/DebugInfo/X86/instcombine-demanded-bits-salvage.ll
@@ -1,5 +1,5 @@
-; RUN: opt -mtriple=x86_64-- %s -S --instcombine  -o - | FileCheck %s
-; Verify that demanded bits optimisations don't affect debuginfo 
+; RUN: opt -temporarily-allow-old-pass-syntax -mtriple=x86_64-- %s -S --instcombine  -o - | FileCheck %s
+; Verify that demanded bits optimisations don't affect debuginfo
 ; variable values.
 ; Bugzilla #44371
 

diff  --git a/llvm/test/DebugInfo/X86/licm-undef-dbg-value.ll b/llvm/test/DebugInfo/X86/licm-undef-dbg-value.ll
index 09a18f937b3bb..5de02979b705a 100644
--- a/llvm/test/DebugInfo/X86/licm-undef-dbg-value.ll
+++ b/llvm/test/DebugInfo/X86/licm-undef-dbg-value.ll
@@ -1,4 +1,4 @@
-; RUN: opt -licm %s -S | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -licm %s -S | FileCheck %s
 
 ; CHECK: for.body:
 ; CHECK-NEXT: llvm.dbg.value(metadata i8 undef
@@ -7,7 +7,7 @@
 ; when licm sinks the instruction.
 
 ; clang reduce.cpp -g -O2 -Xclang -disable-llvm-passes -emit-llvm -o reduce.ll
-; opt -simplifycfg -sroa -loop-rotate -o - -S reduce.ll
+; opt -temporarily-allow-old-pass-syntax -simplifycfg -sroa -loop-rotate -o - -S reduce.ll
 ; cat reduce.cpp
 ; extern char a;
 ; extern char b;

diff  --git a/llvm/test/DebugInfo/X86/undef-type-md.ll b/llvm/test/DebugInfo/X86/undef-type-md.ll
index c99f4570f77b0..db116527e1cf3 100644
--- a/llvm/test/DebugInfo/X86/undef-type-md.ll
+++ b/llvm/test/DebugInfo/X86/undef-type-md.ll
@@ -1,6 +1,6 @@
-; RUN:  opt -S -ipsccp %S/undef-type-md.ll | FileCheck %s
+; RUN:  opt -temporarily-allow-old-pass-syntax -S -ipsccp %S/undef-type-md.ll | FileCheck %s
 ; CHECK: llvm.nondebug.metadata = !{[[NONDEBUG_METADATA:![0-9]+]]}
-; CHECK: [[NONDEBUG_METADATA]] =  distinct !{null} 
+; CHECK: [[NONDEBUG_METADATA]] =  distinct !{null}
 ; CHECK: !DITemplateValueParameter({{.*}} value: %class.1 addrspace(1)* undef)
 
 ; ModuleID = '<stdin>'

diff  --git a/llvm/test/DebugInfo/check-debugify-preserves-analyses.ll b/llvm/test/DebugInfo/check-debugify-preserves-analyses.ll
index 4d9f5acccdcd2..196e840e0f0ef 100644
--- a/llvm/test/DebugInfo/check-debugify-preserves-analyses.ll
+++ b/llvm/test/DebugInfo/check-debugify-preserves-analyses.ll
@@ -1,8 +1,8 @@
-; RUN: opt < %s -passes='require<globals-aa>,function-attrs' | \
-; RUN:   opt -S -strip -strip-dead-prototypes -strip-named-metadata > %t.no_dbg
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -passes='require<globals-aa>,function-attrs' | \
+; RUN:   opt -temporarily-allow-old-pass-syntax -S -strip -strip-dead-prototypes -strip-named-metadata > %t.no_dbg
 
-; RUN: opt < %s -debugify-each -passes='require<globals-aa>,function-attrs' | \
-; RUN:   opt -S -strip -strip-dead-prototypes -strip-named-metadata > %t.with_dbg
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -debugify-each -passes='require<globals-aa>,function-attrs' | \
+; RUN:   opt -temporarily-allow-old-pass-syntax -S -strip -strip-dead-prototypes -strip-named-metadata > %t.with_dbg
 
 ; RUN: 
diff  %t.no_dbg %t.with_dbg
 

diff  --git a/llvm/test/DebugInfo/debugify-bogus-dbg-value.ll b/llvm/test/DebugInfo/debugify-bogus-dbg-value.ll
index 9a3ce244516a0..83c4ee9be77bc 100644
--- a/llvm/test/DebugInfo/debugify-bogus-dbg-value.ll
+++ b/llvm/test/DebugInfo/debugify-bogus-dbg-value.ll
@@ -1,4 +1,4 @@
-; RUN: opt -check-debugify < %s 2>&1 | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -check-debugify < %s 2>&1 | FileCheck %s
 
 define <2 x i64> @test-fun(<2 x i64> %A) !dbg !6 {
   %and = and <2 x i64> %A, <i64 23, i64 42>, !dbg !14

diff  --git a/llvm/test/DebugInfo/debugify-export.ll b/llvm/test/DebugInfo/debugify-export.ll
index af8865c11e701..bf4b02d2bd68d 100644
--- a/llvm/test/DebugInfo/debugify-export.ll
+++ b/llvm/test/DebugInfo/debugify-export.ll
@@ -1,5 +1,5 @@
-; RUN: opt %s -disable-output -debugify-each -debugify-quiet -debugify-export - -globalopt | FileCheck %s
-; RUN: opt %s -disable-output -debugify-each -debugify-quiet -debugify-export - -passes=globalopt | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax %s -disable-output -debugify-each -debugify-quiet -debugify-export - -globalopt -temporarily-allow-old-pass-syntax | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax %s -disable-output -debugify-each -debugify-quiet -debugify-export - -passes=globalopt -temporarily-allow-old-pass-syntax | FileCheck %s
 
 ; CHECK: Pass Name
 ; CHECK-SAME: # of missing debug values

diff  --git a/llvm/test/DebugInfo/debugify-ignore-phi.ll b/llvm/test/DebugInfo/debugify-ignore-phi.ll
index bae91e4e52cb8..1aa413129bcf1 100644
--- a/llvm/test/DebugInfo/debugify-ignore-phi.ll
+++ b/llvm/test/DebugInfo/debugify-ignore-phi.ll
@@ -1,4 +1,4 @@
-; RUN: opt -check-debugify < %s -S 2>&1 | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -check-debugify < %s -S 2>&1 | FileCheck %s
 
 define void @test_phi(i1 %cond) !dbg !6 {
   br i1 %cond, label %1, label %2, !dbg !11

diff  --git a/llvm/test/DebugInfo/debugify-original-no-dbg-info.ll b/llvm/test/DebugInfo/debugify-original-no-dbg-info.ll
index ebe8d145a2bb5..7334e69ee6ed9 100644
--- a/llvm/test/DebugInfo/debugify-original-no-dbg-info.ll
+++ b/llvm/test/DebugInfo/debugify-original-no-dbg-info.ll
@@ -1,4 +1,4 @@
-; RUN: opt -verify-debuginfo-preserve -instcombine -S -o - < %s 2>&1 | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -verify-debuginfo-preserve -instcombine -S -o - < %s 2>&1 | FileCheck %s
 
 ; CHECK: ModuleDebugify (original debuginfo): Skipping module without debug info
 ; CHECK-NEXT: CheckModuleDebugify (original debuginfo): Skipping module without debug info

diff  --git a/llvm/test/DebugInfo/debugify-report-missing-locs-only.ll b/llvm/test/DebugInfo/debugify-report-missing-locs-only.ll
index abf392f531d55..4ba7ac632e9a1 100644
--- a/llvm/test/DebugInfo/debugify-report-missing-locs-only.ll
+++ b/llvm/test/DebugInfo/debugify-report-missing-locs-only.ll
@@ -1,4 +1,4 @@
-; RUN: opt -check-debugify < %s -S -o - 2>&1 | FileCheck %s -implicit-check-not "WARNING: Instruction with empty DebugLoc in function bar"
+; RUN: opt -temporarily-allow-old-pass-syntax -check-debugify < %s -S -o - 2>&1 | FileCheck %s -implicit-check-not "WARNING: Instruction with empty DebugLoc in function bar"
 
 ; CHECK: WARNING: Instruction with empty DebugLoc in function foo --   ret void
 define void @foo() !dbg !6 {

diff  --git a/llvm/test/DebugInfo/debugify.ll b/llvm/test/DebugInfo/debugify.ll
index f18565c7cc466..3f828ccb52a5e 100644
--- a/llvm/test/DebugInfo/debugify.ll
+++ b/llvm/test/DebugInfo/debugify.ll
@@ -1,29 +1,29 @@
-; RUN: opt -debugify -S -o - < %s | FileCheck %s
-; RUN: opt -passes=debugify -S -o - < %s | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -debugify -S -o - < %s | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -passes=debugify -S -o - < %s | FileCheck %s
 
-; RUN: opt -debugify -debugify -S -o - < %s 2>&1 | \
+; RUN: opt -temporarily-allow-old-pass-syntax -debugify -debugify -S -o - < %s 2>&1 | \
 ; RUN:   FileCheck %s -check-prefix=CHECK-REPEAT
-; RUN: opt -passes=debugify,debugify -S -o - < %s 2>&1 | \
+; RUN: opt -temporarily-allow-old-pass-syntax -passes=debugify,debugify -S -o - < %s 2>&1 | \
 ; RUN:   FileCheck %s -check-prefix=CHECK-REPEAT
 
-; RUN: opt -debugify -check-debugify -S -o - < %s | \
+; RUN: opt -temporarily-allow-old-pass-syntax -debugify -check-debugify -S -o - < %s | \
 ; RUN:   FileCheck %s -implicit-check-not="CheckModuleDebugify: FAIL"
-; RUN: opt -passes=debugify,check-debugify -S -o - < %s | \
+; RUN: opt -temporarily-allow-old-pass-syntax -passes=debugify,check-debugify -S -o - < %s | \
 ; RUN:   FileCheck %s -implicit-check-not="CheckModuleDebugify: FAIL"
-; RUN: opt -enable-debugify -passes=verify -S -o - < %s | \
+; RUN: opt -temporarily-allow-old-pass-syntax -enable-debugify -passes=verify -S -o - < %s | \
 ; RUN:   FileCheck %s -implicit-check-not="CheckModuleDebugify: FAIL"
 
-; RUN: opt -debugify -strip -check-debugify -S -o - < %s 2>&1 | \
+; RUN: opt -temporarily-allow-old-pass-syntax -debugify -strip -check-debugify -S -o - < %s 2>&1 | \
 ; RUN:   FileCheck %s -check-prefix=CHECK-WARN
 
-; RUN: opt -enable-debugify -strip -S -o - < %s 2>&1 | \
+; RUN: opt -temporarily-allow-old-pass-syntax -enable-debugify -strip -S -o - < %s 2>&1 | \
 ; RUN:   FileCheck %s -check-prefix=CHECK-WARN
 
-; RUN: opt -enable-debugify -S -o - < %s 2>&1 | FileCheck %s -check-prefix=PASS
+; RUN: opt -temporarily-allow-old-pass-syntax -enable-debugify -S -o - < %s 2>&1 | FileCheck %s -check-prefix=PASS
 
 ; Verify that debugify can be safely used with piping
-; RUN: opt -enable-debugify -O1 < %s | opt -O2 -o /dev/null
-; RUN: opt -debugify -mem2reg -check-debugify < %s | opt -O2 -o /dev/null
+; RUN: opt -temporarily-allow-old-pass-syntax -enable-debugify -O1 < %s | opt -temporarily-allow-old-pass-syntax -O2 -o /dev/null
+; RUN: opt -temporarily-allow-old-pass-syntax -debugify -mem2reg -check-debugify < %s | opt -temporarily-allow-old-pass-syntax -O2 -o /dev/null
 
 ; CHECK-LABEL: define void @foo
 define void @foo() {

diff  --git a/llvm/test/DebugInfo/duplicate_dbgvalue.ll b/llvm/test/DebugInfo/duplicate_dbgvalue.ll
index 82c2868cfc533..090c82b62514e 100644
--- a/llvm/test/DebugInfo/duplicate_dbgvalue.ll
+++ b/llvm/test/DebugInfo/duplicate_dbgvalue.ll
@@ -1,4 +1,4 @@
-; RUN: opt -instcombine -S -o - < %s | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -instcombine -S -o - < %s | FileCheck %s
 
 ; CHECK-LABEL: %3 = load i32, ptr %i1_311
 ; CHECK: call void @llvm.dbg.value(metadata i32 %3

diff  --git a/llvm/test/DebugInfo/limit-arglist-size.ll b/llvm/test/DebugInfo/limit-arglist-size.ll
index 951cc0e1c3cc7..629f5eb2a5808 100644
--- a/llvm/test/DebugInfo/limit-arglist-size.ll
+++ b/llvm/test/DebugInfo/limit-arglist-size.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -instcombine %s -o - | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -S -instcombine %s -o - | FileCheck %s
 
 ; For performance reasons, we currently limit the number of values that can be
 ; referenced by a dbg.value to 16. This test checks that we do not exceed this

diff  --git a/llvm/test/DebugInfo/pr34672.ll b/llvm/test/DebugInfo/pr34672.ll
index c944a11fc409d..b2b9a112ae46c 100644
--- a/llvm/test/DebugInfo/pr34672.ll
+++ b/llvm/test/DebugInfo/pr34672.ll
@@ -1,4 +1,4 @@
-; RUN: opt -verify %s 2>&1 | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -verify %s 2>&1 | FileCheck %s
 ; CHECK: invalid type ref
 ; CHECK-NOT: invalid type ref
 

diff  --git a/llvm/test/DebugInfo/return-same-line-merge.ll b/llvm/test/DebugInfo/return-same-line-merge.ll
index 5c9965b6447f9..293f18ea31748 100644
--- a/llvm/test/DebugInfo/return-same-line-merge.ll
+++ b/llvm/test/DebugInfo/return-same-line-merge.ll
@@ -1,4 +1,4 @@
-; RUN: opt -simplifycfg -S < %s | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -simplifycfg -S < %s | FileCheck %s
 ;
 ; Simplified from the following code:
 ; int foo() {

diff  --git a/llvm/test/DebugInfo/salvage-duplicate-values.ll b/llvm/test/DebugInfo/salvage-duplicate-values.ll
index 1b5366c626bf1..22363f24d822b 100644
--- a/llvm/test/DebugInfo/salvage-duplicate-values.ll
+++ b/llvm/test/DebugInfo/salvage-duplicate-values.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -dce -S | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax %s -dce -S | FileCheck %s
 
 ; Tests the results of salvaging variadic dbg.values that use the same SSA value
 ; multiple times.

diff  --git a/llvm/test/DebugInfo/salvage-gep.ll b/llvm/test/DebugInfo/salvage-gep.ll
index 940cb64c4fb49..01163b6f9af4d 100644
--- a/llvm/test/DebugInfo/salvage-gep.ll
+++ b/llvm/test/DebugInfo/salvage-gep.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -dce -S | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax %s -dce -S | FileCheck %s
 
 ; Tests the salvaging of GEP instructions, specifically struct indexing,
 ; non-constant array indexing, and non-constant array indexing into an array of

diff  --git a/llvm/test/DebugInfo/salvage-limit-expr-size.ll b/llvm/test/DebugInfo/salvage-limit-expr-size.ll
index 51cd06ffac8a8..6660b7435afdd 100644
--- a/llvm/test/DebugInfo/salvage-limit-expr-size.ll
+++ b/llvm/test/DebugInfo/salvage-limit-expr-size.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -dce -S | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax %s -dce -S | FileCheck %s
 
 ;; Tests that a DIExpression will only be salvaged up to a certain length, and
 ;; will produce an undef value if an expression would need to exceed that length.

diff  --git a/llvm/test/DebugInfo/salvage-nonconst-binop.ll b/llvm/test/DebugInfo/salvage-nonconst-binop.ll
index b470bc1ad2a91..f98dfa27a4991 100644
--- a/llvm/test/DebugInfo/salvage-nonconst-binop.ll
+++ b/llvm/test/DebugInfo/salvage-nonconst-binop.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -dce -S | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax %s -dce -S | FileCheck %s
 
 ; Tests the salvaging of binary operators that use more than one non-constant
 ; SSA value.

diff  --git a/llvm/test/DebugInfo/simplify-cfg-preserve-dbg-values.ll b/llvm/test/DebugInfo/simplify-cfg-preserve-dbg-values.ll
index 63959b2a1e88b..f42626ab0a805 100644
--- a/llvm/test/DebugInfo/simplify-cfg-preserve-dbg-values.ll
+++ b/llvm/test/DebugInfo/simplify-cfg-preserve-dbg-values.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg -verify -S -o - | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax %s -simplifycfg -verify -S -o - | FileCheck %s
 ;
 ; Verify that SimplifyCFG does not invalidate operands for
 ; llvm.dbg.value intrinsics.

diff  --git a/llvm/test/DebugInfo/unrolled-loop-remainder.ll b/llvm/test/DebugInfo/unrolled-loop-remainder.ll
index 25b9b3ca11aa3..c4cb1b3f90cc7 100644
--- a/llvm/test/DebugInfo/unrolled-loop-remainder.ll
+++ b/llvm/test/DebugInfo/unrolled-loop-remainder.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -loop-unroll -unroll-runtime -unroll-allow-remainder -unroll-count=4 -unroll-remainder -S %s -o - | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -loop-unroll -unroll-runtime -unroll-allow-remainder -unroll-count=4 -unroll-remainder -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/DebugInfo/verify-di-preserve.ll b/llvm/test/DebugInfo/verify-di-preserve.ll
index d4c7888d1519b..8d9eba08f62c4 100644
--- a/llvm/test/DebugInfo/verify-di-preserve.ll
+++ b/llvm/test/DebugInfo/verify-di-preserve.ll
@@ -1,8 +1,8 @@
-; RUN: opt %s -verify-debuginfo-preserve -instcombine -disable-output 2>&1 | FileCheck --check-prefix=VERIFY %s
+; RUN: opt -temporarily-allow-old-pass-syntax %s -verify-debuginfo-preserve -instcombine -disable-output 2>&1 | FileCheck --check-prefix=VERIFY %s
 
 ; VERIFY: CheckModuleDebugify (original debuginfo):
 
-; RUN: opt %s -verify-each-debuginfo-preserve -O2 -disable-output 2>&1 | FileCheck --check-prefix=VERIFY-EACH %s
+; RUN: opt -temporarily-allow-old-pass-syntax %s -verify-each-debuginfo-preserve -O2 -disable-output 2>&1 | FileCheck --check-prefix=VERIFY-EACH %s
 
 ; VERIFY-EACH: DeadArgumentEliminationPass
 ; VERIFY-EACH: GlobalDCEPass

diff  --git a/llvm/test/Feature/OperandBundles/inliner-conservative.ll b/llvm/test/Feature/OperandBundles/inliner-conservative.ll
index d9f09f71d905a..62ae38c92d5c2 100644
--- a/llvm/test/Feature/OperandBundles/inliner-conservative.ll
+++ b/llvm/test/Feature/OperandBundles/inliner-conservative.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -inline < %s | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -S -inline < %s | FileCheck %s
 
 ; Check that the inliner does not inline through arbitrary unknown
 ; operand bundles.

diff  --git a/llvm/test/Feature/OperandBundles/inliner-funclet-wineh.ll b/llvm/test/Feature/OperandBundles/inliner-funclet-wineh.ll
index 8f00e8768c447..825afe82091dc 100644
--- a/llvm/test/Feature/OperandBundles/inliner-funclet-wineh.ll
+++ b/llvm/test/Feature/OperandBundles/inliner-funclet-wineh.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -always-inline -mtriple=x86_64-windows-msvc < %s | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -S -always-inline -mtriple=x86_64-windows-msvc < %s | FileCheck %s
 
 ; WinEH requires funclet tokens on nounwind intrinsics if they can lower to
 ; regular function calls in the course of IR transformations.

diff  --git a/llvm/test/Feature/OperandBundles/merge-func.ll b/llvm/test/Feature/OperandBundles/merge-func.ll
index 1fa6eb0930842..b69b049052f82 100644
--- a/llvm/test/Feature/OperandBundles/merge-func.ll
+++ b/llvm/test/Feature/OperandBundles/merge-func.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mergefunc < %s | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -S -mergefunc < %s | FileCheck %s
 
 ; Minor note: functions need to be at least three instructions long
 ; to be considered by -mergefunc.

diff  --git a/llvm/test/Feature/global_pv.ll b/llvm/test/Feature/global_pv.ll
index f1a7b7fd356df..dc4047e3d66fd 100644
--- a/llvm/test/Feature/global_pv.ll
+++ b/llvm/test/Feature/global_pv.ll
@@ -1,5 +1,5 @@
-; RUN: opt -instcombine -S < %s | llvm-as
-; RUN: opt -instcombine -globalopt -S < %s | llvm-as
+; RUN: opt -temporarily-allow-old-pass-syntax -instcombine -S < %s | llvm-as
+; RUN: opt -temporarily-allow-old-pass-syntax -instcombine -globalopt -temporarily-allow-old-pass-syntax -S < %s | llvm-as
 @G1 = global i32 zeroinitializer
 @G2 = global i32 zeroinitializer
 @g = global <2 x i32*> zeroinitializer

diff  --git a/llvm/test/LTO/X86/keep-used-puts-during-instcombine.ll b/llvm/test/LTO/X86/keep-used-puts-during-instcombine.ll
index 83345d43b88b0..c1a8c1e09e467 100644
--- a/llvm/test/LTO/X86/keep-used-puts-during-instcombine.ll
+++ b/llvm/test/LTO/X86/keep-used-puts-during-instcombine.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -instcombine <%s | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -S -instcombine <%s | FileCheck %s
 ; rdar://problem/16165191
 ; llvm.compiler.used functions should not be renamed
 

diff  --git a/llvm/test/Other/2002-02-24-InlineBrokePHINodes.ll b/llvm/test/Other/2002-02-24-InlineBrokePHINodes.ll
index db26942096d45..8922386a3bb5e 100644
--- a/llvm/test/Other/2002-02-24-InlineBrokePHINodes.ll
+++ b/llvm/test/Other/2002-02-24-InlineBrokePHINodes.ll
@@ -1,7 +1,7 @@
 ; Inlining used to break PHI nodes.  This tests that they are correctly updated
 ; when a node is split around the call instruction.  The verifier caught the error.
 ;
-; RUN: opt < %s -inline
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -inline
 ;
 
 define i64 @test(i64 %X) {

diff  --git a/llvm/test/Other/2007-09-10-PassManager.ll b/llvm/test/Other/2007-09-10-PassManager.ll
index 5fc519018c9d4..ba849aeab12e2 100644
--- a/llvm/test/Other/2007-09-10-PassManager.ll
+++ b/llvm/test/Other/2007-09-10-PassManager.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -simple-loop-unswitch -indvars -disable-output
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -simple-loop-unswitch -indvars -disable-output
 ; Require SCEV before LCSSA.
 define void @foo() {
 entry:

diff  --git a/llvm/test/Other/2008-02-14-PassManager.ll b/llvm/test/Other/2008-02-14-PassManager.ll
index bdaf9330d2383..c69336ee6edb2 100644
--- a/llvm/test/Other/2008-02-14-PassManager.ll
+++ b/llvm/test/Other/2008-02-14-PassManager.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -loop-unroll -loop-rotate -simplifycfg -disable-output
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -loop-unroll -loop-rotate -simplifycfg -disable-output
 ; PR2028
 define i32 @test1() {
        ret i32 0

diff  --git a/llvm/test/Other/2008-06-04-FieldSizeInPacked.ll b/llvm/test/Other/2008-06-04-FieldSizeInPacked.ll
index d2532553752b8..09ea8be11b57c 100644
--- a/llvm/test/Other/2008-06-04-FieldSizeInPacked.ll
+++ b/llvm/test/Other/2008-06-04-FieldSizeInPacked.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep true
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -instcombine -S | grep true
 
 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/Other/2008-10-06-RemoveDeadPass.ll b/llvm/test/Other/2008-10-06-RemoveDeadPass.ll
index 7cec2c57c2f62..68582daa5ee71 100644
--- a/llvm/test/Other/2008-10-06-RemoveDeadPass.ll
+++ b/llvm/test/Other/2008-10-06-RemoveDeadPass.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -inline -internalize -disable-output
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -inline -internalize -disable-output
 define void @foo() nounwind {
   ret void
 }

diff  --git a/llvm/test/Other/2009-06-05-no-implicit-float.ll b/llvm/test/Other/2009-06-05-no-implicit-float.ll
index 3f07170316763..50a7daaf65cb6 100644
--- a/llvm/test/Other/2009-06-05-no-implicit-float.ll
+++ b/llvm/test/Other/2009-06-05-no-implicit-float.ll
@@ -1,4 +1,4 @@
 
-; RUN: opt < %s -verify -S | grep noimplicitfloat
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -verify -S | grep noimplicitfloat
 declare void @f() noimplicitfloat
 

diff  --git a/llvm/test/Other/X86/debugcounter-divrempairs.ll b/llvm/test/Other/X86/debugcounter-divrempairs.ll
index 4b787e9d2e7af..32828520f9e99 100644
--- a/llvm/test/Other/X86/debugcounter-divrempairs.ll
+++ b/llvm/test/Other/X86/debugcounter-divrempairs.ll
@@ -1,5 +1,5 @@
 ; REQUIRES: asserts
-; RUN: opt < %s -div-rem-pairs -debug-counter=div-rem-pairs-transform-skip=1,div-rem-pairs-transform-count=1 \
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -div-rem-pairs -debug-counter=div-rem-pairs-transform-skip=1,div-rem-pairs-transform-count=1 \
 ; RUN: -S -mtriple=x86_64-unknown-unknown    | FileCheck %s
 ;; Test that, with debug counters on, we only skip the first div-rem-pairs opportunity, optimize one after it,
 ;; and then ignore all the others. There is 1 optimization opportunity in f1, 2 in f2, and another 1 in f3,
@@ -88,4 +88,4 @@ if:
 end:
   %ret = phi i32 [ %div, %if ], [ 3, %entry ]
   ret i32 %ret
-}
\ No newline at end of file
+}

diff  --git a/llvm/test/Other/X86/debugcounter-partiallyinlinelibcalls.ll b/llvm/test/Other/X86/debugcounter-partiallyinlinelibcalls.ll
index f9ca2ebcaa042..0c2cc2ea36a40 100644
--- a/llvm/test/Other/X86/debugcounter-partiallyinlinelibcalls.ll
+++ b/llvm/test/Other/X86/debugcounter-partiallyinlinelibcalls.ll
@@ -1,5 +1,5 @@
 ; REQUIRES: asserts
-; RUN: opt -S -debug-counter=partially-inline-libcalls-transform-skip=1,partially-inline-libcalls-transform-count=1 \
+; RUN: opt -temporarily-allow-old-pass-syntax -S -debug-counter=partially-inline-libcalls-transform-skip=1,partially-inline-libcalls-transform-count=1 \
 ; RUN:     -partially-inline-libcalls -mtriple=x86_64-unknown-linux-gnu < %s | FileCheck %s
 ;; Test that, with debug counters on, we will skip the first optimization opportunity, perform next 1,
 ;; and ignore all the others left.

diff  --git a/llvm/test/Other/cfg-printer-branch-weights-percent.ll b/llvm/test/Other/cfg-printer-branch-weights-percent.ll
index b7e82aa1c6fc3..23c3d6c315b1c 100644
--- a/llvm/test/Other/cfg-printer-branch-weights-percent.ll
+++ b/llvm/test/Other/cfg-printer-branch-weights-percent.ll
@@ -1,4 +1,4 @@
-;RUN: opt < %s -dot-cfg -cfg-weights -cfg-dot-filename-prefix=%t 2>/dev/null > /dev/null
+;RUN: opt -temporarily-allow-old-pass-syntax < %s -dot-cfg -cfg-weights -cfg-dot-filename-prefix=%t 2>/dev/null > /dev/null
 ;RUN: FileCheck %s -input-file=%t.f.dot
 
 define void @f(i32) {

diff  --git a/llvm/test/Other/cfg-printer-branch-weights.ll b/llvm/test/Other/cfg-printer-branch-weights.ll
index bf32f2e553c55..008a6af061808 100644
--- a/llvm/test/Other/cfg-printer-branch-weights.ll
+++ b/llvm/test/Other/cfg-printer-branch-weights.ll
@@ -1,4 +1,4 @@
-;RUN: opt < %s -dot-cfg -cfg-weights -cfg-raw-weights -cfg-dot-filename-prefix=%t 2>/dev/null > /dev/null
+;RUN: opt -temporarily-allow-old-pass-syntax < %s -dot-cfg -cfg-weights -cfg-raw-weights -cfg-dot-filename-prefix=%t 2>/dev/null > /dev/null
 ;RUN: FileCheck %s -input-file=%t.f.dot
 
 define void @f(i32) {

diff  --git a/llvm/test/Other/cfg-printer-filter.ll b/llvm/test/Other/cfg-printer-filter.ll
index e4089c12f1195..e780430bc1a9b 100644
--- a/llvm/test/Other/cfg-printer-filter.ll
+++ b/llvm/test/Other/cfg-printer-filter.ll
@@ -1,12 +1,12 @@
 ; RUN: rm -f %t.other.dot %t-only.other.dot
 
 ;; Both f and func are dumped because their names contain the pattern 'f' as a substring.
-; RUN: opt < %s -dot-cfg -cfg-dot-filename-prefix=%t -cfg-func-name=f 2>/dev/null > /dev/null
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -dot-cfg -cfg-dot-filename-prefix=%t -cfg-func-name=f 2>/dev/null > /dev/null
 ; RUN: FileCheck %s -input-file=%t.f.dot -check-prefix=F
 ; RUN: FileCheck %s -input-file=%t.func.dot -check-prefix=Func
 ; RUN: not test -f %t.other.dot
 
-; RUN: opt < %s -dot-cfg-only -cfg-dot-filename-prefix=%t-only -cfg-func-name=f 2>/dev/null > /dev/null
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -dot-cfg-only -cfg-dot-filename-prefix=%t-only -cfg-func-name=f 2>/dev/null > /dev/null
 ; RUN: FileCheck %s -input-file=%t-only.f.dot -check-prefix=F
 ; RUN: FileCheck %s -input-file=%t-only.func.dot -check-prefix=Func
 ; RUN: not test -f %t-only.other.dot

diff  --git a/llvm/test/Other/cfg_deopt_unreach.ll b/llvm/test/Other/cfg_deopt_unreach.ll
index 1cde68bed2de4..af0d61f4898bd 100644
--- a/llvm/test/Other/cfg_deopt_unreach.ll
+++ b/llvm/test/Other/cfg_deopt_unreach.ll
@@ -1,12 +1,12 @@
 ; RUN: rm -rf %t
 ; RUN: mkdir -p %t
-; RUN: opt < %s -dot-cfg -cfg-hide-unreachable-paths -cfg-dot-filename-prefix=%t/unreach 2>/dev/null > /dev/null
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -dot-cfg -cfg-hide-unreachable-paths -cfg-dot-filename-prefix=%t/unreach 2>/dev/null > /dev/null
 ; RUN: FileCheck %s -input-file=%t/unreach.callee.dot -check-prefix=UNREACH
-; RUN: opt < %s -dot-cfg -cfg-hide-deoptimize-paths -cfg-dot-filename-prefix=%t/deopt 2>/dev/null > /dev/null
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -dot-cfg -cfg-hide-deoptimize-paths -cfg-dot-filename-prefix=%t/deopt -temporarily-allow-old-pass-syntax 2>/dev/null > /dev/null
 ; RUN: FileCheck %s -input-file=%t/deopt.callee.dot -check-prefix=DEOPT
-; RUN: opt < %s -dot-cfg -cfg-dot-filename-prefix=%t/no-flags 2>/dev/null > /dev/null
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -dot-cfg -cfg-dot-filename-prefix=%t/no-flags 2>/dev/null > /dev/null
 ; RUN: FileCheck %s -input-file=%t/no-flags.callee.dot -check-prefix=NO-FLAGS
-; RUN: opt < %s -dot-cfg -cfg-hide-unreachable-paths -cfg-hide-deoptimize-paths -cfg-dot-filename-prefix=%t/both-flags 2>/dev/null > /dev/null
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -dot-cfg -cfg-hide-unreachable-paths -cfg-hide-deoptimize-paths -cfg-dot-filename-prefix=%t/both-flags 2>/dev/null > /dev/null
 ; RUN: FileCheck %s -input-file=%t/both-flags.callee.dot -check-prefix=BOTH-FLAGS
 
 declare i8 @llvm.experimental.deoptimize.i8(...)

diff  --git a/llvm/test/Other/constant-fold-gep.ll b/llvm/test/Other/constant-fold-gep.ll
index 5901e4f21fc8c..6aee66b67cb23 100644
--- a/llvm/test/Other/constant-fold-gep.ll
+++ b/llvm/test/Other/constant-fold-gep.ll
@@ -1,22 +1,22 @@
 ; "PLAIN" - No optimizations. This tests the default target layout
 ; constant folder.
-; RUN: opt -S -o - < %s | FileCheck --check-prefix=PLAIN %s
+; RUN: opt -temporarily-allow-old-pass-syntax -S -o - < %s | FileCheck --check-prefix=PLAIN %s
 
 ; "OPT" - Optimizations but no targetdata. This tests default target layout
 ; folding in the optimizers.
-; RUN: opt -S -o - -instcombine -globalopt < %s | FileCheck --check-prefix=OPT %s
+; RUN: opt -temporarily-allow-old-pass-syntax -S -o - -instcombine -globalopt -temporarily-allow-old-pass-syntax < %s | FileCheck --check-prefix=OPT %s
 
 ; "TO" - Optimizations and targetdata. This tests target-dependent
 ; folding in the optimizers.
-; RUN: opt -S -o - -instcombine -globalopt -data-layout="e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64" < %s | FileCheck --check-prefix=TO %s
+; RUN: opt -temporarily-allow-old-pass-syntax -S -o - -instcombine -globalopt -temporarily-allow-old-pass-syntax -data-layout="e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64" < %s | FileCheck --check-prefix=TO %s
 
 ; "SCEV" - ScalarEvolution with default target layout
-; RUN: opt -passes='print<scalar-evolution>' < %s -disable-output 2>&1 | FileCheck --check-prefix=SCEV %s
+; RUN: opt -temporarily-allow-old-pass-syntax -passes='print<scalar-evolution>' < %s -disable-output 2>&1 | FileCheck --check-prefix=SCEV %s
 
 
-; The automatic constant folder in opt does not have targetdata access, so
+; The automatic constant folder in opt -temporarily-allow-old-pass-syntax does not have targetdata access, so
 ; it can't fold gep arithmetic, in general. However, the constant folder run
-; from instcombine and global opt can use targetdata.
+; from instcombine and global opt -temporarily-allow-old-pass-syntax can use targetdata.
 
 ; PLAIN: @G8 = global i8* getelementptr (i8, i8* inttoptr (i32 1 to i8*), i32 -1)
 ; PLAIN: @G1 = global i1* getelementptr (i1, i1* inttoptr (i32 1 to i1*), i32 -1)

diff  --git a/llvm/test/Other/copy-metadata-of-declaration.ll b/llvm/test/Other/copy-metadata-of-declaration.ll
index aed8db75f6d8a..97e6b5efcbf01 100644
--- a/llvm/test/Other/copy-metadata-of-declaration.ll
+++ b/llvm/test/Other/copy-metadata-of-declaration.ll
@@ -1,4 +1,4 @@
-; RUN: opt -run-twice -verify -S -o - %s | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -run-twice -verify -S -o - %s | FileCheck %s
 
 ; This test is used to check metadata attached to global variable declarations
 ; are copied when CloneModule(). This is required by out-of-tree passes.

diff  --git a/llvm/test/Other/debugcounter-dce.ll b/llvm/test/Other/debugcounter-dce.ll
index b4914fe00fc33..0f9f177a78903 100644
--- a/llvm/test/Other/debugcounter-dce.ll
+++ b/llvm/test/Other/debugcounter-dce.ll
@@ -1,5 +1,5 @@
 ; REQUIRES: asserts
-; RUN: opt -dce -S -debug-counter=dce-transform-skip=1,dce-transform-count=2  < %s | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -dce -S -debug-counter=dce-transform-skip=1,dce-transform-count=2  < %s | FileCheck %s
 ;; Test that, with debug counters on, we will skip the first DCE opportunity, perform next 2,
 ;; and ignore all the others left.
 

diff  --git a/llvm/test/Other/debugcounter-newgvn.ll b/llvm/test/Other/debugcounter-newgvn.ll
index cfe043c8455ac..0d1b75f7d28b6 100644
--- a/llvm/test/Other/debugcounter-newgvn.ll
+++ b/llvm/test/Other/debugcounter-newgvn.ll
@@ -1,6 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
 ; REQUIRES: asserts
-; RUN: opt -S -debug-counter=newgvn-vn-skip=1,newgvn-vn-count=2 -newgvn  < %s 2>&1 | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -S -debug-counter=newgvn-vn-skip=1,newgvn-vn-count=2 -newgvn  < %s 2>&1 | FileCheck %s
 ;; Test that, with debug counters on, we don't value number the first instruction, only the second and third,
 ;; which means we do not discover the return is constant.
 define i32 @vntest() {

diff  --git a/llvm/test/Other/heat-colors-graphs.ll b/llvm/test/Other/heat-colors-graphs.ll
index b570a813c4099..2cb2ce6f01e3e 100644
--- a/llvm/test/Other/heat-colors-graphs.ll
+++ b/llvm/test/Other/heat-colors-graphs.ll
@@ -1,6 +1,6 @@
-; RUN: opt %s -dot-cfg -cfg-heat-colors -cfg-dot-filename-prefix=%t -disable-output
+; RUN: opt -temporarily-allow-old-pass-syntax %s -dot-cfg -cfg-heat-colors -cfg-dot-filename-prefix=%t -disable-output
 ; RUN: FileCheck %s -input-file=%t.f.dot --check-prefixes=CHECK-CFG,CHECK-BOTH
-; RUN: opt %s -dot-callgraph -callgraph-heat-colors -callgraph-dot-filename-prefix=%t -disable-output
+; RUN: opt -temporarily-allow-old-pass-syntax %s -dot-callgraph -callgraph-heat-colors -callgraph-dot-filename-prefix=%t -disable-output
 ; RUN: FileCheck %s -input-file=%t.callgraph.dot --check-prefix=CHECK-BOTH
 
 ; CHECK-BOTH: color="#[[#%x,]]", style={{[a-z]+}}, fillcolor="#[[#%x,]]"

diff  --git a/llvm/test/Other/heat-colors-multigraph.ll b/llvm/test/Other/heat-colors-multigraph.ll
index ff95572dc9c58..526af0498eb1d 100644
--- a/llvm/test/Other/heat-colors-multigraph.ll
+++ b/llvm/test/Other/heat-colors-multigraph.ll
@@ -1,6 +1,6 @@
-; RUN: opt %s -dot-callgraph -callgraph-multigraph -callgraph-dot-filename-prefix=%t -disable-output
+; RUN: opt -temporarily-allow-old-pass-syntax %s -dot-callgraph -callgraph-multigraph -callgraph-dot-filename-prefix=%t -disable-output
 ; RUN: FileCheck %s -input-file=%t.callgraph.dot --check-prefix=CHECK-MULTIGRAPH
-; RUN: opt %s -dot-callgraph -callgraph-dot-filename-prefix=%t -disable-output
+; RUN: opt -temporarily-allow-old-pass-syntax %s -dot-callgraph -callgraph-dot-filename-prefix=%t -disable-output
 ; RUN: FileCheck %s -input-file=%t.callgraph.dot --check-prefix=CHECK
 
 ; CHECK-MULTIGRAPH: {external caller}
@@ -13,4 +13,4 @@ define void @bar() {
 define void @foo() {
   call void @bar()
   ret void
-}
\ No newline at end of file
+}

diff  --git a/llvm/test/Other/module-pass-printer.ll b/llvm/test/Other/module-pass-printer.ll
index b43ef7d82d584..6bc209c518366 100644
--- a/llvm/test/Other/module-pass-printer.ll
+++ b/llvm/test/Other/module-pass-printer.ll
@@ -1,25 +1,25 @@
 ; Check pass name is only printed once.
 ; Check only one function is printed
-; RUN: opt < %s 2>&1 -forceattrs -disable-output -print-after-all -filter-print-funcs=foo | FileCheck %s  -check-prefix=FOO
-; RUN: opt < %s 2>&1 -passes=forceattrs -disable-output -print-after-all -filter-print-funcs=foo | FileCheck %s  -check-prefix=FOO
+; RUN: opt -temporarily-allow-old-pass-syntax < %s 2>&1 -forceattrs -disable-output -print-after-all -filter-print-funcs=foo | FileCheck %s  -check-prefix=FOO
+; RUN: opt -temporarily-allow-old-pass-syntax < %s 2>&1 -passes=forceattrs -disable-output -print-after-all -filter-print-funcs=foo | FileCheck %s  -check-prefix=FOO
 
 ; Check pass name is only printed once.
 ; Check both functions are printed
-; RUN: opt < %s 2>&1 -forceattrs -disable-output -print-after-all -filter-print-funcs=foo,bar | FileCheck %s -check-prefix=BOTH
-; RUN: opt < %s 2>&1 -passes=forceattrs -disable-output -print-after-all -filter-print-funcs=foo,bar | FileCheck %s -check-prefix=BOTH
+; RUN: opt -temporarily-allow-old-pass-syntax < %s 2>&1 -forceattrs -disable-output -print-after-all -filter-print-funcs=foo,bar | FileCheck %s -check-prefix=BOTH
+; RUN: opt -temporarily-allow-old-pass-syntax < %s 2>&1 -passes=forceattrs -disable-output -print-after-all -filter-print-funcs=foo,bar | FileCheck %s -check-prefix=BOTH
 
 ; Check pass name is not printed if a module/SCC doesn't include any function specified in -filter-print-funcs.
-; RUN: opt < %s 2>&1 -forceattrs -disable-output -print-after-all -filter-print-funcs=baz | FileCheck %s -allow-empty -check-prefix=EMPTY
-; RUN: opt < %s 2>&1 -passes=forceattrs -disable-output -print-after-all -filter-print-funcs=baz | FileCheck %s -allow-empty -check-prefix=EMPTY
-; RUN: opt < %s 2>&1 -passes=no-op-cgscc -disable-output -print-after-all -filter-print-funcs=baz | FileCheck %s -allow-empty -check-prefix=EMPTY
+; RUN: opt -temporarily-allow-old-pass-syntax < %s 2>&1 -forceattrs -disable-output -print-after-all -filter-print-funcs=baz | FileCheck %s -allow-empty -check-prefix=EMPTY
+; RUN: opt -temporarily-allow-old-pass-syntax < %s 2>&1 -passes=forceattrs -disable-output -print-after-all -filter-print-funcs=baz | FileCheck %s -allow-empty -check-prefix=EMPTY
+; RUN: opt -temporarily-allow-old-pass-syntax < %s 2>&1 -passes=no-op-cgscc -disable-output -print-after-all -filter-print-funcs=baz | FileCheck %s -allow-empty -check-prefix=EMPTY
 
 ; Check whole module is printed with user-specified wildcast switch -filter-print-funcs=* or -print-module-scope
-; RUN: opt < %s 2>&1 -forceattrs -disable-output -print-after-all | FileCheck %s -check-prefix=ALL
-; RUN: opt < %s 2>&1 -forceattrs -disable-output  -print-after-all -filter-print-funcs=* | FileCheck %s -check-prefix=ALL
-; RUN: opt < %s 2>&1 -forceattrs -disable-output -print-after-all -filter-print-funcs=foo -print-module-scope | FileCheck %s -check-prefix=ALL
-; RUN: opt < %s 2>&1 -passes=forceattrs -disable-output -print-after-all | FileCheck %s -check-prefix=ALL
-; RUN: opt < %s 2>&1 -passes=forceattrs -disable-output -print-after-all -filter-print-funcs=* | FileCheck %s -check-prefix=ALL
-; RUN: opt < %s 2>&1 -passes=forceattrs -disable-output -print-after-all -filter-print-funcs=foo -print-module-scope | FileCheck %s -check-prefix=ALL
+; RUN: opt -temporarily-allow-old-pass-syntax < %s 2>&1 -forceattrs -disable-output -print-after-all | FileCheck %s -check-prefix=ALL
+; RUN: opt -temporarily-allow-old-pass-syntax < %s 2>&1 -forceattrs -disable-output  -print-after-all -filter-print-funcs=* | FileCheck %s -check-prefix=ALL
+; RUN: opt -temporarily-allow-old-pass-syntax < %s 2>&1 -forceattrs -disable-output -print-after-all -filter-print-funcs=foo -print-module-scope | FileCheck %s -check-prefix=ALL
+; RUN: opt -temporarily-allow-old-pass-syntax < %s 2>&1 -passes=forceattrs -disable-output -print-after-all | FileCheck %s -check-prefix=ALL
+; RUN: opt -temporarily-allow-old-pass-syntax < %s 2>&1 -passes=forceattrs -disable-output -print-after-all -filter-print-funcs=* | FileCheck %s -check-prefix=ALL
+; RUN: opt -temporarily-allow-old-pass-syntax < %s 2>&1 -passes=forceattrs -disable-output -print-after-all -filter-print-funcs=foo -print-module-scope | FileCheck %s -check-prefix=ALL
 
 ; FOO:      IR Dump After {{Force set function attributes|ForceFunctionAttrsPass}}
 ; FOO:      define void @foo

diff  --git a/llvm/test/Other/opt-legacy-syntax-deprecation.ll b/llvm/test/Other/opt-legacy-syntax-deprecation.ll
index dd90c67609a25..c9d60bd739f70 100644
--- a/llvm/test/Other/opt-legacy-syntax-deprecation.ll
+++ b/llvm/test/Other/opt-legacy-syntax-deprecation.ll
@@ -1,11 +1,11 @@
 ; REQUIRES: x86-registered-target
 
-; RUN: opt /dev/null -disable-output 2>&1 | FileCheck %s --check-prefix=OK --allow-empty
-; RUN: opt /dev/null -disable-output -passes=instcombine 2>&1 | FileCheck %s --check-prefix=OK --allow-empty
-; RUN: opt /dev/null -disable-output -instcombine 2>&1 | FileCheck %s --check-prefix=WARN
-; RUN: opt /dev/null -disable-output -instcombine -globaldce 2>&1 | FileCheck %s --check-prefix=WARN
-; RUN: opt /dev/null -disable-output -instcombine -enable-new-pm=0 2>&1 | FileCheck %s --check-prefix=OK --allow-empty
-; RUN: opt /dev/null -disable-output -codegenprepare -mtriple=x86_64-unknown-linux-gnu 2>&1 | FileCheck %s --check-prefix=OK --allow-empty
+; RUN: opt -temporarily-allow-old-pass-syntax /dev/null -disable-output 2>&1 | FileCheck %s --check-prefix=OK --allow-empty
+; RUN: opt -temporarily-allow-old-pass-syntax /dev/null -disable-output -passes=instcombine 2>&1 | FileCheck %s --check-prefix=OK --allow-empty
+; RUN: opt -temporarily-allow-old-pass-syntax /dev/null -disable-output -instcombine 2>&1 | FileCheck %s --check-prefix=WARN
+; RUN: opt -temporarily-allow-old-pass-syntax /dev/null -disable-output -instcombine -globaldce 2>&1 | FileCheck %s --check-prefix=WARN
+; RUN: opt -temporarily-allow-old-pass-syntax /dev/null -disable-output -instcombine -enable-new-pm=0 2>&1 | FileCheck %s --check-prefix=OK --allow-empty
+; RUN: opt -temporarily-allow-old-pass-syntax /dev/null -disable-output -codegenprepare -mtriple=x86_64-unknown-linux-gnu 2>&1 | FileCheck %s --check-prefix=OK --allow-empty
 
 ; OK-NOT: deprecated
 

diff  --git a/llvm/test/Other/optimization-remarks-inline.ll b/llvm/test/Other/optimization-remarks-inline.ll
index 1ba993126c9a3..9e9cd3ac07801 100644
--- a/llvm/test/Other/optimization-remarks-inline.ll
+++ b/llvm/test/Other/optimization-remarks-inline.ll
@@ -1,16 +1,16 @@
-; RUN: opt < %s -inline -pass-remarks='inline' -S 2>&1 | FileCheck %s
-; RUN: opt < %s -inline -pass-remarks='inl.*' -S 2>&1 | FileCheck %s
-; RUN: opt < %s -inline -pass-remarks='vector' -pass-remarks='inl' -S 2>&1 | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -inline -pass-remarks='inline' -S 2>&1 | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -inline -pass-remarks='inl.*' -S 2>&1 | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -inline -pass-remarks='vector' -pass-remarks='inl' -S 2>&1 | FileCheck %s
 
 ; These two should not yield an inline remark for the same reason.
 ; In the first command, we only ask for vectorizer remarks, in the
 ; second one we ask for the inliner, but we then ask for the vectorizer
 ; (thus overriding the first flag).
-; RUN: opt < %s -inline -pass-remarks='vector' -S 2>&1 | FileCheck --check-prefix=REMARKS %s
-; RUN: opt < %s -inline -pass-remarks='inl' -pass-remarks='vector' -S 2>&1 | FileCheck --check-prefix=REMARKS %s
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -inline -pass-remarks='vector' -S 2>&1 | FileCheck --check-prefix=REMARKS %s
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -inline -pass-remarks='inl' -pass-remarks='vector' -S 2>&1 | FileCheck --check-prefix=REMARKS %s
 
-; RUN: opt < %s -inline -S 2>&1 | FileCheck --check-prefix=REMARKS %s
-; RUN: not opt < %s -pass-remarks='(' 2>&1 | FileCheck --check-prefix=BAD-REGEXP %s
+; RUN: opt -temporarily-allow-old-pass-syntax < %s -inline -S 2>&1 | FileCheck --check-prefix=REMARKS %s
+; RUN: not opt -temporarily-allow-old-pass-syntax < %s -pass-remarks='(' 2>&1 | FileCheck --check-prefix=BAD-REGEXP %s
 
 define i32 @foo(i32 %x, i32 %y) #0 {
 entry:

diff  --git a/llvm/test/Other/pr32085.ll b/llvm/test/Other/pr32085.ll
index 3676ea8e11713..d3fd75d7ec9de 100644
--- a/llvm/test/Other/pr32085.ll
+++ b/llvm/test/Other/pr32085.ll
@@ -1,6 +1,6 @@
-; RUN: opt -S -O1 < %s -o %t1.ll
-; RUN: opt -S < %t1.ll -o %t2.ll
-; RUN: opt -S -simplifycfg < %t1.ll -o %t3.ll
+; RUN: opt -temporarily-allow-old-pass-syntax -S -O1 < %s -o %t1.ll
+; RUN: opt -temporarily-allow-old-pass-syntax -S < %t1.ll -o %t2.ll
+; RUN: opt -temporarily-allow-old-pass-syntax -S -simplifycfg < %t1.ll -o %t3.ll
 ;; Show that there's no 
diff erence after running another simplify CFG
 ; RUN: 
diff  %t2.ll %t3.ll
 

diff  --git a/llvm/test/Other/print-debug-counter.ll b/llvm/test/Other/print-debug-counter.ll
index 846817add4b84..4ab1bb65fc577 100644
--- a/llvm/test/Other/print-debug-counter.ll
+++ b/llvm/test/Other/print-debug-counter.ll
@@ -1,6 +1,6 @@
 ; REQUIRES: asserts
 
-; RUN: opt -S -debug-counter=early-cse-skip=1,early-cse-count=1 -early-cse -earlycse-debug-hash \
+; RUN: opt -temporarily-allow-old-pass-syntax -S -debug-counter=early-cse-skip=1,early-cse-count=1 -early-cse -earlycse-debug-hash \
 ; RUN:        -debug-counter=newgvn-vn-skip=1,newgvn-vn-count=2 -newgvn \
 ; RUN:        -instcombine -print-debug-counter < %s 2>&1 | FileCheck %s
 ;; Test debug counter prints correct info in right order.

diff  --git a/llvm/test/Other/scalable-vector-struct-intrinsic.ll b/llvm/test/Other/scalable-vector-struct-intrinsic.ll
index 5d98a83756e2f..e187c8e63278e 100644
--- a/llvm/test/Other/scalable-vector-struct-intrinsic.ll
+++ b/llvm/test/Other/scalable-vector-struct-intrinsic.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -verify < %s 2>&1 | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -S -verify < %s 2>&1 | FileCheck %s
 
 ; Make sure we allow scalable vectors in structs for returning multiple
 ; values from intrinsics.

diff  --git a/llvm/test/Other/scalable-vectors-core-ir.ll b/llvm/test/Other/scalable-vectors-core-ir.ll
index f04184a417666..c9842c34476c7 100644
--- a/llvm/test/Other/scalable-vectors-core-ir.ll
+++ b/llvm/test/Other/scalable-vectors-core-ir.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -verify < %s | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -S -verify < %s | FileCheck %s
 target datalayout = "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128"
 target triple = "aarch64--linux-gnu"
 

diff  --git a/llvm/test/Transforms/HardwareLoops/ARM/structure.ll b/llvm/test/Transforms/HardwareLoops/ARM/structure.ll
index 8c9ea6c146b4b..e2cf2d3cfc350 100644
--- a/llvm/test/Transforms/HardwareLoops/ARM/structure.ll
+++ b/llvm/test/Transforms/HardwareLoops/ARM/structure.ll
@@ -1,8 +1,8 @@
-; RUN: opt -mtriple=thumbv8.1m.main-none-none-eabi -hardware-loops %s -S -o - | \
+; RUN: opt -temporarily-allow-old-pass-syntax -mtriple=thumbv8.1m.main-none-none-eabi -hardware-loops %s -S -o - | \
 ; RUN:     FileCheck %s
-; RUN: opt -mtriple=thumbv8.1m.main -loop-unroll -unroll-remainder=false -S < %s | \
+; RUN: opt -temporarily-allow-old-pass-syntax -mtriple=thumbv8.1m.main -loop-unroll -unroll-remainder=false -S < %s | \
 ; RUN:     llc -mtriple=thumbv8.1m.main | FileCheck %s --check-prefix=CHECK-UNROLL
-; RUN: opt -mtriple=thumbv8.1m.main-none-none-eabi -hardware-loops \
+; RUN: opt -temporarily-allow-old-pass-syntax -mtriple=thumbv8.1m.main-none-none-eabi -hardware-loops \
 ; RUN:     -pass-remarks-analysis=hardware-loops  %s -S -o - 2>&1 | \
 ; RUN:     FileCheck %s --check-prefix=CHECK-REMARKS
 

diff  --git a/llvm/test/Transforms/LoadStoreVectorizer/X86/codegenprepare-produced-address-math.ll b/llvm/test/Transforms/LoadStoreVectorizer/X86/codegenprepare-produced-address-math.ll
index 01606a2f2a5e4..76580ff0da23a 100644
--- a/llvm/test/Transforms/LoadStoreVectorizer/X86/codegenprepare-produced-address-math.ll
+++ b/llvm/test/Transforms/LoadStoreVectorizer/X86/codegenprepare-produced-address-math.ll
@@ -1,6 +1,6 @@
-; RUN: opt -codegenprepare -load-store-vectorizer %s -S -o - | FileCheck %s
-; RUN: opt                 -load-store-vectorizer %s -S -o - | FileCheck %s
-; RUN: opt -aa-pipeline=basic-aa -passes='function(load-store-vectorizer)' %s -S -o - | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -codegenprepare -load-store-vectorizer %s -S -o - | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax                 -load-store-vectorizer %s -S -o - | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -aa-pipeline=basic-aa -passes='function(load-store-vectorizer)' %s -S -o - | FileCheck %s
 
 target triple = "x86_64--"
 

diff  --git a/llvm/test/Verifier/dbg-invalid-vector.ll b/llvm/test/Verifier/dbg-invalid-vector.ll
index 84f13f329957e..0f5156ae5b357 100644
--- a/llvm/test/Verifier/dbg-invalid-vector.ll
+++ b/llvm/test/Verifier/dbg-invalid-vector.ll
@@ -1,4 +1,4 @@
-; RUN: opt -verify -disable-output <%s 2>&1 | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -verify -disable-output <%s 2>&1 | FileCheck %s
 ;
 ; This test creates an invalid vector by defining multiple elements for the
 ; vector's DICompositeType definition.  A vector should only have one element

diff  --git a/llvm/test/Verifier/di-subroutine-localvar.ll b/llvm/test/Verifier/di-subroutine-localvar.ll
index 477e63362127f..76d6412f430b3 100644
--- a/llvm/test/Verifier/di-subroutine-localvar.ll
+++ b/llvm/test/Verifier/di-subroutine-localvar.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -verify 2>&1 | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax %s -verify 2>&1 | FileCheck %s
 ; CHECK: invalid type
 ; CHECK: !20 = !DILocalVariable(name: "f", scope: !21, file: !13, line: 970, type: !14)
 ; CHECK: !14 = !DISubroutineType(types: !15)

diff  --git a/llvm/test/Verifier/fp-intrinsics.ll b/llvm/test/Verifier/fp-intrinsics.ll
index 670acc58550e8..b3257e4214ac3 100644
--- a/llvm/test/Verifier/fp-intrinsics.ll
+++ b/llvm/test/Verifier/fp-intrinsics.ll
@@ -1,8 +1,8 @@
-; RUN: opt -verify -S < %s 2>&1 | FileCheck --check-prefix=CHECK1 %s
-; RUN: sed -e s/.T2:// %s | not opt -verify -disable-output 2>&1 | FileCheck --check-prefix=CHECK2 %s
-; RUN: sed -e s/.T3:// %s | not opt -verify -disable-output 2>&1 | FileCheck --check-prefix=CHECK3 %s
-; RUN: sed -e s/.T4:// %s | not opt -verify -disable-output 2>&1 | FileCheck --check-prefix=CHECK4 %s
-; RUN: sed -e s/.T5:// %s | not opt -verify -disable-output 2>&1 | FileCheck --check-prefix=CHECK5 %s
+; RUN: opt -temporarily-allow-old-pass-syntax -verify -S < %s 2>&1 | FileCheck --check-prefix=CHECK1 %s
+; RUN: sed -e s/.T2:// %s | not opt -temporarily-allow-old-pass-syntax -verify -disable-output 2>&1 | FileCheck --check-prefix=CHECK2 %s
+; RUN: sed -e s/.T3:// %s | not opt -temporarily-allow-old-pass-syntax -verify -disable-output 2>&1 | FileCheck --check-prefix=CHECK3 %s
+; RUN: sed -e s/.T4:// %s | not opt -temporarily-allow-old-pass-syntax -verify -disable-output 2>&1 | FileCheck --check-prefix=CHECK4 %s
+; RUN: sed -e s/.T5:// %s | not opt -temporarily-allow-old-pass-syntax -verify -disable-output 2>&1 | FileCheck --check-prefix=CHECK5 %s
 
 ; Common declarations used for all runs.
 declare double @llvm.experimental.constrained.fadd.f64(double, double, metadata, metadata)

diff  --git a/llvm/test/Verifier/non-integral-pointers.ll b/llvm/test/Verifier/non-integral-pointers.ll
index c98b2407f2dfd..29b57b489d780 100644
--- a/llvm/test/Verifier/non-integral-pointers.ll
+++ b/llvm/test/Verifier/non-integral-pointers.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -verify -S < %s 2>&1 | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -verify -S < %s 2>&1 | FileCheck %s
 
 target datalayout = "e-ni:4:6"
 

diff  --git a/llvm/test/Verifier/preallocated-valid.ll b/llvm/test/Verifier/preallocated-valid.ll
index bbb663b94ebf7..09bd7467b0774 100644
--- a/llvm/test/Verifier/preallocated-valid.ll
+++ b/llvm/test/Verifier/preallocated-valid.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S %s -verify
+; RUN: opt -temporarily-allow-old-pass-syntax -S %s -verify
 
 declare token @llvm.call.preallocated.setup(i32)
 declare i8* @llvm.call.preallocated.arg(token, i32)

diff  --git a/llvm/test/Verifier/recursive-struct-param.ll b/llvm/test/Verifier/recursive-struct-param.ll
index 4b280a010f037..57b49aba6619c 100644
--- a/llvm/test/Verifier/recursive-struct-param.ll
+++ b/llvm/test/Verifier/recursive-struct-param.ll
@@ -1,4 +1,4 @@
-; RUN: opt -verify < %s
+; RUN: opt -temporarily-allow-old-pass-syntax -verify < %s
 
 %struct.__sFILE = type { %struct.__sFILE }
 

diff  --git a/llvm/test/Verifier/statepoint.ll b/llvm/test/Verifier/statepoint.ll
index e3b6a3bb6f221..1b91aeeba7433 100644
--- a/llvm/test/Verifier/statepoint.ll
+++ b/llvm/test/Verifier/statepoint.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S %s -verify | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -S %s -verify | FileCheck %s
 
 declare void @use(...)
 declare i8 addrspace(1)* @llvm.experimental.gc.relocate.p1i8(token, i32, i32)

diff  --git a/llvm/test/Verifier/swifttailcc-musttail-valid.ll b/llvm/test/Verifier/swifttailcc-musttail-valid.ll
index f4042359ae184..916d2ca8e1a05 100644
--- a/llvm/test/Verifier/swifttailcc-musttail-valid.ll
+++ b/llvm/test/Verifier/swifttailcc-musttail-valid.ll
@@ -1,4 +1,4 @@
-; RUN: opt -verify %s
+; RUN: opt -temporarily-allow-old-pass-syntax -verify %s
 
 define swifttailcc void @valid_attrs(i64* sret(i64) %ret, i8* byval(i8) %byval, i8* swiftself %self, i8* swiftasync %ctx) {
   musttail call swifttailcc void @valid_attrs(i64* sret(i64) %ret, i8* byval(i8) %byval, i8* swiftself %self, i8* swiftasync %ctx)

diff  --git a/llvm/test/Verifier/tbaa.ll b/llvm/test/Verifier/tbaa.ll
index b1ba5a73a9db5..128c96046fbd0 100644
--- a/llvm/test/Verifier/tbaa.ll
+++ b/llvm/test/Verifier/tbaa.ll
@@ -1,5 +1,5 @@
 ; RUN: not llvm-as < %s 2>&1 | FileCheck %s
-; RUN: llvm-as -disable-verify < %s | opt -verify -S | FileCheck %s  --check-prefix=STRIP
+; RUN: llvm-as -disable-verify < %s | opt -temporarily-allow-old-pass-syntax -verify -S | FileCheck %s  --check-prefix=STRIP
 
 ; STRIP-NOT: tbaa
 ; STRIP: @f_0

diff  --git a/llvm/test/Verifier/vp-intrinsics.ll b/llvm/test/Verifier/vp-intrinsics.ll
index 4f272af5655a3..0621bd0ea060e 100644
--- a/llvm/test/Verifier/vp-intrinsics.ll
+++ b/llvm/test/Verifier/vp-intrinsics.ll
@@ -1,4 +1,4 @@
-; RUN: opt --verify --disable-output %s
+; RUN: opt -temporarily-allow-old-pass-syntax --verify --disable-output %s
 
 define void @test_vp_int(<8 x i32> %i0, <8 x i32> %i1, <8 x i1> %m, i32 %n) {
   %r0 = call <8 x i32> @llvm.vp.add.v8i32(<8 x i32> %i0, <8 x i32> %i1, <8 x i1> %m, i32 %n)
@@ -11,8 +11,8 @@ define void @test_vp_int(<8 x i32> %i0, <8 x i32> %i1, <8 x i1> %m, i32 %n) {
   %r7 = call <8 x i32> @llvm.vp.and.v8i32(<8 x i32> %i0, <8 x i32> %i1, <8 x i1> %m, i32 %n)
   %r8 = call <8 x i32> @llvm.vp.or.v8i32(<8 x i32> %i0, <8 x i32> %i1, <8 x i1> %m, i32 %n)
   %r9 = call <8 x i32> @llvm.vp.xor.v8i32(<8 x i32> %i0, <8 x i32> %i1, <8 x i1> %m, i32 %n)
-  %rA = call <8 x i32> @llvm.vp.ashr.v8i32(<8 x i32> %i0, <8 x i32> %i1, <8 x i1> %m, i32 %n) 
-  %rB = call <8 x i32> @llvm.vp.lshr.v8i32(<8 x i32> %i0, <8 x i32> %i1, <8 x i1> %m, i32 %n) 
+  %rA = call <8 x i32> @llvm.vp.ashr.v8i32(<8 x i32> %i0, <8 x i32> %i1, <8 x i1> %m, i32 %n)
+  %rB = call <8 x i32> @llvm.vp.lshr.v8i32(<8 x i32> %i0, <8 x i32> %i1, <8 x i1> %m, i32 %n)
   %rC = call <8 x i32> @llvm.vp.shl.v8i32(<8 x i32> %i0, <8 x i32> %i1, <8 x i1> %m, i32 %n)
   ret void
 }
@@ -90,8 +90,8 @@ declare <8 x i32> @llvm.vp.urem.v8i32(<8 x i32>, <8 x i32>, <8 x i1>, i32)
 declare <8 x i32> @llvm.vp.and.v8i32(<8 x i32>, <8 x i32>, <8 x i1>, i32)
 declare <8 x i32> @llvm.vp.or.v8i32(<8 x i32>, <8 x i32>, <8 x i1>, i32)
 declare <8 x i32> @llvm.vp.xor.v8i32(<8 x i32>, <8 x i32>, <8 x i1>, i32)
-declare <8 x i32> @llvm.vp.ashr.v8i32(<8 x i32>, <8 x i32>, <8 x i1>, i32) 
-declare <8 x i32> @llvm.vp.lshr.v8i32(<8 x i32>, <8 x i32>, <8 x i1>, i32) 
+declare <8 x i32> @llvm.vp.ashr.v8i32(<8 x i32>, <8 x i32>, <8 x i1>, i32)
+declare <8 x i32> @llvm.vp.lshr.v8i32(<8 x i32>, <8 x i32>, <8 x i1>, i32)
 declare <8 x i32> @llvm.vp.shl.v8i32(<8 x i32>, <8 x i32>, <8 x i1>, i32)
 ; fp arith
 declare <8 x double> @llvm.vp.fadd.v8f64(<8 x double>, <8 x double>, <8 x i1>, i32)

diff  --git a/llvm/test/Verifier/weak-dllimport.ll b/llvm/test/Verifier/weak-dllimport.ll
index c7b6ed977b100..49bc1cae11de7 100644
--- a/llvm/test/Verifier/weak-dllimport.ll
+++ b/llvm/test/Verifier/weak-dllimport.ll
@@ -1,4 +1,4 @@
-; RUN: opt -verify < %s 2>&1 | FileCheck %s
+; RUN: opt -temporarily-allow-old-pass-syntax -verify < %s 2>&1 | FileCheck %s
 ; CHECK-NOT: Global is marked as dllimport, but not external
 
 target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"

diff  --git a/llvm/test/tools/UpdateTestChecks/update_analyze_test_checks/Inputs/x86-loopvectorize-costmodel.ll b/llvm/test/tools/UpdateTestChecks/update_analyze_test_checks/Inputs/x86-loopvectorize-costmodel.ll
index 5fcaf3dd1a40f..506516bf8a81a 100644
--- a/llvm/test/tools/UpdateTestChecks/update_analyze_test_checks/Inputs/x86-loopvectorize-costmodel.ll
+++ b/llvm/test/tools/UpdateTestChecks/update_analyze_test_checks/Inputs/x86-loopvectorize-costmodel.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_analyze_test_checks.py UTC_ARGS: --filter "LV: Found an estimated cost of [0-9]+ for VF [0-9]+ For instruction:\s*%v0 = load float, float\* %in0, align 4"
-; RUN: opt -loop-vectorize -vectorizer-maximize-bandwidth -S -mattr=+avx512bw --debug-only=loop-vectorize < %s 2>&1 | FileCheck %s --check-prefixes=CHECK,AVX512
+; RUN: opt -temporarily-allow-old-pass-syntax -loop-vectorize -vectorizer-maximize-bandwidth -S -mattr=+avx512bw --debug-only=loop-vectorize < %s 2>&1 | FileCheck %s --check-prefixes=CHECK,AVX512
 ; REQUIRES: asserts
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"

diff  --git a/llvm/test/tools/UpdateTestChecks/update_analyze_test_checks/Inputs/x86-loopvectorize-costmodel.ll.expected b/llvm/test/tools/UpdateTestChecks/update_analyze_test_checks/Inputs/x86-loopvectorize-costmodel.ll.expected
index ee9cc062ba308..47b34a00ae49e 100644
--- a/llvm/test/tools/UpdateTestChecks/update_analyze_test_checks/Inputs/x86-loopvectorize-costmodel.ll.expected
+++ b/llvm/test/tools/UpdateTestChecks/update_analyze_test_checks/Inputs/x86-loopvectorize-costmodel.ll.expected
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_analyze_test_checks.py UTC_ARGS: --filter "LV: Found an estimated cost of [0-9]+ for VF [0-9]+ For instruction:\s*%v0 = load float, float\* %in0, align 4"
-; RUN: opt -loop-vectorize -vectorizer-maximize-bandwidth -S -mattr=+avx512bw --debug-only=loop-vectorize < %s 2>&1 | FileCheck %s --check-prefixes=CHECK,AVX512
+; RUN: opt -temporarily-allow-old-pass-syntax -loop-vectorize -vectorizer-maximize-bandwidth -S -mattr=+avx512bw --debug-only=loop-vectorize < %s 2>&1 | FileCheck %s --check-prefixes=CHECK,AVX512
 ; REQUIRES: asserts
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"

diff  --git a/llvm/test/tools/llvm-reduce/remove-function-bodies-comdat.ll b/llvm/test/tools/llvm-reduce/remove-function-bodies-comdat.ll
index b76f439b7425c..e0759ca7128d1 100644
--- a/llvm/test/tools/llvm-reduce/remove-function-bodies-comdat.ll
+++ b/llvm/test/tools/llvm-reduce/remove-function-bodies-comdat.ll
@@ -1,6 +1,6 @@
 ; RUN: llvm-reduce --test FileCheck --test-arg --check-prefixes=CHECK-ALL,CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t
 ; RUN: cat %t | FileCheck --check-prefixes=CHECK-ALL,CHECK-FINAL %s
-; RUN: opt -verify %t
+; RUN: opt -temporarily-allow-old-pass-syntax -verify %t
 
 ; CHECK-FINAL-NOT: = comdat
 ; CHECK-INTERESTINGNESS: @callee(

diff  --git a/llvm/tools/opt/opt.cpp b/llvm/tools/opt/opt.cpp
index a90469c766eb6..9a7b63f87822e 100644
--- a/llvm/tools/opt/opt.cpp
+++ b/llvm/tools/opt/opt.cpp
@@ -87,6 +87,12 @@ static cl::opt<std::string> PassPipeline(
 static cl::alias PassPipeline2("p", cl::aliasopt(PassPipeline),
                                    cl::desc("Alias for -passes"));
 
+static cl::opt<bool> TemporarilyAllowOldPassesSyntax(
+    "temporarily-allow-old-pass-syntax",
+    cl::desc("Do not use in new tests. To be removed once all tests have "
+             "migrated."),
+    cl::init(false));
+
 static cl::opt<bool> PrintPasses("print-passes",
                                  cl::desc("Print available passes that can be "
                                           "specified in -passes=foo and exit"));
@@ -678,6 +684,8 @@ int main(int argc, char **argv) {
                 "alias for a more concise version).\n";
       errs() << "See https://llvm.org/docs/NewPassManager.html#invoking-opt "
                 "for more details on the pass pipeline syntax.\n\n";
+      if (!TemporarilyAllowOldPassesSyntax)
+        return 1;
     }
     std::string Pipeline = PassPipeline;
 


        


More information about the cfe-commits mailing list