[NFC] Port all DebugInfo tests to `-passes=` syntax

diff --git a/llvm/test/DebugInfo/AArch64/ir-outliner.ll b/llvm/test/DebugInfo/AArch64/ir-outliner.ll
index 3b17115f50662cfe92941f8a6ff74259101edd80..8b500d9ebec4eef38777ed3585d86a75aaa09954 100644 (file)
--- 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 -temporarily-allow-old-pass-syntax -verify -iroutliner -ir-outlining-no-cost < %s | \
+; RUN: opt -passes=verify,iroutliner -ir-outlining-no-cost < %s | \
 ; RUN: llc -filetype=obj -mtriple=aarch64-- | llvm-dwarfdump - | FileCheck %s
 
-; RUN: opt -temporarily-allow-old-pass-syntax -S -verify -iroutliner -ir-outlining-no-cost < %s | FileCheck -check-prefix=IRDEBUG %s
+; RUN: opt -S -passes=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 699c32246cfdd96d9f5567177c306051af45c42d..51d3b3975775dba89bc9efa8a8d29a99d2fffd19 100644 (file)
--- a/llvm/test/DebugInfo/ARM/lowerbdgdeclare_vla.ll
+++ b/llvm/test/DebugInfo/ARM/lowerbdgdeclare_vla.ll
@@ -1,4 +1,4 @@
-; RUN: opt -temporarily-allow-old-pass-syntax  -instcombine %s -S | FileCheck %s
+; RUN: opt  -passes=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 77d7b83d561f95f41e8d0fe24d039c2187a7256d..3cff8d64c1e83a08de3f2322389cb8f4ae614b9b 100644 (file)
--- 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 -temporarily-allow-old-pass-syntax < %s -verify -S | FileCheck %s
+; RUN: opt < %s -passes=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 01cbc1427363177849517acefb89981d022ad116..c2649392ff9c334935d6163ba96639297553d70b 100644 (file)
--- a/llvm/test/DebugInfo/Generic/PR37395.ll
+++ b/llvm/test/DebugInfo/Generic/PR37395.ll
@@ -1,4 +1,4 @@
-; RUN: opt -temporarily-allow-old-pass-syntax -lcssa -S %s | FileCheck %s
+; RUN: opt -passes=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 18e861921b184cb066b05c0fb54d3699629fde29..dfa7a074be127d57e6202ff629d1bf997303e002 100644 (file)
--- 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 -temporarily-allow-old-pass-syntax %s -S -dse -o - -experimental-assignment-tracking | FileCheck %s
+; RUN: opt %s -S -passes=dse -o - -experimental-assignment-tracking | FileCheck %s
 
-;; Observed in the wild, but test is created by running memcpyopt -temporarily-allow-old-pass-syntax on
+;; Observed in the wild, but test is created by running memcpyopt 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 b6bbda0349bbc66cb6ab0b416bec7ee3963a0284..91ded875350bfcf0c0125e1bb78caab7d5af75aa 100644 (file)
--- 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 -temporarily-allow-old-pass-syntax %s -S -dse -o - -experimental-assignment-tracking | FileCheck %s
+; RUN: opt %s -S -passes=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 f48f1783c780079aa9c9cb74a6b5b8c78ea5aa71..9f993dc43a9e171a5a636ee764b46729cea6eba4 100644 (file)
--- 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 -temporarily-allow-old-pass-syntax -licm %s -S -experimental-assignment-tracking | FileCheck %s
+; RUN: opt -passes=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 -temporarily-allow-old-pass-syntax -passes=declare-to-assign,sroa,instcombine,simplifycfg,loop-simplify,lcssa,loop-rotate a.ll
+;; $ opt -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 ecbfe63303e8795336b212f1b1e0f72c3cae2703..6c52791e110bd848a625f9ba4e72e0b6dfb7c237 100644 (file)
--- 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 -temporarily-allow-old-pass-syntax %s -S -licm -o - -experimental-assignment-tracking | FileCheck %s
+; RUN: opt %s -S -passes=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 58f38ce9d804e7501dbd40f61e20223901fb53fa..889075454336da5b69842f49166bfe2bc85b115b 100644 (file)
--- 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 -temporarily-allow-old-pass-syntax %s -S -memcpyopt -temporarily-allow-old-pass-syntax -o - -experimental-assignment-tracking | FileCheck %s
+; RUN: opt %s -S -passes=memcpyopt -o - -experimental-assignment-tracking | FileCheck %s
 
 ;; $ cat test.cpp
 ;; struct v {
@@ -16,10 +16,10 @@
 ;;   v g(0);
 ;;   esc(&g);
 ;; }
-;; IR grabbed before memcpyopt -temporarily-allow-old-pass-syntax in:
+;; IR grabbed before memcpyopt in:
 ;; clang++ -Xclang -fexperimental-assignment-tracking -g -c -O2 test.cpp
 
-;; Check that the memset that memcpyopt -temporarily-allow-old-pass-syntax creates to merge 4 stores merges the
+;; Check that the memset that memcpyopt 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 9612497d9a750b1b7351e23f880872d3f2234793..9b3ab01cbb37f7d21ecc7797947a66b29cd363fd 100644 (file)
--- 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 -temporarily-allow-old-pass-syntax -S %s -verify -experimental-assignment-tracking 2>&1 \
+; RUN: opt -S %s -passes=verify -experimental-assignment-tracking 2>&1 \
 ; RUN: | FileCheck %s
 
-;; NOTE: Expect opt -temporarily-allow-old-pass-syntax to return zero because the badly formed debug info
+;; NOTE: Expect opt 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 84d26dac39d2f73a75ea481a89a0a4c2cb9853b9..49aa585ce7f77b1904b341ac004d5407f44b7726 100644 (file)
--- 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 -temporarily-allow-old-pass-syntax %s -verify -experimental-assignment-tracking   \
-; RUN: | opt -temporarily-allow-old-pass-syntax -verify -S -experimental-assignment-tracking \
+; RUN: opt %s -passes=verify -experimental-assignment-tracking   \
+; RUN: | opt -passes=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 cbdcc73888e94c56e57ae0ca7ec2b14fcb486dcf..68444f4761ee5dcb3fee6155b9d03366a166f72e 100644 (file)
--- 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 -temporarily-allow-old-pass-syntax %s -S -verify -experimental-assignment-tracking 2>&1 \
+; RUN: opt %s -S -passes=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 6cbbc3a7a61ef21c58da005d912b80b69a03eb95..d7ba323e4befd4940a9b152519d7a0975f735928 100644 (file)
--- a/llvm/test/DebugInfo/Generic/callsite-attr-invalid.ll
+++ b/llvm/test/DebugInfo/Generic/callsite-attr-invalid.ll
@@ -1,4 +1,4 @@
-; RUN: opt -temporarily-allow-old-pass-syntax -verify < %s 2>&1 | FileCheck %s
+; RUN: opt -passes=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 f00cb97ed245d8b319cea5ccb2f3c3ca26f1dc24..49f97d1e991e5c79c0fe08af4abeba4231247119 100644 (file)
--- 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 -temporarily-allow-old-pass-syntax < %s -always-inline -S | FileCheck %s
+; RUN: opt < %s -passes=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

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

diff --git a/llvm/test/DebugInfo/Generic/global-sra-array.ll b/llvm/test/DebugInfo/Generic/global-sra-array.ll
index c5a1a67af2bdb51626818ee92ca931a4efed63d7..943dad1bc9e3864b1e4b18b4dd05507cbbacf90e 100644 (file)
--- a/llvm/test/DebugInfo/Generic/global-sra-array.ll
+++ b/llvm/test/DebugInfo/Generic/global-sra-array.ll
@@ -1,4 +1,4 @@
-; RUN: opt -temporarily-allow-old-pass-syntax -S -globalopt -temporarily-allow-old-pass-syntax < %s | FileCheck %s
+; RUN: opt -S -passes=globalopt < %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 6b9f4e4a1167a86bfc0a6ae5cb82baf1d577f028..81d5083ac6a7aeea32be7a6b8ff781402e070cb2 100644 (file)
--- 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 -temporarily-allow-old-pass-syntax -S -globalopt -temporarily-allow-old-pass-syntax < %s | FileCheck %s
+; RUN: opt -S -passes=globalopt < %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 091373fca9240865662f893fd5130ff1b063aca8..6216f2edfcd9f8d9298e521d482c5674fb00ae94 100644 (file)
--- 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 -temporarily-allow-old-pass-syntax -S -globalopt -temporarily-allow-old-pass-syntax < %s | FileCheck %s
+; RUN: opt -S -passes=globalopt < %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 3ca9c639a00cdd9d7aa634ed42bc91c6e7af0d49..feb1d77bdbd19186a5db5c1f1eac9b3b0289d809 100644 (file)
--- 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 -temporarily-allow-old-pass-syntax -S -globalopt -temporarily-allow-old-pass-syntax < %s | FileCheck %s
+; RUN: opt -S -passes=globalopt < %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 59cd5da12e9ce1422a44e51e27d3e4fdaa3d7282..d2274f720849491677c66684d9a622f3c03e2ae2 100644 (file)
--- a/llvm/test/DebugInfo/Generic/global-sra-struct.ll
+++ b/llvm/test/DebugInfo/Generic/global-sra-struct.ll
@@ -1,4 +1,4 @@
-; RUN: opt -temporarily-allow-old-pass-syntax -S -globalopt -temporarily-allow-old-pass-syntax < %s | FileCheck %s
+; RUN: opt -S -passes=globalopt < %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 9918c4c00c0ff7d616adde935f85db56f5eaa8a8..88216825acc5aeebdc89e73045eb6a804b274a3f 100644 (file)
--- a/llvm/test/DebugInfo/Generic/indvar-discriminator.ll
+++ b/llvm/test/DebugInfo/Generic/indvar-discriminator.ll
@@ -1,4 +1,4 @@
-; RUN: opt -temporarily-allow-old-pass-syntax -indvars -S < %s | FileCheck %s
+; RUN: opt -passes=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 bb7086ff97528ef4f49e081a6663ef687745148e..58943b6148c624233d0e98bcb0f8dbe15ffe064a 100644 (file)
--- 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 -temporarily-allow-old-pass-syntax -inline -S < %s | FileCheck %s
+; RUN: opt -passes='cgscc(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 8f23b549a69b6713a773ecef013272cd68a2e64f..1cb9b62a4eb369e7181c2f2183b831e77b6eaf65 100644 (file)
--- a/llvm/test/DebugInfo/Generic/inline-debug-info.ll
+++ b/llvm/test/DebugInfo/Generic/inline-debug-info.ll
@@ -1,4 +1,4 @@
-; RUN: opt -temporarily-allow-old-pass-syntax -inline -S < %s | FileCheck %s
+; RUN: opt -passes='cgscc(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 c003075d82ad4f57c8b8de2e6ea115baedc4965c..37e124b537b4d6cbaa7a4e928cf715091c98d29c 100644 (file)
--- a/llvm/test/DebugInfo/Generic/inline-debug-loc.ll
+++ b/llvm/test/DebugInfo/Generic/inline-debug-loc.ll
@@ -1,4 +1,4 @@
-; RUN: opt -temporarily-allow-old-pass-syntax -inline -S < %s | FileCheck %s
+; RUN: opt -passes='cgscc(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 434f9c2eb38c6e429ec0a7c8ef9e7e6a381380bb..face0b3fffb7e3b4121af99f78803c170b414b9a 100644 (file)
--- 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 -temporarily-allow-old-pass-syntax < %s -inline -S | FileCheck %s
+; RUN: opt < %s -passes='cgscc(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 d4e372b114711251943d81b894b89b180695d236..a86111b6a710aca5e2aa0ec757ce6a0411cf6b8e 100644 (file)
--- a/llvm/test/DebugInfo/Generic/licm-hoist-debug-loc.ll
+++ b/llvm/test/DebugInfo/Generic/licm-hoist-debug-loc.ll
@@ -1,11 +1,11 @@
-; RUN: opt -temporarily-allow-old-pass-syntax -S -licm %s | FileCheck %s
+; RUN: opt -S -passes=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 -temporarily-allow-old-pass-syntax -S -sroa -adce -simplifycfg -reassociate -domtree -loops \
-;     -loop-simplify -lcssa -aa -scalar-evolution -loop-rotate t.ll > test.ll
+; opt -S -sroa -passes=adce,simplifycfg -reassociate -domtree -loops \
+;     -loop-simplify -passes=lcssa -aa -scalar-evolution -passes=loop-rotate t.ll > test.ll
 ;
 ; void bar(int *);
 ; void foo(int k, int p)

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 11209cb6214018fe886a195bbf9c7c31445730a6..f1fdc5c24bd98fbf9e55bcdc4489f3a1892dba41 100644 (file)
--- 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 -temporarily-allow-old-pass-syntax -S -licm %s | FileCheck %s
+; RUN: opt -S -passes=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

diff --git a/llvm/test/DebugInfo/Generic/simplifycfg_sink_last_inst.ll b/llvm/test/DebugInfo/Generic/simplifycfg_sink_last_inst.ll
index 66c02e78843e6a6e3743af82c15b4dd927a2495a..ed97623ecc89b4712006483d0d2b82026e9b4d11 100644 (file)
--- 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 -temporarily-allow-old-pass-syntax -simplifycfg -sink-common-insts -S < %s | FileCheck %s
+; RUN: opt -passes=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"

diff --git a/llvm/test/DebugInfo/Generic/volatile-alloca.ll b/llvm/test/DebugInfo/Generic/volatile-alloca.ll
index b6d293abf38e6c999d44373420272e42447ee0a6..ddb86206b851b63dbf99ad7f022f2246df89ecf9 100644 (file)
--- a/llvm/test/DebugInfo/Generic/volatile-alloca.ll
+++ b/llvm/test/DebugInfo/Generic/volatile-alloca.ll
@@ -1,4 +1,4 @@
-; RUN: opt -temporarily-allow-old-pass-syntax -mem2reg -instcombine %s -o - -S | FileCheck %s
+; RUN: opt -passes=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 a5d4266a7f8f89e28ce6eaae1977f66b99bdb74d..07f030ec609e89bb59b9cddd085e38a20631fd72 100644 (file)
--- a/llvm/test/DebugInfo/X86/clone-module-2.ll
+++ b/llvm/test/DebugInfo/X86/clone-module-2.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
 
 ; 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 340339bcae6e88d2b4693b1b9ecc4d71c42ada1a..01d6206534450a7628d0d1aa7de550378d2bdd4b 100644 (file)
--- a/llvm/test/DebugInfo/X86/clone-module.ll
+++ b/llvm/test/DebugInfo/X86/clone-module.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
 
 ; 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 8eb5a983af8bf001cd7e4689bdac08e61f7913ea..f50ab579c58d319357b6cc771aeccd04e0a7d302 100644 (file)
--- 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 -temporarily-allow-old-pass-syntax -instcombine -S %s -o - | FileCheck %s
+; RUN: opt -passes=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 -temporarily-allow-old-pass-syntax -opt-bisect-limit=10 -O2 -o -
+;   | opt -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 1841f66ac25c2e3490f61c85f23dc81db3102225..655c3d1518227a3916ecca3223163935698c7483 100644 (file)
--- 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.
+;; Check that every instruction inserted by -passes=deadargelim has a debug location.
+;; The test was generated by using -passes=debugify option.
 
-; RUN: opt -temporarily-allow-old-pass-syntax < %s -deadargelim -S 2>&1 | FileCheck %s
+; RUN: opt < %s -passes=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 3be694a19db38fc5a8c6a89da8401d9051c992e9..3bd65ef835da5883d114fda7fcdd4e9f09039e15 100644 (file)
--- a/llvm/test/DebugInfo/X86/dead-store-elimination-marks-undef.ll
+++ b/llvm/test/DebugInfo/X86/dead-store-elimination-marks-undef.ll
@@ -1,4 +1,4 @@
-; RUN: opt -temporarily-allow-old-pass-syntax -mtriple=x86_64-- -S --dse %s  -o - | FileCheck %s
+; RUN: opt -mtriple=x86_64-- -S -passes=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 a5a61b2cc2345eac1f06a27e98512c3c7454f3e1..005521b5674af5375c01c0b7939efaf63251af44 100644 (file)
--- 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 -temporarily-allow-old-pass-syntax -S -globalopt -temporarily-allow-old-pass-syntax < %s | FileCheck %s
+; RUN: opt -S -passes=globalopt < %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 457e114f27bb54ce9060c688564179b7f6d4e0fc..6404aad0efa1aa14caedbee4fe534d76375a6878 100644 (file)
--- 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 -temporarily-allow-old-pass-syntax -S -globalopt -temporarily-allow-old-pass-syntax < %s | FileCheck %s
+; RUN: opt -S -passes=globalopt < %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 ea83ba095ac88b0df97aa14b362f281b6f419de2..af2314187761823a696d1ac18fcc5f57c20d01a1 100644 (file)
--- 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 -temporarily-allow-old-pass-syntax -S -globalopt -temporarily-allow-old-pass-syntax < %s | FileCheck %s
+; RUN: opt -S -passes=globalopt < %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 807863575ccdf5a80eb3c166f666e76b9641be3c..9865ba1959a13f535c26d64fc2f31826aba10b7b 100644 (file)
--- a/llvm/test/DebugInfo/X86/instcombine-demanded-bits-salvage.ll
+++ b/llvm/test/DebugInfo/X86/instcombine-demanded-bits-salvage.ll
@@ -1,4 +1,4 @@
-; RUN: opt -temporarily-allow-old-pass-syntax -mtriple=x86_64-- %s -S --instcombine  -o - | FileCheck %s
+; RUN: opt -mtriple=x86_64-- %s -S -passes=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 5de02979b705a0fbc7efb9d7178618c3c42b3840..942ecacc8618f493b865d60bb75e576f2e72fafb 100644 (file)
--- 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 -temporarily-allow-old-pass-syntax -licm %s -S | FileCheck %s
+; RUN: opt -passes=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 -temporarily-allow-old-pass-syntax -simplifycfg -sroa -loop-rotate -o - -S reduce.ll
+; opt -passes=simplifycfg -sroa -passes=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 db116527e1cf333356c3975ba593cbcb22d88a53..f366c12ccd6fec3ce5498d18c3c35c6767408851 100644 (file)
--- a/llvm/test/DebugInfo/X86/undef-type-md.ll
+++ b/llvm/test/DebugInfo/X86/undef-type-md.ll
@@ -1,4 +1,4 @@
-; RUN:  opt -temporarily-allow-old-pass-syntax -S -ipsccp %S/undef-type-md.ll | FileCheck %s
+; RUN:  opt -S -passes=ipsccp %S/undef-type-md.ll | FileCheck %s
 ; CHECK: llvm.nondebug.metadata = !{[[NONDEBUG_METADATA:![0-9]+]]}
 ; CHECK: [[NONDEBUG_METADATA]] =  distinct !{null}
 ; CHECK: !DITemplateValueParameter({{.*}} value: %class.1 addrspace(1)* undef)

diff --git a/llvm/test/DebugInfo/check-debugify-preserves-analyses.ll b/llvm/test/DebugInfo/check-debugify-preserves-analyses.ll
index 196e840e0f0efe94561dacefdadb847a829191c0..015026544230cf8fa0bd436941a6038faed91cba 100644 (file)
--- a/llvm/test/DebugInfo/check-debugify-preserves-analyses.ll
+++ b/llvm/test/DebugInfo/check-debugify-preserves-analyses.ll
@@ -1,8 +1,8 @@
-; 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 -passes='require<globals-aa>,function-attrs' | \
+; RUN:   opt -S -passes=strip,strip-dead-prototypes -strip-named-metadata > %t.no_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: opt < %s -debugify-each -passes='require<globals-aa>,function-attrs' | \
+; RUN:   opt -S -passes=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 83c4ee9be77bcb8df5b45e8c0e0177881b0ee22e..4990979f10c53c90f5858fbab6a699a991deaf77 100644 (file)
--- a/llvm/test/DebugInfo/debugify-bogus-dbg-value.ll
+++ b/llvm/test/DebugInfo/debugify-bogus-dbg-value.ll
@@ -1,4 +1,4 @@
-; RUN: opt -temporarily-allow-old-pass-syntax -check-debugify < %s 2>&1 | FileCheck %s
+; RUN: opt -passes=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 bf4b02d2bd68d46aee539495dac3eff1df623fce..6e5952d433da9bf1774d36acb74a0333ca825091 100644 (file)
--- a/llvm/test/DebugInfo/debugify-export.ll
+++ b/llvm/test/DebugInfo/debugify-export.ll
@@ -1,5 +1,5 @@
-; 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
+; RUN: opt %s -disable-output -debugify-each -debugify-quiet -debugify-export - -passes=globalopt | FileCheck %s
+; RUN: opt %s -disable-output -debugify-each -debugify-quiet -debugify-export - -passes=globalopt | 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 1aa413129bcf16e0e09e82568e0e9c8e38783643..322ccafa22ac81999783653c9bc84f1770a0a447 100644 (file)
--- a/llvm/test/DebugInfo/debugify-ignore-phi.ll
+++ b/llvm/test/DebugInfo/debugify-ignore-phi.ll
@@ -1,4 +1,4 @@
-; RUN: opt -temporarily-allow-old-pass-syntax -check-debugify < %s -S 2>&1 | FileCheck %s
+; RUN: opt -passes=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 7334e69ee6ed9f506cbc167954a0946f5ee42bd3..941b294fb855675f29e03fd64c9f1f639649a2fe 100644 (file)
--- 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 -temporarily-allow-old-pass-syntax -verify-debuginfo-preserve -instcombine -S -o - < %s 2>&1 | FileCheck %s
+; RUN: opt -verify-debuginfo-preserve -passes=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 4ba7ac632e9a14a70d51073bc27d60147ee57df3..1c5daa19c64841e589604b718b620477b865e189 100644 (file)
--- 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 -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"
+; RUN: opt -passes=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 3f828ccb52a5e4fe884da5f635fc1bae4348dc83..5ce6795d41b6bf7e6b7a5e71d9db5ace840d5fb4 100644 (file)
--- a/llvm/test/DebugInfo/debugify.ll
+++ b/llvm/test/DebugInfo/debugify.ll
@@ -1,29 +1,29 @@
-; 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 -passes=debugify -S -o - < %s | FileCheck %s
+; RUN: opt -passes=debugify -S -o - < %s | FileCheck %s
 
-; RUN: opt -temporarily-allow-old-pass-syntax -debugify -debugify -S -o - < %s 2>&1 | \
+; RUN: opt -passes=debugify,debugify -S -o - < %s 2>&1 | \
 ; RUN:   FileCheck %s -check-prefix=CHECK-REPEAT
-; RUN: opt -temporarily-allow-old-pass-syntax -passes=debugify,debugify -S -o - < %s 2>&1 | \
+; RUN: opt -passes=debugify,debugify -S -o - < %s 2>&1 | \
 ; RUN:   FileCheck %s -check-prefix=CHECK-REPEAT
 
-; RUN: opt -temporarily-allow-old-pass-syntax -debugify -check-debugify -S -o - < %s | \
+; RUN: opt -passes=debugify,check-debugify -S -o - < %s | \
 ; RUN:   FileCheck %s -implicit-check-not="CheckModuleDebugify: FAIL"
-; RUN: opt -temporarily-allow-old-pass-syntax -passes=debugify,check-debugify -S -o - < %s | \
+; RUN: opt -passes=debugify,check-debugify -S -o - < %s | \
 ; RUN:   FileCheck %s -implicit-check-not="CheckModuleDebugify: FAIL"
-; RUN: opt -temporarily-allow-old-pass-syntax -enable-debugify -passes=verify -S -o - < %s | \
+; RUN: opt -enable-debugify -passes=verify -S -o - < %s | \
 ; RUN:   FileCheck %s -implicit-check-not="CheckModuleDebugify: FAIL"
 
-; RUN: opt -temporarily-allow-old-pass-syntax -debugify -strip -check-debugify -S -o - < %s 2>&1 | \
+; RUN: opt -passes=debugify,strip,check-debugify -S -o - < %s 2>&1 | \
 ; RUN:   FileCheck %s -check-prefix=CHECK-WARN
 
-; RUN: opt -temporarily-allow-old-pass-syntax -enable-debugify -strip -S -o - < %s 2>&1 | \
+; RUN: opt -enable-debugify -passes=strip -S -o - < %s 2>&1 | \
 ; RUN:   FileCheck %s -check-prefix=CHECK-WARN
 
-; RUN: opt -temporarily-allow-old-pass-syntax -enable-debugify -S -o - < %s 2>&1 | FileCheck %s -check-prefix=PASS
+; RUN: opt -enable-debugify -S -o - < %s 2>&1 | FileCheck %s -check-prefix=PASS
 
 ; Verify that debugify can be safely used with piping
-; 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
+; RUN: opt -enable-debugify -O1 < %s | opt -O2 -o /dev/null
+; RUN: opt -passes=debugify,mem2reg,check-debugify < %s | opt -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 090c82b62514e9da955b936839a3d9a04ef87f55..250d2b5a5f30f2bb6c6c3b66092fbc0865181c62 100644 (file)
--- a/llvm/test/DebugInfo/duplicate_dbgvalue.ll
+++ b/llvm/test/DebugInfo/duplicate_dbgvalue.ll
@@ -1,4 +1,4 @@
-; RUN: opt -temporarily-allow-old-pass-syntax -instcombine -S -o - < %s | FileCheck %s
+; RUN: opt -passes=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 629f5eb2a580809731ffdf8bad819affba9892d7..6db825521b0bd1ebc195de10025cd8180ee5dbef 100644 (file)
--- a/llvm/test/DebugInfo/limit-arglist-size.ll
+++ b/llvm/test/DebugInfo/limit-arglist-size.ll
@@ -1,4 +1,4 @@
-; RUN: opt -temporarily-allow-old-pass-syntax -S -instcombine %s -o - | FileCheck %s
+; RUN: opt -S -passes=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 b2b9a112ae46c055cc958853578ac0d95034fa4d..f80b997232f1431491d612f07eada066abd1f302 100644 (file)
--- a/llvm/test/DebugInfo/pr34672.ll
+++ b/llvm/test/DebugInfo/pr34672.ll
@@ -1,4 +1,4 @@
-; RUN: opt -temporarily-allow-old-pass-syntax -verify %s 2>&1 | FileCheck %s
+; RUN: opt -passes=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 293f18ea317484859c0640ab3f3bf133f8875b03..8363c7451cbf2018e9789b7c447e189bfd8cf24c 100644 (file)
--- a/llvm/test/DebugInfo/return-same-line-merge.ll
+++ b/llvm/test/DebugInfo/return-same-line-merge.ll
@@ -1,4 +1,4 @@
-; RUN: opt -temporarily-allow-old-pass-syntax -simplifycfg -S < %s | FileCheck %s
+; RUN: opt -passes=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 22363f24d822bcdc4c398e0bbb4b3d15d3cf2ad1..8764dbc1dfc77d7e535cd8c5ed0fb4b11c877faa 100644 (file)
--- a/llvm/test/DebugInfo/salvage-duplicate-values.ll
+++ b/llvm/test/DebugInfo/salvage-duplicate-values.ll
@@ -1,4 +1,4 @@
-; RUN: opt -temporarily-allow-old-pass-syntax %s -dce -S | FileCheck %s
+; RUN: opt %s -passes=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 01163b6f9af4dc8074dbbef3b769d88a4a904e11..4d7448ff3f4b64de27942e6be31741fb816dc40c 100644 (file)
--- a/llvm/test/DebugInfo/salvage-gep.ll
+++ b/llvm/test/DebugInfo/salvage-gep.ll
@@ -1,4 +1,4 @@
-; RUN: opt -temporarily-allow-old-pass-syntax %s -dce -S | FileCheck %s
+; RUN: opt %s -passes=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 6660b7435afdd0d21585db8fcc8c62d959daba90..dd5b233576d3be21bdfbe6b0d012c203b078e510 100644 (file)
--- a/llvm/test/DebugInfo/salvage-limit-expr-size.ll
+++ b/llvm/test/DebugInfo/salvage-limit-expr-size.ll
@@ -1,4 +1,4 @@
-; RUN: opt -temporarily-allow-old-pass-syntax %s -dce -S | FileCheck %s
+; RUN: opt %s -passes=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 f98dfa27a499113d439274fac12f1f36802b0a25..da67fac8d5b9f08a5db6a406f96870f72b6ff758 100644 (file)
--- a/llvm/test/DebugInfo/salvage-nonconst-binop.ll
+++ b/llvm/test/DebugInfo/salvage-nonconst-binop.ll
@@ -1,4 +1,4 @@
-; RUN: opt -temporarily-allow-old-pass-syntax %s -dce -S | FileCheck %s\r
+; RUN: opt %s -passes=dce -S | FileCheck %s\r
 \r
 ; Tests the salvaging of binary operators that use more than one non-constant\r
 ; SSA value.\r

diff --git a/llvm/test/DebugInfo/simplify-cfg-preserve-dbg-values.ll b/llvm/test/DebugInfo/simplify-cfg-preserve-dbg-values.ll
index f42626ab0a805e171273c682e446d25166b9e2ed..a0da3f1ec9e023e1f9b1cfbf117eec3277a48071 100644 (file)
--- 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 -temporarily-allow-old-pass-syntax %s -simplifycfg -verify -S -o - | FileCheck %s
+; RUN: opt %s -passes=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 c4cb1b3f90cc716cc61d48326019aebf9118e313..c4e9796b67571631f278bec16f1bd80395f3f47e 100644 (file)
--- 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 -temporarily-allow-old-pass-syntax -loop-unroll -unroll-runtime -unroll-allow-remainder -unroll-count=4 -unroll-remainder -S %s -o - | FileCheck %s
+; RUN: opt -passes=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 8d9eba08f62c40f0a8e1a4d50a3a0b412fff115f..46d17154ebf6225000f54ffc7f05013a463ba889 100644 (file)
--- a/llvm/test/DebugInfo/verify-di-preserve.ll
+++ b/llvm/test/DebugInfo/verify-di-preserve.ll
@@ -1,8 +1,8 @@
-; RUN: opt -temporarily-allow-old-pass-syntax %s -verify-debuginfo-preserve -instcombine -disable-output 2>&1 | FileCheck --check-prefix=VERIFY %s
+; RUN: opt %s -verify-debuginfo-preserve -passes=instcombine -disable-output 2>&1 | FileCheck --check-prefix=VERIFY %s
 
 ; VERIFY: CheckModuleDebugify (original debuginfo):
 
-; RUN: opt -temporarily-allow-old-pass-syntax %s -verify-each-debuginfo-preserve -O2 -disable-output 2>&1 | FileCheck --check-prefix=VERIFY-EACH %s
+; RUN: opt %s -verify-each-debuginfo-preserve -O2 -disable-output 2>&1 | FileCheck --check-prefix=VERIFY-EACH %s
 
 ; VERIFY-EACH: DeadArgumentEliminationPass
 ; VERIFY-EACH: GlobalDCEPass