diff options
Diffstat (limited to 'llvm/test/Regression/Transforms/SimplifyCFG')
46 files changed, 48 insertions, 48 deletions
diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll b/llvm/test/Regression/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll index 054135355c5..9d2fe54cbaf 100644 --- a/llvm/test/Regression/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll +++ b/llvm/test/Regression/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll @@ -1,6 +1,6 @@ ; Basic block #2 should not be merged into BB #3! ; -; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | grep 'br label' +; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | grep 'br label' ; declare void %foo() implementation diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/2002-05-21-PHIElimination.ll b/llvm/test/Regression/Transforms/SimplifyCFG/2002-05-21-PHIElimination.ll index 7baea2e48d8..1ef659384c0 100644 --- a/llvm/test/Regression/Transforms/SimplifyCFG/2002-05-21-PHIElimination.ll +++ b/llvm/test/Regression/Transforms/SimplifyCFG/2002-05-21-PHIElimination.ll @@ -4,7 +4,7 @@ ; ; Which is not valid SSA ; -; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis +; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis void "test"() { br bool true, label %end, label %Loop diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/2002-06-24-PHINode.ll b/llvm/test/Regression/Transforms/SimplifyCFG/2002-06-24-PHINode.ll index 4c0cbbc9807..a669a3ffc73 100644 --- a/llvm/test/Regression/Transforms/SimplifyCFG/2002-06-24-PHINode.ll +++ b/llvm/test/Regression/Transforms/SimplifyCFG/2002-06-24-PHINode.ll @@ -1,7 +1,7 @@ ; -simplifycfg is not folding blocks if there is a PHI node involved. This ; should be fixed eventually -; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep br +; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep br int %main(int %argc) { br label %InlinedFunctionReturnNode diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/2002-09-24-PHIAssertion.ll b/llvm/test/Regression/Transforms/SimplifyCFG/2002-09-24-PHIAssertion.ll index b3c94859ef8..f1674b7ffb5 100644 --- a/llvm/test/Regression/Transforms/SimplifyCFG/2002-09-24-PHIAssertion.ll +++ b/llvm/test/Regression/Transforms/SimplifyCFG/2002-09-24-PHIAssertion.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -simplifycfg +; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg int %test(int %A, int %B, bool %cond) { J: diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/2003-03-07-DominateProblem.ll b/llvm/test/Regression/Transforms/SimplifyCFG/2003-03-07-DominateProblem.ll index 6b75c5fa27e..312e514cf24 100644 --- a/llvm/test/Regression/Transforms/SimplifyCFG/2003-03-07-DominateProblem.ll +++ b/llvm/test/Regression/Transforms/SimplifyCFG/2003-03-07-DominateProblem.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -simplifycfg -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg -disable-output implementation ; Functions: diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/2003-08-05-InvokeCrash.ll b/llvm/test/Regression/Transforms/SimplifyCFG/2003-08-05-InvokeCrash.ll index b6638ee519d..6c791d2e85d 100644 --- a/llvm/test/Regression/Transforms/SimplifyCFG/2003-08-05-InvokeCrash.ll +++ b/llvm/test/Regression/Transforms/SimplifyCFG/2003-08-05-InvokeCrash.ll @@ -1,6 +1,6 @@ ; Do not remove the invoke! ; -; RUN: llvm-as < %s | opt -simplifycfg -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg -disable-output int %test() { %A = invoke int %test() to label %Ret except label %Ret diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/2003-08-05-MishandleInvoke.ll b/llvm/test/Regression/Transforms/SimplifyCFG/2003-08-05-MishandleInvoke.ll index 179ef72d6c9..ff549adbaed 100644 --- a/llvm/test/Regression/Transforms/SimplifyCFG/2003-08-05-MishandleInvoke.ll +++ b/llvm/test/Regression/Transforms/SimplifyCFG/2003-08-05-MishandleInvoke.ll @@ -1,6 +1,6 @@ ; Do not remove the invoke! ; -; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | grep invoke +; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | grep invoke int %test() { invoke int %test() to label %Ret except label %Ret diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/2003-08-17-BranchFold.ll b/llvm/test/Regression/Transforms/SimplifyCFG/2003-08-17-BranchFold.ll index 55199ab2a19..523205b8b93 100644 --- a/llvm/test/Regression/Transforms/SimplifyCFG/2003-08-17-BranchFold.ll +++ b/llvm/test/Regression/Transforms/SimplifyCFG/2003-08-17-BranchFold.ll @@ -1,7 +1,7 @@ ; This test checks to make sure that 'br X, Dest, Dest' is folded into ; 'br Dest' -; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep 'br bool %c2' +; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep 'br bool %c2' declare void %noop() diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/2003-08-17-BranchFoldOrdering.ll b/llvm/test/Regression/Transforms/SimplifyCFG/2003-08-17-BranchFoldOrdering.ll index b96a4a6bb12..1fafe77ed26 100644 --- a/llvm/test/Regression/Transforms/SimplifyCFG/2003-08-17-BranchFoldOrdering.ll +++ b/llvm/test/Regression/Transforms/SimplifyCFG/2003-08-17-BranchFoldOrdering.ll @@ -3,7 +3,7 @@ ; due to the fact that the SimplifyCFG function does not use ; the ConstantFoldTerminator function. -; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep 'br bool %c2' +; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep 'br bool %c2' declare void %noop() diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/2003-08-17-FoldSwitch.ll b/llvm/test/Regression/Transforms/SimplifyCFG/2003-08-17-FoldSwitch.ll index c5b0058925d..91cb68b77e3 100644 --- a/llvm/test/Regression/Transforms/SimplifyCFG/2003-08-17-FoldSwitch.ll +++ b/llvm/test/Regression/Transforms/SimplifyCFG/2003-08-17-FoldSwitch.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep switch +; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep switch int %test1() { ; Test normal folding switch uint 5, label %Default [ diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/2004-12-10-SimplifyCFGCrash.ll b/llvm/test/Regression/Transforms/SimplifyCFG/2004-12-10-SimplifyCFGCrash.ll index 7b449965496..44c89d67b32 100644 --- a/llvm/test/Regression/Transforms/SimplifyCFG/2004-12-10-SimplifyCFGCrash.ll +++ b/llvm/test/Regression/Transforms/SimplifyCFG/2004-12-10-SimplifyCFGCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -simplifycfg -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg -disable-output implementation ; Functions: diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/2005-06-16-PHICrash.ll b/llvm/test/Regression/Transforms/SimplifyCFG/2005-06-16-PHICrash.ll index 33457d8d471..6c53029ea65 100644 --- a/llvm/test/Regression/Transforms/SimplifyCFG/2005-06-16-PHICrash.ll +++ b/llvm/test/Regression/Transforms/SimplifyCFG/2005-06-16-PHICrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -simplifycfg -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg -disable-output ; PR584 %g_38098584 = external global uint ; <uint*> [#uses=1] diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/2005-08-01-PHIUpdateFail.ll b/llvm/test/Regression/Transforms/SimplifyCFG/2005-08-01-PHIUpdateFail.ll index 71c0149f5bd..9271ac209e0 100644 --- a/llvm/test/Regression/Transforms/SimplifyCFG/2005-08-01-PHIUpdateFail.ll +++ b/llvm/test/Regression/Transforms/SimplifyCFG/2005-08-01-PHIUpdateFail.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -simplifycfg -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg -disable-output void %main() { entry: diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/2005-08-03-PHIFactorCrash.ll b/llvm/test/Regression/Transforms/SimplifyCFG/2005-08-03-PHIFactorCrash.ll index e844c08af1a..3f3951ac7c5 100644 --- a/llvm/test/Regression/Transforms/SimplifyCFG/2005-08-03-PHIFactorCrash.ll +++ b/llvm/test/Regression/Transforms/SimplifyCFG/2005-08-03-PHIFactorCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -simplifycfg -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg -disable-output %arraytype.1.Char = type { int, [0 x sbyte] } %arraytype.4.Signed = type { int, [0 x int] } diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/2005-10-02-InvokeSimplify.ll b/llvm/test/Regression/Transforms/SimplifyCFG/2005-10-02-InvokeSimplify.ll index 3a29cb8318b..c3b4194e1e7 100644 --- a/llvm/test/Regression/Transforms/SimplifyCFG/2005-10-02-InvokeSimplify.ll +++ b/llvm/test/Regression/Transforms/SimplifyCFG/2005-10-02-InvokeSimplify.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -simplifycfg -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg -disable-output bool %foo() { %X = invoke bool %foo() to label %N unwind label %F diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/2005-12-03-IncorrectPHIFold.ll b/llvm/test/Regression/Transforms/SimplifyCFG/2005-12-03-IncorrectPHIFold.ll index 18cbc176526..eabedf97937 100644 --- a/llvm/test/Regression/Transforms/SimplifyCFG/2005-12-03-IncorrectPHIFold.ll +++ b/llvm/test/Regression/Transforms/SimplifyCFG/2005-12-03-IncorrectPHIFold.ll @@ -1,6 +1,6 @@ ; Make sure this doesn't turn into an infinite loop -; RUN: llvm-as < %s | opt -simplifycfg -constprop -simplifycfg | llvm-dis | grep bb86 +; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg -constprop -simplifycfg | llvm-dis | grep bb86 %struct.anon = type { uint, int, int, int, [1024 x sbyte] } %_zero_ = external global %struct.anon* ; <%struct.anon**> [#uses=2] diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/2006-02-17-InfiniteUnroll.ll b/llvm/test/Regression/Transforms/SimplifyCFG/2006-02-17-InfiniteUnroll.ll index 16af017c4d0..8b443da1c86 100644 --- a/llvm/test/Regression/Transforms/SimplifyCFG/2006-02-17-InfiniteUnroll.ll +++ b/llvm/test/Regression/Transforms/SimplifyCFG/2006-02-17-InfiniteUnroll.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -simplifycfg -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg -disable-output void %polnel_() { entry: diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/2006-06-12-InfLoop.ll b/llvm/test/Regression/Transforms/SimplifyCFG/2006-06-12-InfLoop.ll index d6e2551637c..c9b1858bd48 100644 --- a/llvm/test/Regression/Transforms/SimplifyCFG/2006-06-12-InfLoop.ll +++ b/llvm/test/Regression/Transforms/SimplifyCFG/2006-06-12-InfLoop.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -simplifycfg -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg -disable-output void %main(int %c) { entry: diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/2006-08-03-Crash.ll b/llvm/test/Regression/Transforms/SimplifyCFG/2006-08-03-Crash.ll index 6280453d4d6..b796dee8034 100644 --- a/llvm/test/Regression/Transforms/SimplifyCFG/2006-08-03-Crash.ll +++ b/llvm/test/Regression/Transforms/SimplifyCFG/2006-08-03-Crash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -load-vn -gcse -simplifycfg -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -load-vn -gcse -simplifycfg -disable-output ; PR867 target endian = big diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/2006-10-19-UncondDiv.ll b/llvm/test/Regression/Transforms/SimplifyCFG/2006-10-19-UncondDiv.ll index b8946dcf989..8e583e880d7 100644 --- a/llvm/test/Regression/Transforms/SimplifyCFG/2006-10-19-UncondDiv.ll +++ b/llvm/test/Regression/Transforms/SimplifyCFG/2006-10-19-UncondDiv.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | opt -simplifycfg -disable-output && -; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep select +; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg -disable-output && +; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep select ; PR957 diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/2006-10-29-InvokeCrash.ll b/llvm/test/Regression/Transforms/SimplifyCFG/2006-10-29-InvokeCrash.ll index 200419acc96..ca48041f67b 100644 --- a/llvm/test/Regression/Transforms/SimplifyCFG/2006-10-29-InvokeCrash.ll +++ b/llvm/test/Regression/Transforms/SimplifyCFG/2006-10-29-InvokeCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -simplifycfg -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg -disable-output %struct..4._102 = type { %struct.QVectorData* } %struct..5._125 = type { %struct.QMapData* } diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/BrUnwind.ll b/llvm/test/Regression/Transforms/SimplifyCFG/BrUnwind.ll index 64264175ae9..94008b0d0f3 100644 --- a/llvm/test/Regression/Transforms/SimplifyCFG/BrUnwind.ll +++ b/llvm/test/Regression/Transforms/SimplifyCFG/BrUnwind.ll @@ -1,4 +1,4 @@ -;RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep 'br label' +;RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep 'br label' void %test(bool %C) { br bool %C, label %A, label %B A: diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/DeadSetCC.ll b/llvm/test/Regression/Transforms/SimplifyCFG/DeadSetCC.ll index 70ccfc8c13b..b180700d4f1 100644 --- a/llvm/test/Regression/Transforms/SimplifyCFG/DeadSetCC.ll +++ b/llvm/test/Regression/Transforms/SimplifyCFG/DeadSetCC.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep seteq +; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep seteq ; Check that simplifycfg deletes a dead 'seteq' instruction when it ; folds a conditional branch into a switch instruction. diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/EqualPHIEdgeBlockMerge.ll b/llvm/test/Regression/Transforms/SimplifyCFG/EqualPHIEdgeBlockMerge.ll index 09e70244748..4b643c6a175 100644 --- a/llvm/test/Regression/Transforms/SimplifyCFG/EqualPHIEdgeBlockMerge.ll +++ b/llvm/test/Regression/Transforms/SimplifyCFG/EqualPHIEdgeBlockMerge.ll @@ -1,6 +1,6 @@ ; Test merging of blocks with phi nodes. ; -; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep 'N:' +; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep 'N:' ; int %test(bool %a) { diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/HoistCode.ll b/llvm/test/Regression/Transforms/SimplifyCFG/HoistCode.ll index db397a7e64d..b8174771613 100644 --- a/llvm/test/Regression/Transforms/SimplifyCFG/HoistCode.ll +++ b/llvm/test/Regression/Transforms/SimplifyCFG/HoistCode.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep br +; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep br void %foo(bool %C, int* %P) { br bool %C, label %T, label %F diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/InvokeEliminate.ll b/llvm/test/Regression/Transforms/SimplifyCFG/InvokeEliminate.ll index 73dc3cfb153..cbce416d66f 100644 --- a/llvm/test/Regression/Transforms/SimplifyCFG/InvokeEliminate.ll +++ b/llvm/test/Regression/Transforms/SimplifyCFG/InvokeEliminate.ll @@ -3,7 +3,7 @@ ; If this test is successful, the function should be reduced to 'call; ret' -; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not egrep 'invoke|br' +; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not egrep 'invoke|br' declare void %bar() diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/PhiBlockMerge.ll b/llvm/test/Regression/Transforms/SimplifyCFG/PhiBlockMerge.ll index 0537722ad9e..881944fd9d0 100644 --- a/llvm/test/Regression/Transforms/SimplifyCFG/PhiBlockMerge.ll +++ b/llvm/test/Regression/Transforms/SimplifyCFG/PhiBlockMerge.ll @@ -1,6 +1,6 @@ ; Test merging of blocks that only have PHI nodes in them ; -; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep 'N:' +; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep 'N:' ; int %test(bool %a, bool %b) { diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/PhiBlockMerge2.ll b/llvm/test/Regression/Transforms/SimplifyCFG/PhiBlockMerge2.ll index 083e45e016c..7e80677bc79 100644 --- a/llvm/test/Regression/Transforms/SimplifyCFG/PhiBlockMerge2.ll +++ b/llvm/test/Regression/Transforms/SimplifyCFG/PhiBlockMerge2.ll @@ -2,7 +2,7 @@ ; where the mergedinto block doesn't have any PHI nodes, and is in fact ; dominated by the block-to-be-eliminated ; -; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep 'N:' +; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep 'N:' ; int %test(bool %a, bool %b) { diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/PhiEliminate.ll b/llvm/test/Regression/Transforms/SimplifyCFG/PhiEliminate.ll index 0ca60e3364f..9411b33f7b3 100644 --- a/llvm/test/Regression/Transforms/SimplifyCFG/PhiEliminate.ll +++ b/llvm/test/Regression/Transforms/SimplifyCFG/PhiEliminate.ll @@ -3,7 +3,7 @@ ; nodes away allows the branches to be eliminated, performing a simple form of ; 'if conversion'. -; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis > %t.xform +; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis > %t.xform ; RUN: not grep phi %t.xform && grep ret %t.xform declare void %use(bool) diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/PhiEliminate2.ll b/llvm/test/Regression/Transforms/SimplifyCFG/PhiEliminate2.ll index e93d2939d8b..fb00a1342bd 100644 --- a/llvm/test/Regression/Transforms/SimplifyCFG/PhiEliminate2.ll +++ b/llvm/test/Regression/Transforms/SimplifyCFG/PhiEliminate2.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep br +; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep br int %test(bool %C, int %V1, int %V2) { entry: diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/PhiNoEliminate.ll b/llvm/test/Regression/Transforms/SimplifyCFG/PhiNoEliminate.ll index 6e7c9f5e782..1eb07b32f16 100644 --- a/llvm/test/Regression/Transforms/SimplifyCFG/PhiNoEliminate.ll +++ b/llvm/test/Regression/Transforms/SimplifyCFG/PhiNoEliminate.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep select +; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep select ;; The PHI node in this example should not be turned into a select, as we are ;; not able to ifcvt the entire block. As such, converting to a select just diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/UncondBranchToReturn.ll b/llvm/test/Regression/Transforms/SimplifyCFG/UncondBranchToReturn.ll index 6e943f35fb1..a3ed678c1be 100644 --- a/llvm/test/Regression/Transforms/SimplifyCFG/UncondBranchToReturn.ll +++ b/llvm/test/Regression/Transforms/SimplifyCFG/UncondBranchToReturn.ll @@ -2,7 +2,7 @@ ; a PHI node and a return. Make sure the simplify cfg can straighten out this ; important case. This is basically the most trivial form of tail-duplication. -; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep 'br label' +; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep 'br label' int %test(bool %B, int %A, int %B) { br bool %B, label %T, label %F diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/UnreachableEliminate.ll b/llvm/test/Regression/Transforms/SimplifyCFG/UnreachableEliminate.ll index 09c41a90dcf..22cd3d4685c 100644 --- a/llvm/test/Regression/Transforms/SimplifyCFG/UnreachableEliminate.ll +++ b/llvm/test/Regression/Transforms/SimplifyCFG/UnreachableEliminate.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep unreachable +; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep unreachable void %test1(bool %C, bool* %BP) { br bool %C, label %T, label %F diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/basictest.ll b/llvm/test/Regression/Transforms/SimplifyCFG/basictest.ll index 9dac7c05ab6..18fa8978ca1 100644 --- a/llvm/test/Regression/Transforms/SimplifyCFG/basictest.ll +++ b/llvm/test/Regression/Transforms/SimplifyCFG/basictest.ll @@ -1,6 +1,6 @@ ; Test CFG simplify removal of branch instructions... ; -; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep br +; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep br void "test1"() { diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/branch-cond-merge.ll b/llvm/test/Regression/Transforms/SimplifyCFG/branch-cond-merge.ll index 55cf4b8cc22..ca5f3e4ab44 100644 --- a/llvm/test/Regression/Transforms/SimplifyCFG/branch-cond-merge.ll +++ b/llvm/test/Regression/Transforms/SimplifyCFG/branch-cond-merge.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -simplifycfg -instcombine -simplifycfg | llvm-dis | not grep call +; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg -instcombine -simplifycfg | llvm-dis | not grep call declare void %bar() diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/branch-cond-prop.ll b/llvm/test/Regression/Transforms/SimplifyCFG/branch-cond-prop.ll index 6ea548c3beb..10270c29fc5 100644 --- a/llvm/test/Regression/Transforms/SimplifyCFG/branch-cond-prop.ll +++ b/llvm/test/Regression/Transforms/SimplifyCFG/branch-cond-prop.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep call +; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep call declare void %bar() diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/branch-fold-test.ll b/llvm/test/Regression/Transforms/SimplifyCFG/branch-fold-test.ll index bb6c5fed3bb..3bbb101ef47 100644 --- a/llvm/test/Regression/Transforms/SimplifyCFG/branch-fold-test.ll +++ b/llvm/test/Regression/Transforms/SimplifyCFG/branch-fold-test.ll @@ -1,7 +1,7 @@ ; This test ensures that the simplifycfg pass continues to constant fold ; terminator instructions. -; RUN: llvm-as < %s | opt -simplifycfg | not grep br +; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | not grep br int %test(int %A, int %B) { J: diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/branch-fold.ll b/llvm/test/Regression/Transforms/SimplifyCFG/branch-fold.ll index 8bd137cc663..bf35c2a4eaa 100644 --- a/llvm/test/Regression/Transforms/SimplifyCFG/branch-fold.ll +++ b/llvm/test/Regression/Transforms/SimplifyCFG/branch-fold.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | grep 'br bool' | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | grep 'br bool' | wc -l | grep 1 void %test(int* %P, int* %Q, bool %A, bool %B) { br bool %A, label %a, label %b ;; fold the two branches into one diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/branch-phi-thread.ll b/llvm/test/Regression/Transforms/SimplifyCFG/branch-phi-thread.ll index 491bb0eefac..3b8d1885443 100644 --- a/llvm/test/Regression/Transforms/SimplifyCFG/branch-phi-thread.ll +++ b/llvm/test/Regression/Transforms/SimplifyCFG/branch-phi-thread.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | opt -simplifycfg -adce | llvm-dis | not grep 'call void %f1' && -; RUN: llvm-as < %s | opt -simplifycfg -adce -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg -adce | llvm-dis | not grep 'call void %f1' && +; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg -adce -disable-output declare void %f1() declare void %f2() declare void %f3() diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/hoist-common-code.ll b/llvm/test/Regression/Transforms/SimplifyCFG/hoist-common-code.ll index 80a5446e6dc..b19eac98d6d 100644 --- a/llvm/test/Regression/Transforms/SimplifyCFG/hoist-common-code.ll +++ b/llvm/test/Regression/Transforms/SimplifyCFG/hoist-common-code.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep 'br' +; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep 'br' declare void %bar(int) void %test(bool %P, int* %Q) { diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/return-merge.ll b/llvm/test/Regression/Transforms/SimplifyCFG/return-merge.ll index 51144f0be2b..cbcfddbd944 100644 --- a/llvm/test/Regression/Transforms/SimplifyCFG/return-merge.ll +++ b/llvm/test/Regression/Transforms/SimplifyCFG/return-merge.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep br +; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep br int %test1(bool %C) { entry: diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/switch-simplify-crash.ll b/llvm/test/Regression/Transforms/SimplifyCFG/switch-simplify-crash.ll index 0f941048271..096f2aeb813 100644 --- a/llvm/test/Regression/Transforms/SimplifyCFG/switch-simplify-crash.ll +++ b/llvm/test/Regression/Transforms/SimplifyCFG/switch-simplify-crash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -simplifycfg -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg -disable-output void %NewExtractNames() { diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/switch_create.ll b/llvm/test/Regression/Transforms/SimplifyCFG/switch_create.ll index ba1b7d65dc2..2d722918b9d 100644 --- a/llvm/test/Regression/Transforms/SimplifyCFG/switch_create.ll +++ b/llvm/test/Regression/Transforms/SimplifyCFG/switch_create.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep br +; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep br declare void %foo1() declare void %foo2() diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/switch_formation.ll b/llvm/test/Regression/Transforms/SimplifyCFG/switch_formation.ll index 60169fe92d5..e13f2399e83 100644 --- a/llvm/test/Regression/Transforms/SimplifyCFG/switch_formation.ll +++ b/llvm/test/Regression/Transforms/SimplifyCFG/switch_formation.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep 'br' +; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep 'br' bool %_ZN4llvm11SetCondInst7classofEPKNS_11InstructionE({uint, uint}* %I) { entry: diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/switch_switch_fold.ll b/llvm/test/Regression/Transforms/SimplifyCFG/switch_switch_fold.ll index cafd7d7e084..8bc5b8d2e65 100644 --- a/llvm/test/Regression/Transforms/SimplifyCFG/switch_switch_fold.ll +++ b/llvm/test/Regression/Transforms/SimplifyCFG/switch_switch_fold.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | grep switch | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | grep switch | wc -l | grep 1 ; Test that a switch going to a switch on the same value can be merged. All ; three switches in this example can be merged into one big one. diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/switch_thread.ll b/llvm/test/Regression/Transforms/SimplifyCFG/switch_thread.ll index 5eee2c7a7ae..60b045ff89a 100644 --- a/llvm/test/Regression/Transforms/SimplifyCFG/switch_thread.ll +++ b/llvm/test/Regression/Transforms/SimplifyCFG/switch_thread.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep 'call void %DEAD' +; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep 'call void %DEAD' ; Test that we can thread a simple known condition through switch statements. |

