diff options
Diffstat (limited to 'test/Transforms/InstCombine')
120 files changed, 148 insertions, 148 deletions
diff --git a/test/Transforms/InstCombine/2002-03-11-InstCombineHang.ll b/test/Transforms/InstCombine/2002-03-11-InstCombineHang.ll index 3bf86482ed..dd683a3d99 100644 --- a/test/Transforms/InstCombine/2002-03-11-InstCombineHang.ll +++ b/test/Transforms/InstCombine/2002-03-11-InstCombineHang.ll @@ -1,6 +1,6 @@ ; This testcase causes instcombine to hang. ; -; RUN: llvm-as < %s | opt -instcombine +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine implementation diff --git a/test/Transforms/InstCombine/2002-05-14-SubFailure.ll b/test/Transforms/InstCombine/2002-05-14-SubFailure.ll index 6f832f2b66..1228fd0aca 100644 --- a/test/Transforms/InstCombine/2002-05-14-SubFailure.ll +++ b/test/Transforms/InstCombine/2002-05-14-SubFailure.ll @@ -1,7 +1,7 @@ ; Instcombine was missing a test that caused it to make illegal transformations ; sometimes. In this case, it transforms the sub into an add: ; RUN: echo foo -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep add +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep add ; diff --git a/test/Transforms/InstCombine/2002-05-14-TouchDeletedInst.ll b/test/Transforms/InstCombine/2002-05-14-TouchDeletedInst.ll index 1ebe6c8f1d..9c278edc8d 100644 --- a/test/Transforms/InstCombine/2002-05-14-TouchDeletedInst.ll +++ b/test/Transforms/InstCombine/2002-05-14-TouchDeletedInst.ll @@ -4,7 +4,7 @@ ; stayed on the worklist, as soon as it came back up to be processed, bad things ; happened, and opt asserted. ; -; RUN: llvm-as < %s | opt -instcombine +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine ; %.LC0 = internal global [21 x sbyte] c"hbMakeCodeLengths(1)\00" ; <[21 x sbyte]*> [#uses=1] diff --git a/test/Transforms/InstCombine/2002-08-02-CastTest.ll b/test/Transforms/InstCombine/2002-08-02-CastTest.ll index 239c96cfb4..55609f1e7f 100644 --- a/test/Transforms/InstCombine/2002-08-02-CastTest.ll +++ b/test/Transforms/InstCombine/2002-08-02-CastTest.ll @@ -1,7 +1,7 @@ ; This testcase is incorrectly getting completely eliminated. There should be ; SOME instruction named %c here, even if it's a bitwise and. ; -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep '%c' +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep '%c' ; ulong %test3(ulong %A) { %c1 = cast ulong %A to ubyte diff --git a/test/Transforms/InstCombine/2002-09-17-GetElementPtrCrash.ll b/test/Transforms/InstCombine/2002-09-17-GetElementPtrCrash.ll index db2b504339..69bec19b2b 100644 --- a/test/Transforms/InstCombine/2002-09-17-GetElementPtrCrash.ll +++ b/test/Transforms/InstCombine/2002-09-17-GetElementPtrCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine %bob = type { int } diff --git a/test/Transforms/InstCombine/2002-12-05-MissedConstProp.ll b/test/Transforms/InstCombine/2002-12-05-MissedConstProp.ll index ec29e6bbbd..6233e5027b 100644 --- a/test/Transforms/InstCombine/2002-12-05-MissedConstProp.ll +++ b/test/Transforms/InstCombine/2002-12-05-MissedConstProp.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep add +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep add int %test(int %A) { %A.neg = sub int 0, %A diff --git a/test/Transforms/InstCombine/2003-05-26-CastMiscompile.ll b/test/Transforms/InstCombine/2003-05-26-CastMiscompile.ll index 218a536ef6..453258980d 100644 --- a/test/Transforms/InstCombine/2003-05-26-CastMiscompile.ll +++ b/test/Transforms/InstCombine/2003-05-26-CastMiscompile.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep 4294967295 +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 4294967295 ulong %test(ulong %Val) { %tmp.3 = cast ulong %Val to uint ; <uint> [#uses=1] diff --git a/test/Transforms/InstCombine/2003-05-27-ConstExprCrash.ll b/test/Transforms/InstCombine/2003-05-27-ConstExprCrash.ll index 309191cdc4..6222169e08 100644 --- a/test/Transforms/InstCombine/2003-05-27-ConstExprCrash.ll +++ b/test/Transforms/InstCombine/2003-05-27-ConstExprCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output %X = global int 5 long %test() { diff --git a/test/Transforms/InstCombine/2003-06-05-BranchInvertInfLoop.ll b/test/Transforms/InstCombine/2003-06-05-BranchInvertInfLoop.ll index 3d26024fe8..ae823d6bf6 100644 --- a/test/Transforms/InstCombine/2003-06-05-BranchInvertInfLoop.ll +++ b/test/Transforms/InstCombine/2003-06-05-BranchInvertInfLoop.ll @@ -2,7 +2,7 @@ ; because it things that the constant value is a not expression... and ; constantly inverts the branch back and forth. ; -; RUN: llvm-as < %s | opt -instcombine -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output ubyte %test19(bool %c) { br bool true, label %True, label %False diff --git a/test/Transforms/InstCombine/2003-06-22-ConstantExprCrash.ll b/test/Transforms/InstCombine/2003-06-22-ConstantExprCrash.ll index 917c86c5e2..92a32d5d35 100644 --- a/test/Transforms/InstCombine/2003-06-22-ConstantExprCrash.ll +++ b/test/Transforms/InstCombine/2003-06-22-ConstantExprCrash.ll @@ -1,7 +1,7 @@ ; This is a bug in the VMcode library, not instcombine, it's just convenient ; to expose it here. -; RUN: llvm-as < %s | opt -instcombine -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output %A = global int 1 %B = global int 2 diff --git a/test/Transforms/InstCombine/2003-07-21-ExternalConstant.ll b/test/Transforms/InstCombine/2003-07-21-ExternalConstant.ll index 2fc1b206ac..c9e3b4c542 100644 --- a/test/Transforms/InstCombine/2003-07-21-ExternalConstant.ll +++ b/test/Transforms/InstCombine/2003-07-21-ExternalConstant.ll @@ -10,7 +10,7 @@ ; should pass through the optimizer without failure. ; ; Extra code: -; RUN: llvm-as < %s | opt -instcombine +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine ; target endian = little diff --git a/test/Transforms/InstCombine/2003-08-12-AllocaNonNull.ll b/test/Transforms/InstCombine/2003-08-12-AllocaNonNull.ll index e2b2afd15f..52b778c10d 100644 --- a/test/Transforms/InstCombine/2003-08-12-AllocaNonNull.ll +++ b/test/Transforms/InstCombine/2003-08-12-AllocaNonNull.ll @@ -1,6 +1,6 @@ ; This testcase can be simplified by "realizing" that alloca can never return ; null. -; RUN: llvm-as < %s | opt -instcombine -simplifycfg | llvm-dis | not grep 'br ' +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -simplifycfg | llvm-dis | not grep 'br ' implementation ; Functions: diff --git a/test/Transforms/InstCombine/2003-09-09-VolatileLoadElim.ll b/test/Transforms/InstCombine/2003-09-09-VolatileLoadElim.ll index 355087a4ce..adb1474a98 100644 --- a/test/Transforms/InstCombine/2003-09-09-VolatileLoadElim.ll +++ b/test/Transforms/InstCombine/2003-09-09-VolatileLoadElim.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep load +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep load void %test(int* %P) { %X = volatile load int* %P ; Dead but not deletable! ret void diff --git a/test/Transforms/InstCombine/2003-10-23-InstcombineNullFail.ll b/test/Transforms/InstCombine/2003-10-23-InstcombineNullFail.ll index 72f983bde1..837494f530 100644 --- a/test/Transforms/InstCombine/2003-10-23-InstcombineNullFail.ll +++ b/test/Transforms/InstCombine/2003-10-23-InstcombineNullFail.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep false +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep false ; ; This actually looks like a constant propagation bug diff --git a/test/Transforms/InstCombine/2003-10-29-CallSiteResolve.ll b/test/Transforms/InstCombine/2003-10-29-CallSiteResolve.ll index cef129192f..07b6dd2db3 100644 --- a/test/Transforms/InstCombine/2003-10-29-CallSiteResolve.ll +++ b/test/Transforms/InstCombine/2003-10-29-CallSiteResolve.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output declare int* %bar() diff --git a/test/Transforms/InstCombine/2003-11-03-VarargsCallBug.ll b/test/Transforms/InstCombine/2003-11-03-VarargsCallBug.ll index 5bb2fe12b6..a2e28d97a1 100644 --- a/test/Transforms/InstCombine/2003-11-03-VarargsCallBug.ll +++ b/test/Transforms/InstCombine/2003-11-03-VarargsCallBug.ll @@ -1,5 +1,5 @@ ; The cast in this testcase is not eliminable on a 32-bit target! -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep inttoptr +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep inttoptr target endian = little target pointersize = 32 diff --git a/test/Transforms/InstCombine/2003-11-13-ConstExprCastCall.ll b/test/Transforms/InstCombine/2003-11-13-ConstExprCastCall.ll index 04bbab8b57..d257286d85 100644 --- a/test/Transforms/InstCombine/2003-11-13-ConstExprCastCall.ll +++ b/test/Transforms/InstCombine/2003-11-13-ConstExprCastCall.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep call | notcast +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep call | notcast declare void %free(sbyte*) diff --git a/test/Transforms/InstCombine/2004-01-13-InstCombineInvokePHI.ll b/test/Transforms/InstCombine/2004-01-13-InstCombineInvokePHI.ll index c33f9e9e33..ff90c32daf 100644 --- a/test/Transforms/InstCombine/2004-01-13-InstCombineInvokePHI.ll +++ b/test/Transforms/InstCombine/2004-01-13-InstCombineInvokePHI.ll @@ -5,7 +5,7 @@ ; invoke instruction, we really cannot perform this transformation at all at ; least without splitting the critical edge. ; -; RUN: llvm-as < %s | opt -instcombine -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output declare sbyte* %test() diff --git a/test/Transforms/InstCombine/2004-02-23-ShiftShiftOverflow.ll b/test/Transforms/InstCombine/2004-02-23-ShiftShiftOverflow.ll index 97020c59c7..85095bf005 100644 --- a/test/Transforms/InstCombine/2004-02-23-ShiftShiftOverflow.ll +++ b/test/Transforms/InstCombine/2004-02-23-ShiftShiftOverflow.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep 34 +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep 34 int %test(int %X) { ; Do not fold into shr X, 34, as this uses undefined behavior! diff --git a/test/Transforms/InstCombine/2004-03-13-InstCombineInfLoop.ll b/test/Transforms/InstCombine/2004-03-13-InstCombineInfLoop.ll index 9e77df948a..fd7a2e346c 100644 --- a/test/Transforms/InstCombine/2004-03-13-InstCombineInfLoop.ll +++ b/test/Transforms/InstCombine/2004-03-13-InstCombineInfLoop.ll @@ -1,7 +1,7 @@ ; This testcase caused the combiner to go into an infinite loop, moving the ; cast back and forth, changing the seteq to operate on int vs uint and back. -; RUN: llvm-as < %s | opt -instcombine -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output bool %test(uint %A, int %B) { %C = sub uint 0, %A diff --git a/test/Transforms/InstCombine/2004-04-04-InstCombineReplaceAllUsesWith.ll b/test/Transforms/InstCombine/2004-04-04-InstCombineReplaceAllUsesWith.ll index b7bfb29f43..4c6ff1b52b 100644 --- a/test/Transforms/InstCombine/2004-04-04-InstCombineReplaceAllUsesWith.ll +++ b/test/Transforms/InstCombine/2004-04-04-InstCombineReplaceAllUsesWith.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output int %test() { ret int 0 diff --git a/test/Transforms/InstCombine/2004-05-07-UnsizedCastLoad.ll b/test/Transforms/InstCombine/2004-05-07-UnsizedCastLoad.ll index 6776ff185d..8e8f019c66 100644 --- a/test/Transforms/InstCombine/2004-05-07-UnsizedCastLoad.ll +++ b/test/Transforms/InstCombine/2004-05-07-UnsizedCastLoad.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output %Ty = type opaque diff --git a/test/Transforms/InstCombine/2004-07-27-ConstantExprMul.ll b/test/Transforms/InstCombine/2004-07-27-ConstantExprMul.ll index aa95320ac1..7994d45c9f 100644 --- a/test/Transforms/InstCombine/2004-07-27-ConstantExprMul.ll +++ b/test/Transforms/InstCombine/2004-07-27-ConstantExprMul.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output %p = weak global int 0 diff --git a/test/Transforms/InstCombine/2004-08-09-RemInfLoop.llx b/test/Transforms/InstCombine/2004-08-09-RemInfLoop.llx index 1ed6054c21..98b35fe3cb 100644 --- a/test/Transforms/InstCombine/2004-08-09-RemInfLoop.llx +++ b/test/Transforms/InstCombine/2004-08-09-RemInfLoop.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine ; This testcase should not send the instcombiner into an infinite loop! diff --git a/test/Transforms/InstCombine/2004-09-20-BadLoadCombine.llx b/test/Transforms/InstCombine/2004-09-20-BadLoadCombine.llx index 5960135f1b..3fcbb88e2d 100644 --- a/test/Transforms/InstCombine/2004-09-20-BadLoadCombine.llx +++ b/test/Transforms/InstCombine/2004-09-20-BadLoadCombine.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine -mem2reg | llvm-dis | not grep 'int 1' +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -mem2reg | llvm-dis | not grep 'int 1' ; When propagating the load through the select, make sure that the load is ; inserted where the original load was, not where the select is. Not doing diff --git a/test/Transforms/InstCombine/2004-09-20-BadLoadCombine2.llx b/test/Transforms/InstCombine/2004-09-20-BadLoadCombine2.llx index 297cf87912..83acd702c6 100644 --- a/test/Transforms/InstCombine/2004-09-20-BadLoadCombine2.llx +++ b/test/Transforms/InstCombine/2004-09-20-BadLoadCombine2.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine -mem2reg -simplifycfg | llvm-dis | \ +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -mem2reg -simplifycfg | llvm-dis | \ ; RUN: grep -v store | not grep 'int 1' ; Test to make sure that instcombine does not accidentally propagate the load diff --git a/test/Transforms/InstCombine/2004-09-28-BadShiftAndSetCC.llx b/test/Transforms/InstCombine/2004-09-28-BadShiftAndSetCC.llx index eaedc855a4..bb55b5c67c 100644 --- a/test/Transforms/InstCombine/2004-09-28-BadShiftAndSetCC.llx +++ b/test/Transforms/InstCombine/2004-09-28-BadShiftAndSetCC.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep -- -65536 +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep -- -65536 bool %test(int %tmp.124) { %tmp.125 = shl int %tmp.124, ubyte 8 diff --git a/test/Transforms/InstCombine/2004-11-22-Missed-and-fold.ll b/test/Transforms/InstCombine/2004-11-22-Missed-and-fold.ll index c8a1d52733..1a741c996f 100644 --- a/test/Transforms/InstCombine/2004-11-22-Missed-and-fold.ll +++ b/test/Transforms/InstCombine/2004-11-22-Missed-and-fold.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep and +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep and sbyte %test21(sbyte %A) { %C = shr sbyte %A, ubyte 7 ;; sign extend diff --git a/test/Transforms/InstCombine/2004-11-27-SetCCForCastLargerAndConstant.ll b/test/Transforms/InstCombine/2004-11-27-SetCCForCastLargerAndConstant.ll index 759c619e6d..17958e198a 100644 --- a/test/Transforms/InstCombine/2004-11-27-SetCCForCastLargerAndConstant.ll +++ b/test/Transforms/InstCombine/2004-11-27-SetCCForCastLargerAndConstant.ll @@ -9,7 +9,7 @@ ; be eliminated. In many cases the setCC is also eliminated based on the ; constant value and the range of the casted value. ; -; RUN: llvm-as %s -o - | opt -instcombine | llvm-dis | notcast '.*int' +; RUN: llvm-upgrade %s -o - | llvm-as | opt -instcombine | llvm-dis | notcast '.*int' implementation ; Functions: diff --git a/test/Transforms/InstCombine/2004-12-08-InstCombineCrash.ll b/test/Transforms/InstCombine/2004-12-08-InstCombineCrash.ll index 02939c0c3e..6e241f4e78 100644 --- a/test/Transforms/InstCombine/2004-12-08-InstCombineCrash.ll +++ b/test/Transforms/InstCombine/2004-12-08-InstCombineCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as %s -o - | opt -instcombine +; RUN: llvm-upgrade %s -o - | llvm-as | opt -instcombine %struct.llvm_java_object_base = type opaque "java/lang/Object" = type { %struct.llvm_java_object_base } diff --git a/test/Transforms/InstCombine/2004-12-08-RemInfiniteLoop.ll b/test/Transforms/InstCombine/2004-12-08-RemInfiniteLoop.ll index 7f83fa837d..fb18ea24c1 100644 --- a/test/Transforms/InstCombine/2004-12-08-RemInfiniteLoop.ll +++ b/test/Transforms/InstCombine/2004-12-08-RemInfiniteLoop.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine int %test(int %X) { %Y = rem int %X, undef diff --git a/test/Transforms/InstCombine/2005-03-04-ShiftOverflow.ll b/test/Transforms/InstCombine/2005-03-04-ShiftOverflow.ll index 05a43965a4..c203bb1c44 100644 --- a/test/Transforms/InstCombine/2005-03-04-ShiftOverflow.ll +++ b/test/Transforms/InstCombine/2005-03-04-ShiftOverflow.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep 'ret bool false' +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep 'ret bool false' bool %test(ulong %tmp.169) { %tmp.1710 = shr ulong %tmp.169, ubyte 1 %tmp.1912 = setgt ulong %tmp.1710, 0 diff --git a/test/Transforms/InstCombine/2005-04-07-UDivSelectCrash.ll b/test/Transforms/InstCombine/2005-04-07-UDivSelectCrash.ll index b41dbd5941..8e523d3fae 100644 --- a/test/Transforms/InstCombine/2005-04-07-UDivSelectCrash.ll +++ b/test/Transforms/InstCombine/2005-04-07-UDivSelectCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output uint %test(bool %C, uint %tmp.15) { %tmp.16 = select bool %C, uint 8, uint 1 diff --git a/test/Transforms/InstCombine/2005-06-15-DivSelectCrash.ll b/test/Transforms/InstCombine/2005-06-15-DivSelectCrash.ll index 0d4e8cac59..fa862fed2a 100644 --- a/test/Transforms/InstCombine/2005-06-15-DivSelectCrash.ll +++ b/test/Transforms/InstCombine/2005-06-15-DivSelectCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output int %_Z13func_31585107li(int %l_39521025, int %l_59244666) { %shortcirc_val = select bool false, uint 1, uint 0 ; <uint> [#uses=1] diff --git a/test/Transforms/InstCombine/2005-06-15-ShiftSetCCCrash.ll b/test/Transforms/InstCombine/2005-06-15-ShiftSetCCCrash.ll index fed675e318..deb61246cf 100644 --- a/test/Transforms/InstCombine/2005-06-15-ShiftSetCCCrash.ll +++ b/test/Transforms/InstCombine/2005-06-15-ShiftSetCCCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output ; PR577 bool %test() { diff --git a/test/Transforms/InstCombine/2005-06-16-RangeCrash.ll b/test/Transforms/InstCombine/2005-06-16-RangeCrash.ll index a586d87cac..ef44301225 100644 --- a/test/Transforms/InstCombine/2005-06-16-RangeCrash.ll +++ b/test/Transforms/InstCombine/2005-06-16-RangeCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output ; PR585 bool %test() { %tmp.26 = div int 0, -2147483648 ; <int> [#uses=1] diff --git a/test/Transforms/InstCombine/2005-06-16-SetCCOrSetCCMiscompile.ll b/test/Transforms/InstCombine/2005-06-16-SetCCOrSetCCMiscompile.ll index 53470971ef..49abb12e6f 100644 --- a/test/Transforms/InstCombine/2005-06-16-SetCCOrSetCCMiscompile.ll +++ b/test/Transforms/InstCombine/2005-06-16-SetCCOrSetCCMiscompile.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep 'ret bool true' +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 'ret bool true' ; PR586 %g_07918478 = external global uint ; <uint*> [#uses=1] diff --git a/test/Transforms/InstCombine/2005-07-07-DeadPHILoop.ll b/test/Transforms/InstCombine/2005-07-07-DeadPHILoop.ll index 29a1d7f794..be9837dc43 100644 --- a/test/Transforms/InstCombine/2005-07-07-DeadPHILoop.ll +++ b/test/Transforms/InstCombine/2005-07-07-DeadPHILoop.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output ; This example caused instcombine to spin into an infinite loop. diff --git a/test/Transforms/InstCombine/2006-02-07-SextZextCrash.ll b/test/Transforms/InstCombine/2006-02-07-SextZextCrash.ll index f3591e663a..e06dca914e 100644 --- a/test/Transforms/InstCombine/2006-02-07-SextZextCrash.ll +++ b/test/Transforms/InstCombine/2006-02-07-SextZextCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output %struct.rtx_const = type { uint, { %union.real_extract } } %struct.rtx_def = type { int, [1 x %union.rtunion_def] } diff --git a/test/Transforms/InstCombine/2006-02-13-DemandedMiscompile.ll b/test/Transforms/InstCombine/2006-02-13-DemandedMiscompile.ll index f070338655..f345775149 100644 --- a/test/Transforms/InstCombine/2006-02-13-DemandedMiscompile.ll +++ b/test/Transforms/InstCombine/2006-02-13-DemandedMiscompile.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | opt -instcombine -disable-output && -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep undef +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output && +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep undef int %test(sbyte %A) { %B = cast sbyte %A to int diff --git a/test/Transforms/InstCombine/2006-02-28-Crash.ll b/test/Transforms/InstCombine/2006-02-28-Crash.ll index 17fc8b668f..241c254dc4 100644 --- a/test/Transforms/InstCombine/2006-02-28-Crash.ll +++ b/test/Transforms/InstCombine/2006-02-28-Crash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output int %test() { %tmp203 = seteq uint 1, 2 ; <bool> [#uses=1] %tmp203 = cast bool %tmp203 to int ; <int> [#uses=1] diff --git a/test/Transforms/InstCombine/2006-03-30-ExtractElement.ll b/test/Transforms/InstCombine/2006-03-30-ExtractElement.ll index 99ecd35a09..314946085f 100644 --- a/test/Transforms/InstCombine/2006-03-30-ExtractElement.ll +++ b/test/Transforms/InstCombine/2006-03-30-ExtractElement.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output float %test(<4 x float> %V) { %V2 = insertelement <4 x float> %V, float 1.0, uint 3 diff --git a/test/Transforms/InstCombine/2006-04-01-InfLoop.ll b/test/Transforms/InstCombine/2006-04-01-InfLoop.ll index d77b1fb19a..260b9b3ff4 100644 --- a/test/Transforms/InstCombine/2006-04-01-InfLoop.ll +++ b/test/Transforms/InstCombine/2006-04-01-InfLoop.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output %struct.DecRefPicMarking_s = type { int, int, int, int, int, %struct.DecRefPicMarking_s* } %struct.datapartition = type { %typedef.Bitstream*, %typedef.DecodingEnvironment, int (%struct.syntaxelement*, %struct.img_par*, %struct.inp_par*, %struct.datapartition*)* } diff --git a/test/Transforms/InstCombine/2006-04-28-ShiftShiftLongLong.ll b/test/Transforms/InstCombine/2006-04-28-ShiftShiftLongLong.ll index 5c38342c84..12fc742a5f 100644 --- a/test/Transforms/InstCombine/2006-04-28-ShiftShiftLongLong.ll +++ b/test/Transforms/InstCombine/2006-04-28-ShiftShiftLongLong.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep shl && -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | notcast +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep shl && +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | notcast ; This cannot be turned into a sign extending cast! diff --git a/test/Transforms/InstCombine/2006-05-04-DemandedBitCrash.ll b/test/Transforms/InstCombine/2006-05-04-DemandedBitCrash.ll index 2a6a4412ee..6f95e925c7 100644 --- a/test/Transforms/InstCombine/2006-05-04-DemandedBitCrash.ll +++ b/test/Transforms/InstCombine/2006-05-04-DemandedBitCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output void %test() { bb38.i: diff --git a/test/Transforms/InstCombine/2006-05-06-Infloop.ll b/test/Transforms/InstCombine/2006-05-06-Infloop.ll index 633b7b6f98..ef05e6b354 100644 --- a/test/Transforms/InstCombine/2006-05-06-Infloop.ll +++ b/test/Transforms/InstCombine/2006-05-06-Infloop.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output %struct.gs_matrix = type { float, int, float, int, float, int, float, int, float, int, float, int } %struct.gx_bitmap = type { ubyte*, int, int, int } diff --git a/test/Transforms/InstCombine/2006-05-10-InvalidIndexUndef.ll b/test/Transforms/InstCombine/2006-05-10-InvalidIndexUndef.ll index c6eb3039f3..8cdaa5841f 100644 --- a/test/Transforms/InstCombine/2006-05-10-InvalidIndexUndef.ll +++ b/test/Transforms/InstCombine/2006-05-10-InvalidIndexUndef.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep undef +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep undef ; XFAIL: * %str = constant [4 x ubyte] c"str\00" diff --git a/test/Transforms/InstCombine/2006-06-28-infloop.ll b/test/Transforms/InstCombine/2006-06-28-infloop.ll index 2c48ffb2d9..beb4489946 100644 --- a/test/Transforms/InstCombine/2006-06-28-infloop.ll +++ b/test/Transforms/InstCombine/2006-06-28-infloop.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output target endian = big target pointersize = 32 target triple = "powerpc-apple-darwin8" diff --git a/test/Transforms/InstCombine/2006-09-11-EmptyStructCrash.ll b/test/Transforms/InstCombine/2006-09-11-EmptyStructCrash.ll index 0369307b13..a8f9cd41ba 100644 --- a/test/Transforms/InstCombine/2006-09-11-EmptyStructCrash.ll +++ b/test/Transforms/InstCombine/2006-09-11-EmptyStructCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output ; PR905 %RPYTHON_EXCEPTION = type { %RPYTHON_EXCEPTION_VTABLE* } diff --git a/test/Transforms/InstCombine/2006-09-15-CastToBool.ll b/test/Transforms/InstCombine/2006-09-15-CastToBool.ll index e649b3eedc..c38b32524a 100644 --- a/test/Transforms/InstCombine/2006-09-15-CastToBool.ll +++ b/test/Transforms/InstCombine/2006-09-15-CastToBool.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep and +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep and ; PR913 int %test(int* %tmp1) { diff --git a/test/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst-2.ll b/test/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst-2.ll index f7925e138d..d3bfdfa65f 100644 --- a/test/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst-2.ll +++ b/test/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst-2.ll @@ -1,5 +1,5 @@ ; The optimizer should be able to remove cast operation here. -; RUN: llvm-as %s -o - | opt -instcombine | llvm-dis | not grep 'sext.*int' +; RUN: llvm-upgrade %s -o - | llvm-as | opt -instcombine | llvm-dis | not grep 'sext.*int' bool %eq_signed_to_small_unsigned(sbyte %SB) { %Y = cast sbyte %SB to uint ; <uint> [#uses=1] diff --git a/test/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst.ll b/test/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst.ll index f23f5fb229..cab0b940d8 100644 --- a/test/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst.ll +++ b/test/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst.ll @@ -1,6 +1,6 @@ ; This test case is reduced from llvmAsmParser.cpp ; The optimizer should not remove the cast here. -; RUN: llvm-as %s -o - | opt -instcombine | llvm-dis | grep 'sext.*int' +; RUN: llvm-upgrade %s -o - | llvm-as | opt -instcombine | llvm-dis | grep 'sext.*int' bool %test(short %X) { %A = cast short %X to uint diff --git a/test/Transforms/InstCombine/2006-10-20-mask.ll b/test/Transforms/InstCombine/2006-10-20-mask.ll index 2596d52632..51855cd9b5 100644 --- a/test/Transforms/InstCombine/2006-10-20-mask.ll +++ b/test/Transforms/InstCombine/2006-10-20-mask.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as %s -o - | opt -instcombine | llvm-dis | grep 'and' +; RUN: llvm-upgrade %s -o - | llvm-as | opt -instcombine | llvm-dis | grep 'and' ulong %foo(ulong %tmp, ulong %tmp2) { %tmp = cast ulong %tmp to uint %tmp2 = cast ulong %tmp2 to uint diff --git a/test/Transforms/InstCombine/2006-10-26-VectorReassoc.ll b/test/Transforms/InstCombine/2006-10-26-VectorReassoc.ll index cf68f63e68..a7172b8a09 100644 --- a/test/Transforms/InstCombine/2006-10-26-VectorReassoc.ll +++ b/test/Transforms/InstCombine/2006-10-26-VectorReassoc.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep mul | wc -l | grep 2 +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep mul | wc -l | grep 2 <4 x float> %test(<4 x float> %V) { diff --git a/test/Transforms/InstCombine/2006-11-03-Memmove64.ll b/test/Transforms/InstCombine/2006-11-03-Memmove64.ll index b4c3a534cf..e863ab86e8 100644 --- a/test/Transforms/InstCombine/2006-11-03-Memmove64.ll +++ b/test/Transforms/InstCombine/2006-11-03-Memmove64.ll @@ -1,4 +1,4 @@ -;RUN: llvm-as < %s | opt -instcombine | llvm-dis |not grep memmove.i32 +;RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis |not grep memmove.i32 ; Instcombine was trying to turn this into a memmove.i32 target datalayout = "e-p:64:64" diff --git a/test/Transforms/InstCombine/2006-11-10-ashr-miscompile.ll b/test/Transforms/InstCombine/2006-11-10-ashr-miscompile.ll index 85c1f91594..1809d3ce91 100644 --- a/test/Transforms/InstCombine/2006-11-10-ashr-miscompile.ll +++ b/test/Transforms/InstCombine/2006-11-10-ashr-miscompile.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep lshr +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep lshr ; Verify this is not turned into -1. int %test(ubyte %amt) { diff --git a/test/Transforms/InstCombine/2006-11-27-XorBug.ll b/test/Transforms/InstCombine/2006-11-27-XorBug.ll index b1dd1e8ec0..6150166829 100644 --- a/test/Transforms/InstCombine/2006-11-27-XorBug.ll +++ b/test/Transforms/InstCombine/2006-11-27-XorBug.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep 'and.*32' && -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep 'or.*153' +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 'and.*32' && +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep 'or.*153' ; PR1014 int %test(int %tmp1) { diff --git a/test/Transforms/InstCombine/CPP_min_max.llx b/test/Transforms/InstCombine/CPP_min_max.llx index 0a0baf8588..e64d0b9188 100644 --- a/test/Transforms/InstCombine/CPP_min_max.llx +++ b/test/Transforms/InstCombine/CPP_min_max.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep select | not grep 'int\*' +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep select | not grep 'int\*' ; This testcase corresponds to PR362, which notices that this horrible code ; is generated by the C++ front-end and LLVM optimizers, which has lots of diff --git a/test/Transforms/InstCombine/GEPIdxCanon.ll b/test/Transforms/InstCombine/GEPIdxCanon.ll index 0dcce2d794..afaabc3e2f 100644 --- a/test/Transforms/InstCombine/GEPIdxCanon.ll +++ b/test/Transforms/InstCombine/GEPIdxCanon.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine -gcse -instcombine | llvm-dis | not grep getelementptr +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -gcse -instcombine | llvm-dis | not grep getelementptr bool %test(int* %A) { %B = getelementptr int* %A, int 1 diff --git a/test/Transforms/InstCombine/IntPtrCast.ll b/test/Transforms/InstCombine/IntPtrCast.ll index c3cc96728d..9f509b6fbc 100644 --- a/test/Transforms/InstCombine/IntPtrCast.ll +++ b/test/Transforms/InstCombine/IntPtrCast.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | notcast +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | notcast target pointersize = 32 int *%test(int *%P) { diff --git a/test/Transforms/InstCombine/JavaCompare.ll b/test/Transforms/InstCombine/JavaCompare.ll index 30208f5499..cce96097a0 100644 --- a/test/Transforms/InstCombine/JavaCompare.ll +++ b/test/Transforms/InstCombine/JavaCompare.ll @@ -1,7 +1,7 @@ ; This is the sequence of stuff that the Java front-end expands for a single ; <= comparison. Check to make sure we turn it into a <= (only) -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep -v setle | not grep '#uses' +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep -v setle | not grep '#uses' bool %le(int %A, int %B) { %c1 = setgt int %A, %B; diff --git a/test/Transforms/InstCombine/add.ll b/test/Transforms/InstCombine/add.ll index 382596ba87..55eba647f8 100644 --- a/test/Transforms/InstCombine/add.ll +++ b/test/Transforms/InstCombine/add.ll @@ -1,6 +1,6 @@ ; This test makes sure that add instructions are properly eliminated. -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep -v OK | not grep add +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep -v OK | not grep add implementation diff --git a/test/Transforms/InstCombine/alloca.ll b/test/Transforms/InstCombine/alloca.ll index 23a52c328d..c5d7818229 100644 --- a/test/Transforms/InstCombine/alloca.ll +++ b/test/Transforms/InstCombine/alloca.ll @@ -1,6 +1,6 @@ ; Zero byte allocas should be deleted. -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep alloca +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep alloca declare void %use(...) void %test() { diff --git a/test/Transforms/InstCombine/and-compare.ll b/test/Transforms/InstCombine/and-compare.ll index 35516a5065..864b8c25e2 100644 --- a/test/Transforms/InstCombine/and-compare.ll +++ b/test/Transforms/InstCombine/and-compare.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep and | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep and | wc -l | grep 1 ; Should be optimized to one and. bool %test1(uint %a, uint %b) { diff --git a/test/Transforms/InstCombine/and-or-and.ll b/test/Transforms/InstCombine/and-or-and.ll index f497f3fd0c..1c8465c730 100644 --- a/test/Transforms/InstCombine/and-or-and.ll +++ b/test/Transforms/InstCombine/and-or-and.ll @@ -9,7 +9,7 @@ ; ; Which corresponds to test1. -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep 'or ' +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep 'or ' int %test1(int %X, int %Y) { %A = and int %X, 7 diff --git a/test/Transforms/InstCombine/and.ll b/test/Transforms/InstCombine/and.ll index ed6d26b9f7..dc30c564d0 100644 --- a/test/Transforms/InstCombine/and.ll +++ b/test/Transforms/InstCombine/and.ll @@ -1,7 +1,7 @@ ; This test makes sure that these instructions are properly eliminated. ; -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep and +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep and implementation diff --git a/test/Transforms/InstCombine/binop-cast.ll b/test/Transforms/InstCombine/binop-cast.ll index 13404df941..7ca0151159 100644 --- a/test/Transforms/InstCombine/binop-cast.ll +++ b/test/Transforms/InstCombine/binop-cast.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | notcast +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | notcast uint %testAdd(int %X, int %Y) { %tmp = add int %X, %Y diff --git a/test/Transforms/InstCombine/bit-tracking.ll b/test/Transforms/InstCombine/bit-tracking.ll index c7806ec40f..f6654738d7 100644 --- a/test/Transforms/InstCombine/bit-tracking.ll +++ b/test/Transforms/InstCombine/bit-tracking.ll @@ -1,7 +1,7 @@ ; This file contains various testcases that require tracking whether bits are ; set or cleared by various instructions. -; RUN: llvm-as < %s | opt -instcombine -instcombine -disable-output && -; RUN: llvm-as < %s | opt -instcombine -instcombine | llvm-dis | not grep %ELIM +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -instcombine -disable-output && +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -instcombine | llvm-dis | not grep %ELIM ; Reduce down to a single XOR int %test3(int %B) { diff --git a/test/Transforms/InstCombine/bittest.ll b/test/Transforms/InstCombine/bittest.ll index a4f1d418fa..7fb5fdee57 100644 --- a/test/Transforms/InstCombine/bittest.ll +++ b/test/Transforms/InstCombine/bittest.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | opt -instcombine -simplifycfg -disable-output && -; RUN: llvm-as < %s | opt -instcombine -simplifycfg | llvm-dis | not grep 'call void %abort' +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -simplifycfg -disable-output && +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -simplifycfg | llvm-dis | not grep 'call void %abort' %b_rec.0 = external global int diff --git a/test/Transforms/InstCombine/bswap-fold.ll b/test/Transforms/InstCombine/bswap-fold.ll index eb7539c1dd..0ee486ad1a 100644 --- a/test/Transforms/InstCombine/bswap-fold.ll +++ b/test/Transforms/InstCombine/bswap-fold.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep ret | wc -l | grep 3 && -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep 'call.*bswap' +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep ret | wc -l | grep 3 && +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep 'call.*bswap' bool %test1(ushort %tmp2) { %tmp10 = call ushort %llvm.bswap.i16( ushort %tmp2 ) diff --git a/test/Transforms/InstCombine/bswap.ll b/test/Transforms/InstCombine/bswap.ll index 87caf29252..5eed8b3722 100644 --- a/test/Transforms/InstCombine/bswap.ll +++ b/test/Transforms/InstCombine/bswap.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep 'call.*llvm.bswap' | wc -l | grep 5 +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 'call.*llvm.bswap' | wc -l | grep 5 uint %test1(uint %i) { %tmp1 = shr uint %i, ubyte 24 ; <uint> [#uses=1] diff --git a/test/Transforms/InstCombine/call-cast-target.ll b/test/Transforms/InstCombine/call-cast-target.ll index 77097caf29..4a3cb2af22 100644 --- a/test/Transforms/InstCombine/call-cast-target.ll +++ b/test/Transforms/InstCombine/call-cast-target.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep call | not grep bitcast +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep call | not grep bitcast target endian = little target pointersize = 32 diff --git a/test/Transforms/InstCombine/call-intrinsics.ll b/test/Transforms/InstCombine/call-intrinsics.ll index 07435c4a3b..df042022fb 100644 --- a/test/Transforms/InstCombine/call-intrinsics.ll +++ b/test/Transforms/InstCombine/call-intrinsics.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine | llvm-dis +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis declare void %llvm.memmove(sbyte*, sbyte*, uint, uint) declare void %llvm.memcpy(sbyte*, sbyte*, uint, uint) diff --git a/test/Transforms/InstCombine/call.ll b/test/Transforms/InstCombine/call.ll index f721f3569f..aa9495e0c2 100644 --- a/test/Transforms/InstCombine/call.ll +++ b/test/Transforms/InstCombine/call.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep call | notcast +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep call | notcast implementation diff --git a/test/Transforms/InstCombine/canonicalize_branch.ll b/test/Transforms/InstCombine/canonicalize_branch.ll index dbf3ab2058..1434c7bee0 100644 --- a/test/Transforms/InstCombine/canonicalize_branch.ll +++ b/test/Transforms/InstCombine/canonicalize_branch.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep 'setne\|setle\|setge' +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep 'setne\|setle\|setge' int %test1(uint %X, uint %Y) { %C = setne uint %X, %Y diff --git a/test/Transforms/InstCombine/cast-and-cast.ll b/test/Transforms/InstCombine/cast-and-cast.ll index 64647fb5bb..b141974bec 100644 --- a/test/Transforms/InstCombine/cast-and-cast.ll +++ b/test/Transforms/InstCombine/cast-and-cast.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep bitcast +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep bitcast bool %test1(uint %val) { %t1 = bitcast uint %val to int diff --git a/test/Transforms/InstCombine/cast-cast-to-and.ll b/test/Transforms/InstCombine/cast-cast-to-and.ll index 0491de9349..8789b98b44 100644 --- a/test/Transforms/InstCombine/cast-cast-to-and.ll +++ b/test/Transforms/InstCombine/cast-cast-to-and.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep ubyte +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep ubyte int %test1(uint %X) { %Y = cast uint %X to ubyte ;; Turn into an AND diff --git a/test/Transforms/InstCombine/cast-load-gep.ll b/test/Transforms/InstCombine/cast-load-gep.ll index 9c997b887f..0a369bce03 100644 --- a/test/Transforms/InstCombine/cast-load-gep.ll +++ b/test/Transforms/InstCombine/cast-load-gep.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine -globaldce | llvm-dis | not grep Array +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -globaldce | llvm-dis | not grep Array ; Pulling the cast out of the load allows us to eliminate the load, and then ; the whole array. diff --git a/test/Transforms/InstCombine/cast-malloc.ll b/test/Transforms/InstCombine/cast-malloc.ll index 25eb4367c6..2458bf3ea4 100644 --- a/test/Transforms/InstCombine/cast-malloc.ll +++ b/test/Transforms/InstCombine/cast-malloc.ll @@ -1,5 +1,5 @@ ; test that casted mallocs get converted to malloc of the right type -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep bitcast +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep bitcast int* %test(uint %size) { %X = malloc long, uint %size diff --git a/test/Transforms/InstCombine/cast-propagate.ll b/test/Transforms/InstCombine/cast-propagate.ll index f3b4730123..d4f07a4d84 100644 --- a/test/Transforms/InstCombine/cast-propagate.ll +++ b/test/Transforms/InstCombine/cast-propagate.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine -mem2reg | llvm-dis | not grep load +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -mem2reg | llvm-dis | not grep load int %test1(uint* %P) { %A = alloca uint diff --git a/test/Transforms/InstCombine/cast-set.ll b/test/Transforms/InstCombine/cast-set.ll index a1ac29bc3f..801aa1bfc5 100644 --- a/test/Transforms/InstCombine/cast-set.ll +++ b/test/Transforms/InstCombine/cast-set.ll @@ -1,7 +1,7 @@ ; This tests for various complex cast elimination cases instcombine should ; handle. -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | notcast +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | notcast bool %test1(int %X) { %A = cast int %X to uint diff --git a/test/Transforms/InstCombine/cast.ll b/test/Transforms/InstCombine/cast.ll index 32b62158bc..8c6e37986f 100644 --- a/test/Transforms/InstCombine/cast.ll +++ b/test/Transforms/InstCombine/cast.ll @@ -1,6 +1,6 @@ ; Tests to make sure elimination of casts is working correctly -; RUN: llvm-as < %s | opt -instcombine -disable-output && -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep '%c' | notcast +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output && +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep '%c' | notcast %inbuf = external global [32832 x ubyte] diff --git a/test/Transforms/InstCombine/cast_ptr.ll b/test/Transforms/InstCombine/cast_ptr.ll index 7b572560e4..19d3ca6f8e 100644 --- a/test/Transforms/InstCombine/cast_ptr.ll +++ b/test/Transforms/InstCombine/cast_ptr.ll @@ -1,6 +1,6 @@ ; Tests to make sure elimination of casts is working correctly -; RUN: llvm-as < %s | opt -instcombine -disable-output && -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep '\([sz]ext\)\|\(trunc\)' +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output && +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep '\([sz]ext\)\|\(trunc\)' target pointersize = 32 diff --git a/test/Transforms/InstCombine/deadcode.ll b/test/Transforms/InstCombine/deadcode.ll index e738576f5f..fbd3c0c2df 100644 --- a/test/Transforms/InstCombine/deadcode.ll +++ b/test/Transforms/InstCombine/deadcode.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep 'ret int %A' +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 'ret int %A' int %test(int %A) { %X = or bool false, false diff --git a/test/Transforms/InstCombine/div.ll b/test/Transforms/InstCombine/div.ll index fdcbd02578..18d93c2a76 100644 --- a/test/Transforms/InstCombine/div.ll +++ b/test/Transforms/InstCombine/div.ll @@ -1,7 +1,7 @@ ; This test makes sure that div instructions are properly eliminated. ; -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep div +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep div implementation diff --git a/test/Transforms/InstCombine/fpcast.ll b/test/Transforms/InstCombine/fpcast.ll index 31cd47f619..dedcd13f9b 100644 --- a/test/Transforms/InstCombine/fpcast.ll +++ b/test/Transforms/InstCombine/fpcast.ll @@ -1,6 +1,6 @@ ; Test some floating point casting cases -; RUN: llvm-as %s -o - | opt -instcombine | llvm-dis | notcast -; RUN: llvm-as %s -o - | opt -instcombine | llvm-dis | \ +; RUN: llvm-upgrade %s -o - | llvm-as | opt -instcombine | llvm-dis | notcast +; RUN: llvm-upgrade %s -o - | llvm-as | opt -instcombine | llvm-dis | \ ; RUN: grep 'ret [us]byte \(-1\)\|\(255\)' sbyte %test() { diff --git a/test/Transforms/InstCombine/getelementptr-setcc.ll b/test/Transforms/InstCombine/getelementptr-setcc.ll index 292e4ae63a..4b637f2cfb 100644 --- a/test/Transforms/InstCombine/getelementptr-setcc.ll +++ b/test/Transforms/InstCombine/getelementptr-setcc.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep getelementptr +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep getelementptr bool %test1(short* %P, int %I, int %J) { %X = getelementptr short* %P, int %I diff --git a/test/Transforms/InstCombine/getelementptr.ll b/test/Transforms/InstCombine/getelementptr.ll index 1d3efed50e..53a2892dc7 100644 --- a/test/Transforms/InstCombine/getelementptr.ll +++ b/test/Transforms/InstCombine/getelementptr.ll @@ -1,6 +1,6 @@ ; The %A getelementptr instruction should be eliminated here -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep -v '%B' | not grep getelementptr +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep -v '%B' | not grep getelementptr %Global = constant [10 x sbyte] c"helloworld" diff --git a/test/Transforms/InstCombine/getelementptr_cast.ll b/test/Transforms/InstCombine/getelementptr_cast.ll index b600874e12..9d629d3bad 100644 --- a/test/Transforms/InstCombine/getelementptr_cast.ll +++ b/test/Transforms/InstCombine/getelementptr_cast.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | notcast '' 'getelementptr.*' +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | notcast '' 'getelementptr.*' %G = external global [3 x sbyte] implementation diff --git a/test/Transforms/InstCombine/getelementptr_const.ll b/test/Transforms/InstCombine/getelementptr_const.ll index a4150dee21..9a078c50fd 100644 --- a/test/Transforms/InstCombine/getelementptr_const.ll +++ b/test/Transforms/InstCombine/getelementptr_const.ll @@ -1,5 +1,5 @@ ; Test folding of constantexpr geps into normal geps. -; RUN: llvm-as < %s | opt -instcombine -gcse -instcombine | llvm-dis | not grep getelementptr +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -gcse -instcombine | llvm-dis | not grep getelementptr %Array = external global [40 x int] diff --git a/test/Transforms/InstCombine/getelementptr_index.ll b/test/Transforms/InstCombine/getelementptr_index.ll index 8346fa5191..c4a7317bde 100644 --- a/test/Transforms/InstCombine/getelementptr_index.ll +++ b/test/Transforms/InstCombine/getelementptr_index.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep trunc +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep trunc target endian = little target pointersize = 32 diff --git a/test/Transforms/InstCombine/hoist_instr.ll b/test/Transforms/InstCombine/hoist_instr.ll index 1b6caf63de..4059563dc2 100644 --- a/test/Transforms/InstCombine/hoist_instr.ll +++ b/test/Transforms/InstCombine/hoist_instr.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | %prcontext div 1 | grep then: +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | %prcontext div 1 | grep then: ;; This tests that the div is hoisted into the then block. diff --git a/test/Transforms/InstCombine/load.ll b/test/Transforms/InstCombine/load.ll index 6b3f4a68cd..58f9894903 100644 --- a/test/Transforms/InstCombine/load.ll +++ b/test/Transforms/InstCombine/load.ll @@ -1,7 +1,7 @@ ; This test makes sure that these instructions are properly eliminated. ; -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep load +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep load %X = constant int 42 %X2 = constant int 47 diff --git a/test/Transforms/InstCombine/malloc.ll b/test/Transforms/InstCombine/malloc.ll index ed13f415b3..34fdfe862e 100644 --- a/test/Transforms/InstCombine/malloc.ll +++ b/test/Transforms/InstCombine/malloc.ll @@ -1,5 +1,5 @@ ; test that malloc's with a constant argument are promoted to array allocations -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep getelementptr +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep getelementptr int* %test() { %X = malloc int, uint 4 diff --git a/test/Transforms/InstCombine/memmove.ll b/test/Transforms/InstCombine/memmove.ll index 1313d341c0..fb20dbc873 100644 --- a/test/Transforms/InstCombine/memmove.ll +++ b/test/Transforms/InstCombine/memmove.ll @@ -1,7 +1,7 @@ ; This test makes sure that memmove instructions are properly eliminated. ; -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep 'call void %llvm.memmove' +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep 'call void %llvm.memmove' %S = internal constant [33 x sbyte] c"panic: restorelist inconsistency\00" diff --git a/test/Transforms/InstCombine/mul.ll b/test/Transforms/InstCombine/mul.ll index f52b0f4251..ccec6b894a 100644 --- a/test/Transforms/InstCombine/mul.ll +++ b/test/Transforms/InstCombine/mul.ll @@ -1,7 +1,7 @@ ; This test makes sure that mul instructions are properly eliminated. ; -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep mul +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep mul implementation diff --git a/test/Transforms/InstCombine/narrow.ll b/test/Transforms/InstCombine/narrow.ll index 75a78a3f8b..c382575f3f 100644 --- a/test/Transforms/InstCombine/narrow.ll +++ b/test/Transforms/InstCombine/narrow.ll @@ -1,7 +1,7 @@ ; This file contains various testcases that check to see that instcombine ; is narrowing computations when possible. -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep 'ret bool false' +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 'ret bool false' ; test1 - Eliminating the casts in this testcase (by narrowing the AND ; operation) allows instcombine to realize the function always returns false. diff --git a/test/Transforms/InstCombine/not.ll b/test/Transforms/InstCombine/not.ll index 11718466da..3e85692500 100644 --- a/test/Transforms/InstCombine/not.ll +++ b/test/Transforms/InstCombine/not.ll @@ -1,7 +1,7 @@ ; This test makes sure that these instructions are properly eliminated. ; -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep xor +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep xor implementation diff --git a/test/Transforms/InstCombine/or.ll b/test/Transforms/InstCombine/or.ll index 4b731dfa5c..933f5f006a 100644 --- a/test/Transforms/InstCombine/or.ll +++ b/test/Transforms/InstCombine/or.ll @@ -1,8 +1,8 @@ ; This test makes sure that these instructions are properly eliminated. ; -; RUN: llvm-as < %s | opt -instcombine -disable-output && -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep -v xor | not grep 'or ' +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output && +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep -v xor | not grep 'or ' implementation diff --git a/test/Transforms/InstCombine/phi.ll b/test/Transforms/InstCombine/phi.ll index 830c44f624..296e2e5369 100644 --- a/test/Transforms/InstCombine/phi.ll +++ b/test/Transforms/InstCombine/phi.ll @@ -1,7 +1,7 @@ ; This test makes sure that these instructions are properly eliminated. ; -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep phi +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep phi implementation diff --git a/test/Transforms/InstCombine/rem.ll b/test/Transforms/InstCombine/rem.ll index da8c20a3df..ccb358de4d 100644 --- a/test/Transforms/InstCombine/rem.ll +++ b/test/Transforms/InstCombine/rem.ll @@ -1,7 +1,7 @@ ; This test makes sure that these instructions are properly eliminated. ; -; RUN: llvm-as < %s | opt -instcombine -disable-output && -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep rem +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output && +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep rem implementation diff --git a/test/Transforms/InstCombine/select.ll b/test/Transforms/InstCombine/select.ll index 617f0f9fe0..a9dd75d9ea 100644 --- a/test/Transforms/InstCombine/select.ll +++ b/test/Transforms/InstCombine/select.ll @@ -1,7 +1,7 @@ ; This test makes sure that these instructions are properly eliminated. -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep select && -; RUN: llvm-as < %s | opt -instcombine -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep select && +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output implementation diff --git a/test/Transforms/InstCombine/set.ll b/test/Transforms/InstCombine/set.ll index 756ade4952..a9ef2bf551 100644 --- a/test/Transforms/InstCombine/set.ll +++ b/test/Transforms/InstCombine/set.ll @@ -1,7 +1,7 @@ ; This test makes sure that these instructions are properly eliminated. ; -; RUN: llvm-as < %s | opt -instcombine -disable-output && -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep set +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output && +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep set %X = uninitialized global int diff --git a/test/Transforms/InstCombine/setcc-cast-cast.ll b/test/Transforms/InstCombine/setcc-cast-cast.ll index e311c523fb..a25fa0c37d 100644 --- a/test/Transforms/InstCombine/setcc-cast-cast.ll +++ b/test/Transforms/InstCombine/setcc-cast-cast.ll @@ -1,7 +1,7 @@ ; This test case was reduced from MultiSource/Applications/hbd. It makes sure ; that folding doesn't happen in case a zext is applied where a sext should have ; been when a setcc is used with two casts. -; RUN: llvm-as < %s | llc -instcombine | llvm-dis | not grep 'br bool false' +; RUN: llvm-upgrade < %s | llvm-as | llc -instcombine | llvm-dis | not grep 'br bool false' int %bug(ubyte %inbuff) { entry: %tmp = bitcast ubyte %inbuff to sbyte ; <sbyte> [#uses=1] diff --git a/test/Transforms/InstCombine/setcc-strength-reduce.ll b/test/Transforms/InstCombine/setcc-strength-reduce.ll index 0c6683c57d..4c86206397 100644 --- a/test/Transforms/InstCombine/setcc-strength-reduce.ll +++ b/test/Transforms/InstCombine/setcc-strength-reduce.ll @@ -3,7 +3,7 @@ ; into equivalent setne,eq instructions. ; -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep -v seteq | grep -v setne | not grep set +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep -v seteq | grep -v setne | not grep set bool %test1(uint %A) { %B = setge uint %A, 1 ; setne %A, 0 diff --git a/test/Transforms/InstCombine/shift-simplify.ll b/test/Transforms/InstCombine/shift-simplify.ll index b91637f7c4..ce19384d16 100644 --- a/test/Transforms/InstCombine/shift-simplify.ll +++ b/test/Transforms/InstCombine/shift-simplify.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | egrep 'shl|lshr|ashr' | wc -l | grep 3 +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | egrep 'shl|lshr|ashr' | wc -l | grep 3 int %test0(int %A, int %B, ubyte %C) { %X = shl int %A, ubyte %C diff --git a/test/Transforms/InstCombine/shift-sra.ll b/test/Transforms/InstCombine/shift-sra.ll index fe1b142b74..43a4ebdfd2 100644 --- a/test/Transforms/InstCombine/shift-sra.ll +++ b/test/Transforms/InstCombine/shift-sra.ll @@ -1,6 +1,6 @@ -; RUN: llvm-as < %s | opt -instcombine -disable-output && -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep 'lshr int' | wc -l | grep 2 && -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep ashr +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output && +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 'lshr int' | wc -l | grep 2 && +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep ashr int %test1(int %X, ubyte %A) { %Y = shr int %X, ubyte %A ; can be logical shift. diff --git a/test/Transforms/InstCombine/shift.ll b/test/Transforms/InstCombine/shift.ll index 9756880bcc..28c517018e 100644 --- a/test/Transforms/InstCombine/shift.ll +++ b/test/Transforms/InstCombine/shift.ll @@ -1,8 +1,8 @@ ; This test makes sure that these instructions are properly eliminated. ; -; RUN: llvm-as < %s | opt -instcombine -disable-output && -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep sh +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output && +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep sh implementation diff --git a/test/Transforms/InstCombine/signext.ll b/test/Transforms/InstCombine/signext.ll index a3b4982249..7dcb466ad6 100644 --- a/test/Transforms/InstCombine/signext.ll +++ b/test/Transforms/InstCombine/signext.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | opt -instcombine -disable-output && -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep '(and\|xor\|add\|shl\|shr)' +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output && +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep '(and\|xor\|add\|shl\|shr)' int %test1(int %x) { %tmp.1 = and int %x, 65535 ; <int> [#uses=1] diff --git a/test/Transforms/InstCombine/sink_instruction.ll b/test/Transforms/InstCombine/sink_instruction.ll index 36e0357c28..a45c16163f 100644 --- a/test/Transforms/InstCombine/sink_instruction.ll +++ b/test/Transforms/InstCombine/sink_instruction.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | %prcontext div 1 | grep ret +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | %prcontext div 1 | grep ret ;; This tests that the instructions in the entry blocks are sunk into each ;; arm of the 'if'. diff --git a/test/Transforms/InstCombine/stacksaverestore.ll b/test/Transforms/InstCombine/stacksaverestore.ll index c41a1b1e7f..d9633b5c3b 100644 --- a/test/Transforms/InstCombine/stacksaverestore.ll +++ b/test/Transforms/InstCombine/stacksaverestore.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | opt -instcombine -disable-output && -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep call +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output && +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep call ;; Test that llvm.stackrestore is removed when possible. diff --git a/test/Transforms/InstCombine/store.ll b/test/Transforms/InstCombine/store.ll index d2442fa95f..2102fec100 100644 --- a/test/Transforms/InstCombine/store.ll +++ b/test/Transforms/InstCombine/store.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | opt -instcombine -disable-output && -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep -v 'store.*,.*null' | not grep store +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output && +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep -v 'store.*,.*null' | not grep store void %test1(int* %P) { store int undef, int* %P diff --git a/test/Transforms/InstCombine/sub.ll b/test/Transforms/InstCombine/sub.ll index 7d728055fe..8ca2e783ca 100644 --- a/test/Transforms/InstCombine/sub.ll +++ b/test/Transforms/InstCombine/sub.ll @@ -1,7 +1,7 @@ ; This test makes sure that these instructions are properly eliminated. ; -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep -v 'sub int %Cok, %Bok' | not grep sub +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep -v 'sub int %Cok, %Bok' | not grep sub implementation diff --git a/test/Transforms/InstCombine/vec_demanded_elts.ll b/test/Transforms/InstCombine/vec_demanded_elts.ll index 3da22e7554..9642ffda56 100644 --- a/test/Transforms/InstCombine/vec_demanded_elts.ll +++ b/test/Transforms/InstCombine/vec_demanded_elts.ll @@ -1,8 +1,8 @@ -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep 'sub float' && -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep 'mul float' && -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep 'insertelement.*0.00' && -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep 'call.*llvm.x86.sse.mul' && -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep 'call.*llvm.x86.sse.sub' +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 'sub float' && +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 'mul float' && +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep 'insertelement.*0.00' && +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep 'call.*llvm.x86.sse.mul' && +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep 'call.*llvm.x86.sse.sub' ushort %Convert_sse(float %f) { entry: diff --git a/test/Transforms/InstCombine/vec_insert_to_shuffle.ll b/test/Transforms/InstCombine/vec_insert_to_shuffle.ll index 0379203691..0611305bee 100644 --- a/test/Transforms/InstCombine/vec_insert_to_shuffle.ll +++ b/test/Transforms/InstCombine/vec_insert_to_shuffle.ll @@ -1,6 +1,6 @@ -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep shufflevec | wc -l | grep 1 && -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep insertelement && -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep extractelement +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep shufflevec | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep insertelement && +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep extractelement <4 x float> %test(<4 x float> %tmp, <4 x float> %tmp1) { %tmp4 = extractelement <4 x float> %tmp, uint 1 ; <float> [#uses=1] diff --git a/test/Transforms/InstCombine/vec_narrow.ll b/test/Transforms/InstCombine/vec_narrow.ll index d5c7f854b8..1ad671c509 100644 --- a/test/Transforms/InstCombine/vec_narrow.ll +++ b/test/Transforms/InstCombine/vec_narrow.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep 'add float' +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 'add float' %V = type <4 x float> diff --git a/test/Transforms/InstCombine/vec_shuffle.ll b/test/Transforms/InstCombine/vec_shuffle.ll index 47ce526f62..01c24e76ba 100644 --- a/test/Transforms/InstCombine/vec_shuffle.ll +++ b/test/Transforms/InstCombine/vec_shuffle.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | opt -instcombine -disable-output && -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep vector_shuffle +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output && +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep vector_shuffle %T = type <4 x float> diff --git a/test/Transforms/InstCombine/xor.ll b/test/Transforms/InstCombine/xor.ll index e9f4d3fd70..ad28660756 100644 --- a/test/Transforms/InstCombine/xor.ll +++ b/test/Transforms/InstCombine/xor.ll @@ -1,8 +1,8 @@ ; This test makes sure that these instructions are properly eliminated. ; -; RUN: llvm-as < %s | opt -instcombine -disable-output && -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep 'xor ' +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output && +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep 'xor ' %G1 = global uint 0 %G2 = global uint 0 diff --git a/test/Transforms/InstCombine/zeroext-and-reduce.ll b/test/Transforms/InstCombine/zeroext-and-reduce.ll index 6c794a3e3f..e32f4b966c 100644 --- a/test/Transforms/InstCombine/zeroext-and-reduce.ll +++ b/test/Transforms/InstCombine/zeroext-and-reduce.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep 'and int %Y, 8' +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 'and int %Y, 8' int %test1(ubyte %X) { %Y = cast ubyte %X to int diff --git a/test/Transforms/InstCombine/zext.ll b/test/Transforms/InstCombine/zext.ll index 27442aab61..7835fe690b 100644 --- a/test/Transforms/InstCombine/zext.ll +++ b/test/Transforms/InstCombine/zext.ll @@ -1,6 +1,6 @@ ; Tests to make sure elimination of casts is working correctly -; RUN: llvm-as < %s | opt -instcombine -disable-output && -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | notcast '' '%c1.*' +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output && +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | notcast '' '%c1.*' long %test_sext_zext(short %A) { %c1 = zext short %A to uint |