From 92e54b09ce076a9e5e109d52e4fff6b1530dcb7a Mon Sep 17 00:00:00 2001 From: Roman Lebedev Date: Wed, 7 Dec 2022 22:53:08 +0300 Subject: [PATCH] [NFC] Port all SimpleLoopUnswitch tests to `-passes=` syntax --- llvm/test/Transforms/SimpleLoopUnswitch/2006-06-13-SingleEntryPHI.ll | 2 +- llvm/test/Transforms/SimpleLoopUnswitch/2006-06-27-DeadSwitchCase.ll | 2 +- llvm/test/Transforms/SimpleLoopUnswitch/2007-05-09-Unreachable.ll | 2 +- llvm/test/Transforms/SimpleLoopUnswitch/2007-05-09-tl.ll | 2 +- llvm/test/Transforms/SimpleLoopUnswitch/2007-07-12-ExitDomInfo.ll | 2 +- llvm/test/Transforms/SimpleLoopUnswitch/2007-07-13-DomInfo.ll | 2 +- llvm/test/Transforms/SimpleLoopUnswitch/2007-07-18-DomInfo.ll | 2 +- llvm/test/Transforms/SimpleLoopUnswitch/2007-08-01-Dom.ll | 2 +- llvm/test/Transforms/SimpleLoopUnswitch/2007-08-01-LCSSA.ll | 2 +- llvm/test/Transforms/SimpleLoopUnswitch/2007-10-04-DomFrontier.ll | 2 +- llvm/test/Transforms/SimpleLoopUnswitch/2008-06-02-DomInfo.ll | 2 +- llvm/test/Transforms/SimpleLoopUnswitch/2008-06-17-DomFrontier.ll | 2 +- llvm/test/Transforms/SimpleLoopUnswitch/2010-11-18-LCSSA.ll | 2 +- llvm/test/Transforms/SimpleLoopUnswitch/2011-06-02-CritSwitch.ll | 2 +- llvm/test/Transforms/SimpleLoopUnswitch/2012-04-02-IndirectBr.ll | 4 ++-- .../SimpleLoopUnswitch/2012-04-30-LoopUnswitch-LPad-Crash.ll | 2 +- llvm/test/Transforms/SimpleLoopUnswitch/2012-05-20-Phi.ll | 2 +- llvm/test/Transforms/SimpleLoopUnswitch/2015-09-18-Addrspace.ll | 4 ++-- .../Transforms/SimpleLoopUnswitch/ARM/nontrivial-unswitch-cost.ll | 2 +- llvm/test/Transforms/SimpleLoopUnswitch/LIV-loop-condtion.ll | 4 ++-- llvm/test/Transforms/SimpleLoopUnswitch/catchswitch.ll | 2 +- llvm/test/Transforms/SimpleLoopUnswitch/cleanuppad.ll | 2 +- llvm/test/Transforms/SimpleLoopUnswitch/copy-metadata.ll | 2 +- llvm/test/Transforms/SimpleLoopUnswitch/crash.ll | 2 +- .../SimpleLoopUnswitch/dead-blocks-uses-in-unreachablel-blocks.ll | 1 - llvm/test/Transforms/SimpleLoopUnswitch/delete-dead-blocks.ll | 4 ++-- llvm/test/Transforms/SimpleLoopUnswitch/exponential-behavior.ll | 2 +- llvm/test/Transforms/SimpleLoopUnswitch/formDedicatedAfterTrivial1.ll | 2 +- llvm/test/Transforms/SimpleLoopUnswitch/formDedicatedAfterTrivial2.ll | 2 +- llvm/test/Transforms/SimpleLoopUnswitch/formDedicatedAfterTrivial3.ll | 2 +- llvm/test/Transforms/SimpleLoopUnswitch/guards.ll | 2 +- llvm/test/Transforms/SimpleLoopUnswitch/implicit-null-checks.ll | 4 ++-- llvm/test/Transforms/SimpleLoopUnswitch/infinite-loop.ll | 4 ++-- llvm/test/Transforms/SimpleLoopUnswitch/nontrivial-unswitch-cost.ll | 2 +- llvm/test/Transforms/SimpleLoopUnswitch/nontrivial-unswitch-freeze.ll | 2 +- .../SimpleLoopUnswitch/nontrivial-unswitch-redundant-switch.ll | 2 +- .../SimpleLoopUnswitch/nontrivial-unswitch-skip-selects-in-guards.ll | 2 +- llvm/test/Transforms/SimpleLoopUnswitch/nontrivial-unswitch.ll | 2 +- llvm/test/Transforms/SimpleLoopUnswitch/pr37888.ll | 2 +- llvm/test/Transforms/SimpleLoopUnswitch/preserve-analyses.ll | 2 +- .../SimpleLoopUnswitch/preserve-scev-exiting-multiple-loops.ll | 4 ++-- 41 files changed, 47 insertions(+), 48 deletions(-) diff --git a/llvm/test/Transforms/SimpleLoopUnswitch/2006-06-13-SingleEntryPHI.ll b/llvm/test/Transforms/SimpleLoopUnswitch/2006-06-13-SingleEntryPHI.ll index 2c6424c..06dc92e 100644 --- a/llvm/test/Transforms/SimpleLoopUnswitch/2006-06-13-SingleEntryPHI.ll +++ b/llvm/test/Transforms/SimpleLoopUnswitch/2006-06-13-SingleEntryPHI.ll @@ -1,4 +1,4 @@ -; RUN: opt < %s -simple-loop-unswitch -verify-memoryssa -disable-output +; RUN: opt < %s -passes=simple-loop-unswitch -verify-memoryssa -disable-output %struct.BLEND_MAP = type { i16, i16, i16, i32, %struct.BLEND_MAP_ENTRY* } %struct.BLEND_MAP_ENTRY = type { float, i8, { [5 x float], [4 x i8] } } diff --git a/llvm/test/Transforms/SimpleLoopUnswitch/2006-06-27-DeadSwitchCase.ll b/llvm/test/Transforms/SimpleLoopUnswitch/2006-06-27-DeadSwitchCase.ll index 61460da..bf324ef 100644 --- a/llvm/test/Transforms/SimpleLoopUnswitch/2006-06-27-DeadSwitchCase.ll +++ b/llvm/test/Transforms/SimpleLoopUnswitch/2006-06-27-DeadSwitchCase.ll @@ -1,4 +1,4 @@ -; RUN: opt < %s -simple-loop-unswitch -verify-memoryssa -disable-output +; RUN: opt < %s -passes=simple-loop-unswitch -verify-memoryssa -disable-output define void @init_caller_save() { entry: diff --git a/llvm/test/Transforms/SimpleLoopUnswitch/2007-05-09-Unreachable.ll b/llvm/test/Transforms/SimpleLoopUnswitch/2007-05-09-Unreachable.ll index 6e0362e..9a4c988 100644 --- a/llvm/test/Transforms/SimpleLoopUnswitch/2007-05-09-Unreachable.ll +++ b/llvm/test/Transforms/SimpleLoopUnswitch/2007-05-09-Unreachable.ll @@ -1,5 +1,5 @@ ; PR1333 -; RUN: opt < %s -simple-loop-unswitch -verify-memoryssa -disable-output +; RUN: opt < %s -passes=simple-loop-unswitch -verify-memoryssa -disable-output target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64" target triple = "i686-pc-linux-gnu" diff --git a/llvm/test/Transforms/SimpleLoopUnswitch/2007-05-09-tl.ll b/llvm/test/Transforms/SimpleLoopUnswitch/2007-05-09-tl.ll index 13b78dd..f770354 100644 --- a/llvm/test/Transforms/SimpleLoopUnswitch/2007-05-09-tl.ll +++ b/llvm/test/Transforms/SimpleLoopUnswitch/2007-05-09-tl.ll @@ -1,4 +1,4 @@ -; RUN: opt < %s -simple-loop-unswitch -verify-memoryssa -disable-output +; RUN: opt < %s -passes=simple-loop-unswitch -verify-memoryssa -disable-output ; PR1333 define void @pp_cxx_expression() { diff --git a/llvm/test/Transforms/SimpleLoopUnswitch/2007-07-12-ExitDomInfo.ll b/llvm/test/Transforms/SimpleLoopUnswitch/2007-07-12-ExitDomInfo.ll index 6556036..8b5d0b7 100644 --- a/llvm/test/Transforms/SimpleLoopUnswitch/2007-07-12-ExitDomInfo.ll +++ b/llvm/test/Transforms/SimpleLoopUnswitch/2007-07-12-ExitDomInfo.ll @@ -1,4 +1,4 @@ -; RUN: opt < %s -simple-loop-unswitch -verify-memoryssa -instcombine -disable-output +; RUN: opt < %s -passes='loop(simple-loop-unswitch),instcombine' -verify-memoryssa -disable-output @str3 = external constant [3 x i8] ; <[3 x i8]*> [#uses=1] diff --git a/llvm/test/Transforms/SimpleLoopUnswitch/2007-07-13-DomInfo.ll b/llvm/test/Transforms/SimpleLoopUnswitch/2007-07-13-DomInfo.ll index 644aaed..2c695a5 100644 --- a/llvm/test/Transforms/SimpleLoopUnswitch/2007-07-13-DomInfo.ll +++ b/llvm/test/Transforms/SimpleLoopUnswitch/2007-07-13-DomInfo.ll @@ -1,4 +1,4 @@ -; RUN: opt < %s -simple-loop-unswitch -verify-memoryssa -disable-output +; RUN: opt < %s -passes=simple-loop-unswitch -verify-memoryssa -disable-output define i32 @main(i32 %argc, i8** %argv) { entry: diff --git a/llvm/test/Transforms/SimpleLoopUnswitch/2007-07-18-DomInfo.ll b/llvm/test/Transforms/SimpleLoopUnswitch/2007-07-18-DomInfo.ll index e7c94cc..2bf085a 100644 --- a/llvm/test/Transforms/SimpleLoopUnswitch/2007-07-18-DomInfo.ll +++ b/llvm/test/Transforms/SimpleLoopUnswitch/2007-07-18-DomInfo.ll @@ -1,4 +1,4 @@ -; RUN: opt < %s -simple-loop-unswitch -verify-memoryssa -disable-output +; RUN: opt < %s -passes=simple-loop-unswitch -verify-memoryssa -disable-output ; PR1559 target triple = "i686-pc-linux-gnu" diff --git a/llvm/test/Transforms/SimpleLoopUnswitch/2007-08-01-Dom.ll b/llvm/test/Transforms/SimpleLoopUnswitch/2007-08-01-Dom.ll index 794d19e..143772c 100644 --- a/llvm/test/Transforms/SimpleLoopUnswitch/2007-08-01-Dom.ll +++ b/llvm/test/Transforms/SimpleLoopUnswitch/2007-08-01-Dom.ll @@ -1,4 +1,4 @@ -; RUN: opt < %s -licm -simple-loop-unswitch -disable-output +; RUN: opt < %s -passes=licm,simple-loop-unswitch -disable-output ; PR 1589 %struct.QBasicAtomic = type { i32 } diff --git a/llvm/test/Transforms/SimpleLoopUnswitch/2007-08-01-LCSSA.ll b/llvm/test/Transforms/SimpleLoopUnswitch/2007-08-01-LCSSA.ll index c389b2e..591b840 100644 --- a/llvm/test/Transforms/SimpleLoopUnswitch/2007-08-01-LCSSA.ll +++ b/llvm/test/Transforms/SimpleLoopUnswitch/2007-08-01-LCSSA.ll @@ -1,4 +1,4 @@ -; RUN: opt < %s -simple-loop-unswitch -verify-memoryssa -instcombine -disable-output +; RUN: opt < %s -passes='loop(simple-loop-unswitch),instcombine' -verify-memoryssa -disable-output %struct.ClassDef = type { %struct.QByteArray, %struct.QByteArray, %"struct.QList", %"struct.QList", i8, i8, %"struct.QList", %"struct.QList", %"struct.QList", %"struct.QList", %"struct.QList", %"struct.QList", %"struct.QMap", %"struct.QList", %"struct.QMap", i32, i32 } %struct.FILE = type { i32, i8*, i8*, i8*, i8*, i8*, i8*, i8*, i8*, i8*, i8*, i8*, %struct._IO_marker*, %struct.FILE*, i32, i32, i32, i16, i8, [1 x i8], i8*, i64, i8*, i8*, i8*, i8*, i32, i32, [40 x i8] } %struct.Generator = type { %struct.FILE*, %struct.ClassDef*, %"struct.QList", %struct.QByteArray, %"struct.QList" } diff --git a/llvm/test/Transforms/SimpleLoopUnswitch/2007-10-04-DomFrontier.ll b/llvm/test/Transforms/SimpleLoopUnswitch/2007-10-04-DomFrontier.ll index efbb761..6854ae4 100644 --- a/llvm/test/Transforms/SimpleLoopUnswitch/2007-10-04-DomFrontier.ll +++ b/llvm/test/Transforms/SimpleLoopUnswitch/2007-10-04-DomFrontier.ll @@ -1,4 +1,4 @@ -; RUN: opt < %s -licm -loop-unroll -disable-output +; RUN: opt < %s -passes='loop-mssa(licm),loop-unroll' -disable-output @resonant = external global i32 ; [#uses=2] diff --git a/llvm/test/Transforms/SimpleLoopUnswitch/2008-06-02-DomInfo.ll b/llvm/test/Transforms/SimpleLoopUnswitch/2008-06-02-DomInfo.ll index ed61b1a..0768b41 100644 --- a/llvm/test/Transforms/SimpleLoopUnswitch/2008-06-02-DomInfo.ll +++ b/llvm/test/Transforms/SimpleLoopUnswitch/2008-06-02-DomInfo.ll @@ -1,4 +1,4 @@ -; RUN: opt < %s -simple-loop-unswitch -verify-memoryssa -instcombine -gvn -disable-output +; RUN: opt < %s -passes='loop(simple-loop-unswitch),instcombine,gvn' -verify-memoryssa -disable-output ; PR2372 target triple = "i386-pc-linux-gnu" diff --git a/llvm/test/Transforms/SimpleLoopUnswitch/2008-06-17-DomFrontier.ll b/llvm/test/Transforms/SimpleLoopUnswitch/2008-06-17-DomFrontier.ll index e309d60..054a7d1 100644 --- a/llvm/test/Transforms/SimpleLoopUnswitch/2008-06-17-DomFrontier.ll +++ b/llvm/test/Transforms/SimpleLoopUnswitch/2008-06-17-DomFrontier.ll @@ -1,4 +1,4 @@ -; RUN: opt < %s -licm -simple-loop-unswitch -disable-output +; RUN: opt < %s -passes=licm,simple-loop-unswitch -disable-output @g_56 = external global i16 ; [#uses=2] define i32 @func_67(i32 %p_68, i8 signext %p_69, i8 signext %p_71) nounwind { diff --git a/llvm/test/Transforms/SimpleLoopUnswitch/2010-11-18-LCSSA.ll b/llvm/test/Transforms/SimpleLoopUnswitch/2010-11-18-LCSSA.ll index ece07c6..9619972 100644 --- a/llvm/test/Transforms/SimpleLoopUnswitch/2010-11-18-LCSSA.ll +++ b/llvm/test/Transforms/SimpleLoopUnswitch/2010-11-18-LCSSA.ll @@ -1,4 +1,4 @@ -; RUN: opt < %s -simple-loop-unswitch -verify-memoryssa +; RUN: opt < %s -passes=simple-loop-unswitch -verify-memoryssa ; PR8622 @g_38 = external global i32, align 4 diff --git a/llvm/test/Transforms/SimpleLoopUnswitch/2011-06-02-CritSwitch.ll b/llvm/test/Transforms/SimpleLoopUnswitch/2011-06-02-CritSwitch.ll index 9ee6f4c..55c9d67 100644 --- a/llvm/test/Transforms/SimpleLoopUnswitch/2011-06-02-CritSwitch.ll +++ b/llvm/test/Transforms/SimpleLoopUnswitch/2011-06-02-CritSwitch.ll @@ -1,4 +1,4 @@ -; RUN: opt -simple-loop-unswitch -verify-memoryssa -disable-output < %s +; RUN: opt -passes=simple-loop-unswitch -verify-memoryssa -disable-output < %s ; PR10031 define i32 @test(i32 %command) { diff --git a/llvm/test/Transforms/SimpleLoopUnswitch/2012-04-02-IndirectBr.ll b/llvm/test/Transforms/SimpleLoopUnswitch/2012-04-02-IndirectBr.ll index 61cc78f..82395ca 100644 --- a/llvm/test/Transforms/SimpleLoopUnswitch/2012-04-02-IndirectBr.ll +++ b/llvm/test/Transforms/SimpleLoopUnswitch/2012-04-02-IndirectBr.ll @@ -1,5 +1,5 @@ -; RUN: opt < %s -S -simple-loop-unswitch -verify-loop-info -verify-dom-info -verify-memoryssa | FileCheck %s -; PR12343: -simple-loop-unswitch crash on indirect branch +; RUN: opt < %s -S -passes=simple-loop-unswitch -verify-loop-info -verify-dom-info -verify-memoryssa | FileCheck %s +; PR12343: -passes=simple-loop-unswitch crash on indirect branch ; CHECK: %0 = icmp eq i64 undef, 0 ; CHECK-NEXT: br i1 %0, label %"5", label %"4" diff --git a/llvm/test/Transforms/SimpleLoopUnswitch/2012-04-30-LoopUnswitch-LPad-Crash.ll b/llvm/test/Transforms/SimpleLoopUnswitch/2012-04-30-LoopUnswitch-LPad-Crash.ll index 03b3c88..d61aff1 100644 --- a/llvm/test/Transforms/SimpleLoopUnswitch/2012-04-30-LoopUnswitch-LPad-Crash.ll +++ b/llvm/test/Transforms/SimpleLoopUnswitch/2012-04-30-LoopUnswitch-LPad-Crash.ll @@ -1,4 +1,4 @@ -; RUN: opt < %s -instcombine -inline -function-attrs -licm -simple-loop-unswitch -gvn -verify +; RUN: opt < %s -passes='function(instcombine),cgscc(inline),function-attrs,function(loop-mssa(licm),simple-loop-unswitch,gvn,verify)' ; PR12573 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.7.0" diff --git a/llvm/test/Transforms/SimpleLoopUnswitch/2012-05-20-Phi.ll b/llvm/test/Transforms/SimpleLoopUnswitch/2012-05-20-Phi.ll index feed1f0..3d9474b 100644 --- a/llvm/test/Transforms/SimpleLoopUnswitch/2012-05-20-Phi.ll +++ b/llvm/test/Transforms/SimpleLoopUnswitch/2012-05-20-Phi.ll @@ -1,4 +1,4 @@ -; RUN: opt < %s -simple-loop-unswitch -verify-memoryssa -disable-output +; RUN: opt < %s -passes=simple-loop-unswitch -verify-memoryssa -disable-output ; PR12887 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128" target triple = "x86_64-unknown-linux-gnu" diff --git a/llvm/test/Transforms/SimpleLoopUnswitch/2015-09-18-Addrspace.ll b/llvm/test/Transforms/SimpleLoopUnswitch/2015-09-18-Addrspace.ll index 74e918a..a9cf3c0 100644 --- a/llvm/test/Transforms/SimpleLoopUnswitch/2015-09-18-Addrspace.ll +++ b/llvm/test/Transforms/SimpleLoopUnswitch/2015-09-18-Addrspace.ll @@ -1,4 +1,4 @@ -; RUN: opt < %s -simple-loop-unswitch -verify-memoryssa -S | FileCheck %s +; RUN: opt < %s -passes=simple-loop-unswitch -verify-memoryssa -S | FileCheck %s ; In cases where two address spaces do not have the same size pointer, the ; input for the addrspacecast should not be used as a substitute for itself @@ -14,7 +14,7 @@ entry: br i1 undef, label %for.body.i, label %bar.exit for.body.i: ; preds = %for.body.i, %entry -; When we call makeLoopInvariant (i.e. trivial LICM) on this load, it +; When we call makeLoopInvariant (i.e. trivial LICM) on this load, it ; will try to find the base object to prove deferenceability. If we look ; through the addrspacecast, we'll fail an assertion about bitwidths matching ; CHECK-LABEL: for.body.i diff --git a/llvm/test/Transforms/SimpleLoopUnswitch/ARM/nontrivial-unswitch-cost.ll b/llvm/test/Transforms/SimpleLoopUnswitch/ARM/nontrivial-unswitch-cost.ll index 39caedf..1a537d6 100644 --- a/llvm/test/Transforms/SimpleLoopUnswitch/ARM/nontrivial-unswitch-cost.ll +++ b/llvm/test/Transforms/SimpleLoopUnswitch/ARM/nontrivial-unswitch-cost.ll @@ -1,5 +1,5 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py -; RUN: opt -mtriple=thumbv8m.main -simple-loop-unswitch -enable-nontrivial-unswitch -unswitch-threshold=5 -S -o - %s | FileCheck %s +; RUN: opt -mtriple=thumbv8m.main -passes='simple-loop-unswitch' -unswitch-threshold=5 -S -o - %s | FileCheck %s declare void @a() declare void @b() diff --git a/llvm/test/Transforms/SimpleLoopUnswitch/LIV-loop-condtion.ll b/llvm/test/Transforms/SimpleLoopUnswitch/LIV-loop-condtion.ll index d9c13e4..e795ff0 100644 --- a/llvm/test/Transforms/SimpleLoopUnswitch/LIV-loop-condtion.ll +++ b/llvm/test/Transforms/SimpleLoopUnswitch/LIV-loop-condtion.ll @@ -1,4 +1,4 @@ -; RUN: opt < %s -simple-loop-unswitch -verify-memoryssa -S 2>&1 | FileCheck %s +; RUN: opt < %s -passes=simple-loop-unswitch -verify-memoryssa -S 2>&1 | FileCheck %s ; This is to test trivial loop unswitch only happens when trivial condition ; itself is an LIV loop condition (not partial LIV which could occur in and/or). @@ -34,4 +34,4 @@ loop_exit: ret i32 0 } -declare void @some_func() noreturn +declare void @some_func() noreturn diff --git a/llvm/test/Transforms/SimpleLoopUnswitch/catchswitch.ll b/llvm/test/Transforms/SimpleLoopUnswitch/catchswitch.ll index 19e327c..f0bc312 100644 --- a/llvm/test/Transforms/SimpleLoopUnswitch/catchswitch.ll +++ b/llvm/test/Transforms/SimpleLoopUnswitch/catchswitch.ll @@ -1,4 +1,4 @@ -; RUN: opt -passes=simple-loop-unswitch -enable-nontrivial-unswitch < %s -S | FileCheck %s +; RUN: opt -passes='simple-loop-unswitch' < %s -S | FileCheck %s ; CHECK: if.end{{.*}}: ; CHECK-NOT: if.end{{.*}}: diff --git a/llvm/test/Transforms/SimpleLoopUnswitch/cleanuppad.ll b/llvm/test/Transforms/SimpleLoopUnswitch/cleanuppad.ll index 2c949aa..f9dc280 100644 --- a/llvm/test/Transforms/SimpleLoopUnswitch/cleanuppad.ll +++ b/llvm/test/Transforms/SimpleLoopUnswitch/cleanuppad.ll @@ -1,4 +1,4 @@ -; RUN: opt -S -simple-loop-unswitch -verify-memoryssa < %s | FileCheck %s +; RUN: opt -S -passes=simple-loop-unswitch -verify-memoryssa < %s | FileCheck %s target triple = "x86_64-pc-win32" define void @f(i32 %doit, i1 %x, i1 %y) personality i32 (...)* @__CxxFrameHandler3 { diff --git a/llvm/test/Transforms/SimpleLoopUnswitch/copy-metadata.ll b/llvm/test/Transforms/SimpleLoopUnswitch/copy-metadata.ll index 6ad72c6..5f6a4c3 100644 --- a/llvm/test/Transforms/SimpleLoopUnswitch/copy-metadata.ll +++ b/llvm/test/Transforms/SimpleLoopUnswitch/copy-metadata.ll @@ -1,4 +1,4 @@ -; RUN: opt < %s -simple-loop-unswitch -verify-memoryssa -S | FileCheck %s +; RUN: opt < %s -passes=simple-loop-unswitch -verify-memoryssa -S | FileCheck %s ; This test checks if unswitched condition preserve make.implicit metadata. define i32 @test(i1 %cond) { diff --git a/llvm/test/Transforms/SimpleLoopUnswitch/crash.ll b/llvm/test/Transforms/SimpleLoopUnswitch/crash.ll index 554c30e..9bf061e 100644 --- a/llvm/test/Transforms/SimpleLoopUnswitch/crash.ll +++ b/llvm/test/Transforms/SimpleLoopUnswitch/crash.ll @@ -1,4 +1,4 @@ -; RUN: opt < %s -simple-loop-unswitch -verify-memoryssa -disable-output +; RUN: opt < %s -passes=simple-loop-unswitch -verify-memoryssa -disable-output define void @test1(i32* %S2) { entry: diff --git a/llvm/test/Transforms/SimpleLoopUnswitch/dead-blocks-uses-in-unreachablel-blocks.ll b/llvm/test/Transforms/SimpleLoopUnswitch/dead-blocks-uses-in-unreachablel-blocks.ll index 42b1a74..52bb291 100644 --- a/llvm/test/Transforms/SimpleLoopUnswitch/dead-blocks-uses-in-unreachablel-blocks.ll +++ b/llvm/test/Transforms/SimpleLoopUnswitch/dead-blocks-uses-in-unreachablel-blocks.ll @@ -1,6 +1,5 @@ ; REQUIRES: asserts ; RUN: opt < %s -passes='simple-loop-unswitch' -disable-output -; RUN: opt < %s -simple-loop-unswitch -enable-nontrivial-unswitch -disable-output ; Make sure we don't crash due to a dangling use of %tmp2 in bb7. diff --git a/llvm/test/Transforms/SimpleLoopUnswitch/delete-dead-blocks.ll b/llvm/test/Transforms/SimpleLoopUnswitch/delete-dead-blocks.ll index bfbeb7e..770f42a 100644 --- a/llvm/test/Transforms/SimpleLoopUnswitch/delete-dead-blocks.ll +++ b/llvm/test/Transforms/SimpleLoopUnswitch/delete-dead-blocks.ll @@ -1,4 +1,4 @@ -; RUN: opt < %s -simple-loop-unswitch -enable-nontrivial-unswitch -S 2>&1 | FileCheck %s +; RUN: opt < %s -passes='simple-loop-unswitch' -S 2>&1 | FileCheck %s ; RUN: opt < %s -passes='simple-loop-unswitch' -S 2>&1 | FileCheck %s ; RUN: opt < %s -passes='loop-mssa(simple-loop-unswitch)' -S 2>&1 | FileCheck %s ; @@ -15,7 +15,7 @@ outer: br label %inner inner: %ii = phi i32 [ 0, %outer ], [ %iinc, %continue] - call void @foo() + call void @foo() switch i32 %0, label %get_out2 [ i32 0, label %continue i32 1, label %case1 diff --git a/llvm/test/Transforms/SimpleLoopUnswitch/exponential-behavior.ll b/llvm/test/Transforms/SimpleLoopUnswitch/exponential-behavior.ll index 5d309ee..2a6954a 100644 --- a/llvm/test/Transforms/SimpleLoopUnswitch/exponential-behavior.ll +++ b/llvm/test/Transforms/SimpleLoopUnswitch/exponential-behavior.ll @@ -1,4 +1,4 @@ -; RUN: opt -simple-loop-unswitch -verify-memoryssa -S < %s | FileCheck %s +; RUN: opt -passes=simple-loop-unswitch -verify-memoryssa -S < %s | FileCheck %s define void @f(i32 %n, i32* %ptr) { ; CHECK-LABEL: @f( diff --git a/llvm/test/Transforms/SimpleLoopUnswitch/formDedicatedAfterTrivial1.ll b/llvm/test/Transforms/SimpleLoopUnswitch/formDedicatedAfterTrivial1.ll index b6cbbc4..19a2bc3 100644 --- a/llvm/test/Transforms/SimpleLoopUnswitch/formDedicatedAfterTrivial1.ll +++ b/llvm/test/Transforms/SimpleLoopUnswitch/formDedicatedAfterTrivial1.ll @@ -1,4 +1,4 @@ -; RUN: opt < %s -simple-loop-unswitch -disable-output +; RUN: opt < %s -passes=simple-loop-unswitch -disable-output ; PR38283 ; PR38737 diff --git a/llvm/test/Transforms/SimpleLoopUnswitch/formDedicatedAfterTrivial2.ll b/llvm/test/Transforms/SimpleLoopUnswitch/formDedicatedAfterTrivial2.ll index 1ac4bbd2..5fa7e22 100644 --- a/llvm/test/Transforms/SimpleLoopUnswitch/formDedicatedAfterTrivial2.ll +++ b/llvm/test/Transforms/SimpleLoopUnswitch/formDedicatedAfterTrivial2.ll @@ -1,4 +1,4 @@ -; RUN: opt < %s -simple-loop-unswitch -disable-output +; RUN: opt < %s -passes=simple-loop-unswitch -disable-output ; PR38283 ; PR38737 diff --git a/llvm/test/Transforms/SimpleLoopUnswitch/formDedicatedAfterTrivial3.ll b/llvm/test/Transforms/SimpleLoopUnswitch/formDedicatedAfterTrivial3.ll index 64f285d..53285274 100644 --- a/llvm/test/Transforms/SimpleLoopUnswitch/formDedicatedAfterTrivial3.ll +++ b/llvm/test/Transforms/SimpleLoopUnswitch/formDedicatedAfterTrivial3.ll @@ -1,4 +1,4 @@ -; RUN: opt < %s -simple-loop-unswitch -disable-output +; RUN: opt < %s -passes=simple-loop-unswitch -disable-output ; PR38283 ; PR38737 diff --git a/llvm/test/Transforms/SimpleLoopUnswitch/guards.ll b/llvm/test/Transforms/SimpleLoopUnswitch/guards.ll index e325f25..4172520 100644 --- a/llvm/test/Transforms/SimpleLoopUnswitch/guards.ll +++ b/llvm/test/Transforms/SimpleLoopUnswitch/guards.ll @@ -1,5 +1,5 @@ ; RUN: opt -passes='loop(simple-loop-unswitch),verify' -simple-loop-unswitch-guards -S < %s | FileCheck %s -; RUN: opt -simple-loop-unswitch -enable-nontrivial-unswitch -simple-loop-unswitch-guards -S < %s | FileCheck %s +; RUN: opt -passes='simple-loop-unswitch' -simple-loop-unswitch-guards -S < %s | FileCheck %s ; RUN: opt -passes='loop-mssa(simple-loop-unswitch),verify' -simple-loop-unswitch-guards -verify-memoryssa -S < %s | FileCheck %s declare void @llvm.experimental.guard(i1, ...) diff --git a/llvm/test/Transforms/SimpleLoopUnswitch/implicit-null-checks.ll b/llvm/test/Transforms/SimpleLoopUnswitch/implicit-null-checks.ll index 75196ca..9fe5292 100644 --- a/llvm/test/Transforms/SimpleLoopUnswitch/implicit-null-checks.ll +++ b/llvm/test/Transforms/SimpleLoopUnswitch/implicit-null-checks.ll @@ -1,6 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py -; RUN: opt -enable-nontrivial-unswitch=true -simple-loop-unswitch -S < %s | FileCheck %s -; RUN: opt -enable-nontrivial-unswitch=true -passes='loop(simple-loop-unswitch),verify' -S < %s | FileCheck %s +; RUN: opt -passes='simple-loop-unswitch' -S < %s | FileCheck %s +; RUN: opt -passes='loop(simple-loop-unswitch),verify' -S < %s | FileCheck %s declare void @may_exit() declare void @throw_npe() diff --git a/llvm/test/Transforms/SimpleLoopUnswitch/infinite-loop.ll b/llvm/test/Transforms/SimpleLoopUnswitch/infinite-loop.ll index 71691548..495b82b 100644 --- a/llvm/test/Transforms/SimpleLoopUnswitch/infinite-loop.ll +++ b/llvm/test/Transforms/SimpleLoopUnswitch/infinite-loop.ll @@ -1,6 +1,6 @@ ; REQUIRES: asserts -; RUN: opt -simple-loop-unswitch -disable-output -stats -info-output-file - < %s | FileCheck --check-prefix=STATS %s -; RUN: opt -simple-loop-unswitch -verify-memoryssa -S < %s | FileCheck %s +; RUN: opt -passes=simple-loop-unswitch -disable-output -stats -info-output-file - < %s | FileCheck --check-prefix=STATS %s +; RUN: opt -passes=simple-loop-unswitch -verify-memoryssa -S < %s | FileCheck %s ; PR5373 ; Loop unswitching shouldn't trivially unswitch the true case of condition %a diff --git a/llvm/test/Transforms/SimpleLoopUnswitch/nontrivial-unswitch-cost.ll b/llvm/test/Transforms/SimpleLoopUnswitch/nontrivial-unswitch-cost.ll index 32d03ef..f7224d3 100644 --- a/llvm/test/Transforms/SimpleLoopUnswitch/nontrivial-unswitch-cost.ll +++ b/llvm/test/Transforms/SimpleLoopUnswitch/nontrivial-unswitch-cost.ll @@ -2,7 +2,7 @@ ; ; RUN: opt -passes='loop(simple-loop-unswitch),verify' -unswitch-threshold=5 -S < %s | FileCheck %s ; RUN: opt -passes='loop-mssa(simple-loop-unswitch),verify' -unswitch-threshold=5 -S < %s | FileCheck %s -; RUN: opt -simple-loop-unswitch -enable-nontrivial-unswitch -unswitch-threshold=5 -verify-memoryssa -S < %s | FileCheck %s +; RUN: opt -passes='simple-loop-unswitch' -unswitch-threshold=5 -verify-memoryssa -S < %s | FileCheck %s declare void @a() declare void @b() diff --git a/llvm/test/Transforms/SimpleLoopUnswitch/nontrivial-unswitch-freeze.ll b/llvm/test/Transforms/SimpleLoopUnswitch/nontrivial-unswitch-freeze.ll index ff9feab..e5c2fee 100644 --- a/llvm/test/Transforms/SimpleLoopUnswitch/nontrivial-unswitch-freeze.ll +++ b/llvm/test/Transforms/SimpleLoopUnswitch/nontrivial-unswitch-freeze.ll @@ -1,7 +1,7 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py ; RUN: opt -freeze-loop-unswitch-cond -passes='loop(simple-loop-unswitch),verify' -S < %s | FileCheck %s ; RUN: opt -freeze-loop-unswitch-cond -passes='loop-mssa(simple-loop-unswitch),verify' -S < %s | FileCheck %s -; RUN: opt -freeze-loop-unswitch-cond -simple-loop-unswitch -enable-nontrivial-unswitch -verify-memoryssa -S < %s | FileCheck %s +; RUN: opt -freeze-loop-unswitch-cond -passes='simple-loop-unswitch' -verify-memoryssa -S < %s | FileCheck %s declare i32 @a() declare i32 @b() diff --git a/llvm/test/Transforms/SimpleLoopUnswitch/nontrivial-unswitch-redundant-switch.ll b/llvm/test/Transforms/SimpleLoopUnswitch/nontrivial-unswitch-redundant-switch.ll index b28535c..b5af2c7 100644 --- a/llvm/test/Transforms/SimpleLoopUnswitch/nontrivial-unswitch-redundant-switch.ll +++ b/llvm/test/Transforms/SimpleLoopUnswitch/nontrivial-unswitch-redundant-switch.ll @@ -1,7 +1,7 @@ ; REQUIRES: asserts ; RUN: opt -passes='simple-loop-unswitch' -disable-output -S < %s ; RUN: opt -passes='loop-mssa(simple-loop-unswitch)' -disable-output -S < %s -; RUN: opt -simple-loop-unswitch -enable-nontrivial-unswitch -disable-output -S < %s +; RUN: opt -passes='simple-loop-unswitch' -disable-output -S < %s ; This loop shouldn't trigger asserts in SimpleLoopUnswitch. define void @test_redundant_switch(i1* %ptr, i32 %cond) { diff --git a/llvm/test/Transforms/SimpleLoopUnswitch/nontrivial-unswitch-skip-selects-in-guards.ll b/llvm/test/Transforms/SimpleLoopUnswitch/nontrivial-unswitch-skip-selects-in-guards.ll index 91dd181..a1012ca 100644 --- a/llvm/test/Transforms/SimpleLoopUnswitch/nontrivial-unswitch-skip-selects-in-guards.ll +++ b/llvm/test/Transforms/SimpleLoopUnswitch/nontrivial-unswitch-skip-selects-in-guards.ll @@ -1,7 +1,7 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py ; RUN: opt -passes='loop(simple-loop-unswitch),verify' -S < %s | FileCheck %s ; RUN: opt -passes='loop-mssa(simple-loop-unswitch),verify' -S < %s | FileCheck %s -; RUN: opt -simple-loop-unswitch -enable-nontrivial-unswitch -verify-memoryssa -S < %s | FileCheck %s +; RUN: opt -passes='simple-loop-unswitch' -verify-memoryssa -S < %s | FileCheck %s declare ptr @pluto() declare void @llvm.experimental.guard(i1, ...) diff --git a/llvm/test/Transforms/SimpleLoopUnswitch/nontrivial-unswitch.ll b/llvm/test/Transforms/SimpleLoopUnswitch/nontrivial-unswitch.ll index 001595d..9688547 100644 --- a/llvm/test/Transforms/SimpleLoopUnswitch/nontrivial-unswitch.ll +++ b/llvm/test/Transforms/SimpleLoopUnswitch/nontrivial-unswitch.ll @@ -1,6 +1,6 @@ ; RUN: opt -passes='loop(simple-loop-unswitch),verify' -S < %s | FileCheck %s ; RUN: opt -passes='loop-mssa(simple-loop-unswitch),verify' -S < %s | FileCheck %s -; RUN: opt -simple-loop-unswitch -enable-nontrivial-unswitch -verify-memoryssa -S < %s | FileCheck %s +; RUN: opt -passes='simple-loop-unswitch' -verify-memoryssa -S < %s | FileCheck %s declare i32 @a() declare i32 @b() diff --git a/llvm/test/Transforms/SimpleLoopUnswitch/pr37888.ll b/llvm/test/Transforms/SimpleLoopUnswitch/pr37888.ll index 2fc3d2b..099d6a5 100644 --- a/llvm/test/Transforms/SimpleLoopUnswitch/pr37888.ll +++ b/llvm/test/Transforms/SimpleLoopUnswitch/pr37888.ll @@ -1,4 +1,4 @@ -; RUN: opt -simple-loop-unswitch -verify-memoryssa -loop-deletion -S < %s | FileCheck %s +; RUN: opt -passes=simple-loop-unswitch,loop-deletion -verify-memoryssa -S < %s | FileCheck %s ; ; Check that when we do unswitching where we re-enqueue the loop to be processed ; again, but manage to delete the loop before ever getting to iterate on it, it diff --git a/llvm/test/Transforms/SimpleLoopUnswitch/preserve-analyses.ll b/llvm/test/Transforms/SimpleLoopUnswitch/preserve-analyses.ll index 50dac9d4..0a9dc31 100644 --- a/llvm/test/Transforms/SimpleLoopUnswitch/preserve-analyses.ll +++ b/llvm/test/Transforms/SimpleLoopUnswitch/preserve-analyses.ll @@ -1,4 +1,4 @@ -; RUN: opt -simple-loop-unswitch -verify-loop-info -verify-dom-info -verify-memoryssa -disable-output < %s +; RUN: opt -passes=simple-loop-unswitch -verify-loop-info -verify-dom-info -verify-memoryssa -disable-output < %s ; Loop unswitch should be able to unswitch these loops and ; preserve LCSSA and LoopSimplify forms. diff --git a/llvm/test/Transforms/SimpleLoopUnswitch/preserve-scev-exiting-multiple-loops.ll b/llvm/test/Transforms/SimpleLoopUnswitch/preserve-scev-exiting-multiple-loops.ll index badb623..b182bc6 100644 --- a/llvm/test/Transforms/SimpleLoopUnswitch/preserve-scev-exiting-multiple-loops.ll +++ b/llvm/test/Transforms/SimpleLoopUnswitch/preserve-scev-exiting-multiple-loops.ll @@ -1,8 +1,8 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py -; We run -indvars before -simple-loop-unswitch to compute SCEV exit counts before +; We run -indvars before -passes=simple-loop-unswitch to compute SCEV exit counts before ; running -simple-loop-unswitch. -; RUN: opt -indvars -simple-loop-unswitch -S %s -verify-scev | FileCheck %s +; RUN: opt -passes=indvars,simple-loop-unswitch -S %s -verify-scev | FileCheck %s ; Test for PR43972. -- 2.7.4