[llvm] b25ad38 - [NFC] Port all DebugInfo tests to `-passes=` syntax
Roman Lebedev via llvm-commits
llvm-commits at lists.llvm.org
Thu Dec 8 14:05:50 PST 2022
Author: Roman Lebedev
Date: 2022-12-09T01:04:45+03:00
New Revision: b25ad38307fdf162d7030a002b6ef1d2048fda55
URL: https://github.com/llvm/llvm-project/commit/b25ad38307fdf162d7030a002b6ef1d2048fda55
DIFF: https://github.com/llvm/llvm-project/commit/b25ad38307fdf162d7030a002b6ef1d2048fda55.diff
LOG: [NFC] Port all DebugInfo tests to `-passes=` syntax
Added:
Modified:
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
Removed:
################################################################################
diff --git a/llvm/test/DebugInfo/AArch64/ir-outliner.ll b/llvm/test/DebugInfo/AArch64/ir-outliner.ll
index 3b17115f50662..8b500d9ebec4e 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 -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 699c32246cfdd..51d3b3975775d 100644
--- 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 77d7b83d561f9..3cff8d64c1e83 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 -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 01cbc14273631..c2649392ff9c3 100644
--- 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 18e861921b184..dfa7a074be127 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 -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 b6bbda0349bbc..91ded875350bf 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 -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 f48f1783c7800..9f993dc43a9e1 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 -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 ecbfe63303e87..6c52791e110bd 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 -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 58f38ce9d804e..889075454336d 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 -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 9612497d9a750..9b3ab01cbb37f 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 -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 84d26dac39d2f..49aa585ce7f77 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 -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 cbdcc73888e94..68444f4761ee5 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 -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 6cbbc3a7a61ef..d7ba323e4befd 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 -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 f00cb97ed245d..49f97d1e991e5 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 -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 2bcfcf6694bb0..d5ec03e0b358e 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 -temporarily-allow-old-pass-syntax -verify < %s | opt -temporarily-allow-old-pass-syntax -verify -S | FileCheck %s
+; RUN: opt -passes=verify < %s | opt -passes=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 c5a1a67af2bdb..943dad1bc9e38 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 -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 6b9f4e4a1167a..81d5083ac6a7a 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 -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 091373fca9240..6216f2edfcd9f 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 -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 3ca9c639a00cd..feb1d77bdbd19 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 -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 59cd5da12e9ce..d2274f7208494 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 -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 9918c4c00c0ff..88216825acc5a 100644
--- 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 bb7086ff97528..58943b6148c62 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 -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 8f23b549a69b6..1cb9b62a4eb36 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 -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 c003075d82ad4..37e124b537b4d 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 -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 434f9c2eb38c6..face0b3fffb7e 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 -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 d4e372b114711..a86111b6a710a 100644
--- 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 11209cb621401..f1fdc5c24bd98 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 -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 66c02e78843e6..ed97623ecc89b 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 -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 b6d293abf38e6..ddb86206b851b 100644
--- 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 a5d4266a7f8f8..07f030ec609e8 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 -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 340339bcae6e8..01d6206534450 100644
--- 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 8eb5a983af8bf..f50ab579c58d3 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 -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 1841f66ac25c2..655c3d1518227 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.
+;; 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 3be694a19db38..3bd65ef835da5 100644
--- 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 a5a61b2cc2345..005521b5674af 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 -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 457e114f27bb5..6404aad0efa1a 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 -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 ea83ba095ac88..af23141877618 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 -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 807863575ccdf..9865ba1959a13 100644
--- 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 5de02979b705a..942ecacc8618f 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 -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 db116527e1cf3..f366c12ccd6fe 100644
--- 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 196e840e0f0ef..015026544230c 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 -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 83c4ee9be77bc..4990979f10c53 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 -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 bf4b02d2bd68d..6e5952d433da9 100644
--- 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 1aa413129bcf1..322ccafa22ac8 100644
--- 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 7334e69ee6ed9..941b294fb8556 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 -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 4ba7ac632e9a1..1c5daa19c6484 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 -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 3f828ccb52a5e..5ce6795d41b6b 100644
--- 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 090c82b62514e..250d2b5a5f30f 100644
--- 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 629f5eb2a5808..6db825521b0bd 100644
--- 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 b2b9a112ae46c..f80b997232f14 100644
--- 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 293f18ea31748..8363c7451cbf2 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 -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 22363f24d822b..8764dbc1dfc77 100644
--- 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 01163b6f9af4d..4d7448ff3f4b6 100644
--- 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 6660b7435afdd..dd5b233576d3b 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 -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 f98dfa27a4991..da67fac8d5b9f 100644
--- 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
+; RUN: opt %s -passes=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 f42626ab0a805..a0da3f1ec9e02 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 -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 c4cb1b3f90cc7..c4e9796b67571 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 -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 8d9eba08f62c4..46d17154ebf62 100644
--- 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
More information about the llvm-commits
mailing list