From 34c4fae4b296038bbfda5b37c4eb06d5a2c0650b Mon Sep 17 00:00:00 2001
From: Roman Lebedev <lebedev.ri@gmail.com>
Date: Fri, 9 Dec 2022 00:51:45 +0300
Subject: [PATCH] [NFC] Port all Other tests to `-passes=` syntax

---
 llvm/test/Other/2002-02-24-InlineBrokePHINodes.ll  |  2 +-
 llvm/test/Other/2007-09-10-PassManager.ll          |  2 +-
 llvm/test/Other/2008-02-14-PassManager.ll          |  2 +-
 llvm/test/Other/2008-06-04-FieldSizeInPacked.ll    |  2 +-
 llvm/test/Other/2008-10-06-RemoveDeadPass.ll       |  2 +-
 llvm/test/Other/2009-06-05-no-implicit-float.ll    |  2 +-
 llvm/test/Other/X86/debugcounter-divrempairs.ll    |  2 +-
 .../X86/debugcounter-partiallyinlinelibcalls.ll    |  4 ++--
 .../Other/cfg-printer-branch-weights-percent.ll    |  2 +-
 llvm/test/Other/cfg-printer-branch-weights.ll      |  2 +-
 llvm/test/Other/cfg-printer-filter.ll              |  4 ++--
 llvm/test/Other/cfg_deopt_unreach.ll               |  8 +++----
 llvm/test/Other/constant-fold-gep.ll               | 12 +++++-----
 llvm/test/Other/copy-metadata-of-declaration.ll    |  2 +-
 llvm/test/Other/debugcounter-dce.ll                |  2 +-
 llvm/test/Other/debugcounter-newgvn.ll             |  2 +-
 llvm/test/Other/heat-colors-graphs.ll              |  4 ++--
 llvm/test/Other/heat-colors-multigraph.ll          |  4 ++--
 llvm/test/Other/module-pass-printer.ll             | 26 +++++++++++-----------
 llvm/test/Other/optimization-remarks-inline.ll     | 14 ++++++------
 llvm/test/Other/pr32085.ll                         |  6 ++---
 llvm/test/Other/print-debug-counter.ll             |  6 ++---
 .../test/Other/scalable-vector-struct-intrinsic.ll |  2 +-
 llvm/test/Other/scalable-vectors-core-ir.ll        |  2 +-
 24 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/llvm/test/Other/2002-02-24-InlineBrokePHINodes.ll b/llvm/test/Other/2002-02-24-InlineBrokePHINodes.ll
index 8922386..064bccd 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 -temporarily-allow-old-pass-syntax < %s -inline
+; RUN: opt < %s -passes='cgscc(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 ba849ae..bff11ee 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 -temporarily-allow-old-pass-syntax < %s -simple-loop-unswitch -indvars -disable-output
+; RUN: opt < %s -passes=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 c69336e..1a6284e 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 -temporarily-allow-old-pass-syntax < %s -loop-unroll -loop-rotate -simplifycfg -disable-output
+; RUN: opt < %s -passes=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 09ea8be1..735cc2e 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 -temporarily-allow-old-pass-syntax < %s -instcombine -S | grep true
+; RUN: opt < %s -passes=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 68582da..aecdbce 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 -temporarily-allow-old-pass-syntax < %s -inline -internalize -disable-output
+; RUN: opt < %s -passes='cgscc(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 50a7daa..47e37ab 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 -temporarily-allow-old-pass-syntax < %s -verify -S | grep noimplicitfloat
+; RUN: opt < %s -passes=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 3282852..ed4b47a 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 -temporarily-allow-old-pass-syntax < %s -div-rem-pairs -debug-counter=div-rem-pairs-transform-skip=1,div-rem-pairs-transform-count=1 \
+; RUN: opt < %s -passes=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,
diff --git a/llvm/test/Other/X86/debugcounter-partiallyinlinelibcalls.ll b/llvm/test/Other/X86/debugcounter-partiallyinlinelibcalls.ll
index 0c2cc2e..5fdb3c2 100644
--- a/llvm/test/Other/X86/debugcounter-partiallyinlinelibcalls.ll
+++ b/llvm/test/Other/X86/debugcounter-partiallyinlinelibcalls.ll
@@ -1,6 +1,6 @@
 ; REQUIRES: asserts
-; 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
+; RUN: opt -S -debug-counter=partially-inline-libcalls-transform-skip=1,partially-inline-libcalls-transform-count=1 \
+; RUN:     -passes=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 23c3d6c..795c2ff 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 -temporarily-allow-old-pass-syntax < %s -dot-cfg -cfg-weights -cfg-dot-filename-prefix=%t 2>/dev/null > /dev/null
+;RUN: opt < %s -passes=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 008a6af..c8d57ec 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 -temporarily-allow-old-pass-syntax < %s -dot-cfg -cfg-weights -cfg-raw-weights -cfg-dot-filename-prefix=%t 2>/dev/null > /dev/null
+;RUN: opt < %s -passes=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 e780430..4ec6b73 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 -temporarily-allow-old-pass-syntax < %s -dot-cfg -cfg-dot-filename-prefix=%t -cfg-func-name=f 2>/dev/null > /dev/null
+; RUN: opt < %s -passes=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 -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: opt < %s -passes=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 af0d61f..d001b7f 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 -temporarily-allow-old-pass-syntax < %s -dot-cfg -cfg-hide-unreachable-paths -cfg-dot-filename-prefix=%t/unreach 2>/dev/null > /dev/null
+; RUN: opt < %s -passes=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 -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: opt < %s -passes=dot-cfg -cfg-hide-deoptimize-paths -cfg-dot-filename-prefix=%t/deopt 2>/dev/null > /dev/null
 ; RUN: FileCheck %s -input-file=%t/deopt.callee.dot -check-prefix=DEOPT
-; RUN: opt -temporarily-allow-old-pass-syntax < %s -dot-cfg -cfg-dot-filename-prefix=%t/no-flags 2>/dev/null > /dev/null
+; RUN: opt < %s -passes=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 -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: opt < %s -passes=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 6aee66b..616fadb 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 -temporarily-allow-old-pass-syntax -S -o - < %s | FileCheck --check-prefix=PLAIN %s
+; RUN: opt -S -o - < %s | FileCheck --check-prefix=PLAIN %s
 
 ; "OPT" - Optimizations but no targetdata. This tests default target layout
 ; folding in the optimizers.
-; RUN: opt -temporarily-allow-old-pass-syntax -S -o - -instcombine -globalopt -temporarily-allow-old-pass-syntax < %s | FileCheck --check-prefix=OPT %s
+; RUN: opt -S -o - -passes='function(instcombine),globalopt' < %s | FileCheck --check-prefix=OPT %s
 
 ; "TO" - Optimizations and targetdata. This tests target-dependent
 ; folding in the optimizers.
-; 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
+; RUN: opt -S -o - -passes='function(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
 
 ; "SCEV" - ScalarEvolution with default target layout
-; RUN: opt -temporarily-allow-old-pass-syntax -passes='print<scalar-evolution>' < %s -disable-output 2>&1 | FileCheck --check-prefix=SCEV %s
+; RUN: opt -passes='print<scalar-evolution>' < %s -disable-output 2>&1 | FileCheck --check-prefix=SCEV %s
 
 
-; The automatic constant folder in opt -temporarily-allow-old-pass-syntax does not have targetdata access, so
+; The automatic constant folder in opt does not have targetdata access, so
 ; it can't fold gep arithmetic, in general. However, the constant folder run
-; from instcombine and global opt -temporarily-allow-old-pass-syntax can use targetdata.
+; from instcombine and global opt 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 97e6b5e..de127af 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 -temporarily-allow-old-pass-syntax -run-twice -verify -S -o - %s | FileCheck %s
+; RUN: opt -run-twice -passes=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 0f9f177..7530214 100644
--- a/llvm/test/Other/debugcounter-dce.ll
+++ b/llvm/test/Other/debugcounter-dce.ll
@@ -1,5 +1,5 @@
 ; REQUIRES: asserts
-; RUN: opt -temporarily-allow-old-pass-syntax -dce -S -debug-counter=dce-transform-skip=1,dce-transform-count=2  < %s | FileCheck %s
+; RUN: opt -passes=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 0d1b75f..6ebca60 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 -temporarily-allow-old-pass-syntax -S -debug-counter=newgvn-vn-skip=1,newgvn-vn-count=2 -newgvn  < %s 2>&1 | FileCheck %s
+; RUN: opt -S -debug-counter=newgvn-vn-skip=1,newgvn-vn-count=2 -passes=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 2cb2ce6..38007b1 100644
--- a/llvm/test/Other/heat-colors-graphs.ll
+++ b/llvm/test/Other/heat-colors-graphs.ll
@@ -1,6 +1,6 @@
-; RUN: opt -temporarily-allow-old-pass-syntax %s -dot-cfg -cfg-heat-colors -cfg-dot-filename-prefix=%t -disable-output
+; RUN: opt %s -passes=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 -temporarily-allow-old-pass-syntax %s -dot-callgraph -callgraph-heat-colors -callgraph-dot-filename-prefix=%t -disable-output
+; RUN: opt %s -passes=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 526af04..deb900b 100644
--- a/llvm/test/Other/heat-colors-multigraph.ll
+++ b/llvm/test/Other/heat-colors-multigraph.ll
@@ -1,6 +1,6 @@
-; RUN: opt -temporarily-allow-old-pass-syntax %s -dot-callgraph -callgraph-multigraph -callgraph-dot-filename-prefix=%t -disable-output
+; RUN: opt %s -passes=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 -temporarily-allow-old-pass-syntax %s -dot-callgraph -callgraph-dot-filename-prefix=%t -disable-output
+; RUN: opt %s -passes=dot-callgraph -callgraph-dot-filename-prefix=%t -disable-output
 ; RUN: FileCheck %s -input-file=%t.callgraph.dot --check-prefix=CHECK
 
 ; CHECK-MULTIGRAPH: {external caller}
diff --git a/llvm/test/Other/module-pass-printer.ll b/llvm/test/Other/module-pass-printer.ll
index 6bc209c..b44fc4c 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 -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
+; RUN: opt < %s 2>&1 -passes=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
 
 ; Check pass name is only printed once.
 ; Check both functions are printed
-; 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
+; RUN: opt < %s 2>&1 -passes=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
 
 ; Check pass name is not printed if a module/SCC doesn't include any function specified in -filter-print-funcs.
-; 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
+; 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=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
 
 ; Check whole module is printed with user-specified wildcast switch -filter-print-funcs=* or -print-module-scope
-; 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
+; 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 < %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
 
 ; FOO:      IR Dump After {{Force set function attributes|ForceFunctionAttrsPass}}
 ; FOO:      define void @foo
diff --git a/llvm/test/Other/optimization-remarks-inline.ll b/llvm/test/Other/optimization-remarks-inline.ll
index 9e9cd3a..129f414 100644
--- a/llvm/test/Other/optimization-remarks-inline.ll
+++ b/llvm/test/Other/optimization-remarks-inline.ll
@@ -1,16 +1,16 @@
-; 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
+; RUN: opt < %s -passes='cgscc(inline)' -pass-remarks='inline' -S 2>&1 | FileCheck %s
+; RUN: opt < %s -passes='cgscc(inline)' -pass-remarks='inl.*' -S 2>&1 | FileCheck %s
+; RUN: opt < %s -passes='cgscc(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 -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 -passes='cgscc(inline)' -pass-remarks='vector' -S 2>&1 | FileCheck --check-prefix=REMARKS %s
+; RUN: opt < %s -passes='cgscc(inline)' -pass-remarks='inl' -pass-remarks='vector' -S 2>&1 | FileCheck --check-prefix=REMARKS %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
+; RUN: opt < %s -passes='cgscc(inline)' -S 2>&1 | FileCheck --check-prefix=REMARKS %s
+; RUN: not opt < %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 d3fd75d..4bbc686 100644
--- a/llvm/test/Other/pr32085.ll
+++ b/llvm/test/Other/pr32085.ll
@@ -1,6 +1,6 @@
-; 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
+; RUN: opt -S -O1 < %s -o %t1.ll
+; RUN: opt -S < %t1.ll -o %t2.ll
+; RUN: opt -S -passes=simplifycfg < %t1.ll -o %t3.ll
 ;; Show that there's no difference 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 4ab1bb6..ac9882f 100644
--- a/llvm/test/Other/print-debug-counter.ll
+++ b/llvm/test/Other/print-debug-counter.ll
@@ -1,8 +1,8 @@
 ; REQUIRES: asserts
 
-; 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
+; RUN: opt -S -debug-counter=early-cse-skip=1,early-cse-count=1 -passes=early-cse,newgvn,instcombine -earlycse-debug-hash \
+; RUN:        -debug-counter=newgvn-vn-skip=1,newgvn-vn-count=2 \
+; RUN:        -print-debug-counter < %s 2>&1 | FileCheck %s
 ;; Test debug counter prints correct info in right order.
 ; CHECK-LABEL: Counters and values:
 ; CHECK:       early-cse
diff --git a/llvm/test/Other/scalable-vector-struct-intrinsic.ll b/llvm/test/Other/scalable-vector-struct-intrinsic.ll
index e187c8e..5d59f8a 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 -temporarily-allow-old-pass-syntax -S -verify < %s 2>&1 | FileCheck %s
+; RUN: opt -S -passes=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 c9842c3..1b8e4a6 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 -temporarily-allow-old-pass-syntax -S -verify < %s | FileCheck %s
+; RUN: opt -S -passes=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"
 
-- 
2.7.4