diff options
| author | Reid Spencer <rspencer@reidspencer.com> | 2006-12-02 04:23:10 +0000 |
|---|---|---|
| committer | Reid Spencer <rspencer@reidspencer.com> | 2006-12-02 04:23:10 +0000 |
| commit | 69ccadd7535a83b348595cf603126e6a68b2883b (patch) | |
| tree | b7bd0dcf1c3042a7f4bbbbb4854ececda37568ba | |
| parent | a50d5962edbf9606a9a7636d845be9f980c28b87 (diff) | |
| download | llvm-69ccadd7535a83b348595cf603126e6a68b2883b.tar.gz llvm-69ccadd7535a83b348595cf603126e6a68b2883b.tar.bz2 llvm-69ccadd7535a83b348595cf603126e6a68b2883b.tar.xz | |
Use the llvm-upgrade program to upgrade llvm assembly.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@32115 91177308-0d34-0410-b5e6-96231b3b80d8
1199 files changed, 1682 insertions, 1676 deletions
diff --git a/test/Analysis/Andersens/arg-must-alias.ll b/test/Analysis/Andersens/arg-must-alias.ll index 5aef808b84..d19b381e4a 100644 --- a/test/Analysis/Andersens/arg-must-alias.ll +++ b/test/Analysis/Andersens/arg-must-alias.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -anders-aa -load-vn -gcse -deadargelim | llvm-dis | not grep ARG +; RUN: llvm-upgrade < %s | llvm-as | opt -anders-aa -load-vn -gcse -deadargelim | llvm-dis | not grep ARG %G = internal constant int* null diff --git a/test/Analysis/Andersens/basictest.ll b/test/Analysis/Andersens/basictest.ll index 220e3bca74..5730f75b5b 100644 --- a/test/Analysis/Andersens/basictest.ll +++ b/test/Analysis/Andersens/basictest.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -anders-aa -aa-eval +; RUN: llvm-upgrade < %s | llvm-as | opt -anders-aa -aa-eval implementation diff --git a/test/Analysis/Andersens/external.ll b/test/Analysis/Andersens/external.ll index 117a690ab0..a829999f44 100644 --- a/test/Analysis/Andersens/external.ll +++ b/test/Analysis/Andersens/external.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -anders-aa -load-vn -gcse -deadargelim | llvm-dis | grep store | not grep null +; RUN: llvm-upgrade < %s | llvm-as | opt -anders-aa -load-vn -gcse -deadargelim | llvm-dis | grep store | not grep null ; Because the 'internal' function is passed to an external function, we don't ; know what the incoming values will alias. As such, we cannot do the diff --git a/test/Analysis/Andersens/modreftest.ll b/test/Analysis/Andersens/modreftest.ll index 979aa03738..488c6f5473 100644 --- a/test/Analysis/Andersens/modreftest.ll +++ b/test/Analysis/Andersens/modreftest.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -anders-aa -load-vn -gcse -instcombine | llvm-dis | grep 'ret bool true' +; RUN: llvm-upgrade < %s | llvm-as | opt -anders-aa -load-vn -gcse -instcombine | llvm-dis | grep 'ret bool true' %G = internal global int* null declare int *%ext() diff --git a/test/Analysis/Andersens/trivialtest.ll b/test/Analysis/Andersens/trivialtest.ll index 5cebe0065e..9e447d6d6b 100644 --- a/test/Analysis/Andersens/trivialtest.ll +++ b/test/Analysis/Andersens/trivialtest.ll @@ -1,3 +1,3 @@ -; RUN: llvm-as < %s | opt -anders-aa -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -anders-aa -disable-output void %foo() { ret void } diff --git a/test/Analysis/BasicAA/2003-02-26-AccessSizeTest.ll b/test/Analysis/BasicAA/2003-02-26-AccessSizeTest.ll index fb44d94a57..cb2b27eeb2 100644 --- a/test/Analysis/BasicAA/2003-02-26-AccessSizeTest.ll +++ b/test/Analysis/BasicAA/2003-02-26-AccessSizeTest.ll @@ -2,7 +2,7 @@ ; is performed. It is not legal to delete the second load instruction because ; the value computed by the first load instruction is changed by the store. -; RUN: llvm-as < %s | opt -load-vn -gcse -instcombine | llvm-dis | grep DONOTREMOVE +; RUN: llvm-upgrade < %s | llvm-as | opt -load-vn -gcse -instcombine | llvm-dis | grep DONOTREMOVE int %test() { %A = alloca int diff --git a/test/Analysis/BasicAA/2003-03-04-GEPCrash.ll b/test/Analysis/BasicAA/2003-03-04-GEPCrash.ll index 8a25031d7b..ee008a8df0 100644 --- a/test/Analysis/BasicAA/2003-03-04-GEPCrash.ll +++ b/test/Analysis/BasicAA/2003-03-04-GEPCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -basicaa -aa-eval -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -basicaa -aa-eval -disable-output ; Test for a bug in BasicAA which caused a crash when querying equality of P1&P2 void %test({[2 x int],[2 x int]}* %A, long %X, long %Y) { %P1 = getelementptr {[2 x int],[2 x int]}* %A, long 0, uint 0, long %X diff --git a/test/Analysis/BasicAA/2003-04-22-GEPProblem.ll b/test/Analysis/BasicAA/2003-04-22-GEPProblem.ll index 70f71c22fb..ddadc8eea2 100644 --- a/test/Analysis/BasicAA/2003-04-22-GEPProblem.ll +++ b/test/Analysis/BasicAA/2003-04-22-GEPProblem.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -load-vn -gcse -instcombine | llvm-dis | grep sub +; RUN: llvm-upgrade < %s | llvm-as | opt -load-vn -gcse -instcombine | llvm-dis | grep sub ; BasicAA was incorrectly concluding that P1 and P2 didn't conflict! diff --git a/test/Analysis/BasicAA/2003-04-25-GEPCrash.ll b/test/Analysis/BasicAA/2003-04-25-GEPCrash.ll index 14013822f9..7e39f1398b 100644 --- a/test/Analysis/BasicAA/2003-04-25-GEPCrash.ll +++ b/test/Analysis/BasicAA/2003-04-25-GEPCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -basicaa -aa-eval -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -basicaa -aa-eval -disable-output ; Test for a bug in BasicAA which caused a crash when querying equality of P1&P2 void %test([17 x ushort]* %mask_bits) { %P1 = getelementptr [17 x ushort]* %mask_bits, long 0, long 0 diff --git a/test/Analysis/BasicAA/2003-05-21-GEP-Problem.ll b/test/Analysis/BasicAA/2003-05-21-GEP-Problem.ll index 2e95261b5d..146fc54f4d 100644 --- a/test/Analysis/BasicAA/2003-05-21-GEP-Problem.ll +++ b/test/Analysis/BasicAA/2003-05-21-GEP-Problem.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -licm -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -licm -disable-output %struct..apr_array_header_t = type { int*, int, int, int, sbyte* } %struct..apr_table_t = type { %struct..apr_array_header_t, uint, [32 x int], [32 x int] } diff --git a/test/Analysis/BasicAA/2003-06-01-AliasCrash.ll b/test/Analysis/BasicAA/2003-06-01-AliasCrash.ll index 2c2fbca550..772bca906e 100644 --- a/test/Analysis/BasicAA/2003-06-01-AliasCrash.ll +++ b/test/Analysis/BasicAA/2003-06-01-AliasCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -basicaa -aa-eval -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -basicaa -aa-eval -disable-output int %MTConcat([3 x int]* %a.1) { %tmp.961 = getelementptr [3 x int]* %a.1, long 0, long 4 diff --git a/test/Analysis/BasicAA/2003-07-03-BasicAACrash.ll b/test/Analysis/BasicAA/2003-07-03-BasicAACrash.ll index 942fe9f147..61f39579b4 100644 --- a/test/Analysis/BasicAA/2003-07-03-BasicAACrash.ll +++ b/test/Analysis/BasicAA/2003-07-03-BasicAACrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -basicaa -aa-eval -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -basicaa -aa-eval -disable-output %struct..RefPoint = type { int, { uint, ushort, ushort } } %struct..RefRect = type { %struct..RefPoint, %struct..RefPoint } diff --git a/test/Analysis/BasicAA/2003-09-19-LocalArgument.ll b/test/Analysis/BasicAA/2003-09-19-LocalArgument.ll index 90f7172e4a..ee6ac9c65a 100644 --- a/test/Analysis/BasicAA/2003-09-19-LocalArgument.ll +++ b/test/Analysis/BasicAA/2003-09-19-LocalArgument.ll @@ -1,6 +1,6 @@ ; In this test, a local alloca cannot alias an incoming argument. -; RUN: llvm-as < %s | opt -load-vn -gcse -instcombine | llvm-dis | not grep sub +; RUN: llvm-upgrade < %s | llvm-as | opt -load-vn -gcse -instcombine | llvm-dis | not grep sub int %test(int* %P) { %X = alloca int diff --git a/test/Analysis/BasicAA/2003-11-04-SimpleCases.ll b/test/Analysis/BasicAA/2003-11-04-SimpleCases.ll index c030c06ade..fe6ed0804a 100644 --- a/test/Analysis/BasicAA/2003-11-04-SimpleCases.ll +++ b/test/Analysis/BasicAA/2003-11-04-SimpleCases.ll @@ -1,7 +1,7 @@ ; This testcase consists of alias relations which should be completely ; resolvable by basicaa. -; RUN: llvm-as < %s | opt -aa-eval -print-may-aliases 2>&1 -disable-output | not grep May: +; RUN: llvm-upgrade < %s | llvm-as | opt -aa-eval -print-may-aliases 2>&1 -disable-output | not grep May: %T = type { uint, [10 x ubyte] } diff --git a/test/Analysis/BasicAA/2003-12-11-ConstExprGEP.ll b/test/Analysis/BasicAA/2003-12-11-ConstExprGEP.ll index f751928c06..f74bdba2c1 100644 --- a/test/Analysis/BasicAA/2003-12-11-ConstExprGEP.ll +++ b/test/Analysis/BasicAA/2003-12-11-ConstExprGEP.ll @@ -1,7 +1,7 @@ ; This testcase consists of alias relations which should be completely ; resolvable by basicaa, but require analysis of getelementptr constant exprs. -; RUN: llvm-as < %s | opt -aa-eval -print-may-aliases 2>&1 -disable-output | not grep May: +; RUN: llvm-upgrade < %s | llvm-as | opt -aa-eval -print-may-aliases 2>&1 -disable-output | not grep May: %T = type { uint, [10 x ubyte] } diff --git a/test/Analysis/BasicAA/2004-12-08-BasicAACrash.ll b/test/Analysis/BasicAA/2004-12-08-BasicAACrash.ll index 4921824998..2539c453ef 100644 --- a/test/Analysis/BasicAA/2004-12-08-BasicAACrash.ll +++ b/test/Analysis/BasicAA/2004-12-08-BasicAACrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -licm +; RUN: llvm-upgrade < %s | llvm-as | opt -licm "java/lang/Object" = type { %struct.llvm_java_object_base } "java/lang/StringBuffer" = type { "java/lang/Object", int, { "java/lang/Object", uint, [0 x ushort] }*, bool } diff --git a/test/Analysis/BasicAA/2004-12-08-BasicAACrash2.ll b/test/Analysis/BasicAA/2004-12-08-BasicAACrash2.ll index d856260bae..d5d16d872f 100644 --- a/test/Analysis/BasicAA/2004-12-08-BasicAACrash2.ll +++ b/test/Analysis/BasicAA/2004-12-08-BasicAACrash2.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -dse +; RUN: llvm-upgrade < %s | llvm-as | opt -dse "java/lang/Object" = type { %struct.llvm_java_object_base } "java/lang/StringBuffer" = type { "java/lang/Object", int, { "java/lang/Object", uint, [0 x ushort] }*, bool } diff --git a/test/Analysis/BasicAA/2005-03-09-BrokenBasicAA.ll b/test/Analysis/BasicAA/2005-03-09-BrokenBasicAA.ll index 7560143207..e8289109dd 100644 --- a/test/Analysis/BasicAA/2005-03-09-BrokenBasicAA.ll +++ b/test/Analysis/BasicAA/2005-03-09-BrokenBasicAA.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -basicaa -load-vn -gcse -instcombine | llvm-dis | grep 'load int\* %A' +; RUN: llvm-upgrade < %s | llvm-as | opt -basicaa -load-vn -gcse -instcombine | llvm-dis | grep 'load int\* %A' declare double* %useit(int*) diff --git a/test/Analysis/BasicAA/2006-03-03-BadArraySubscript.ll b/test/Analysis/BasicAA/2006-03-03-BadArraySubscript.ll index 767df3460b..6c82217239 100644 --- a/test/Analysis/BasicAA/2006-03-03-BadArraySubscript.ll +++ b/test/Analysis/BasicAA/2006-03-03-BadArraySubscript.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -aa-eval -disable-output 2>&1 | grep '2 no alias respon' +; RUN: llvm-upgrade < %s | llvm-as | opt -aa-eval -disable-output 2>&1 | grep '2 no alias respon' ;; TEST that A[1][0] may alias A[0][i]. diff --git a/test/Analysis/BasicAA/2006-11-03-BasicAAVectorCrash.ll b/test/Analysis/BasicAA/2006-11-03-BasicAAVectorCrash.ll index 9279825a4e..0503faca91 100644 --- a/test/Analysis/BasicAA/2006-11-03-BasicAAVectorCrash.ll +++ b/test/Analysis/BasicAA/2006-11-03-BasicAAVectorCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -licm -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -licm -disable-output target endian = big target pointersize = 32 target triple = "powerpc-apple-darwin8.7.0" diff --git a/test/Analysis/BasicAA/featuretest.ll b/test/Analysis/BasicAA/featuretest.ll index d7bec22447..52e0a52670 100644 --- a/test/Analysis/BasicAA/featuretest.ll +++ b/test/Analysis/BasicAA/featuretest.ll @@ -1,7 +1,7 @@ ; This testcase tests for various features the basicaa test should be able to ; determine, as noted in the comments. -; RUN: llvm-as < %s | opt -basicaa -load-vn -gcse -instcombine -dce | llvm-dis | not grep REMOVE +; RUN: llvm-upgrade < %s | llvm-as | opt -basicaa -load-vn -gcse -instcombine -dce | llvm-dis | not grep REMOVE %Global = external global { int } diff --git a/test/Analysis/BasicAA/gcsetest.ll b/test/Analysis/BasicAA/gcsetest.ll index 4af5cc16db..cd1286f60b 100644 --- a/test/Analysis/BasicAA/gcsetest.ll +++ b/test/Analysis/BasicAA/gcsetest.ll @@ -2,7 +2,7 @@ ; disambiguating some obvious cases. All loads should be removable in ; this testcase. -; RUN: llvm-as < %s | opt -basicaa -load-vn -gcse -instcombine -dce | llvm-dis | not grep load +; RUN: llvm-upgrade < %s | llvm-as | opt -basicaa -load-vn -gcse -instcombine -dce | llvm-dis | not grep load %A = global int 7 %B = global int 8 diff --git a/test/Analysis/BasicAA/global-size.ll b/test/Analysis/BasicAA/global-size.ll index 52ea7bc7b0..5e752494a5 100644 --- a/test/Analysis/BasicAA/global-size.ll +++ b/test/Analysis/BasicAA/global-size.ll @@ -1,7 +1,7 @@ ; A store or load cannot alias a global if the accessed amount is larger then ; the global. -; RUN: llvm-as < %s | opt -basicaa -load-vn -gcse -instcombine | llvm-dis | not grep load +; RUN: llvm-upgrade < %s | llvm-as | opt -basicaa -load-vn -gcse -instcombine | llvm-dis | not grep load %B = global short 8 diff --git a/test/Analysis/BasicAA/licmtest.ll b/test/Analysis/BasicAA/licmtest.ll index 56682c7cab..0b1394394e 100644 --- a/test/Analysis/BasicAA/licmtest.ll +++ b/test/Analysis/BasicAA/licmtest.ll @@ -3,7 +3,7 @@ ; two pointers, then the load should be hoisted, and the store sunk. Thus ; the loop becomes empty and can be deleted by ADCE. -; RUN: llvm-as < %s | opt -basicaa -licm --adce | llvm-dis | not grep Loop +; RUN: llvm-upgrade < %s | llvm-as | opt -basicaa -licm --adce | llvm-dis | not grep Loop %A = global int 7 %B = global int 8 diff --git a/test/Analysis/BasicAA/modref.ll b/test/Analysis/BasicAA/modref.ll index 1cb478c8e1..be2506c801 100644 --- a/test/Analysis/BasicAA/modref.ll +++ b/test/Analysis/BasicAA/modref.ll @@ -1,6 +1,6 @@ ; A very rudimentary test on AliasAnalysis::getModRefInfo. -; RUN: llvm-as < %s | opt -print-all-alias-modref-info -aa-eval -disable-output && -; RUN: llvm-as < %s | opt -print-all-alias-modref-info -aa-eval -disable-output 2>&1 | not grep NoModRef +; RUN: llvm-upgrade < %s | llvm-as | opt -print-all-alias-modref-info -aa-eval -disable-output && +; RUN: llvm-upgrade < %s | llvm-as | opt -print-all-alias-modref-info -aa-eval -disable-output 2>&1 | not grep NoModRef int %callee() { %X = alloca { int, int } diff --git a/test/Analysis/BasicAA/tailcall-modref.ll b/test/Analysis/BasicAA/tailcall-modref.ll index c58ad7ffcd..7fbddd769f 100644 --- a/test/Analysis/BasicAA/tailcall-modref.ll +++ b/test/Analysis/BasicAA/tailcall-modref.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -basicaa -load-vn -gcse -instcombine | llvm-dis | grep 'ret int 0' +; RUN: llvm-upgrade < %s | llvm-as | opt -basicaa -load-vn -gcse -instcombine | llvm-dis | grep 'ret int 0' declare void %foo(int*) declare void %bar() diff --git a/test/Analysis/DSGraph/2003-06-29-IncompleteTDPass.ll b/test/Analysis/DSGraph/2003-06-29-IncompleteTDPass.ll index 713a876536..9afd1daa8a 100644 --- a/test/Analysis/DSGraph/2003-06-29-IncompleteTDPass.ll +++ b/test/Analysis/DSGraph/2003-06-29-IncompleteTDPass.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -analyze -datastructure-gc -dsgc-dspass=td -dsgc-check-flags=Ptr:HR +; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -datastructure-gc -dsgc-dspass=td -dsgc-check-flags=Ptr:HR diff --git a/test/Analysis/DSGraph/2003-06-29-NodeCollapsing.ll b/test/Analysis/DSGraph/2003-06-29-NodeCollapsing.ll index db956231f8..9ecf0f1741 100644 --- a/test/Analysis/DSGraph/2003-06-29-NodeCollapsing.ll +++ b/test/Analysis/DSGraph/2003-06-29-NodeCollapsing.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -no-aa -ds-aa -load-vn -gcse | llvm-dis | not grep load +; RUN: llvm-upgrade < %s | llvm-as | opt -no-aa -ds-aa -load-vn -gcse | llvm-dis | not grep load %T = type { int*, int* } int %main() { diff --git a/test/Analysis/DSGraph/2003-06-29-NodeCollapsing2.ll b/test/Analysis/DSGraph/2003-06-29-NodeCollapsing2.ll index 93260e821e..d9ded6019e 100644 --- a/test/Analysis/DSGraph/2003-06-29-NodeCollapsing2.ll +++ b/test/Analysis/DSGraph/2003-06-29-NodeCollapsing2.ll @@ -1,7 +1,7 @@ ; This is the same testcase as 2003-06-29-NodeCollapsing2.ll, but it uses the ; graph checker. ; -; RUN: llvm-as < %s | opt -analyze -datastructure-gc -dsgc-abort-if-any-collapsed +; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -datastructure-gc -dsgc-abort-if-any-collapsed ; %T = type { int} diff --git a/test/Analysis/DSGraph/2003-06-30-TopDownResolve.ll b/test/Analysis/DSGraph/2003-06-30-TopDownResolve.ll index 631eb9f078..143289ceee 100644 --- a/test/Analysis/DSGraph/2003-06-30-TopDownResolve.ll +++ b/test/Analysis/DSGraph/2003-06-30-TopDownResolve.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -analyze -datastructure-gc -dsgc-dspass=td -dsgc-check-flags=X:GM +; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -datastructure-gc -dsgc-dspass=td -dsgc-check-flags=X:GM %G = internal global int 5 diff --git a/test/Analysis/DSGraph/2003-07-01-FieldCollapse.ll b/test/Analysis/DSGraph/2003-07-01-FieldCollapse.ll index a0ab492443..3ae36fef8b 100644 --- a/test/Analysis/DSGraph/2003-07-01-FieldCollapse.ll +++ b/test/Analysis/DSGraph/2003-07-01-FieldCollapse.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -analyze -datastructure-gc -dsgc-abort-if-any-collapsed +; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -datastructure-gc -dsgc-abort-if-any-collapsed %X = internal global { int, short, short } { int 1, short 2, short 3 } diff --git a/test/Analysis/DSGraph/2003-07-16-ConstantExprCollapse.ll b/test/Analysis/DSGraph/2003-07-16-ConstantExprCollapse.ll index cd8919df0f..0fd930f06d 100644 --- a/test/Analysis/DSGraph/2003-07-16-ConstantExprCollapse.ll +++ b/test/Analysis/DSGraph/2003-07-16-ConstantExprCollapse.ll @@ -1,6 +1,6 @@ ; This should cause the global node to collapse!! ; XFAIL: * -; RUN: llvm-as < %s | opt -analyze -datastructure-gc --dsgc-check-flags=test:GAU +; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -datastructure-gc --dsgc-check-flags=test:GAU %Tree = type { int, %Tree*, %Tree* } %T5 = external global %Tree diff --git a/test/Analysis/DSGraph/2003-11-02-NodeCollapsing.ll b/test/Analysis/DSGraph/2003-11-02-NodeCollapsing.ll index 416fc25bbb..c082b61ea4 100644 --- a/test/Analysis/DSGraph/2003-11-02-NodeCollapsing.ll +++ b/test/Analysis/DSGraph/2003-11-02-NodeCollapsing.ll @@ -1,7 +1,7 @@ ; This is the same testcase as 2003-06-29-NodeCollapsing2.ll, but it uses the ; graph checker. ; -; RUN: llvm-as < %s | opt -analyze -datastructure-gc -dsgc-abort-if-any-collapsed +; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -datastructure-gc -dsgc-abort-if-any-collapsed ; %S = type { double, int } diff --git a/test/Analysis/DSGraph/2004-02-13-memcpy.ll b/test/Analysis/DSGraph/2004-02-13-memcpy.ll index 835b42cbe4..d580097e92 100644 --- a/test/Analysis/DSGraph/2004-02-13-memcpy.ll +++ b/test/Analysis/DSGraph/2004-02-13-memcpy.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | opt -analyze -datastructure-gc -dsgc-check-flags=Xn:SMR && -; RUN: llvm-as < %s | opt -analyze -datastructure-gc -dsgc-check-flags=X:SMR +; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -datastructure-gc -dsgc-check-flags=Xn:SMR && +; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -datastructure-gc -dsgc-check-flags=X:SMR declare void %llvm.memcpy.i32(sbyte*, sbyte*, uint, uint) declare void %llvm.memmove.i32(sbyte*, sbyte*, uint, uint) diff --git a/test/Analysis/DSGraph/2004-03-10-ElimLoad.ll b/test/Analysis/DSGraph/2004-03-10-ElimLoad.ll index 1ae0a48a84..09ebb2b4a4 100644 --- a/test/Analysis/DSGraph/2004-03-10-ElimLoad.ll +++ b/test/Analysis/DSGraph/2004-03-10-ElimLoad.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -ds-aa -load-vn -gcse -instcombine | llvm-dis | not grep sub +; RUN: llvm-upgrade < %s | llvm-as | opt -ds-aa -load-vn -gcse -instcombine | llvm-dis | not grep sub void %bar(int* %p) { ret void diff --git a/test/Analysis/DSGraph/2004-03-10-NoElimLoad.ll b/test/Analysis/DSGraph/2004-03-10-NoElimLoad.ll index 3a8e540ef1..fdd16de047 100644 --- a/test/Analysis/DSGraph/2004-03-10-NoElimLoad.ll +++ b/test/Analysis/DSGraph/2004-03-10-NoElimLoad.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -ds-aa -load-vn -gcse -instcombine | llvm-dis | grep sub +; RUN: llvm-upgrade < %s | llvm-as | opt -ds-aa -load-vn -gcse -instcombine | llvm-dis | grep sub void %bar(int* %p) { store int 15, int* %p diff --git a/test/Analysis/DSGraph/2005-03-22-IncompleteGlobal.ll b/test/Analysis/DSGraph/2005-03-22-IncompleteGlobal.ll index 86b053367d..b8abe2e41b 100644 --- a/test/Analysis/DSGraph/2005-03-22-IncompleteGlobal.ll +++ b/test/Analysis/DSGraph/2005-03-22-IncompleteGlobal.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | opt -analyze -datastructure-gc -dsgc-check-flags=G:GIM -dsgc-dspass=bu &&\ -; RUN: llvm-as < %s | opt -analyze -datastructure-gc -dsgc-check-flags=G:GIM -dsgc-dspass=td +; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -datastructure-gc -dsgc-check-flags=G:GIM -dsgc-dspass=bu &&\ +; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -datastructure-gc -dsgc-check-flags=G:GIM -dsgc-dspass=td %S = type { double, int } diff --git a/test/Analysis/DSGraph/2005-03-24-Global-Arg-Alias.ll b/test/Analysis/DSGraph/2005-03-24-Global-Arg-Alias.ll index 510997de22..e79acd777b 100644 --- a/test/Analysis/DSGraph/2005-03-24-Global-Arg-Alias.ll +++ b/test/Analysis/DSGraph/2005-03-24-Global-Arg-Alias.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -ds-aa -load-vn -gcse | llvm-dis | grep 'load int\* %L' +; RUN: llvm-upgrade < %s | llvm-as | opt -ds-aa -load-vn -gcse | llvm-dis | grep 'load int\* %L' %G = internal global int* null diff --git a/test/Analysis/DSGraph/2006-03-27-LinkedCollapsed.ll b/test/Analysis/DSGraph/2006-03-27-LinkedCollapsed.ll index ce1ebb9202..1c5ed693a2 100644 --- a/test/Analysis/DSGraph/2006-03-27-LinkedCollapsed.ll +++ b/test/Analysis/DSGraph/2006-03-27-LinkedCollapsed.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -analyze -datastructure +; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -datastructure target endian = little target pointersize = 32 diff --git a/test/Analysis/DSGraph/2006-04-13-ZeroArrayStruct.ll b/test/Analysis/DSGraph/2006-04-13-ZeroArrayStruct.ll index 0fa6ba8d8f..14ef03319b 100644 --- a/test/Analysis/DSGraph/2006-04-13-ZeroArrayStruct.ll +++ b/test/Analysis/DSGraph/2006-04-13-ZeroArrayStruct.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -analyze -datastructure +; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -datastructure ; ModuleID = 'bug3.bc' target endian = little diff --git a/test/Analysis/DSGraph/2006-04-25-ZeroArrayStructUse.ll b/test/Analysis/DSGraph/2006-04-25-ZeroArrayStructUse.ll index db072d906d..5598c2035b 100644 --- a/test/Analysis/DSGraph/2006-04-25-ZeroArrayStructUse.ll +++ b/test/Analysis/DSGraph/2006-04-25-ZeroArrayStructUse.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -analyze -datastructure-gc -dsgc-check-flags=x:IA +; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -datastructure-gc -dsgc-check-flags=x:IA ; ModuleID = 'bug3.bc' target endian = little diff --git a/test/Analysis/DSGraph/FunctionPointerTable-const.ll b/test/Analysis/DSGraph/FunctionPointerTable-const.ll index 9c904fa0e0..6ac224721d 100644 --- a/test/Analysis/DSGraph/FunctionPointerTable-const.ll +++ b/test/Analysis/DSGraph/FunctionPointerTable-const.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | opt -analyze -datastructure-gc -dsgc-dspass=bu -dsgc-check-flags=Y:SHM && \ -; RUN: llvm-as < %s | opt -analyze -datastructure-gc -dsgc-dspass=td -dsgc-check-flags=P1:SHM,P2:SHM +; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -datastructure-gc -dsgc-dspass=bu -dsgc-check-flags=Y:SHM && \ +; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -datastructure-gc -dsgc-dspass=td -dsgc-check-flags=P1:SHM,P2:SHM %G = internal constant [2 x int*(int*)*] [ int*(int*)* %callee1, int*(int*)* %callee2 diff --git a/test/Analysis/DSGraph/GlobalsGraphFuncPtr.ll b/test/Analysis/DSGraph/GlobalsGraphFuncPtr.ll index 6cc06c4b01..a44488d885 100644 --- a/test/Analysis/DSGraph/GlobalsGraphFuncPtr.ll +++ b/test/Analysis/DSGraph/GlobalsGraphFuncPtr.ll @@ -4,7 +4,7 @@ ; -- latter should remain unresolved in main() and copied to GG ; -- globals in GG pointed to by latter should be marked I, but not other nodes ; -; RUN: llvm-as < %s | opt -analyze -datastructure-gc -dsgc-check-flags=KnownPtr:S,UnknownPtr:SI -dsgc-dspass=bu +; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -datastructure-gc -dsgc-check-flags=KnownPtr:S,UnknownPtr:SI -dsgc-dspass=bu %Z = internal global int 0 %X = internal global int 0 diff --git a/test/Analysis/DSGraph/HardBUCase.ll b/test/Analysis/DSGraph/HardBUCase.ll index 63ec3faca0..838a33ac82 100644 --- a/test/Analysis/DSGraph/HardBUCase.ll +++ b/test/Analysis/DSGraph/HardBUCase.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -analyze -budatastructure -dont-print-ds +; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -budatastructure -dont-print-ds %MidFnTy = type void (\2*) diff --git a/test/Analysis/DSGraph/PhysicalSubtyping.ll b/test/Analysis/DSGraph/PhysicalSubtyping.ll index 6e9676ea12..025ead093f 100644 --- a/test/Analysis/DSGraph/PhysicalSubtyping.ll +++ b/test/Analysis/DSGraph/PhysicalSubtyping.ll @@ -1,6 +1,6 @@ ; Test to check for support for "physical subtyping" ; -; RUN: llvm-as < %s | opt -analyze -datastructure-gc -dsgc-abort-if-any-collapsed +; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -datastructure-gc -dsgc-abort-if-any-collapsed ; %S = type { int } %T = type { int, float, double } diff --git a/test/Analysis/DSGraph/SCCSimpleExample.ll b/test/Analysis/DSGraph/SCCSimpleExample.ll index c742afa25f..d55e541567 100644 --- a/test/Analysis/DSGraph/SCCSimpleExample.ll +++ b/test/Analysis/DSGraph/SCCSimpleExample.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | opt -analyze -datastructure-gc --dsgc-abort-if-merged=Y,BVal +; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -datastructure-gc --dsgc-abort-if-merged=Y,BVal implementation diff --git a/test/Analysis/DSGraph/buglobals.ll b/test/Analysis/DSGraph/buglobals.ll index c3bc745686..2f7c8f6449 100644 --- a/test/Analysis/DSGraph/buglobals.ll +++ b/test/Analysis/DSGraph/buglobals.ll @@ -1,7 +1,7 @@ ; This tests to make sure that G ends up in the globals graph of the BU pass. ; If it is not, then %G will get converted to a 'constant' from a 'global' ; -; RUN: llvm-as < %s | opt -ds-opt -globaldce | llvm-dis | grep %G +; RUN: llvm-upgrade < %s | llvm-as | opt -ds-opt -globaldce | llvm-dis | grep %G %G = internal global int 0 ; <int*> [#uses=2] diff --git a/test/Analysis/DSGraph/constant_globals.ll b/test/Analysis/DSGraph/constant_globals.ll index 1ee6530883..67de589de3 100644 --- a/test/Analysis/DSGraph/constant_globals.ll +++ b/test/Analysis/DSGraph/constant_globals.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -analyze -datastructure-gc -dsgc-dspass=bu -dsgc-check-flags=A:SM +; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -datastructure-gc -dsgc-dspass=bu -dsgc-check-flags=A:SM ; Constant globals should not mark stuff incomplete. This should allow the ; bu pass to resolve the indirect call immediately in "test", allowing %A to ; be marked complete and the store to happen. diff --git a/test/Analysis/DSGraph/constantize.ll b/test/Analysis/DSGraph/constantize.ll index fa7c12f5d8..c8d0ad8fc5 100644 --- a/test/Analysis/DSGraph/constantize.ll +++ b/test/Analysis/DSGraph/constantize.ll @@ -1,6 +1,6 @@ ; Make sure that the ds-opt pass is constantizing globals ; -; RUN: llvm-as < %s | opt -ds-opt | llvm-dis | grep %G | grep constant +; RUN: llvm-upgrade < %s | llvm-as | opt -ds-opt | llvm-dis | grep %G | grep constant %G = internal global int 0 ; <int*> [#uses=2] diff --git a/test/Analysis/DSGraph/field-sensitive.ll b/test/Analysis/DSGraph/field-sensitive.ll index dc3fc22dfb..49aeaba7df 100644 --- a/test/Analysis/DSGraph/field-sensitive.ll +++ b/test/Analysis/DSGraph/field-sensitive.ll @@ -1,5 +1,5 @@ ; Test that ds-aa can be used for queries that require field sensitive AA. -; RUN: llvm-as < %s | opt -no-aa -ds-aa -load-vn -gcse | llvm-dis | not grep load +; RUN: llvm-upgrade < %s | llvm-as | opt -no-aa -ds-aa -load-vn -gcse | llvm-dis | not grep load %Pair = type { int, int } diff --git a/test/Analysis/DSGraph/gcsetest.ll b/test/Analysis/DSGraph/gcsetest.ll index b9b28c4f8c..bb7af1249c 100644 --- a/test/Analysis/DSGraph/gcsetest.ll +++ b/test/Analysis/DSGraph/gcsetest.ll @@ -1,7 +1,7 @@ ; Test that GCSE uses ds-aa to do alias analysis, which is capable of ; disambiguating some cases. -; RUN: llvm-as < %s | opt -no-aa -ds-aa -load-vn -gcse -instcombine -dce | llvm-dis | not grep ELIM +; RUN: llvm-upgrade < %s | llvm-as | opt -no-aa -ds-aa -load-vn -gcse -instcombine -dce | llvm-dis | not grep ELIM %intpair = type {int*, int*} implementation diff --git a/test/Analysis/DSGraph/incompletenode.ll b/test/Analysis/DSGraph/incompletenode.ll index b9940db157..c94faf0894 100644 --- a/test/Analysis/DSGraph/incompletenode.ll +++ b/test/Analysis/DSGraph/incompletenode.ll @@ -1,7 +1,7 @@ ; This test was failing because the globals X and Y are marked incomplete ; in the TD graph for %test ; XFAIL: * -; RUN: llvm-as < %s | opt -no-aa -ds-aa -load-vn -gcse -instcombine | llvm-dis | not grep seteq +; RUN: llvm-upgrade < %s | llvm-as | opt -no-aa -ds-aa -load-vn -gcse -instcombine | llvm-dis | not grep seteq %X = internal global int 20 %Y = internal global int* null diff --git a/test/Analysis/DSGraph/mustalias.ll b/test/Analysis/DSGraph/mustalias.ll index 4425157f08..111b7addce 100644 --- a/test/Analysis/DSGraph/mustalias.ll +++ b/test/Analysis/DSGraph/mustalias.ll @@ -1,6 +1,6 @@ ; Test that ds-aa is returning must-alias information when it can. ; XFAIL: * -; RUN: llvm-as < %s | opt -no-aa -ds-aa -load-vn -gcse | llvm-dis | not grep load +; RUN: llvm-upgrade < %s | llvm-as | opt -no-aa -ds-aa -load-vn -gcse | llvm-dis | not grep load %X = internal global int 20 diff --git a/test/Analysis/DSGraph/strcpy.ll b/test/Analysis/DSGraph/strcpy.ll index 7697c7ffa7..20c2da802d 100644 --- a/test/Analysis/DSGraph/strcpy.ll +++ b/test/Analysis/DSGraph/strcpy.ll @@ -3,7 +3,7 @@ ; has no defined way to check for this, so DSA can know that strcpy doesn't ; require merging the input arguments. -; RUN: llvm-as < %s | opt -analyze -datastructure-gc --dsgc-abort-if-merged=A,B --dsgc-check-flags=A:ASM,B:ASR --dsgc-dspass=bu +; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -datastructure-gc --dsgc-abort-if-merged=A,B --dsgc-check-flags=A:ASM,B:ASR --dsgc-dspass=bu implementation diff --git a/test/Analysis/Dominators/2003-05-12-UnreachableCode.ll b/test/Analysis/Dominators/2003-05-12-UnreachableCode.ll index 1df4f785fd..256cb54e56 100644 --- a/test/Analysis/Dominators/2003-05-12-UnreachableCode.ll +++ b/test/Analysis/Dominators/2003-05-12-UnreachableCode.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -analyze -domset -disable-verify +; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -domset -disable-verify ; int %re_match_2() { ENTRY: diff --git a/test/Analysis/Dominators/2006-09-26-PostDominanceFrontier.ll b/test/Analysis/Dominators/2006-09-26-PostDominanceFrontier.ll index 3ff1184bfa..36385e2b20 100644 --- a/test/Analysis/Dominators/2006-09-26-PostDominanceFrontier.ll +++ b/test/Analysis/Dominators/2006-09-26-PostDominanceFrontier.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -analyze -postdomfrontier -disable-verify +; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -postdomfrontier -disable-verify ; ; ModuleID = '2006-09-26-PostDominanceFrontier.bc' target endian = little diff --git a/test/Analysis/Dominators/2006-10-02-BreakCritEdges.ll b/test/Analysis/Dominators/2006-10-02-BreakCritEdges.ll index cce885beec..e7bb43e97f 100644 --- a/test/Analysis/Dominators/2006-10-02-BreakCritEdges.ll +++ b/test/Analysis/Dominators/2006-10-02-BreakCritEdges.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -domtree -break-crit-edges -analyze -domtree | grep '3.*%brtrue$' +; RUN: llvm-upgrade < %s | llvm-as | opt -domtree -break-crit-edges -analyze -domtree | grep '3.*%brtrue$' ; PR932 implementation ; Functions: diff --git a/test/Analysis/GlobalsModRef/aliastest.ll b/test/Analysis/GlobalsModRef/aliastest.ll index 19def38595..4363d3b30f 100644 --- a/test/Analysis/GlobalsModRef/aliastest.ll +++ b/test/Analysis/GlobalsModRef/aliastest.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -globalsmodref-aa -load-vn -gcse | llvm-dis | not grep load +; RUN: llvm-upgrade < %s | llvm-as | opt -globalsmodref-aa -load-vn -gcse | llvm-dis | not grep load %X = internal global int 4 int %test(int *%P) { diff --git a/test/Analysis/GlobalsModRef/chaining-analysis.ll b/test/Analysis/GlobalsModRef/chaining-analysis.ll index 5caa0a8eb9..49244563c0 100644 --- a/test/Analysis/GlobalsModRef/chaining-analysis.ll +++ b/test/Analysis/GlobalsModRef/chaining-analysis.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -globalsmodref-aa -load-vn -gcse | llvm-dis | not grep load +; RUN: llvm-upgrade < %s | llvm-as | opt -globalsmodref-aa -load-vn -gcse | llvm-dis | not grep load ; This test requires the use of previous analyses to determine that ; doesnotmodX does not modify X (because 'sin' doesn't). diff --git a/test/Analysis/GlobalsModRef/indirect-global.ll b/test/Analysis/GlobalsModRef/indirect-global.ll index 206955eba7..d0f79c12ea 100644 --- a/test/Analysis/GlobalsModRef/indirect-global.ll +++ b/test/Analysis/GlobalsModRef/indirect-global.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -globalsmodref-aa -load-vn -gcse -instcombine | llvm-dis | grep 'ret int 0' +; RUN: llvm-upgrade < %s | llvm-as | opt -globalsmodref-aa -load-vn -gcse -instcombine | llvm-dis | grep 'ret int 0' %G = internal global int* null implementation diff --git a/test/Analysis/GlobalsModRef/modreftest.ll b/test/Analysis/GlobalsModRef/modreftest.ll index a08eef1b66..fadc7471f8 100644 --- a/test/Analysis/GlobalsModRef/modreftest.ll +++ b/test/Analysis/GlobalsModRef/modreftest.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -globalsmodref-aa -load-vn -gcse | llvm-dis | not grep load +; RUN: llvm-upgrade < %s | llvm-as | opt -globalsmodref-aa -load-vn -gcse | llvm-dis | not grep load %X = internal global int 4 int %test(int *%P) { diff --git a/test/Analysis/GlobalsModRef/purecse.ll b/test/Analysis/GlobalsModRef/purecse.ll index bed282338d..0c95182d46 100644 --- a/test/Analysis/GlobalsModRef/purecse.ll +++ b/test/Analysis/GlobalsModRef/purecse.ll @@ -1,6 +1,6 @@ ; Test that pure functions are cse'd away -; RUN: llvm-as < %s | opt -globalsmodref-aa -load-vn -gcse -instcombine | llvm-dis | not grep sub +; RUN: llvm-upgrade < %s | llvm-as | opt -globalsmodref-aa -load-vn -gcse -instcombine | llvm-dis | not grep sub int %pure(int %X) { %Y = add int %X, 1 diff --git a/test/Analysis/LoadVN/RLE-Eliminate.ll b/test/Analysis/LoadVN/RLE-Eliminate.ll index dba82b7e75..4c3a668bc9 100644 --- a/test/Analysis/LoadVN/RLE-Eliminate.ll +++ b/test/Analysis/LoadVN/RLE-Eliminate.ll @@ -1,7 +1,7 @@ ; This testcase ensures that redundant loads are eliminated when they should ; be. All RL variables (redundant loads) should be eliminated. ; -; RUN: llvm-as < %s | opt -load-vn -gcse | llvm-dis | not grep %RL +; RUN: llvm-upgrade < %s | llvm-as | opt -load-vn -gcse | llvm-dis | not grep %RL ; int "test1"(int* %P) { %A = load int* %P diff --git a/test/Analysis/LoadVN/RLE-Preserve-Volatile.ll b/test/Analysis/LoadVN/RLE-Preserve-Volatile.ll index c320bc3eea..99660168fb 100644 --- a/test/Analysis/LoadVN/RLE-Preserve-Volatile.ll +++ b/test/Analysis/LoadVN/RLE-Preserve-Volatile.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | opt -load-vn -gcse -instcombine | llvm-dis | grep sub +; RUN: llvm-upgrade < %s | llvm-as | opt -load-vn -gcse -instcombine | llvm-dis | grep sub int %test(int* %P) { %X = volatile load int* %P diff --git a/test/Analysis/LoadVN/RLE-Preserve.ll b/test/Analysis/LoadVN/RLE-Preserve.ll index 88a0c7f298..e08c41ceeb 100644 --- a/test/Analysis/LoadVN/RLE-Preserve.ll +++ b/test/Analysis/LoadVN/RLE-Preserve.ll @@ -1,6 +1,6 @@ ; This testcase ensures that redundant loads are preserved when they are not ; allowed to be eliminated. -; RUN: llvm-as < %s | opt -load-vn -gcse | llvm-dis | grep sub +; RUN: llvm-upgrade < %s | llvm-as | opt -load-vn -gcse | llvm-dis | grep sub ; int %test1(int* %P) { %A = load int* %P diff --git a/test/Analysis/LoadVN/call_cse.ll b/test/Analysis/LoadVN/call_cse.ll index 311f38aa15..78cdd43051 100644 --- a/test/Analysis/LoadVN/call_cse.ll +++ b/test/Analysis/LoadVN/call_cse.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -basicaa -load-vn -gcse -instcombine | llvm-dis | not grep sub +; RUN: llvm-upgrade < %s | llvm-as | opt -basicaa -load-vn -gcse -instcombine | llvm-dis | not grep sub declare int %strlen(sbyte*) int %test(sbyte* %P) { diff --git a/test/Analysis/LoadVN/call_pure_function.ll b/test/Analysis/LoadVN/call_pure_function.ll index c9de486c06..302ae60466 100644 --- a/test/Analysis/LoadVN/call_pure_function.ll +++ b/test/Analysis/LoadVN/call_pure_function.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -basicaa -load-vn -gcse -instcombine | llvm-dis | not grep sub +; RUN: llvm-upgrade < %s | llvm-as | opt -basicaa -load-vn -gcse -instcombine | llvm-dis | not grep sub declare int %strlen(sbyte*) declare void %use(int %X) diff --git a/test/Analysis/LoadVN/dependent_loads.ll b/test/Analysis/LoadVN/dependent_loads.ll index 331ba2110e..168b640c9e 100644 --- a/test/Analysis/LoadVN/dependent_loads.ll +++ b/test/Analysis/LoadVN/dependent_loads.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -basicaa -load-vn -gcse -instcombine | llvm-dis | not grep sub +; RUN: llvm-upgrade < %s | llvm-as | opt -basicaa -load-vn -gcse -instcombine | llvm-dis | not grep sub %S = type { int, sbyte } diff --git a/test/Analysis/LoadVN/undefined_load.ll b/test/Analysis/LoadVN/undefined_load.ll index 9f01d24806..8e4660c045 100644 --- a/test/Analysis/LoadVN/undefined_load.ll +++ b/test/Analysis/LoadVN/undefined_load.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -load-vn -gcse | llvm-dis | not grep load +; RUN: llvm-upgrade < %s | llvm-as | opt -load-vn -gcse | llvm-dis | not grep load ; Test that loads of undefined memory are eliminated. int %test1() { diff --git a/test/Analysis/LoopInfo/2003-05-15-NestingProblem.ll b/test/Analysis/LoopInfo/2003-05-15-NestingProblem.ll index 6c5bb689b4..3eeecae053 100644 --- a/test/Analysis/LoopInfo/2003-05-15-NestingProblem.ll +++ b/test/Analysis/LoopInfo/2003-05-15-NestingProblem.ll @@ -1,7 +1,7 @@ ; This testcase was incorrectly computing that the loopentry.7 loop was ; not a child of the loopentry.6 loop. ; -; RUN: llvm-as < %s | opt -analyze -loops | grep "^ Loop Containing: %loopentry.7" +; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -loops | grep "^ Loop Containing: %loopentry.7" void %getAndMoveToFrontDecode() { ; No predecessors! br label %endif.2 diff --git a/test/Assembler/2002-04-07-HexFloatConstants.llx b/test/Assembler/2002-04-07-HexFloatConstants.llx index 04a1b463c4..d0f413ae9e 100644 --- a/test/Assembler/2002-04-07-HexFloatConstants.llx +++ b/test/Assembler/2002-04-07-HexFloatConstants.llx @@ -5,8 +5,8 @@ ; of the bug that was causing the Olden Health benchmark to output incorrect ; results! ; -; RUN: llvm-as < %s | opt -constprop | llvm-dis > %t.1 && \ -; RUN: llvm-as < %s | llvm-dis | llvm-as | opt -constprop | llvm-dis > %t.2 && \ +; RUN: llvm-upgrade < %s | llvm-as | opt -constprop | llvm-dis > %t.1 && \ +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | llvm-as | opt -constprop | llvm-dis > %t.2 && \ ; RUN: diff %t.1 %t.2 implementation diff --git a/test/Assembler/2002-04-07-InfConstant.llx b/test/Assembler/2002-04-07-InfConstant.llx index 8ca7450bf7..f1479eb4df 100644 --- a/test/Assembler/2002-04-07-InfConstant.llx +++ b/test/Assembler/2002-04-07-InfConstant.llx @@ -1,6 +1,6 @@ ; The output formater prints out 1.0e100 as Inf! ; -; RUN: llvm-as < %s | llvm-dis | llvm-as | llvm-dis +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | llvm-as | llvm-dis implementation diff --git a/test/Assembler/2002-04-29-NameBinding.llx b/test/Assembler/2002-04-29-NameBinding.llx index 88ad493606..ad994f0386 100644 --- a/test/Assembler/2002-04-29-NameBinding.llx +++ b/test/Assembler/2002-04-29-NameBinding.llx @@ -4,7 +4,7 @@ ; Check by running globaldce, which will remove the constant if there are ; no references to it! ; -; RUN: llvm-as < %s | opt -globaldce | llvm-dis | not grep constant +; RUN: llvm-upgrade < %s | llvm-as | opt -globaldce | llvm-dis | not grep constant ; %v1 = internal constant int 5 diff --git a/test/Assembler/2002-07-14-InternalLossage.llx b/test/Assembler/2002-07-14-InternalLossage.llx index 31469649c2..51f88e4d61 100644 --- a/test/Assembler/2002-07-14-InternalLossage.llx +++ b/test/Assembler/2002-07-14-InternalLossage.llx @@ -1,6 +1,6 @@ ; Test to make sure that the 'internal' tag is not lost! ; -; RUN: llvm-as < %s | llvm-dis | grep internal +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | grep internal declare void %foo() implementation diff --git a/test/Assembler/2002-07-14-OpaqueType.llx b/test/Assembler/2002-07-14-OpaqueType.llx index b4de7e720f..dce13fe6b8 100644 --- a/test/Assembler/2002-07-14-OpaqueType.llx +++ b/test/Assembler/2002-07-14-OpaqueType.llx @@ -1,5 +1,5 @@ ; Test that opaque types are preserved correctly -; RUN: llvm-as < %s | llvm-dis | llvm-as | llvm-dis +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | llvm-as | llvm-dis ; %Ty = type opaque diff --git a/test/Assembler/2002-07-25-QuoteInString.llx b/test/Assembler/2002-07-25-QuoteInString.llx index 156f97963b..59a664e054 100644 --- a/test/Assembler/2002-07-25-QuoteInString.llx +++ b/test/Assembler/2002-07-25-QuoteInString.llx @@ -1,5 +1,5 @@ ; Test double quotes in strings work correctly! -; RUN: llvm-as < %s | llvm-dis | llvm-as | llvm-dis +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | llvm-as | llvm-dis ; %str = internal global [6 x sbyte] c"\22foo\22\00" diff --git a/test/Assembler/2002-07-25-ReturnPtrFunction.llx b/test/Assembler/2002-07-25-ReturnPtrFunction.llx index 354fa54be9..c5c4aa8a8b 100644 --- a/test/Assembler/2002-07-25-ReturnPtrFunction.llx +++ b/test/Assembler/2002-07-25-ReturnPtrFunction.llx @@ -1,7 +1,7 @@ ; Test that returning a pointer to a function causes the disassembler to print ; the right thing. ; -; RUN: llvm-as < %s | llvm-dis | llvm-as +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | llvm-as %ty = type void (int) diff --git a/test/Assembler/2002-07-31-SlashInString.llx b/test/Assembler/2002-07-31-SlashInString.llx index 4408f0a8bb..9fae11aa33 100644 --- a/test/Assembler/2002-07-31-SlashInString.llx +++ b/test/Assembler/2002-07-31-SlashInString.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llvm-dis | llvm-as +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | llvm-as ; Make sure that \\ works in a string initializer %Slashtest = internal global [8 x sbyte] c"\5Cbegin{\00" diff --git a/test/Assembler/2002-08-16-ConstExprInlined.llx b/test/Assembler/2002-08-16-ConstExprInlined.llx index a88dc6ad88..b344d9facc 100644 --- a/test/Assembler/2002-08-16-ConstExprInlined.llx +++ b/test/Assembler/2002-08-16-ConstExprInlined.llx @@ -8,7 +8,7 @@ ; reader should NEVER produce a program "successfully" with placeholders still ; around! -; RUN: llvm-as < %s | llvm-dis | llvm-as +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | llvm-as %.LC0 = internal global [4 x sbyte] c"foo\00" ; <[4 x sbyte]*> [#uses=1] diff --git a/test/Assembler/2002-08-19-BytecodeReader.llx b/test/Assembler/2002-08-19-BytecodeReader.llx index 3e49761801..01301b7ab0 100644 --- a/test/Assembler/2002-08-19-BytecodeReader.llx +++ b/test/Assembler/2002-08-19-BytecodeReader.llx @@ -1,7 +1,7 @@ ; Testcase that seems to break the bytecode reader. This comes from the ; "crafty" spec benchmark. ; -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | llvm-as +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | llvm-as %CHESS_POSITION = type { uint, int } diff --git a/test/Assembler/2002-10-13-ConstantEncodingProblem.llx b/test/Assembler/2002-10-13-ConstantEncodingProblem.llx index 0634b9f430..2c3f41b8ce 100644 --- a/test/Assembler/2002-10-13-ConstantEncodingProblem.llx +++ b/test/Assembler/2002-10-13-ConstantEncodingProblem.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llvm-dis +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis %Domain = type { %Domain**, %Domain* } diff --git a/test/Assembler/2003-05-03-BytecodeReaderProblem.llx b/test/Assembler/2003-05-03-BytecodeReaderProblem.llx index b8b82d94d1..f45d9a9a39 100644 --- a/test/Assembler/2003-05-03-BytecodeReaderProblem.llx +++ b/test/Assembler/2003-05-03-BytecodeReaderProblem.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llvm-dis +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis void %test() { %tmp.123 = cast long cast ([5 x { ubyte, sbyte }]* getelementptr ([30 x [5 x { ubyte, sbyte }]]* null, long 0, long 0) to long) to int diff --git a/test/Assembler/2003-05-12-MinIntProblem.llx b/test/Assembler/2003-05-12-MinIntProblem.llx index 515ad0f9fe..88d83c536d 100644 --- a/test/Assembler/2003-05-12-MinIntProblem.llx +++ b/test/Assembler/2003-05-12-MinIntProblem.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llvm-dis | grep -- -2147483648 +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | grep -- -2147483648 int %foo() { ret int -2147483648 diff --git a/test/Assembler/2003-06-17-InvokeDisassemble.llx b/test/Assembler/2003-06-17-InvokeDisassemble.llx index a444dc9b81..ceb1d2e7fe 100644 --- a/test/Assembler/2003-06-17-InvokeDisassemble.llx +++ b/test/Assembler/2003-06-17-InvokeDisassemble.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llvm-dis +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis void %test() { invoke void %test() to label %Next except label %Next Next: diff --git a/test/Assembler/2003-08-20-ConstantExprGEP-Fold.llx b/test/Assembler/2003-08-20-ConstantExprGEP-Fold.llx index d93cf19e49..27e3169337 100644 --- a/test/Assembler/2003-08-20-ConstantExprGEP-Fold.llx +++ b/test/Assembler/2003-08-20-ConstantExprGEP-Fold.llx @@ -1,4 +1,4 @@ -; 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 %.str_1 = internal constant [6 x sbyte] c"_Bool\00" ; <[6 x sbyte]*> [#uses=1] diff --git a/test/Assembler/2003-08-21-ConstantExprCast-Fold.llx b/test/Assembler/2003-08-21-ConstantExprCast-Fold.llx index 453be5ec0f..37b0363e19 100644 --- a/test/Assembler/2003-08-21-ConstantExprCast-Fold.llx +++ b/test/Assembler/2003-08-21-ConstantExprCast-Fold.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llvm-dis | not grep getelementptr +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | not grep getelementptr %A = external global { float } ; <{ float }*> [#uses=1] global int* cast (float* getelementptr ({ float }* %A, long 0, ubyte 0) to int*) diff --git a/test/Assembler/2003-11-05-ConstantExprShift.llx b/test/Assembler/2003-11-05-ConstantExprShift.llx index 8e79abe33a..e78af237f9 100644 --- a/test/Assembler/2003-11-05-ConstantExprShift.llx +++ b/test/Assembler/2003-11-05-ConstantExprShift.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llvm-dis +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis int %test() { ret int shr (int cast (int()* %test to int), ubyte 2) diff --git a/test/Assembler/2003-11-12-ConstantExprCast.llx b/test/Assembler/2003-11-12-ConstantExprCast.llx index 8b3f05128b..d243df45ba 100644 --- a/test/Assembler/2003-11-12-ConstantExprCast.llx +++ b/test/Assembler/2003-11-12-ConstantExprCast.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llvm-dis | grep ' bitcast (' +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | grep ' bitcast (' %.Base64_1 = external constant [4 x sbyte] diff --git a/test/Assembler/2004-01-11-getelementptrfolding.llx b/test/Assembler/2004-01-11-getelementptrfolding.llx index 6f7f06a9b2..6ab1a5577b 100644 --- a/test/Assembler/2004-01-11-getelementptrfolding.llx +++ b/test/Assembler/2004-01-11-getelementptrfolding.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llvm-dis | not grep 'getelementptr.*getelementptr' +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | not grep 'getelementptr.*getelementptr' %struct.TUVVertex = type { short, short, short, short } %struct.TTriangleItem = type { sbyte*, sbyte*, [3 x %struct.TUVVertex] } diff --git a/test/Assembler/2004-01-20-MaxLongLong.llx b/test/Assembler/2004-01-20-MaxLongLong.llx index a55fcd6e8c..cb75284e74 100644 --- a/test/Assembler/2004-01-20-MaxLongLong.llx +++ b/test/Assembler/2004-01-20-MaxLongLong.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llvm-dis | grep 9223372036854775808 +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | grep 9223372036854775808 global long -9223372036854775808 diff --git a/test/Assembler/2004-02-01-NegativeZero.llx b/test/Assembler/2004-02-01-NegativeZero.llx index b999672b8d..b8c02f9452 100644 --- a/test/Assembler/2004-02-01-NegativeZero.llx +++ b/test/Assembler/2004-02-01-NegativeZero.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llvm-dis | grep -- -0.0 +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | grep -- -0.0 global double 0x8000000000000000 diff --git a/test/Assembler/2004-03-07-FunctionAddressAlignment.llx b/test/Assembler/2004-03-07-FunctionAddressAlignment.llx index 13f7392c9f..909585cddf 100644 --- a/test/Assembler/2004-03-07-FunctionAddressAlignment.llx +++ b/test/Assembler/2004-03-07-FunctionAddressAlignment.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llvm-dis | not grep cast +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | not grep cast ; All of these should be eliminable diff --git a/test/Assembler/2004-12-05-LocalGlobalSymtabConflict.ll b/test/Assembler/2004-12-05-LocalGlobalSymtabConflict.ll index 66e7d121a9..5743e42f9d 100644 --- a/test/Assembler/2004-12-05-LocalGlobalSymtabConflict.ll +++ b/test/Assembler/2004-12-05-LocalGlobalSymtabConflict.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -inline | llvm-dis | not grep '%G = alloca int' +; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | not grep '%G = alloca int' ; In this testcase, %bar stores to the global G. Make sure that inlining does ; not cause it to store to the G in main instead. diff --git a/test/Assembler/2005-01-03-FPConstantDisassembly.ll b/test/Assembler/2005-01-03-FPConstantDisassembly.ll index bd0d389ff7..7dfa0e5404 100644 --- a/test/Assembler/2005-01-03-FPConstantDisassembly.ll +++ b/test/Assembler/2005-01-03-FPConstantDisassembly.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llvm-dis | grep '1.0' +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | grep '1.0' double %test() { ret double 1.0 ;; This should not require hex notation diff --git a/test/Assembler/2005-02-09-AsmWriterStoreBug.ll b/test/Assembler/2005-02-09-AsmWriterStoreBug.ll index 3e7f5e44f1..f2e186d024 100644 --- a/test/Assembler/2005-02-09-AsmWriterStoreBug.ll +++ b/test/Assembler/2005-02-09-AsmWriterStoreBug.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llvm-dis | llvm-as +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | llvm-as ; Ensure that the asm writer emits types before both operands of the ; store, even though they can be the same. diff --git a/test/Assembler/2005-05-05-OpaqueUndefValues.ll b/test/Assembler/2005-05-05-OpaqueUndefValues.ll index 9321d3bf30..8ea8d97c58 100644 --- a/test/Assembler/2005-05-05-OpaqueUndefValues.ll +++ b/test/Assembler/2005-05-05-OpaqueUndefValues.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llvm-dis | llvm-as +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | llvm-as %t = type opaque %x = global %t undef diff --git a/test/Assembler/2006-05-26-VarargsCallEncode.ll b/test/Assembler/2006-05-26-VarargsCallEncode.ll index c06de84386..0c76d6fe86 100644 --- a/test/Assembler/2006-05-26-VarargsCallEncode.ll +++ b/test/Assembler/2006-05-26-VarargsCallEncode.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llvm-dis | grep 'tail call csretcc' +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | grep 'tail call csretcc' declare csretcc void %foo({}*, ...) diff --git a/test/Assembler/ConstantExprFold.llx b/test/Assembler/ConstantExprFold.llx index a0e9505909..06d0b75a98 100644 --- a/test/Assembler/ConstantExprFold.llx +++ b/test/Assembler/ConstantExprFold.llx @@ -1,6 +1,6 @@ ; This test checks to make sure that constant exprs fold in some simple situations -; RUN: llvm-as < %s | llvm-dis | not grep '(' && +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | not grep '(' && ; RUN: llvm-as < %s %A = global long 0 diff --git a/test/Assembler/ConstantExprFoldCast.llx b/test/Assembler/ConstantExprFoldCast.llx index 48394ddfab..abc93168cf 100644 --- a/test/Assembler/ConstantExprFoldCast.llx +++ b/test/Assembler/ConstantExprFoldCast.llx @@ -1,6 +1,6 @@ ; This test checks to make sure that constant exprs fold in some simple situations -; RUN: llvm-as < %s | llvm-dis | not grep cast +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | not grep cast %A = global int* cast (sbyte* null to int*) ; Cast null -> fold %B = global int** cast (int** %A to int**) ; Cast to same type -> fold diff --git a/test/CodeGen/ARM/alloca.ll b/test/CodeGen/ARM/alloca.ll index b77f234e10..6722026835 100644 --- a/test/CodeGen/ARM/alloca.ll +++ b/test/CodeGen/ARM/alloca.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=arm +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm void %f(uint %a) { entry: %tmp = alloca sbyte, uint %a diff --git a/test/CodeGen/ARM/argaddr.ll b/test/CodeGen/ARM/argaddr.ll index abdf215ee0..a1317213fc 100644 --- a/test/CodeGen/ARM/argaddr.ll +++ b/test/CodeGen/ARM/argaddr.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=arm +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm void %f(int %a, int %b, int %c, int %d, int %e) { entry: %a_addr = alloca int ; <int*> [#uses=2] diff --git a/test/CodeGen/ARM/bits.ll b/test/CodeGen/ARM/bits.ll index ca79e49829..c5052e5bac 100644 --- a/test/CodeGen/ARM/bits.ll +++ b/test/CodeGen/ARM/bits.ll @@ -1,9 +1,9 @@ -; RUN: llvm-as < %s | llc -march=arm && -; RUN: llvm-as < %s | llc -march=arm | grep and | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=arm | grep orr | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=arm | grep eor | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=arm | grep mov.*lsl | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=arm | grep mov.*asr | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep and | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep orr | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep eor | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep mov.*lsl | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep mov.*asr | wc -l | grep 1 int %f1(int %a, int %b) { entry: diff --git a/test/CodeGen/ARM/branch.ll b/test/CodeGen/ARM/branch.ll index 57aa179a7c..54929ad5df 100644 --- a/test/CodeGen/ARM/branch.ll +++ b/test/CodeGen/ARM/branch.ll @@ -1,8 +1,8 @@ -; RUN: llvm-as < %s | llc -march=arm && -; RUN: llvm-as < %s | llc -march=arm | grep bne && -; RUN: llvm-as < %s | llc -march=arm | grep bge && -; RUN: llvm-as < %s | llc -march=arm | grep bcs && -; RUN: llvm-as < %s | llc -march=arm | grep bcc +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep bne && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep bge && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep bcs && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep bcc void %f1(int %a, int %b, int* %v) { entry: diff --git a/test/CodeGen/ARM/call.ll b/test/CodeGen/ARM/call.ll index b223698c65..a4b6b807d6 100644 --- a/test/CodeGen/ARM/call.ll +++ b/test/CodeGen/ARM/call.ll @@ -1,6 +1,6 @@ -; RUN: llvm-as < %s | llc -march=arm && -; RUN: llvm-as < %s | llc -march=arm | grep bl && -; RUN: llvm-as < %s | llc -march=arm | grep blx +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep bl && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep blx void %f() { entry: diff --git a/test/CodeGen/ARM/constants.ll b/test/CodeGen/ARM/constants.ll index f161b9d070..0d69f53585 100644 --- a/test/CodeGen/ARM/constants.ll +++ b/test/CodeGen/ARM/constants.ll @@ -1,11 +1,11 @@ -; RUN: llvm-as < %s | llc -march=arm && -; RUN: llvm-as < %s | llc -march=arm | grep "mov r0, #0" | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=arm | grep "mov r0, #255" | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=arm | grep "mov r0, #256" | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=arm | grep ".word.*257" | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=arm | grep "mov r0, #-1073741761" | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=arm | grep "mov r0, #1008" | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=arm | grep "\.comm.*a,4,4" | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "mov r0, #0" | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "mov r0, #255" | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "mov r0, #256" | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep ".word.*257" | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "mov r0, #-1073741761" | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "mov r0, #1008" | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "\.comm.*a,4,4" | wc -l | grep 1 %a = internal global int 0 diff --git a/test/CodeGen/ARM/div.ll b/test/CodeGen/ARM/div.ll index 1d7839439d..5ad660ed5a 100644 --- a/test/CodeGen/ARM/div.ll +++ b/test/CodeGen/ARM/div.ll @@ -1,8 +1,8 @@ -; RUN: llvm-as < %s | llc -march=arm && -; RUN: llvm-as < %s | llc -march=arm | grep __divsi3 && -; RUN: llvm-as < %s | llc -march=arm | grep __udivsi3 && -; RUN: llvm-as < %s | llc -march=arm | grep __modsi3 && -; RUN: llvm-as < %s | llc -march=arm | grep __umodsi3 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep __divsi3 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep __udivsi3 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep __modsi3 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep __umodsi3 int %f1(int %a, int %b) { entry: diff --git a/test/CodeGen/ARM/fp.ll b/test/CodeGen/ARM/fp.ll index 681ccc1bf6..127d9a1a21 100644 --- a/test/CodeGen/ARM/fp.ll +++ b/test/CodeGen/ARM/fp.ll @@ -1,13 +1,13 @@ -; RUN: llvm-as < %s | llc -march=arm && -; RUN: llvm-as < %s | llc -march=arm | grep fmsr && -; RUN: llvm-as < %s | llc -march=arm | grep fmrs && -; RUN: llvm-as < %s | llc -march=arm | grep fmrrd && -; RUN: llvm-as < %s | llc -march=arm | grep fmdrr && -; RUN: llvm-as < %s | llc -march=arm | grep fldd && -; RUN: llvm-as < %s | llc -march=arm | grep flds && -; RUN: llvm-as < %s | llc -march=arm | grep fstd && -; RUN: llvm-as < %s | llc -march=arm | grep fsts && -; RUN: llvm-as < %s | llc -march=arm | grep ".word.*1065353216" +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep fmsr && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep fmrs && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep fmrrd && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep fmdrr && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep fldd && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep flds && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep fstd && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep fsts && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep ".word.*1065353216" double %h(double* %v) { diff --git a/test/CodeGen/ARM/fparith.ll b/test/CodeGen/ARM/fparith.ll index db115a95f0..0328cb35ba 100644 --- a/test/CodeGen/ARM/fparith.ll +++ b/test/CodeGen/ARM/fparith.ll @@ -1,12 +1,12 @@ -; RUN: llvm-as < %s | llc -march=arm && -; RUN: llvm-as < %s | llc -march=arm | grep fadds && -; RUN: llvm-as < %s | llc -march=arm | grep faddd && -; RUN: llvm-as < %s | llc -march=arm | grep fmuls && -; RUN: llvm-as < %s | llc -march=arm | grep fmuld && -; RUN: llvm-as < %s | llc -march=arm | grep fnegs && -; RUN: llvm-as < %s | llc -march=arm | grep fnegd && -; RUN: llvm-as < %s | llc -march=arm | grep fdivs && -; RUN: llvm-as < %s | llc -march=arm | grep fdivd +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep fadds && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep faddd && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep fmuls && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep fmuld && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep fnegs && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep fnegd && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep fdivs && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep fdivd float %f1(float %a, float %b) { entry: diff --git a/test/CodeGen/ARM/fpcmp.ll b/test/CodeGen/ARM/fpcmp.ll index 61dc489356..402dc7a1ac 100644 --- a/test/CodeGen/ARM/fpcmp.ll +++ b/test/CodeGen/ARM/fpcmp.ll @@ -1,12 +1,12 @@ -; RUN: llvm-as < %s | llc -march=arm && -; RUN: llvm-as < %s | llc -march=arm | grep movmi && -; RUN: llvm-as < %s | llc -march=arm | grep moveq && -; RUN: llvm-as < %s | llc -march=arm | grep movgt && -; RUN: llvm-as < %s | llc -march=arm | grep movge && -; RUN: llvm-as < %s | llc -march=arm | grep movls && -; RUN: llvm-as < %s | llc -march=arm | grep movne && -; RUN: llvm-as < %s | llc -march=arm | grep fcmps && -; RUN: llvm-as < %s | llc -march=arm | grep fcmpd +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep movmi && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep moveq && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep movgt && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep movge && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep movls && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep movne && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep fcmps && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep fcmpd int %f1(float %a) { entry: diff --git a/test/CodeGen/ARM/fpconv.ll b/test/CodeGen/ARM/fpconv.ll index a86feb6c05..4ac542f0fd 100644 --- a/test/CodeGen/ARM/fpconv.ll +++ b/test/CodeGen/ARM/fpconv.ll @@ -1,14 +1,14 @@ -; RUN: llvm-as < %s | llc -march=arm && -; RUN: llvm-as < %s | llc -march=arm | grep fcvtsd && -; RUN: llvm-as < %s | llc -march=arm | grep fcvtds && -; RUN: llvm-as < %s | llc -march=arm | grep ftosis && -; RUN: llvm-as < %s | llc -march=arm | grep ftouis && -; RUN: llvm-as < %s | llc -march=arm | grep ftosid && -; RUN: llvm-as < %s | llc -march=arm | grep ftouid && -; RUN: llvm-as < %s | llc -march=arm | grep fsitos && -; RUN: llvm-as < %s | llc -march=arm | grep fsitod && -; RUN: llvm-as < %s | llc -march=arm | grep fuitos && -; RUN: llvm-as < %s | llc -march=arm | grep fuitod +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep fcvtsd && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep fcvtds && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep ftosis && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep ftouis && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep ftosid && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep ftouid && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep fsitos && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep fsitod && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep fuitos && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep fuitod float %f1(double %x) { entry: diff --git a/test/CodeGen/ARM/fpmem.ll b/test/CodeGen/ARM/fpmem.ll index b617a6911d..7704f2b9a7 100644 --- a/test/CodeGen/ARM/fpmem.ll +++ b/test/CodeGen/ARM/fpmem.ll @@ -1,7 +1,7 @@ -; RUN: llvm-as < %s | llc -march=arm && -; RUN: llvm-as < %s | llc -march=arm | grep flds | wc -l | grep 2 && -; RUN: llvm-as < %s | llc -march=arm | grep "flds.*\[" | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=arm | grep "fsts.*\[" | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep flds | wc -l | grep 2 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "flds.*\[" | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "fsts.*\[" | wc -l | grep 1 float %f1(float %a) { entry: diff --git a/test/CodeGen/ARM/hello.ll b/test/CodeGen/ARM/hello.ll index 61354a0425..af5fafacc3 100644 --- a/test/CodeGen/ARM/hello.ll +++ b/test/CodeGen/ARM/hello.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=arm && -; RUN: llvm-as < %s | llc -march=arm | grep mov | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep mov | wc -l | grep 1 %str = internal constant [12 x sbyte] c"Hello World\00" ; <[12 x sbyte]*> [#uses=1] implementation ; Functions: diff --git a/test/CodeGen/ARM/ldr.ll b/test/CodeGen/ARM/ldr.ll index 4f25a1e71f..0b463bf0ba 100644 --- a/test/CodeGen/ARM/ldr.ll +++ b/test/CodeGen/ARM/ldr.ll @@ -1,6 +1,6 @@ -; RUN: llvm-as < %s | llc -march=arm && -; RUN: llvm-as < %s | llc -march=arm | grep "ldr r0.*#0" | wc -l | grep 2 && -; RUN: llvm-as < %s | llc -march=arm | grep "ldr r0.*#4092" | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "ldr r0.*#0" | wc -l | grep 2 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "ldr r0.*#4092" | wc -l | grep 1 int %f1(int* %v) { entry: diff --git a/test/CodeGen/ARM/load.ll b/test/CodeGen/ARM/load.ll index 603a8b2780..68d193b78f 100644 --- a/test/CodeGen/ARM/load.ll +++ b/test/CodeGen/ARM/load.ll @@ -1,8 +1,8 @@ -; RUN: llvm-as < %s | llc -march=arm && -; RUN: llvm-as < %s | llc -march=arm | grep ldrsb && -; RUN: llvm-as < %s | llc -march=arm | grep ldrb && -; RUN: llvm-as < %s | llc -march=arm | grep ldrsh && -; RUN: llvm-as < %s | llc -march=arm | grep ldrh +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep ldrsb && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep ldrb && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep ldrsh && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep ldrh int %f1(sbyte* %p) { entry: diff --git a/test/CodeGen/ARM/long.ll b/test/CodeGen/ARM/long.ll index b310bc00c0..33e9b31bd0 100644 --- a/test/CodeGen/ARM/long.ll +++ b/test/CodeGen/ARM/long.ll @@ -1,15 +1,15 @@ -; RUN: llvm-as < %s | llc -march=arm && -; RUN: llvm-as < %s | llc -march=arm | grep "mov r1, #0" | wc -l | grep 4 && -; RUN: llvm-as < %s | llc -march=arm | grep "mov r0, #1" | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=arm | grep ".word.*2147483647" | wc -l | grep 2 && -; RUN: llvm-as < %s | llc -march=arm | grep "mov r0, #-2147483648" | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=arm | grep ".word.*4294967295" | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=arm | grep "adds" | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=arm | grep "adcs" | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=arm | grep "subs" | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=arm | grep "sbcs" | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=arm | grep "smull" | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=arm | grep "umull" | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "mov r1, #0" | wc -l | grep 4 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "mov r0, #1" | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep ".word.*2147483647" | wc -l | grep 2 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "mov r0, #-2147483648" | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep ".word.*4294967295" | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "adds" | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "adcs" | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "subs" | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "sbcs" | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "smull" | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "umull" | wc -l | grep 1 long %f1() { entry: diff --git a/test/CodeGen/ARM/longarith.ll b/test/CodeGen/ARM/longarith.ll index ecf66c1cc8..63b81bcac0 100644 --- a/test/CodeGen/ARM/longarith.ll +++ b/test/CodeGen/ARM/longarith.ll @@ -1,7 +1,7 @@ -; RUN: llvm-as < %s | llc -march=arm && -; RUN: llvm-as < %s | llc -march=arm | grep __ashldi3 && -; RUN: llvm-as < %s | llc -march=arm | grep __ashrdi3 && -; RUN: llvm-as < %s | llc -march=arm | grep __lshrdi3 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep __ashldi3 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep __ashrdi3 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep __lshrdi3 uint %f1(ulong %x, ubyte %y) { entry: %a = shl ulong %x, ubyte %y diff --git a/test/CodeGen/ARM/mem.ll b/test/CodeGen/ARM/mem.ll index 1bd328c3cc..6a0f0e1716 100644 --- a/test/CodeGen/ARM/mem.ll +++ b/test/CodeGen/ARM/mem.ll @@ -1,6 +1,6 @@ -; RUN: llvm-as < %s | llc -march=arm && -; RUN: llvm-as < %s | llc -march=arm | grep strb && -; RUN: llvm-as < %s | llc -march=arm | grep strh +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep strb && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep strh void %f1() { entry: diff --git a/test/CodeGen/ARM/mul.ll b/test/CodeGen/ARM/mul.ll index 77f94f087f..4ef01b346b 100644 --- a/test/CodeGen/ARM/mul.ll +++ b/test/CodeGen/ARM/mul.ll @@ -1,6 +1,6 @@ -; RUN: llvm-as < %s | llc -march=arm && -; RUN: llvm-as < %s | llc -march=arm | grep "mul r0, r12, r0" | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=arm | grep "mul r0, r1, r0" | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "mul r0, r12, r0" | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "mul r0, r1, r0" | wc -l | grep 1 int %mul1(int %u) { entry: diff --git a/test/CodeGen/ARM/ret_arg1.ll b/test/CodeGen/ARM/ret_arg1.ll index db7c7a04c3..d490cb3430 100644 --- a/test/CodeGen/ARM/ret_arg1.ll +++ b/test/CodeGen/ARM/ret_arg1.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=arm +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm int %test(int %a1) { ret int %a1 } diff --git a/test/CodeGen/ARM/ret_arg2.ll b/test/CodeGen/ARM/ret_arg2.ll index 365bcd60e7..eb155da66f 100644 --- a/test/CodeGen/ARM/ret_arg2.ll +++ b/test/CodeGen/ARM/ret_arg2.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=arm +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm int %test(int %a1, int %a2) { ret int %a2 } diff --git a/test/CodeGen/ARM/ret_arg3.ll b/test/CodeGen/ARM/ret_arg3.ll index c1fc09263f..41fc9306be 100644 --- a/test/CodeGen/ARM/ret_arg3.ll +++ b/test/CodeGen/ARM/ret_arg3.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=arm +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm int %test(int %a1, int %a2, int %a3) { ret int %a3 } diff --git a/test/CodeGen/ARM/ret_arg4.ll b/test/CodeGen/ARM/ret_arg4.ll index cb7b1974db..e04f29695b 100644 --- a/test/CodeGen/ARM/ret_arg4.ll +++ b/test/CodeGen/ARM/ret_arg4.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=arm +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm int %test(int %a1, int %a2, int %a3, int %a4) { ret int %a4 } diff --git a/test/CodeGen/ARM/ret_arg5.ll b/test/CodeGen/ARM/ret_arg5.ll index e434bcab28..a49929bca4 100644 --- a/test/CodeGen/ARM/ret_arg5.ll +++ b/test/CodeGen/ARM/ret_arg5.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=arm +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm int %test(int %a1, int %a2, int %a3, int %a4, int %a5) { ret int %a5 } diff --git a/test/CodeGen/ARM/ret_void.ll b/test/CodeGen/ARM/ret_void.ll index c1c1556691..5cd82e33d0 100644 --- a/test/CodeGen/ARM/ret_void.ll +++ b/test/CodeGen/ARM/ret_void.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=arm +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm void %test() { ret void } diff --git a/test/CodeGen/ARM/select.ll b/test/CodeGen/ARM/select.ll index 0bfffc89b4..8ed6e401a9 100644 --- a/test/CodeGen/ARM/select.ll +++ b/test/CodeGen/ARM/select.ll @@ -1,10 +1,10 @@ -; RUN: llvm-as < %s | llc -march=arm && -; RUN: llvm-as < %s | llc -march=arm | grep moveq | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=arm | grep movgt | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=arm | grep movlt | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=arm | grep movle | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=arm | grep movls | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=arm | grep movhi | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep moveq | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep movgt | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep movlt | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep movle | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep movls | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep movhi | wc -l | grep 1 int %f1(int %a) { entry: diff --git a/test/CodeGen/ARM/vargs.ll b/test/CodeGen/ARM/vargs.ll index f60c51a3c9..aa5e8e6f78 100644 --- a/test/CodeGen/ARM/vargs.ll +++ b/test/CodeGen/ARM/vargs.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=arm +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm %str = internal constant [43 x sbyte] c"Hello World %d %d %d %d %d %d %d %d %d %d\0A\00" ; <[43 x sbyte]*> [#uses=1] implementation ; Functions: diff --git a/test/CodeGen/ARM/vargs2.ll b/test/CodeGen/ARM/vargs2.ll index 232149cc8d..1404a412ee 100644 --- a/test/CodeGen/ARM/vargs2.ll +++ b/test/CodeGen/ARM/vargs2.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=arm +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm %str = internal constant [7 x ubyte] c"%d %d\0A\00" ; <[7 x ubyte]*> [#uses=1] implementation ; Functions: diff --git a/test/CodeGen/Alpha/2005-07-12-TwoMallocCalls.ll b/test/CodeGen/Alpha/2005-07-12-TwoMallocCalls.ll index 34ad65d217..eb5c6d911d 100644 --- a/test/CodeGen/Alpha/2005-07-12-TwoMallocCalls.ll +++ b/test/CodeGen/Alpha/2005-07-12-TwoMallocCalls.ll @@ -1,5 +1,5 @@ ; There should be exactly two calls here (memset and malloc), no more. -; RUN: llvm-as < %s | llc -march=alpha | grep jsr | wc -l | grep 2 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep jsr | wc -l | grep 2 implementation ; Functions: diff --git a/test/CodeGen/Alpha/2005-12-12-MissingFCMov.ll b/test/CodeGen/Alpha/2005-12-12-MissingFCMov.ll index 7307d96781..5b9fa19422 100644 --- a/test/CodeGen/Alpha/2005-12-12-MissingFCMov.ll +++ b/test/CodeGen/Alpha/2005-12-12-MissingFCMov.ll @@ -1,5 +1,5 @@ ; This shouldn't crash -; RUN: llvm-as < %s | llc -march=alpha +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha ; ModuleID = 'bugpoint-reduced-simplified.bc' target endian = little diff --git a/test/CodeGen/Alpha/2006-01-18-MissedGlobal.ll b/test/CodeGen/Alpha/2006-01-18-MissedGlobal.ll index c9d33d77f6..f0a5c17ddc 100644 --- a/test/CodeGen/Alpha/2006-01-18-MissedGlobal.ll +++ b/test/CodeGen/Alpha/2006-01-18-MissedGlobal.ll @@ -1,5 +1,5 @@ ; The global symbol should be legalized -; RUN: llvm-as < %s | llc -march=alpha +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha target endian = little target pointersize = 64 diff --git a/test/CodeGen/Alpha/2006-01-26-VaargBreak.ll b/test/CodeGen/Alpha/2006-01-26-VaargBreak.ll index d282066d0a..e58152ee80 100644 --- a/test/CodeGen/Alpha/2006-01-26-VaargBreak.ll +++ b/test/CodeGen/Alpha/2006-01-26-VaargBreak.ll @@ -1,5 +1,5 @@ ; This shouldn't crash -; RUN: llvm-as < %s | llc -march=alpha +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha ; ModuleID = 'simp.bc' target endian = little diff --git a/test/CodeGen/Alpha/2006-04-04-zextload.ll b/test/CodeGen/Alpha/2006-04-04-zextload.ll index 055bc1048a..75ad7e0c42 100644 --- a/test/CodeGen/Alpha/2006-04-04-zextload.ll +++ b/test/CodeGen/Alpha/2006-04-04-zextload.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=alpha +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha target endian = little target pointersize = 64 diff --git a/test/CodeGen/Alpha/2006-07-03-ASMFormalLowering.ll b/test/CodeGen/Alpha/2006-07-03-ASMFormalLowering.ll index a68ec20937..94cc0d3c67 100644 --- a/test/CodeGen/Alpha/2006-07-03-ASMFormalLowering.ll +++ b/test/CodeGen/Alpha/2006-07-03-ASMFormalLowering.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=alpha +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha target endian = little target pointersize = 64 diff --git a/test/CodeGen/Alpha/2006-11-01-vastart.ll b/test/CodeGen/Alpha/2006-11-01-vastart.ll index 3a87a00000..61d6db9a57 100644 --- a/test/CodeGen/Alpha/2006-11-01-vastart.ll +++ b/test/CodeGen/Alpha/2006-11-01-vastart.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=alpha +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha target datalayout = "e-p:64:64" target endian = little diff --git a/test/CodeGen/Alpha/add.ll b/test/CodeGen/Alpha/add.ll index bbd5a59b7f..516270e0df 100644 --- a/test/CodeGen/Alpha/add.ll +++ b/test/CodeGen/Alpha/add.ll @@ -1,20 +1,20 @@ ;test all the shifted and signextending adds and subs with and without consts -; RUN: llvm-as < %s | llc -march=alpha | grep ' addl' |wc -l |grep 2 && -; RUN: llvm-as < %s | llc -march=alpha | grep ' addq' |wc -l |grep 2 && -; RUN: llvm-as < %s | llc -march=alpha | grep ' subl' |wc -l |grep 2 && -; RUN: llvm-as < %s | llc -march=alpha | grep ' subq' |wc -l |grep 1 && -; RUN: llvm-as < %s | llc -march=alpha | grep 'lda $0,-100($16)' |wc -l |grep 1 && - -; RUN: llvm-as < %s | llc -march=alpha | grep 's4addl' |wc -l |grep 2 && -; RUN: llvm-as < %s | llc -march=alpha | grep 's8addl' |wc -l |grep 2 && -; RUN: llvm-as < %s | llc -march=alpha | grep 's4addq' |wc -l |grep 2 && -; RUN: llvm-as < %s | llc -march=alpha | grep 's8addq' |wc -l |grep 2 && - -; RUN: llvm-as < %s | llc -march=alpha | grep 's4subl' |wc -l |grep 2 && -; RUN: llvm-as < %s | llc -march=alpha | grep 's8subl' |wc -l |grep 2 && -; RUN: llvm-as < %s | llc -march=alpha | grep 's4subq' |wc -l |grep 2 && -; RUN: llvm-as < %s | llc -march=alpha | grep 's8subq' |wc -l |grep 2 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep ' addl' |wc -l |grep 2 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep ' addq' |wc -l |grep 2 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep ' subl' |wc -l |grep 2 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep ' subq' |wc -l |grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 'lda $0,-100($16)' |wc -l |grep 1 && + +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 's4addl' |wc -l |grep 2 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 's8addl' |wc -l |grep 2 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 's4addq' |wc -l |grep 2 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 's8addq' |wc -l |grep 2 && + +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 's4subl' |wc -l |grep 2 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 's8subl' |wc -l |grep 2 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 's4subq' |wc -l |grep 2 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 's8subq' |wc -l |grep 2 implementation ; Functions: diff --git a/test/CodeGen/Alpha/bic.ll b/test/CodeGen/Alpha/bic.ll index 46e0d88bd8..f4664c82e3 100644 --- a/test/CodeGen/Alpha/bic.ll +++ b/test/CodeGen/Alpha/bic.ll @@ -1,5 +1,5 @@ ; Make sure this testcase codegens to the bic instruction -; RUN: llvm-as < %s | llc -march=alpha | grep 'bic' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 'bic' implementation ; Functions: diff --git a/test/CodeGen/Alpha/bsr.ll b/test/CodeGen/Alpha/bsr.ll index 1f88767c7e..1cd68067ef 100644 --- a/test/CodeGen/Alpha/bsr.ll +++ b/test/CodeGen/Alpha/bsr.ll @@ -1,5 +1,5 @@ ; Make sure this testcase codegens the bsr instruction -; RUN: llvm-as < %s | llc -march=alpha | grep 'bsr' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 'bsr' implementation diff --git a/test/CodeGen/Alpha/call_adj.ll b/test/CodeGen/Alpha/call_adj.ll index d56257850c..da47c6ca62 100644 --- a/test/CodeGen/Alpha/call_adj.ll +++ b/test/CodeGen/Alpha/call_adj.ll @@ -1,5 +1,5 @@ ;All this should do is not crash -;RUN: llvm-as < %s | llc -march=alpha +;RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha target endian = little target pointersize = 64 diff --git a/test/CodeGen/Alpha/cmov.ll b/test/CodeGen/Alpha/cmov.ll index 68ab61e2ec..c5f9f63c34 100644 --- a/test/CodeGen/Alpha/cmov.ll +++ b/test/CodeGen/Alpha/cmov.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=alpha | not grep cmovlt -; RUN: llvm-as < %s | llc -march=alpha | grep cmoveq +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | not grep cmovlt +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep cmoveq long %cmov_lt(long %a, long %c) { entry: diff --git a/test/CodeGen/Alpha/cmpbge.ll b/test/CodeGen/Alpha/cmpbge.ll index 50f00bf4aa..b7b1c09ce0 100644 --- a/test/CodeGen/Alpha/cmpbge.ll +++ b/test/CodeGen/Alpha/cmpbge.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=alpha | grep cmpbge | wc -l | grep 2 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep cmpbge | wc -l | grep 2 bool %test1(ulong %A, ulong %B) { %C = and ulong %A, 255 diff --git a/test/CodeGen/Alpha/ctlz.ll b/test/CodeGen/Alpha/ctlz.ll index 8b6526a8cd..75035f2c26 100644 --- a/test/CodeGen/Alpha/ctlz.ll +++ b/test/CodeGen/Alpha/ctlz.ll @@ -1,9 +1,9 @@ ; Make sure this testcase codegens to the ctlz instruction -; RUN: llvm-as < %s | llc -march=alpha -mcpu=ev67 | grep -i 'ctlz' -; RUN: llvm-as < %s | llc -march=alpha -mattr=+CIX | grep -i 'ctlz' -; RUN: llvm-as < %s | llc -march=alpha -mcpu=ev6 | not grep -i 'ctlz' -; RUN: llvm-as < %s | llc -march=alpha -mcpu=ev56 | not grep -i 'ctlz' -; RUN: llvm-as < %s | llc -march=alpha -mattr=-CIX | not grep -i 'ctlz' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha -mcpu=ev67 | grep -i 'ctlz' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha -mattr=+CIX | grep -i 'ctlz' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha -mcpu=ev6 | not grep -i 'ctlz' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha -mcpu=ev56 | not grep -i 'ctlz' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha -mattr=-CIX | not grep -i 'ctlz' declare ubyte %llvm.ctlz(ubyte) diff --git a/test/CodeGen/Alpha/ctlz_e.ll b/test/CodeGen/Alpha/ctlz_e.ll index dc16eb50be..d7dab23ea9 100644 --- a/test/CodeGen/Alpha/ctlz_e.ll +++ b/test/CodeGen/Alpha/ctlz_e.ll @@ -1,5 +1,5 @@ ; Make sure this testcase does not use ctpop -; RUN: llvm-as < %s | llc -march=alpha | grep -i 'ctpop' |wc -l |grep 0 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep -i 'ctpop' |wc -l |grep 0 declare ulong %llvm.ctlz(ulong) diff --git a/test/CodeGen/Alpha/ctpop.ll b/test/CodeGen/Alpha/ctpop.ll index 7da46df16a..bbd35ffa97 100644 --- a/test/CodeGen/Alpha/ctpop.ll +++ b/test/CodeGen/Alpha/ctpop.ll @@ -1,9 +1,9 @@ ; Make sure this testcase codegens to the ctpop instruction -; RUN: llvm-as < %s | llc -march=alpha -mcpu=ev67 | grep -i 'ctpop' -; RUN: llvm-as < %s | llc -march=alpha -mattr=+CIX | grep -i 'ctpop' -; RUN: llvm-as < %s | llc -march=alpha -mcpu=ev6 | not grep -i 'ctpop' -; RUN: llvm-as < %s | llc -march=alpha -mcpu=ev56 | not grep -i 'ctpop' -; RUN: llvm-as < %s | llc -march=alpha -mattr=-CIX | not grep -i 'ctpop' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha -mcpu=ev67 | grep -i 'ctpop' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha -mattr=+CIX | grep -i 'ctpop' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha -mcpu=ev6 | not grep -i 'ctpop' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha -mcpu=ev56 | not grep -i 'ctpop' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha -mattr=-CIX | not grep -i 'ctpop' declare long %llvm.ctpop(long) diff --git a/test/CodeGen/Alpha/eqv.ll b/test/CodeGen/Alpha/eqv.ll index 2358c92f49..f8e6991647 100644 --- a/test/CodeGen/Alpha/eqv.ll +++ b/test/CodeGen/Alpha/eqv.ll @@ -1,5 +1,5 @@ ; Make sure this testcase codegens to the eqv instruction -; RUN: llvm-as < %s | llc -march=alpha | grep 'eqv' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 'eqv' implementation ; Functions: diff --git a/test/CodeGen/Alpha/i32_sub_1.ll b/test/CodeGen/Alpha/i32_sub_1.ll index ea6ab9299c..473127809c 100644 --- a/test/CodeGen/Alpha/i32_sub_1.ll +++ b/test/CodeGen/Alpha/i32_sub_1.ll @@ -1,5 +1,5 @@ ; Make sure this testcase codegens to the ctpop instruction -; RUN: llvm-as < %s | llc -march=alpha | grep -i 'subl $16,1,$0' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep -i 'subl $16,1,$0' implementation ; Functions: diff --git a/test/CodeGen/Alpha/jmp_table.ll b/test/CodeGen/Alpha/jmp_table.ll index 00ae601259..9c1f27877a 100644 --- a/test/CodeGen/Alpha/jmp_table.ll +++ b/test/CodeGen/Alpha/jmp_table.ll @@ -1,8 +1,8 @@ ; try to check that we have the most important instructions, which shouldn't appear otherwise -; RUN: llvm-as < %s | llc -march=alpha | grep 'jmp' && -; RUN: llvm-as < %s | llc -march=alpha | grep 'gprel32' && -; RUN: llvm-as < %s | llc -march=alpha | grep 'ldl' && -; RUN: llvm-as < %s | llc -march=alpha | grep 'rodata' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 'jmp' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 'gprel32' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 'ldl' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 'rodata' target endian = little target pointersize = 64 diff --git a/test/CodeGen/Alpha/mul5.ll b/test/CodeGen/Alpha/mul5.ll index 4f2a4c2698..5e41d0fd85 100644 --- a/test/CodeGen/Alpha/mul5.ll +++ b/test/CodeGen/Alpha/mul5.ll @@ -1,5 +1,5 @@ ; Make sure this testcase does not use mulq -; RUN: llvm-as < %s | llc -march=alpha | grep -i 'mul' |wc -l |grep 0 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep -i 'mul' |wc -l |grep 0 implementation ; Functions: diff --git a/test/CodeGen/Alpha/neg1.ll b/test/CodeGen/Alpha/neg1.ll index b8f7d69ee5..e8e50860bb 100644 --- a/test/CodeGen/Alpha/neg1.ll +++ b/test/CodeGen/Alpha/neg1.ll @@ -1,5 +1,5 @@ ; Make sure this testcase codegens to the lda -1 instruction -; RUN: llvm-as < %s | llc -march=alpha | grep '\-1' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep '\-1' implementation ; Functions: diff --git a/test/CodeGen/Alpha/not.ll b/test/CodeGen/Alpha/not.ll index fca659cd42..406f624293 100644 --- a/test/CodeGen/Alpha/not.ll +++ b/test/CodeGen/Alpha/not.ll @@ -1,5 +1,5 @@ ; Make sure this testcase codegens to the ornot instruction -; RUN: llvm-as < %s | llc -march=alpha | grep 'eqv' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 'eqv' implementation ; Functions: diff --git a/test/CodeGen/Alpha/ornot.ll b/test/CodeGen/Alpha/ornot.ll index 1ab30a6cb9..fc982b34aa 100644 --- a/test/CodeGen/Alpha/ornot.ll +++ b/test/CodeGen/Alpha/ornot.ll @@ -1,5 +1,5 @@ ; Make sure this testcase codegens to the ornot instruction -; RUN: llvm-as < %s | llc -march=alpha | grep 'ornot' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 'ornot' implementation ; Functions: diff --git a/test/CodeGen/Alpha/rpcc.ll b/test/CodeGen/Alpha/rpcc.ll index fbf97ad60c..ba143a6fd7 100644 --- a/test/CodeGen/Alpha/rpcc.ll +++ b/test/CodeGen/Alpha/rpcc.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=alpha | grep rpcc +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep rpcc declare ulong %llvm.readcyclecounter() diff --git a/test/CodeGen/Alpha/srl_and.ll b/test/CodeGen/Alpha/srl_and.ll index 5d3c2b6d61..49074cc916 100644 --- a/test/CodeGen/Alpha/srl_and.ll +++ b/test/CodeGen/Alpha/srl_and.ll @@ -1,5 +1,5 @@ ; Make sure this testcase codegens to the zapnot instruction -; RUN: llvm-as < %s | llc -march=alpha | grep 'zapnot' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 'zapnot' ulong %foo(ulong %y) { entry: diff --git a/test/CodeGen/Alpha/zapnot.ll b/test/CodeGen/Alpha/zapnot.ll index f7cb294da9..057d16b1b9 100644 --- a/test/CodeGen/Alpha/zapnot.ll +++ b/test/CodeGen/Alpha/zapnot.ll @@ -1,5 +1,5 @@ ; Make sure this testcase codegens to the bic instruction -; RUN: llvm-as < %s | llc -march=alpha | grep 'zapnot' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 'zapnot' implementation ; Functions: diff --git a/test/CodeGen/Alpha/zapnot2.ll b/test/CodeGen/Alpha/zapnot2.ll index 50ab112b3e..a84400f556 100644 --- a/test/CodeGen/Alpha/zapnot2.ll +++ b/test/CodeGen/Alpha/zapnot2.ll @@ -1,5 +1,5 @@ ; Make sure this testcase codegens to the zapnot instruction -; RUN: llvm-as < %s | llc -march=alpha | grep 'zapnot' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep 'zapnot' implementation ; Functions: diff --git a/test/CodeGen/Alpha/zapnot3.ll b/test/CodeGen/Alpha/zapnot3.ll index 371044a081..1784c4a1af 100644 --- a/test/CodeGen/Alpha/zapnot3.ll +++ b/test/CodeGen/Alpha/zapnot3.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=alpha | grep zapnot | wc -l | grep 2 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep zapnot | wc -l | grep 2 ulong %foo(ulong %y) { %tmp = and ulong %y, 65535 diff --git a/test/CodeGen/Alpha/zapnot4.ll b/test/CodeGen/Alpha/zapnot4.ll index bf1b88bed1..b805607bee 100644 --- a/test/CodeGen/Alpha/zapnot4.ll +++ b/test/CodeGen/Alpha/zapnot4.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=alpha | grep zapnot +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep zapnot ulong %foo(ulong %y) { %tmp = shl ulong %y, ubyte 3 ; <ulong> [#uses=1] diff --git a/test/CodeGen/CBackend/2002-05-16-NameCollide.ll b/test/CodeGen/CBackend/2002-05-16-NameCollide.ll index e9206b5045..249927d1ff 100644 --- a/test/CodeGen/CBackend/2002-05-16-NameCollide.ll +++ b/test/CodeGen/CBackend/2002-05-16-NameCollide.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=c +; RUN: llvm-upgrade < %s | llvm-as | llc -march=c ; Make sure that global variables do not collide if they have the same name, ; but different types. diff --git a/test/CodeGen/CBackend/2002-05-21-MissingReturn.ll b/test/CodeGen/CBackend/2002-05-21-MissingReturn.ll index a5045b5f4a..775a7623e5 100644 --- a/test/CodeGen/CBackend/2002-05-21-MissingReturn.ll +++ b/test/CodeGen/CBackend/2002-05-21-MissingReturn.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=c +; RUN: llvm-upgrade < %s | llvm-as | llc -march=c ; This case was emitting code that looked like this: ; ... diff --git a/test/CodeGen/CBackend/2002-08-19-ConstPointerRef.ll b/test/CodeGen/CBackend/2002-08-19-ConstPointerRef.ll index 4b776cd938..c8d12013e9 100644 --- a/test/CodeGen/CBackend/2002-08-19-ConstPointerRef.ll +++ b/test/CodeGen/CBackend/2002-08-19-ConstPointerRef.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=c +; RUN: llvm-upgrade < %s | llvm-as | llc -march=c ; Test const pointer refs & forward references diff --git a/test/CodeGen/CBackend/2002-08-19-ConstantExpr.ll b/test/CodeGen/CBackend/2002-08-19-ConstantExpr.ll index 813a3478ee..2842faae09 100644 --- a/test/CodeGen/CBackend/2002-08-19-ConstantExpr.ll +++ b/test/CodeGen/CBackend/2002-08-19-ConstantExpr.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=c +; RUN: llvm-upgrade < %s | llvm-as | llc -march=c global int* cast (float* %0 to int*) ;; Forward numeric reference global float* %0 ;; Duplicate forward numeric reference diff --git a/test/CodeGen/CBackend/2002-08-19-DataPointer.ll b/test/CodeGen/CBackend/2002-08-19-DataPointer.ll index b76f1d22be..ca2af794c7 100644 --- a/test/CodeGen/CBackend/2002-08-19-DataPointer.ll +++ b/test/CodeGen/CBackend/2002-08-19-DataPointer.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=c +; RUN: llvm-upgrade < %s | llvm-as | llc -march=c %sptr1 = global [11x sbyte]* %somestr ;; Forward ref to a constant %somestr = constant [11x sbyte] c"hello world" diff --git a/test/CodeGen/CBackend/2002-08-19-FunctionPointer.ll b/test/CodeGen/CBackend/2002-08-19-FunctionPointer.ll index c06d72dd63..baf7d78a0c 100644 --- a/test/CodeGen/CBackend/2002-08-19-FunctionPointer.ll +++ b/test/CodeGen/CBackend/2002-08-19-FunctionPointer.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=c +; RUN: llvm-upgrade < %s | llvm-as | llc -march=c %fptr = global void() * %f ;; Forward ref method defn declare void "f"() ;; External method diff --git a/test/CodeGen/CBackend/2002-08-19-HardConstantExpr.ll b/test/CodeGen/CBackend/2002-08-19-HardConstantExpr.ll index f4f0a122de..51bc9503dd 100644 --- a/test/CodeGen/CBackend/2002-08-19-HardConstantExpr.ll +++ b/test/CodeGen/CBackend/2002-08-19-HardConstantExpr.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=c +; RUN: llvm-upgrade < %s | llvm-as | llc -march=c %array = constant [2 x int] [ int 12, int 52 ] ; <[2 x int]*> [#uses=1] %arrayPtr = global int* getelementptr ([2 x int]* %array, long 0, long 0) ; <int**> [#uses=1] diff --git a/test/CodeGen/CBackend/2002-08-20-RecursiveTypes.ll b/test/CodeGen/CBackend/2002-08-20-RecursiveTypes.ll index 1ae02d0ec2..fdcdeed599 100644 --- a/test/CodeGen/CBackend/2002-08-20-RecursiveTypes.ll +++ b/test/CodeGen/CBackend/2002-08-20-RecursiveTypes.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=c +; RUN: llvm-upgrade < %s | llvm-as | llc -march=c %MyIntList = uninitialized global { \2 *, int } diff --git a/test/CodeGen/CBackend/2002-08-20-UnnamedArgument.ll b/test/CodeGen/CBackend/2002-08-20-UnnamedArgument.ll index 46ac9b6ae9..3ec23fb6b7 100644 --- a/test/CodeGen/CBackend/2002-08-20-UnnamedArgument.ll +++ b/test/CodeGen/CBackend/2002-08-20-UnnamedArgument.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=c +; RUN: llvm-upgrade < %s | llvm-as | llc -march=c ; The C Writer bombs on this testcase because it tries the print the prototype ; for the test function, which tries to print the argument name. The function diff --git a/test/CodeGen/CBackend/2002-08-26-IndirectCallTest.ll b/test/CodeGen/CBackend/2002-08-26-IndirectCallTest.ll index 9a76cfbc7a..4a977e864b 100644 --- a/test/CodeGen/CBackend/2002-08-26-IndirectCallTest.ll +++ b/test/CodeGen/CBackend/2002-08-26-IndirectCallTest.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=c +; RUN: llvm-upgrade < %s | llvm-as | llc -march=c ; Indirect function call test... found by Joel & Brian ; diff --git a/test/CodeGen/CBackend/2002-08-30-StructureOrderingTest.ll b/test/CodeGen/CBackend/2002-08-30-StructureOrderingTest.ll index 141928332f..d8477d5cb8 100644 --- a/test/CodeGen/CBackend/2002-08-30-StructureOrderingTest.ll +++ b/test/CodeGen/CBackend/2002-08-30-StructureOrderingTest.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=c +; RUN: llvm-upgrade < %s | llvm-as | llc -march=c ; This testcase fails because the C backend does not arrange to output the ; contents of a structure type before it outputs the structure type itself. diff --git a/test/CodeGen/CBackend/2002-09-20-ArrayTypeFailure.ll b/test/CodeGen/CBackend/2002-09-20-ArrayTypeFailure.ll index 66514c647c..6158b2f565 100644 --- a/test/CodeGen/CBackend/2002-09-20-ArrayTypeFailure.ll +++ b/test/CodeGen/CBackend/2002-09-20-ArrayTypeFailure.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=c +; RUN: llvm-upgrade < %s | llvm-as | llc -march=c diff --git a/test/CodeGen/CBackend/2002-09-20-VarArgPrototypes.ll b/test/CodeGen/CBackend/2002-09-20-VarArgPrototypes.ll index 934bee45c4..f3841f44ee 100644 --- a/test/CodeGen/CBackend/2002-09-20-VarArgPrototypes.ll +++ b/test/CodeGen/CBackend/2002-09-20-VarArgPrototypes.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=c +; RUN: llvm-upgrade < %s | llvm-as | llc -march=c declare void %foo(...) diff --git a/test/CodeGen/CBackend/2002-10-15-OpaqueTypeProblem.ll b/test/CodeGen/CBackend/2002-10-15-OpaqueTypeProblem.ll index 4a82f279aa..1a9cdb766c 100644 --- a/test/CodeGen/CBackend/2002-10-15-OpaqueTypeProblem.ll +++ b/test/CodeGen/CBackend/2002-10-15-OpaqueTypeProblem.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=c +; RUN: llvm-upgrade < %s | llvm-as | llc -march=c %MPI_Comm = type %struct.Comm* %struct.Comm = type opaque diff --git a/test/CodeGen/CBackend/2002-10-16-External.ll b/test/CodeGen/CBackend/2002-10-16-External.ll index edfc397a9c..d60a3d87c1 100644 --- a/test/CodeGen/CBackend/2002-10-16-External.ll +++ b/test/CodeGen/CBackend/2002-10-16-External.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=c +; RUN: llvm-upgrade < %s | llvm-as | llc -march=c %bob = external global int ; <int*> [#uses=2] diff --git a/test/CodeGen/CBackend/2002-10-30-FunctionPointerAlloca.ll b/test/CodeGen/CBackend/2002-10-30-FunctionPointerAlloca.ll index 4e1ff83e01..b8874883bc 100644 --- a/test/CodeGen/CBackend/2002-10-30-FunctionPointerAlloca.ll +++ b/test/CodeGen/CBackend/2002-10-30-FunctionPointerAlloca.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=c +; RUN: llvm-upgrade < %s | llvm-as | llc -march=c %BitField = type int diff --git a/test/CodeGen/CBackend/2002-11-06-PrintEscaped.ll b/test/CodeGen/CBackend/2002-11-06-PrintEscaped.ll index 3d267325b7..62c0e274f9 100644 --- a/test/CodeGen/CBackend/2002-11-06-PrintEscaped.ll +++ b/test/CodeGen/CBackend/2002-11-06-PrintEscaped.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=c +; RUN: llvm-upgrade < %s | llvm-as | llc -march=c %testString = internal constant [18 x sbyte] c "Escaped newline\n\00" diff --git a/test/CodeGen/CBackend/2003-05-12-IntegerSizeWarning.ll b/test/CodeGen/CBackend/2003-05-12-IntegerSizeWarning.ll index 0f2fc1bbe3..2c6a596a75 100644 --- a/test/CodeGen/CBackend/2003-05-12-IntegerSizeWarning.ll +++ b/test/CodeGen/CBackend/2003-05-12-IntegerSizeWarning.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=c +; RUN: llvm-upgrade < %s | llvm-as | llc -march=c ; Apparently this constant was unsigned in ISO C 90, but not in C 99. diff --git a/test/CodeGen/CBackend/2003-05-13-VarArgFunction.ll b/test/CodeGen/CBackend/2003-05-13-VarArgFunction.ll index 45638a0883..1e08b2d61f 100644 --- a/test/CodeGen/CBackend/2003-05-13-VarArgFunction.ll +++ b/test/CodeGen/CBackend/2003-05-13-VarArgFunction.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=c +; RUN: llvm-upgrade < %s | llvm-as | llc -march=c ; This testcase breaks the C backend, because gcc doesn't like (...) functions ; with no arguments at all. diff --git a/test/CodeGen/CBackend/2003-05-31-MissingStructName.ll b/test/CodeGen/CBackend/2003-05-31-MissingStructName.ll index 6e86a2a017..567d8e4367 100644 --- a/test/CodeGen/CBackend/2003-05-31-MissingStructName.ll +++ b/test/CodeGen/CBackend/2003-05-31-MissingStructName.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=c +; RUN: llvm-upgrade < %s | llvm-as | llc -march=c ; The C backend was dying when there was no typename for a struct type! diff --git a/test/CodeGen/CBackend/2003-06-01-NullPointerType.ll b/test/CodeGen/CBackend/2003-06-01-NullPointerType.ll index c970786a71..224ba15187 100644 --- a/test/CodeGen/CBackend/2003-06-01-NullPointerType.ll +++ b/test/CodeGen/CBackend/2003-06-01-NullPointerType.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=c +; RUN: llvm-upgrade < %s | llvm-as | llc -march=c %X = type { int, float } diff --git a/test/CodeGen/CBackend/2003-06-11-HexConstant.ll b/test/CodeGen/CBackend/2003-06-11-HexConstant.ll index 4b5ddaadff..bc5691f22f 100644 --- a/test/CodeGen/CBackend/2003-06-11-HexConstant.ll +++ b/test/CodeGen/CBackend/2003-06-11-HexConstant.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=c +; RUN: llvm-upgrade < %s | llvm-as | llc -march=c ; Make sure hex constant does not continue into a valid hexadecimal letter/number %version = global [3 x sbyte] c"\001\00" diff --git a/test/CodeGen/CBackend/2003-06-11-LiteralStringProblem.ll b/test/CodeGen/CBackend/2003-06-11-LiteralStringProblem.ll index bd89ec5848..7af255b73b 100644 --- a/test/CodeGen/CBackend/2003-06-11-LiteralStringProblem.ll +++ b/test/CodeGen/CBackend/2003-06-11-LiteralStringProblem.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=c +; RUN: llvm-upgrade < %s | llvm-as | llc -march=c %version = global [3 x sbyte] c"1\00\00" diff --git a/test/CodeGen/CBackend/2003-06-23-PromotedExprs.llx b/test/CodeGen/CBackend/2003-06-23-PromotedExprs.llx index 286d65b345..d7f8e56213 100644 --- a/test/CodeGen/CBackend/2003-06-23-PromotedExprs.llx +++ b/test/CodeGen/CBackend/2003-06-23-PromotedExprs.llx @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=c > %t1.cbe.c +; RUN: llvm-upgrade < %s | llvm-as | llc -march=c > %t1.cbe.c ; RUN: gcc -B/usr/bin/ %t1.cbe.c -o %t1.cbe ; RUN: %t1.cbe diff --git a/test/CodeGen/CBackend/2003-06-28-InvokeSupport.ll b/test/CodeGen/CBackend/2003-06-28-InvokeSupport.ll index cc59035f37..2d87233a8c 100644 --- a/test/CodeGen/CBackend/2003-06-28-InvokeSupport.ll +++ b/test/CodeGen/CBackend/2003-06-28-InvokeSupport.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=c +; RUN: llvm-upgrade < %s | llvm-as | llc -march=c declare int %callee(int, int) diff --git a/test/CodeGen/CBackend/2003-06-28-LinkOnceGlobalVars.llx b/test/CodeGen/CBackend/2003-06-28-LinkOnceGlobalVars.llx index acb3c22db8..75e223d410 100644 --- a/test/CodeGen/CBackend/2003-06-28-LinkOnceGlobalVars.llx +++ b/test/CodeGen/CBackend/2003-06-28-LinkOnceGlobalVars.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=c | grep common | grep X +; RUN: llvm-upgrade < %s | llvm-as | llc -march=c | grep common | grep X %X = linkonce global int 5 diff --git a/test/CodeGen/CBackend/2003-10-12-NANGlobalInits.ll b/test/CodeGen/CBackend/2003-10-12-NANGlobalInits.ll index 2addddaa5a..a82d7e5969 100644 --- a/test/CodeGen/CBackend/2003-10-12-NANGlobalInits.ll +++ b/test/CodeGen/CBackend/2003-10-12-NANGlobalInits.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=c +; RUN: llvm-upgrade < %s | llvm-as | llc -march=c ; This is a non-normal FP value: it's a nan. %NAN = global { float } { float 0x7FF8000000000000 } diff --git a/test/CodeGen/CBackend/2003-10-23-UnusedType.ll b/test/CodeGen/CBackend/2003-10-23-UnusedType.ll index bb9f4b7091..e073928b2f 100644 --- a/test/CodeGen/CBackend/2003-10-23-UnusedType.ll +++ b/test/CodeGen/CBackend/2003-10-23-UnusedType.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=c +; RUN: llvm-upgrade < %s | llvm-as | llc -march=c %A = type { uint, sbyte*, { uint, uint, uint, uint, uint, uint, uint, uint }*, ushort } diff --git a/test/CodeGen/CBackend/2003-10-23-ZeroArgVarargs.ll b/test/CodeGen/CBackend/2003-10-23-ZeroArgVarargs.ll index 3072bb6d6a..e1c71072b0 100644 --- a/test/CodeGen/CBackend/2003-10-23-ZeroArgVarargs.ll +++ b/test/CodeGen/CBackend/2003-10-23-ZeroArgVarargs.ll @@ -1,5 +1,5 @@ ; XFAIL: * -; RUN: llvm-as < %s | llc -march=c +; RUN: llvm-upgrade < %s | llvm-as | llc -march=c declare sbyte* %llvm.va_start() diff --git a/test/CodeGen/CBackend/2003-10-28-CastToPtrToStruct.ll b/test/CodeGen/CBackend/2003-10-28-CastToPtrToStruct.ll index 0fd4fbacfc..4c7ab32f9f 100644 --- a/test/CodeGen/CBackend/2003-10-28-CastToPtrToStruct.ll +++ b/test/CodeGen/CBackend/2003-10-28-CastToPtrToStruct.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=c +; RUN: llvm-upgrade < %s | llvm-as | llc -march=c ; reduced from DOOM. %union._XEvent = type { int } diff --git a/test/CodeGen/CBackend/2003-11-21-ConstantShiftExpr.ll b/test/CodeGen/CBackend/2003-11-21-ConstantShiftExpr.ll index 32358a409f..3866200de0 100644 --- a/test/CodeGen/CBackend/2003-11-21-ConstantShiftExpr.ll +++ b/test/CodeGen/CBackend/2003-11-21-ConstantShiftExpr.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=c +; RUN: llvm-upgrade < %s | llvm-as | llc -march=c %y = weak global sbyte 0 implementation diff --git a/test/CodeGen/CBackend/2004-02-13-FrameReturnAddress.llx b/test/CodeGen/CBackend/2004-02-13-FrameReturnAddress.llx index 613c03ecc9..973e6d8b7e 100644 --- a/test/CodeGen/CBackend/2004-02-13-FrameReturnAddress.llx +++ b/test/CodeGen/CBackend/2004-02-13-FrameReturnAddress.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=c | grep builtin_return_address +; RUN: llvm-upgrade < %s | llvm-as | llc -march=c | grep builtin_return_address declare sbyte* %llvm.returnaddress(uint) declare sbyte* %llvm.frameaddress(uint) diff --git a/test/CodeGen/CBackend/2004-02-15-PreexistingExternals.llx b/test/CodeGen/CBackend/2004-02-15-PreexistingExternals.llx index 1c07708e57..d880876afa 100644 --- a/test/CodeGen/CBackend/2004-02-15-PreexistingExternals.llx +++ b/test/CodeGen/CBackend/2004-02-15-PreexistingExternals.llx @@ -4,7 +4,7 @@ ; this testcase for example, which caused the CBE to mangle one, screwing ; everything up. :( Test that this does not happen anymore. ; -; RUN: llvm-as < %s | llc -march=c | not grep _memcpy +; RUN: llvm-upgrade < %s | llvm-as | llc -march=c | not grep _memcpy declare void %llvm.memcpy(sbyte*, sbyte*, uint,uint) declare float* %memcpy(int*, uint,int) diff --git a/test/CodeGen/CBackend/2004-02-26-FPNotPrintableConstants.llx b/test/CodeGen/CBackend/2004-02-26-FPNotPrintableConstants.llx index 36b19f3d8c..87a642b69d 100644 --- a/test/CodeGen/CBackend/2004-02-26-FPNotPrintableConstants.llx +++ b/test/CodeGen/CBackend/2004-02-26-FPNotPrintableConstants.llx @@ -1,5 +1,5 @@ ; This is a non-normal FP value -; RUN: llvm-as < %s | llc -march=c | grep FPConstant | grep static +; RUN: llvm-upgrade < %s | llvm-as | llc -march=c | grep FPConstant | grep static float %func () { ret float 0xFFF0000000000000 ; -inf diff --git a/test/CodeGen/CBackend/2004-02-26-LinkOnceFunctions.llx b/test/CodeGen/CBackend/2004-02-26-LinkOnceFunctions.llx index 918252d736..997f1c9fda 100644 --- a/test/CodeGen/CBackend/2004-02-26-LinkOnceFunctions.llx +++ b/test/CodeGen/CBackend/2004-02-26-LinkOnceFunctions.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=c | grep func1 | grep WEAK +; RUN: llvm-upgrade < %s | llvm-as | llc -march=c | grep func1 | grep WEAK implementation diff --git a/test/CodeGen/CBackend/2004-08-09-va-end-null.ll b/test/CodeGen/CBackend/2004-08-09-va-end-null.ll index f15fa86897..f8e8fe5bb7 100644 --- a/test/CodeGen/CBackend/2004-08-09-va-end-null.ll +++ b/test/CodeGen/CBackend/2004-08-09-va-end-null.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=c +; RUN: llvm-upgrade < %s | llvm-as | llc -march=c declare void %llvm.va_end(sbyte*) diff --git a/test/CodeGen/CBackend/2004-11-13-FunctionPointerCast.llx b/test/CodeGen/CBackend/2004-11-13-FunctionPointerCast.llx index 8af996c2bc..99bb602ce3 100644 --- a/test/CodeGen/CBackend/2004-11-13-FunctionPointerCast.llx +++ b/test/CodeGen/CBackend/2004-11-13-FunctionPointerCast.llx @@ -1,7 +1,7 @@ ; The CBE should not emit code that casts the function pointer. This causes ; GCC to get testy and insert trap instructions instead of doing the right ; thing. :( -; RUN: llvm-as < %s | llc -march=c +; RUN: llvm-upgrade < %s | llvm-as | llc -march=c implementation diff --git a/test/CodeGen/CBackend/2004-12-03-ExternStatics.ll b/test/CodeGen/CBackend/2004-12-03-ExternStatics.ll index ca4aa5921c..6a55db8617 100644 --- a/test/CodeGen/CBackend/2004-12-03-ExternStatics.ll +++ b/test/CodeGen/CBackend/2004-12-03-ExternStatics.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=c | not grep 'extern.*msg' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=c | not grep 'extern.*msg' ; This is PR472 diff --git a/test/CodeGen/CBackend/2004-12-28-LogicalConstantExprs.ll b/test/CodeGen/CBackend/2004-12-28-LogicalConstantExprs.ll index 3377fd1fea..ebe4566aa1 100644 --- a/test/CodeGen/CBackend/2004-12-28-LogicalConstantExprs.ll +++ b/test/CodeGen/CBackend/2004-12-28-LogicalConstantExprs.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=c +; RUN: llvm-upgrade < %s | llvm-as | llc -march=c int %foo() { ret int and (int 123456, int cast (int()* %foo to int)) diff --git a/test/CodeGen/CBackend/2005-02-14-VolatileOperations.ll b/test/CodeGen/CBackend/2005-02-14-VolatileOperations.ll index b6089d1d19..e161e46b55 100644 --- a/test/CodeGen/CBackend/2005-02-14-VolatileOperations.ll +++ b/test/CodeGen/CBackend/2005-02-14-VolatileOperations.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=c | grep volatile +; RUN: llvm-upgrade < %s | llvm-as | llc -march=c | grep volatile void %test(int* %P) { %X = volatile load int*%P diff --git a/test/CodeGen/CBackend/2005-03-08-RecursiveTypeCrash.ll b/test/CodeGen/CBackend/2005-03-08-RecursiveTypeCrash.ll index 382c817d6d..5349488d64 100644 --- a/test/CodeGen/CBackend/2005-03-08-RecursiveTypeCrash.ll +++ b/test/CodeGen/CBackend/2005-03-08-RecursiveTypeCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=c +; RUN: llvm-upgrade < %s | llvm-as | llc -march=c %JNIEnv = type %struct.JNINa* %struct.JNINa = type { sbyte*, sbyte*, sbyte*, void (%JNIEnv*)* } diff --git a/test/CodeGen/CBackend/2005-07-14-NegationToMinusMinus.ll b/test/CodeGen/CBackend/2005-07-14-NegationToMinusMinus.ll index 9880456dbe..0411fb6a79 100644 --- a/test/CodeGen/CBackend/2005-07-14-NegationToMinusMinus.ll +++ b/test/CodeGen/CBackend/2005-07-14-NegationToMinusMinus.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=c | not grep "\-\-65535" +; RUN: llvm-upgrade < %s | llvm-as | llc -march=c | not grep "\-\-65535" ; ModuleID = '<stdin>' target endian = little target pointersize = 32 diff --git a/test/CodeGen/CBackend/2005-08-23-Fmod.ll b/test/CodeGen/CBackend/2005-08-23-Fmod.ll index 20f05b651b..5ce1e9660f 100644 --- a/test/CodeGen/CBackend/2005-08-23-Fmod.ll +++ b/test/CodeGen/CBackend/2005-08-23-Fmod.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=c | grep fmod +; RUN: llvm-upgrade < %s | llvm-as | llc -march=c | grep fmod double %test(double %A, double %B) { %C = rem double %A, %B diff --git a/test/CodeGen/CBackend/2005-09-27-VolatileFuncPtr.ll b/test/CodeGen/CBackend/2005-09-27-VolatileFuncPtr.ll index 96223f2edf..a29c20b13a 100644 --- a/test/CodeGen/CBackend/2005-09-27-VolatileFuncPtr.ll +++ b/test/CodeGen/CBackend/2005-09-27-VolatileFuncPtr.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=c && -; RUN: llvm-as < %s | llc -march=c | grep '\* *volatile *\*' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=c && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=c | grep '\* *volatile *\*' %G = external global void()* diff --git a/test/CodeGen/Generic/2004-02-08-UnwindSupport.llx b/test/CodeGen/Generic/2004-02-08-UnwindSupport.llx index 2b952f9fbf..6e57fbc209 100644 --- a/test/CodeGen/Generic/2004-02-08-UnwindSupport.llx +++ b/test/CodeGen/Generic/2004-02-08-UnwindSupport.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -enable-correct-eh-support +; RUN: llvm-upgrade < %s | llvm-as | llc -enable-correct-eh-support int %test() { unwind diff --git a/test/CodeGen/Generic/2004-05-09-LiveVarPartialRegister.llx b/test/CodeGen/Generic/2004-05-09-LiveVarPartialRegister.llx index a98ae856e9..82d33a0db5 100644 --- a/test/CodeGen/Generic/2004-05-09-LiveVarPartialRegister.llx +++ b/test/CodeGen/Generic/2004-05-09-LiveVarPartialRegister.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc %global_long_1 = linkonce global long 7 %global_long_2 = linkonce global long 49 diff --git a/test/CodeGen/Generic/2005-01-18-SetUO-InfLoop.ll b/test/CodeGen/Generic/2005-01-18-SetUO-InfLoop.ll index 072841d948..e47aa18f41 100644 --- a/test/CodeGen/Generic/2005-01-18-SetUO-InfLoop.ll +++ b/test/CodeGen/Generic/2005-01-18-SetUO-InfLoop.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc void %intersect_pixel() { entry: diff --git a/test/CodeGen/Generic/2005-04-09-GlobalInPHI.ll b/test/CodeGen/Generic/2005-04-09-GlobalInPHI.ll index ad379dac59..54f9883ae9 100644 --- a/test/CodeGen/Generic/2005-04-09-GlobalInPHI.ll +++ b/test/CodeGen/Generic/2005-04-09-GlobalInPHI.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc %struct.TypHeader = type { uint, %struct.TypHeader**, [3 x sbyte], ubyte } %.str_67 = external global [4 x sbyte] ; <[4 x sbyte]*> [#uses=1] %.str_87 = external global [17 x sbyte] ; <[17 x sbyte]*> [#uses=1] diff --git a/test/CodeGen/Generic/2005-07-12-memcpy-i64-length.ll b/test/CodeGen/Generic/2005-07-12-memcpy-i64-length.ll index c6eea6a1bf..96b9435e7f 100644 --- a/test/CodeGen/Generic/2005-07-12-memcpy-i64-length.ll +++ b/test/CodeGen/Generic/2005-07-12-memcpy-i64-length.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc ; Test that llvm.memcpy works with a i64 length operand on all targets. diff --git a/test/CodeGen/Generic/2005-10-18-ZeroSizeStackObject.ll b/test/CodeGen/Generic/2005-10-18-ZeroSizeStackObject.ll index 59b31d95b1..e7cce1f4ef 100644 --- a/test/CodeGen/Generic/2005-10-18-ZeroSizeStackObject.ll +++ b/test/CodeGen/Generic/2005-10-18-ZeroSizeStackObject.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc void %test() { %X = alloca {} diff --git a/test/CodeGen/Generic/2005-10-21-longlonggtu.ll b/test/CodeGen/Generic/2005-10-21-longlonggtu.ll index 7d12d78cf2..602321398a 100644 --- a/test/CodeGen/Generic/2005-10-21-longlonggtu.ll +++ b/test/CodeGen/Generic/2005-10-21-longlonggtu.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc float %t(long %u) { %u = cast long %u to ulong ; <ulong> [#uses=1] %tmp5 = add ulong %u, 9007199254740991 ; <ulong> [#uses=1] diff --git a/test/CodeGen/Generic/2005-12-01-Crash.ll b/test/CodeGen/Generic/2005-12-01-Crash.ll index a3238da001..a9d8deb6d6 100644 --- a/test/CodeGen/Generic/2005-12-01-Crash.ll +++ b/test/CodeGen/Generic/2005-12-01-Crash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc %str = external global [36 x sbyte] ; <[36 x sbyte]*> [#uses=0] %str = external global [29 x sbyte] ; <[29 x sbyte]*> [#uses=0] diff --git a/test/CodeGen/Generic/2005-12-12-ExpandSextInreg.ll b/test/CodeGen/Generic/2005-12-12-ExpandSextInreg.ll index 20ef2d9f06..ef1359ee7c 100644 --- a/test/CodeGen/Generic/2005-12-12-ExpandSextInreg.ll +++ b/test/CodeGen/Generic/2005-12-12-ExpandSextInreg.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc long %test(long %A) { %B = cast long %A to sbyte diff --git a/test/CodeGen/Generic/2006-01-12-BadSetCCFold.ll b/test/CodeGen/Generic/2006-01-12-BadSetCCFold.ll index fb5092a588..192274a845 100644 --- a/test/CodeGen/Generic/2006-01-12-BadSetCCFold.ll +++ b/test/CodeGen/Generic/2006-01-12-BadSetCCFold.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc target endian = little target pointersize = 32 diff --git a/test/CodeGen/Generic/2006-01-18-InvalidBranchOpcodeAssert.ll b/test/CodeGen/Generic/2006-01-18-InvalidBranchOpcodeAssert.ll index 5f5aed43e3..73fd6582a2 100644 --- a/test/CodeGen/Generic/2006-01-18-InvalidBranchOpcodeAssert.ll +++ b/test/CodeGen/Generic/2006-01-18-InvalidBranchOpcodeAssert.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc ; This crashed the PPC backend. void %test() { diff --git a/test/CodeGen/Generic/2006-02-12-InsertLibcall.ll b/test/CodeGen/Generic/2006-02-12-InsertLibcall.ll index 5a48570d32..d18ce14c63 100644 --- a/test/CodeGen/Generic/2006-02-12-InsertLibcall.ll +++ b/test/CodeGen/Generic/2006-02-12-InsertLibcall.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc %G = external global int void %encode_one_frame(long %tmp.2i) { diff --git a/test/CodeGen/Generic/2006-03-01-dagcombineinfloop.ll b/test/CodeGen/Generic/2006-03-01-dagcombineinfloop.ll index 27b00d5f9f..797af74c20 100644 --- a/test/CodeGen/Generic/2006-03-01-dagcombineinfloop.ll +++ b/test/CodeGen/Generic/2006-03-01-dagcombineinfloop.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc ; Infinite loop in the dag combiner, reduced from 176.gcc. %struct._obstack_chunk = type { sbyte*, %struct._obstack_chunk*, [4 x sbyte] } diff --git a/test/CodeGen/Generic/2006-03-27-DebugInfoNULLDeclare.ll b/test/CodeGen/Generic/2006-03-27-DebugInfoNULLDeclare.ll index e778a6f109..4e262f85a3 100644 --- a/test/CodeGen/Generic/2006-03-27-DebugInfoNULLDeclare.ll +++ b/test/CodeGen/Generic/2006-03-27-DebugInfoNULLDeclare.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc implementation ; Functions: diff --git a/test/CodeGen/Generic/2006-04-11-vecload.ll b/test/CodeGen/Generic/2006-04-11-vecload.ll index 9df1c0a290..056edac008 100644 --- a/test/CodeGen/Generic/2006-04-11-vecload.ll +++ b/test/CodeGen/Generic/2006-04-11-vecload.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 -mcpu=yonah +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=yonah ; The vload was getting memoized to the previous scalar load! diff --git a/test/CodeGen/Generic/2006-04-26-SetCCAnd.ll b/test/CodeGen/Generic/2006-04-26-SetCCAnd.ll index d827a0cc14..2a424be94e 100644 --- a/test/CodeGen/Generic/2006-04-26-SetCCAnd.ll +++ b/test/CodeGen/Generic/2006-04-26-SetCCAnd.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc ; PR748 %G = external global ushort ; <ushort*> [#uses=1] diff --git a/test/CodeGen/Generic/2006-04-28-Sign-extend-bool.ll b/test/CodeGen/Generic/2006-04-28-Sign-extend-bool.ll index 719c66d552..068d6807b8 100644 --- a/test/CodeGen/Generic/2006-04-28-Sign-extend-bool.ll +++ b/test/CodeGen/Generic/2006-04-28-Sign-extend-bool.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc int %test(int %tmp93) { %tmp98 = shl int %tmp93, ubyte 31 ; <int> [#uses=1] diff --git a/test/CodeGen/Generic/2006-05-06-GEP-Cast-Sink-Crash.ll b/test/CodeGen/Generic/2006-05-06-GEP-Cast-Sink-Crash.ll index cbe77a2e7c..ac7e19d381 100644 --- a/test/CodeGen/Generic/2006-05-06-GEP-Cast-Sink-Crash.ll +++ b/test/CodeGen/Generic/2006-05-06-GEP-Cast-Sink-Crash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc %struct.FILE = type { ubyte*, int, int, short, short, %struct.__sbuf, int, sbyte*, int (sbyte*)*, int (sbyte*, sbyte*, int)*, long (sbyte*, long, int)*, int (sbyte*, sbyte*, int)*, %struct.__sbuf, %struct.__sFILEX*, int, [3 x ubyte], [1 x ubyte], %struct.__sbuf, int, long } %struct.SYMBOL_TABLE_ENTRY = type { [9 x sbyte], [9 x sbyte], int, int, uint, %struct.SYMBOL_TABLE_ENTRY* } diff --git a/test/CodeGen/Generic/2006-06-12-LowerSwitchCrash.ll b/test/CodeGen/Generic/2006-06-12-LowerSwitchCrash.ll index c7cd33fe7a..0cf2e9359d 100644 --- a/test/CodeGen/Generic/2006-06-12-LowerSwitchCrash.ll +++ b/test/CodeGen/Generic/2006-06-12-LowerSwitchCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -fast +; RUN: llvm-upgrade < %s | llvm-as | llc -fast float %test(uint %tmp12771278) { switch uint %tmp12771278, label %bb1279 [ diff --git a/test/CodeGen/Generic/2006-06-13-ComputeMaskedBitsCrash.ll b/test/CodeGen/Generic/2006-06-13-ComputeMaskedBitsCrash.ll index 5c5a1dc4e2..a910b58ac8 100644 --- a/test/CodeGen/Generic/2006-06-13-ComputeMaskedBitsCrash.ll +++ b/test/CodeGen/Generic/2006-06-13-ComputeMaskedBitsCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -fast +; RUN: llvm-upgrade < %s | llvm-as | llc -fast %struct.cl_perfunc_opts = type { ubyte, ubyte, ubyte, ubyte, ubyte, ubyte, ubyte, ubyte, ubyte, ubyte, ubyte, ubyte, int, int, int, int, int, int, int } %cl_pf_opts = external global %struct.cl_perfunc_opts ; <%struct.cl_perfunc_opts*> [#uses=2] diff --git a/test/CodeGen/Generic/2006-06-28-SimplifySetCCCrash.ll b/test/CodeGen/Generic/2006-06-28-SimplifySetCCCrash.ll index 0c2acc86ce..f5d0fb35c4 100644 --- a/test/CodeGen/Generic/2006-06-28-SimplifySetCCCrash.ll +++ b/test/CodeGen/Generic/2006-06-28-SimplifySetCCCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc %struct.rtunion = type { long } %struct.rtx_def = type { ushort, ubyte, ubyte, [1 x %struct.rtunion] } %ix86_cpu = external global uint ; <uint*> [#uses=1] diff --git a/test/CodeGen/Generic/2006-08-30-CoallescerCrash.ll b/test/CodeGen/Generic/2006-08-30-CoallescerCrash.ll index ea50cec318..68aadc5710 100644 --- a/test/CodeGen/Generic/2006-08-30-CoallescerCrash.ll +++ b/test/CodeGen/Generic/2006-08-30-CoallescerCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc %struct.CUMULATIVE_ARGS = type { int, int, int, int, int, int, int, int, int, int, int, int, int, int } %struct.VEC_edge = type { uint, uint, [1 x %struct.edge_def*] } diff --git a/test/CodeGen/Generic/2006-09-02-LocalAllocCrash.ll b/test/CodeGen/Generic/2006-09-02-LocalAllocCrash.ll index 3231a3cec2..e2f07e8ae2 100644 --- a/test/CodeGen/Generic/2006-09-02-LocalAllocCrash.ll +++ b/test/CodeGen/Generic/2006-09-02-LocalAllocCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -regalloc=local +; RUN: llvm-upgrade < %s | llvm-as | llc -regalloc=local %struct.CHESS_POSITION = type { ulong, ulong, ulong, ulong, ulong, ulong, ulong, ulong, ulong, ulong, ulong, ulong, ulong, ulong, ulong, ulong, ulong, ulong, uint, int, sbyte, sbyte, [64 x sbyte], sbyte, sbyte, sbyte, sbyte, sbyte } %search = external global %struct.CHESS_POSITION ; <%struct.CHESS_POSITION*> [#uses=2] diff --git a/test/CodeGen/Generic/2006-09-06-SwitchLowering.ll b/test/CodeGen/Generic/2006-09-06-SwitchLowering.ll index 29b81bb70a..2b12926174 100644 --- a/test/CodeGen/Generic/2006-09-06-SwitchLowering.ll +++ b/test/CodeGen/Generic/2006-09-06-SwitchLowering.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc void %foo() { br label %cond_true813.i diff --git a/test/CodeGen/Generic/2006-10-27-CondFolding.ll b/test/CodeGen/Generic/2006-10-27-CondFolding.ll index 6ebe9fbcf5..8bf3c11e26 100644 --- a/test/CodeGen/Generic/2006-10-27-CondFolding.ll +++ b/test/CodeGen/Generic/2006-10-27-CondFolding.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc void %start_pass_huff(int %gather_statistics) { entry: diff --git a/test/CodeGen/Generic/2006-10-29-Crash.ll b/test/CodeGen/Generic/2006-10-29-Crash.ll index 0296cb07bd..8857c930dd 100644 --- a/test/CodeGen/Generic/2006-10-29-Crash.ll +++ b/test/CodeGen/Generic/2006-10-29-Crash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc void %form_component_prediction(int %dy) { entry: diff --git a/test/CodeGen/Generic/2006-11-06-MemIntrinsicExpand.ll b/test/CodeGen/Generic/2006-11-06-MemIntrinsicExpand.ll index b329520614..d7ef1db635 100644 --- a/test/CodeGen/Generic/2006-11-06-MemIntrinsicExpand.ll +++ b/test/CodeGen/Generic/2006-11-06-MemIntrinsicExpand.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=x86 && -; RUN: llvm-as < %s | llc -march=x86 | not grep adc +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep adc ; PR987 diff --git a/test/CodeGen/Generic/2006-11-10-DAGCombineMiscompile.ll b/test/CodeGen/Generic/2006-11-10-DAGCombineMiscompile.ll index 972418c037..a5476eb3b5 100644 --- a/test/CodeGen/Generic/2006-11-10-DAGCombineMiscompile.ll +++ b/test/CodeGen/Generic/2006-11-10-DAGCombineMiscompile.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=ppc32 | grep rlwimi +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep rlwimi void %test(short %div.0.i.i.i.i, int %L_num.0.i.i.i.i, int %tmp1.i.i206.i.i, short* %P) { %X = shl short %div.0.i.i.i.i, ubyte 1 ; <short> [#uses=1] diff --git a/test/CodeGen/Generic/2006-11-20-DAGCombineCrash.ll b/test/CodeGen/Generic/2006-11-20-DAGCombineCrash.ll index 93b58575dc..6a76079e25 100644 --- a/test/CodeGen/Generic/2006-11-20-DAGCombineCrash.ll +++ b/test/CodeGen/Generic/2006-11-20-DAGCombineCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc ; PR1011 %struct.mng_data = type { sbyte* (%struct.mng_data*, uint)*, int, int, int, sbyte, sbyte, int, int, int, int, int } diff --git a/test/CodeGen/Generic/BasicInstrs.llx b/test/CodeGen/Generic/BasicInstrs.llx index 2d969345fe..82606094c3 100644 --- a/test/CodeGen/Generic/BasicInstrs.llx +++ b/test/CodeGen/Generic/BasicInstrs.llx @@ -1,7 +1,7 @@ ; New testcase, this contains a bunch of simple instructions that should be ; handled by a code generator. -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc int %add(int %A, int %B) { %R = add int %A, %B diff --git a/test/CodeGen/Generic/ConstantExprLowering.llx b/test/CodeGen/Generic/ConstantExprLowering.llx index 20c3ef6f81..afb6530bab 100644 --- a/test/CodeGen/Generic/ConstantExprLowering.llx +++ b/test/CodeGen/Generic/ConstantExprLowering.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc %.str_1 = internal constant [16 x sbyte] c"%d %d %d %d %d\0A\00" diff --git a/test/CodeGen/Generic/DebugStuff.ll b/test/CodeGen/Generic/DebugStuff.ll index 76d354be0c..fd60d0b604 100644 --- a/test/CodeGen/Generic/DebugStuff.ll +++ b/test/CodeGen/Generic/DebugStuff.ll @@ -1,5 +1,5 @@ ; Verify debugger intrinsics are ignored or accepted. -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc ;; Debugger type declarations %lldb.compile_unit = type { uint, ushort, ushort, sbyte*, sbyte*, sbyte*, {}* } diff --git a/test/CodeGen/Generic/GC/alloc_loop.ll b/test/CodeGen/Generic/GC/alloc_loop.ll index 3311470108..11294e1eb2 100644 --- a/test/CodeGen/Generic/GC/alloc_loop.ll +++ b/test/CodeGen/Generic/GC/alloc_loop.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc implementation diff --git a/test/CodeGen/Generic/SwitchLowering.ll b/test/CodeGen/Generic/SwitchLowering.ll index 136bdb494b..37bfffaa02 100644 --- a/test/CodeGen/Generic/SwitchLowering.ll +++ b/test/CodeGen/Generic/SwitchLowering.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 | grep cmp | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep cmp | wc -l | grep 1 ; PR964 sbyte* %FindChar(sbyte* %CurPtr) { diff --git a/test/CodeGen/Generic/bool-to-double.ll b/test/CodeGen/Generic/bool-to-double.ll index b2396ea04c..ad9bc8e86f 100644 --- a/test/CodeGen/Generic/bool-to-double.ll +++ b/test/CodeGen/Generic/bool-to-double.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc double %test(bool %X) { %Y = cast bool %X to double ret double %Y diff --git a/test/CodeGen/Generic/call-ret0.ll b/test/CodeGen/Generic/call-ret0.ll index 79edc1e645..44c30d3f6f 100644 --- a/test/CodeGen/Generic/call-ret0.ll +++ b/test/CodeGen/Generic/call-ret0.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc int %foo(int %x) { ret int %x diff --git a/test/CodeGen/Generic/call-ret42.ll b/test/CodeGen/Generic/call-ret42.ll index 2e8ed381a0..b0a480f045 100644 --- a/test/CodeGen/Generic/call-ret42.ll +++ b/test/CodeGen/Generic/call-ret42.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc int %foo(int %x) { ret int 42 diff --git a/test/CodeGen/Generic/call-void.ll b/test/CodeGen/Generic/call-void.ll index 1263b98976..64e6336b16 100644 --- a/test/CodeGen/Generic/call-void.ll +++ b/test/CodeGen/Generic/call-void.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc void %foo() { ret void diff --git a/test/CodeGen/Generic/call2-ret0.ll b/test/CodeGen/Generic/call2-ret0.ll index a0bde8de2b..55be5c68b6 100644 --- a/test/CodeGen/Generic/call2-ret0.ll +++ b/test/CodeGen/Generic/call2-ret0.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc int %bar(int %x) { ret int 0 diff --git a/test/CodeGen/Generic/cast-fp.ll b/test/CodeGen/Generic/cast-fp.ll index 1b80385cd4..8359329035 100644 --- a/test/CodeGen/Generic/cast-fp.ll +++ b/test/CodeGen/Generic/cast-fp.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc %a_fstr = internal constant [8 x sbyte] c"a = %f\0A\00" %a_lstr = internal constant [10 x sbyte] c"a = %lld\0A\00" diff --git a/test/CodeGen/Generic/debug-info.ll b/test/CodeGen/Generic/debug-info.ll index 0c69ea0eb6..cd5c3557f7 100644 --- a/test/CodeGen/Generic/debug-info.ll +++ b/test/CodeGen/Generic/debug-info.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc %lldb.compile_unit = type { uint, ushort, ushort, sbyte*, sbyte*, sbyte*, { }* } %d.compile_unit7 = external global %lldb.compile_unit ; <%lldb.compile_unit*> [#uses=1] diff --git a/test/CodeGen/Generic/div-neg-power-2.ll b/test/CodeGen/Generic/div-neg-power-2.ll index 76d6182931..7452c7e3aa 100644 --- a/test/CodeGen/Generic/div-neg-power-2.ll +++ b/test/CodeGen/Generic/div-neg-power-2.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc int %test(int %X) { %Y = div int %X, -2 diff --git a/test/CodeGen/Generic/fneg-fabs.ll b/test/CodeGen/Generic/fneg-fabs.ll index a533fe5599..3dc4588eea 100644 --- a/test/CodeGen/Generic/fneg-fabs.ll +++ b/test/CodeGen/Generic/fneg-fabs.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc double %fneg(double %X) { %Y = sub double -0.0, %X diff --git a/test/CodeGen/Generic/fp_to_int.ll b/test/CodeGen/Generic/fp_to_int.ll index 7b9c0e985b..a99c5b5e8d 100644 --- a/test/CodeGen/Generic/fp_to_int.ll +++ b/test/CodeGen/Generic/fp_to_int.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc sbyte %test1(double %X) { %tmp.1 = cast double %X to sbyte diff --git a/test/CodeGen/Generic/global-ret0.ll b/test/CodeGen/Generic/global-ret0.ll index 993049dfb9..dfe6aef67d 100644 --- a/test/CodeGen/Generic/global-ret0.ll +++ b/test/CodeGen/Generic/global-ret0.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc %g = global int 0 diff --git a/test/CodeGen/Generic/hello.ll b/test/CodeGen/Generic/hello.ll index e68d588519..d9e9d587ce 100644 --- a/test/CodeGen/Generic/hello.ll +++ b/test/CodeGen/Generic/hello.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc %.str_1 = internal constant [7 x sbyte] c"hello\0A\00" diff --git a/test/CodeGen/Generic/intrinsics.ll b/test/CodeGen/Generic/intrinsics.ll index f8a64f7cba..7c1d1a52bc 100644 --- a/test/CodeGen/Generic/intrinsics.ll +++ b/test/CodeGen/Generic/intrinsics.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc ;; SQRT declare float %llvm.sqrt(float) diff --git a/test/CodeGen/Generic/isunord.ll b/test/CodeGen/Generic/isunord.ll index 21205c181d..f11ec33736 100644 --- a/test/CodeGen/Generic/isunord.ll +++ b/test/CodeGen/Generic/isunord.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc ; XFAIL: ia64|sparcv8 diff --git a/test/CodeGen/Generic/llvm-ct-intrinsics.ll b/test/CodeGen/Generic/llvm-ct-intrinsics.ll index 2095ca3584..1897abee57 100644 --- a/test/CodeGen/Generic/llvm-ct-intrinsics.ll +++ b/test/CodeGen/Generic/llvm-ct-intrinsics.ll @@ -1,5 +1,5 @@ ; Make sure this testcase is supported by all code generators -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc declare long %llvm.ctpop(long) declare int %llvm.ctpop(int) diff --git a/test/CodeGen/Generic/nested-select.ll b/test/CodeGen/Generic/nested-select.ll index c2dd580a44..18798d1d27 100644 --- a/test/CodeGen/Generic/nested-select.ll +++ b/test/CodeGen/Generic/nested-select.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -o /dev/null -f +; RUN: llvm-upgrade < %s | llvm-as | llc -o /dev/null -f ; Test that select of a select works diff --git a/test/CodeGen/Generic/print-add.ll b/test/CodeGen/Generic/print-add.ll index 6e5c3c48fa..ef224a1403 100644 --- a/test/CodeGen/Generic/print-add.ll +++ b/test/CodeGen/Generic/print-add.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc %.str_1 = internal constant [4 x sbyte] c"%d\0A\00" diff --git a/test/CodeGen/Generic/print-arith-fp.ll b/test/CodeGen/Generic/print-arith-fp.ll index 446dbea3fd..cfa7583981 100644 --- a/test/CodeGen/Generic/print-arith-fp.ll +++ b/test/CodeGen/Generic/print-arith-fp.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc %a_str = internal constant [8 x sbyte] c"a = %f\0A\00" %b_str = internal constant [8 x sbyte] c"b = %f\0A\00" diff --git a/test/CodeGen/Generic/print-arith-int.ll b/test/CodeGen/Generic/print-arith-int.ll index b67850388c..708abec5f2 100644 --- a/test/CodeGen/Generic/print-arith-int.ll +++ b/test/CodeGen/Generic/print-arith-int.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc %a_str = internal constant [8 x sbyte] c"a = %d\0A\00" %b_str = internal constant [8 x sbyte] c"b = %d\0A\00" diff --git a/test/CodeGen/Generic/print-int.ll b/test/CodeGen/Generic/print-int.ll index cd3e2b276d..27cf637e10 100644 --- a/test/CodeGen/Generic/print-int.ll +++ b/test/CodeGen/Generic/print-int.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc %.str_1 = internal constant [4 x sbyte] c"%d\0A\00" diff --git a/test/CodeGen/Generic/print-mul-exp.ll b/test/CodeGen/Generic/print-mul-exp.ll index 0a8fd782b7..d5f5f93557 100644 --- a/test/CodeGen/Generic/print-mul-exp.ll +++ b/test/CodeGen/Generic/print-mul-exp.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc %a_str = internal constant [8 x sbyte] c"a = %d\0A\00" %a_mul_str = internal constant [13 x sbyte] c"a * %d = %d\0A\00" diff --git a/test/CodeGen/Generic/print-mul.ll b/test/CodeGen/Generic/print-mul.ll index 80d2d5140d..911c73e993 100644 --- a/test/CodeGen/Generic/print-mul.ll +++ b/test/CodeGen/Generic/print-mul.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc %a_str = internal constant [8 x sbyte] c"a = %d\0A\00" %b_str = internal constant [8 x sbyte] c"b = %d\0A\00" diff --git a/test/CodeGen/Generic/print-shift.ll b/test/CodeGen/Generic/print-shift.ll index 8ce3bac159..4f699d5c18 100644 --- a/test/CodeGen/Generic/print-shift.ll +++ b/test/CodeGen/Generic/print-shift.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc %a_str = internal constant [8 x sbyte] c"a = %d\0A\00" %b_str = internal constant [8 x sbyte] c"b = %d\0A\00" diff --git a/test/CodeGen/Generic/ret0.ll b/test/CodeGen/Generic/ret0.ll index 439a2f3284..4d0d10b0e0 100644 --- a/test/CodeGen/Generic/ret0.ll +++ b/test/CodeGen/Generic/ret0.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc int %main() { ret int 0 diff --git a/test/CodeGen/Generic/ret42.ll b/test/CodeGen/Generic/ret42.ll index ac14231b8b..88d3c986e2 100644 --- a/test/CodeGen/Generic/ret42.ll +++ b/test/CodeGen/Generic/ret42.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc int %main() { ret int 42 diff --git a/test/CodeGen/Generic/shift-int64.ll b/test/CodeGen/Generic/shift-int64.ll index 50299af071..a5ab37d725 100644 --- a/test/CodeGen/Generic/shift-int64.ll +++ b/test/CodeGen/Generic/shift-int64.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc long %test_imm(long %X) { %Y = shr long %X, ubyte 17 diff --git a/test/CodeGen/Generic/stacksave-restore.ll b/test/CodeGen/Generic/stacksave-restore.ll index 8ef0dac46d..65cf6c1e61 100644 --- a/test/CodeGen/Generic/stacksave-restore.ll +++ b/test/CodeGen/Generic/stacksave-restore.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc declare sbyte* %llvm.stacksave() declare void %llvm.stackrestore(sbyte*) diff --git a/test/CodeGen/Generic/switch-crit-edge-constant.ll b/test/CodeGen/Generic/switch-crit-edge-constant.ll index 460354e9b9..12c15159af 100644 --- a/test/CodeGen/Generic/switch-crit-edge-constant.ll +++ b/test/CodeGen/Generic/switch-crit-edge-constant.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=x86 && -; RUN: llvm-as < %s | llc -march=x86 | grep 'mov.*str1' | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep 'mov.*str1' | wc -l | grep 1 ; PR925 target endian = little diff --git a/test/CodeGen/Generic/vector-constantexpr.ll b/test/CodeGen/Generic/vector-constantexpr.ll index eb49dbfbd7..31b60a4d68 100644 --- a/test/CodeGen/Generic/vector-constantexpr.ll +++ b/test/CodeGen/Generic/vector-constantexpr.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc void ""(float* %inregs, float* %outregs) { %a_addr.i = alloca <4 x float> ; <<4 x float>*> [#uses=1] diff --git a/test/CodeGen/Generic/vector-identity-shuffle.ll b/test/CodeGen/Generic/vector-identity-shuffle.ll index 7ee5fd6d2b..1cdf580cfb 100644 --- a/test/CodeGen/Generic/vector-identity-shuffle.ll +++ b/test/CodeGen/Generic/vector-identity-shuffle.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | grep _test && -; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | not grep vperm +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | grep _test && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | not grep vperm void %test(<4 x float> *%tmp2.i) { %tmp2.i = load <4x float>* %tmp2.i diff --git a/test/CodeGen/Generic/vector.ll b/test/CodeGen/Generic/vector.ll index 34a3b2444b..207c51dc43 100644 --- a/test/CodeGen/Generic/vector.ll +++ b/test/CodeGen/Generic/vector.ll @@ -1,10 +1,10 @@ ; Test that vectors are scalarized/lowered correctly. -; RUN: llvm-as < %s | llc && -; RUN: llvm-as < %s | llc -mtriple a-b-c && -; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 && -; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g3 && -; RUN: llvm-as < %s | llc -march=x86 -mcpu=i386 && -; RUN: llvm-as < %s | llc -march=x86 -mcpu=yonah +; RUN: llvm-upgrade < %s | llvm-as | llc && +; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple a-b-c && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g3 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=i386 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=yonah %f1 = type <1 x float> %f2 = type <2 x float> diff --git a/test/CodeGen/IA64/2005-08-22-LegalizerCrash.ll b/test/CodeGen/IA64/2005-08-22-LegalizerCrash.ll index a4946a8659..c160e7fe82 100644 --- a/test/CodeGen/IA64/2005-08-22-LegalizerCrash.ll +++ b/test/CodeGen/IA64/2005-08-22-LegalizerCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=ia64 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ia64 %_ZN9__gnu_cxx16__stl_prime_listE = external global [28 x uint] ; <[28 x uint]*> [#uses=3] diff --git a/test/CodeGen/IA64/2005-10-29-shladd.ll b/test/CodeGen/IA64/2005-10-29-shladd.ll index 0f241abca6..355b487ef5 100644 --- a/test/CodeGen/IA64/2005-10-29-shladd.ll +++ b/test/CodeGen/IA64/2005-10-29-shladd.ll @@ -1,5 +1,5 @@ ; this should turn into shladd -; RUN: llvm-as < %s | llc -march=ia64 | grep 'shladd' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ia64 | grep 'shladd' implementation ; Functions: diff --git a/test/CodeGen/IA64/ret-0.ll b/test/CodeGen/IA64/ret-0.ll index 7f240cde76..0f5cf8947a 100644 --- a/test/CodeGen/IA64/ret-0.ll +++ b/test/CodeGen/IA64/ret-0.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=ia64 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ia64 double %test() { ret double 0.0 diff --git a/test/CodeGen/PowerPC/2004-11-29-ShrCrash.ll b/test/CodeGen/PowerPC/2004-11-29-ShrCrash.ll index 3e5e89d16e..e2a00d1e6e 100644 --- a/test/CodeGen/PowerPC/2004-11-29-ShrCrash.ll +++ b/test/CodeGen/PowerPC/2004-11-29-ShrCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=ppc32 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 void %main() { %tr1 = shr uint 1, ubyte 0 diff --git a/test/CodeGen/PowerPC/2004-11-30-shift-crash.ll b/test/CodeGen/PowerPC/2004-11-30-shift-crash.ll index 9c611649e6..4603bdbbf0 100644 --- a/test/CodeGen/PowerPC/2004-11-30-shift-crash.ll +++ b/test/CodeGen/PowerPC/2004-11-30-shift-crash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=ppc32 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 void %main() { %tr4 = shl ulong 1, ubyte 0 ; <ulong> [#uses=0] diff --git a/test/CodeGen/PowerPC/2004-11-30-shr-var-crash.ll b/test/CodeGen/PowerPC/2004-11-30-shr-var-crash.ll index e768753d81..8f54c78e7a 100644 --- a/test/CodeGen/PowerPC/2004-11-30-shr-var-crash.ll +++ b/test/CodeGen/PowerPC/2004-11-30-shr-var-crash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=ppc32 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 void %main() { %shamt = add ubyte 0, 1 ; <ubyte> [#uses=1] diff --git a/test/CodeGen/PowerPC/2004-12-12-ZeroSizeCommon.ll b/test/CodeGen/PowerPC/2004-12-12-ZeroSizeCommon.ll index 9773de2700..839e88c51e 100644 --- a/test/CodeGen/PowerPC/2004-12-12-ZeroSizeCommon.ll +++ b/test/CodeGen/PowerPC/2004-12-12-ZeroSizeCommon.ll @@ -1,3 +1,3 @@ -; RUN: llvm-as < %s | llc -march=ppc32 | not grep '.comm.*X,0' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep '.comm.*X,0' %X = linkonce global {} {} diff --git a/test/CodeGen/PowerPC/2005-01-14-SetSelectCrash.ll b/test/CodeGen/PowerPC/2005-01-14-SetSelectCrash.ll index fe2dcf536b..5dc4b28655 100644 --- a/test/CodeGen/PowerPC/2005-01-14-SetSelectCrash.ll +++ b/test/CodeGen/PowerPC/2005-01-14-SetSelectCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=ppc32 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 int %main() { %setle = setle long 1, 0 diff --git a/test/CodeGen/PowerPC/2005-01-14-UndefLong.ll b/test/CodeGen/PowerPC/2005-01-14-UndefLong.ll index 21e72e0c66..a4121c522f 100644 --- a/test/CodeGen/PowerPC/2005-01-14-UndefLong.ll +++ b/test/CodeGen/PowerPC/2005-01-14-UndefLong.ll @@ -1,3 +1,3 @@ -; RUN: llvm-as < %s | llc -march=ppc32 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 long %test() { ret long undef } diff --git a/test/CodeGen/PowerPC/2005-08-12-rlwimi-crash.ll b/test/CodeGen/PowerPC/2005-08-12-rlwimi-crash.ll index e9deb8f276..ef0137f4cd 100644 --- a/test/CodeGen/PowerPC/2005-08-12-rlwimi-crash.ll +++ b/test/CodeGen/PowerPC/2005-08-12-rlwimi-crash.ll @@ -1,6 +1,6 @@ ; this should not crash the ppc backend -; RUN: llvm-as < %s | llc -march=ppc32 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 uint %test( int %j.0.0.i) { %tmp.85.i = and int %j.0.0.i, 7 diff --git a/test/CodeGen/PowerPC/2005-09-02-LegalizeDuplicatesCalls.ll b/test/CodeGen/PowerPC/2005-09-02-LegalizeDuplicatesCalls.ll index 1c30f09716..1e748b752c 100644 --- a/test/CodeGen/PowerPC/2005-09-02-LegalizeDuplicatesCalls.ll +++ b/test/CodeGen/PowerPC/2005-09-02-LegalizeDuplicatesCalls.ll @@ -1,6 +1,6 @@ ; This function should have exactly one call to fixdfdi, no more! -; RUN: llvm-as < %s | llc -march=ppc32 -mattr=-64bit | grep 'bl .*fixdfdi' | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mattr=-64bit | grep 'bl .*fixdfdi' | wc -l | grep 1 double %test2(double %tmp.7705) { %mem_tmp.2.0.in = cast double %tmp.7705 to long ; <long> [#uses=1] diff --git a/test/CodeGen/PowerPC/2005-10-08-ArithmeticRotate.ll b/test/CodeGen/PowerPC/2005-10-08-ArithmeticRotate.ll index 44d725d9c1..edbdc4a09d 100644 --- a/test/CodeGen/PowerPC/2005-10-08-ArithmeticRotate.ll +++ b/test/CodeGen/PowerPC/2005-10-08-ArithmeticRotate.ll @@ -1,7 +1,7 @@ ; This was erroneously being turned into an rlwinm instruction. ; The sign bit does matter in this case. -; RUN: llvm-as < %s | llc -march=ppc32 | grep srawi +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep srawi int %test(int %X) { %Y = and int %X, -2 %Z = shr int %Y, ubyte 11 diff --git a/test/CodeGen/PowerPC/2005-11-30-vastart-crash.ll b/test/CodeGen/PowerPC/2005-11-30-vastart-crash.ll index 665429b4e8..4264e9e82f 100644 --- a/test/CodeGen/PowerPC/2005-11-30-vastart-crash.ll +++ b/test/CodeGen/PowerPC/2005-11-30-vastart-crash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc target endian = big target pointersize = 32 target triple = "powerpc-apple-darwin8.2.0" diff --git a/test/CodeGen/PowerPC/2006-01-11-darwin-fp-argument.ll b/test/CodeGen/PowerPC/2006-01-11-darwin-fp-argument.ll index 916f383311..fd7f27d0bd 100644 --- a/test/CodeGen/PowerPC/2006-01-11-darwin-fp-argument.ll +++ b/test/CodeGen/PowerPC/2006-01-11-darwin-fp-argument.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc && -; RUN: llvm-as < %s | llc | not grep ', f1' +; RUN: llvm-upgrade < %s | llvm-as | llc && +; RUN: llvm-upgrade < %s | llvm-as | llc | not grep ', f1' target endian = big target pointersize = 32 diff --git a/test/CodeGen/PowerPC/2006-01-20-ShiftPartsCrash.ll b/test/CodeGen/PowerPC/2006-01-20-ShiftPartsCrash.ll index eb8046f395..8edb96284e 100644 --- a/test/CodeGen/PowerPC/2006-01-20-ShiftPartsCrash.ll +++ b/test/CodeGen/PowerPC/2006-01-20-ShiftPartsCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc void %iterative_hash_host_wide_int() { %zero = alloca int ; <int*> [#uses=2] diff --git a/test/CodeGen/PowerPC/2006-04-01-FloatDoubleExtend.ll b/test/CodeGen/PowerPC/2006-04-01-FloatDoubleExtend.ll index f662ce289b..dcf599b1a3 100644 --- a/test/CodeGen/PowerPC/2006-04-01-FloatDoubleExtend.ll +++ b/test/CodeGen/PowerPC/2006-04-01-FloatDoubleExtend.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=ppc32 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 double %CalcSpeed(float %tmp127) { %tmp145 = cast float %tmp127 to double ; <double> [#uses=1] diff --git a/test/CodeGen/PowerPC/2006-04-05-splat-ish.ll b/test/CodeGen/PowerPC/2006-04-05-splat-ish.ll index 69cb89f11e..1aca3e3516 100644 --- a/test/CodeGen/PowerPC/2006-04-05-splat-ish.ll +++ b/test/CodeGen/PowerPC/2006-04-05-splat-ish.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | grep 'vspltish v.*, 10' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | grep 'vspltish v.*, 10' void %test(<8 x short>* %P) { %tmp = load <8 x short>* %P ; <<8 x short>> [#uses=1] diff --git a/test/CodeGen/PowerPC/2006-04-19-vmaddfp-crash.ll b/test/CodeGen/PowerPC/2006-04-19-vmaddfp-crash.ll index 32188cfd13..59f7ed4662 100644 --- a/test/CodeGen/PowerPC/2006-04-19-vmaddfp-crash.ll +++ b/test/CodeGen/PowerPC/2006-04-19-vmaddfp-crash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 void %test(sbyte* %stack) { entry: diff --git a/test/CodeGen/PowerPC/2006-05-12-rlwimi-crash.ll b/test/CodeGen/PowerPC/2006-05-12-rlwimi-crash.ll index 283f93570b..6c34cd7861 100644 --- a/test/CodeGen/PowerPC/2006-05-12-rlwimi-crash.ll +++ b/test/CodeGen/PowerPC/2006-05-12-rlwimi-crash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=ppc32 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 %struct.attr_desc = type { sbyte*, %struct.attr_desc*, %struct.attr_value*, %struct.attr_value*, uint } %struct.attr_value = type { %struct.rtx_def*, %struct.attr_value*, %struct.insn_ent*, int, int } diff --git a/test/CodeGen/PowerPC/2006-07-07-ComputeMaskedBits.ll b/test/CodeGen/PowerPC/2006-07-07-ComputeMaskedBits.ll index 396da37d2f..10260725f0 100644 --- a/test/CodeGen/PowerPC/2006-07-07-ComputeMaskedBits.ll +++ b/test/CodeGen/PowerPC/2006-07-07-ComputeMaskedBits.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -mtriple=powerpc64-apple-darwin | grep extsw | wc -l | grep 2 +; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=powerpc64-apple-darwin | grep extsw | wc -l | grep 2 %lens = external global ubyte* %vals = external global int* diff --git a/test/CodeGen/PowerPC/2006-07-19-stwbrx-crash.ll b/test/CodeGen/PowerPC/2006-07-19-stwbrx-crash.ll index 6f2fbcb08a..d71ba5a382 100644 --- a/test/CodeGen/PowerPC/2006-07-19-stwbrx-crash.ll +++ b/test/CodeGen/PowerPC/2006-07-19-stwbrx-crash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=ppc32 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 void %img2buf(int %symbol_size_in_bytes, ushort* %ui16) { %tmp93 = load ushort* null ; <ushort> [#uses=1] diff --git a/test/CodeGen/PowerPC/2006-08-11-RetVector.ll b/test/CodeGen/PowerPC/2006-08-11-RetVector.ll index ca9841e30e..ab9ef35a0f 100644 --- a/test/CodeGen/PowerPC/2006-08-11-RetVector.ll +++ b/test/CodeGen/PowerPC/2006-08-11-RetVector.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | grep vsldoi && -; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | not grep vor +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | grep vsldoi && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | not grep vor <4 x float> %func(<4 x float> %fp0, <4 x float> %fp1) { %tmp76 = shufflevector <4 x float> %fp0, <4 x float> %fp1, <4 x uint> < uint 0, uint 1, uint 2, uint 7 > ; <<4 x float>> [#uses=1] diff --git a/test/CodeGen/PowerPC/2006-08-15-SelectionCrash.ll b/test/CodeGen/PowerPC/2006-08-15-SelectionCrash.ll index 2218fcad7b..287a79d29a 100644 --- a/test/CodeGen/PowerPC/2006-08-15-SelectionCrash.ll +++ b/test/CodeGen/PowerPC/2006-08-15-SelectionCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc %struct..0anon = type { int } %struct.rtx_def = type { ushort, ubyte, ubyte, [1 x %struct..0anon] } diff --git a/test/CodeGen/PowerPC/2006-09-28-shift_64.ll b/test/CodeGen/PowerPC/2006-09-28-shift_64.ll index d5da348bcf..58d1f265f6 100644 --- a/test/CodeGen/PowerPC/2006-09-28-shift_64.ll +++ b/test/CodeGen/PowerPC/2006-09-28-shift_64.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=ppc64 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 target endian = big target pointersize = 64 target triple = "powerpc64-apple-darwin8" diff --git a/test/CodeGen/PowerPC/2006-10-11-combiner-aa-regression.ll b/test/CodeGen/PowerPC/2006-10-11-combiner-aa-regression.ll index 474492a299..72ba9932ae 100644 --- a/test/CodeGen/PowerPC/2006-10-11-combiner-aa-regression.ll +++ b/test/CodeGen/PowerPC/2006-10-11-combiner-aa-regression.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=ppc32 -combiner-alias-analysis | grep 'f5' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -combiner-alias-analysis | grep 'f5' target endian = big target pointersize = 32 diff --git a/test/CodeGen/PowerPC/2006-10-13-Miscompile.ll b/test/CodeGen/PowerPC/2006-10-13-Miscompile.ll index d19245945f..162cbdb1d3 100644 --- a/test/CodeGen/PowerPC/2006-10-13-Miscompile.ll +++ b/test/CodeGen/PowerPC/2006-10-13-Miscompile.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=ppc32 && -; RUN: llvm-as < %s | llc -march=ppc32 | not grep IMPLICIT_DEF +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep IMPLICIT_DEF void %foo(long %X) { entry: diff --git a/test/CodeGen/PowerPC/2006-10-17-brcc-miscompile.ll b/test/CodeGen/PowerPC/2006-10-17-brcc-miscompile.ll index b8e714eb6a..397ada76c6 100644 --- a/test/CodeGen/PowerPC/2006-10-17-brcc-miscompile.ll +++ b/test/CodeGen/PowerPC/2006-10-17-brcc-miscompile.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=ppc32 | grep xor +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep xor target endian = big target pointersize = 32 diff --git a/test/CodeGen/PowerPC/2006-10-17-ppc64-alloca.ll b/test/CodeGen/PowerPC/2006-10-17-ppc64-alloca.ll index bb46a1bdfc..c981c269dc 100644 --- a/test/CodeGen/PowerPC/2006-10-17-ppc64-alloca.ll +++ b/test/CodeGen/PowerPC/2006-10-17-ppc64-alloca.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=ppc64 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 int * %foo(uint %n) { %A = alloca int, uint %n diff --git a/test/CodeGen/PowerPC/2006-11-29-AltivecFPSplat.ll b/test/CodeGen/PowerPC/2006-11-29-AltivecFPSplat.ll index d74e47e6b6..0411eb5930 100644 --- a/test/CodeGen/PowerPC/2006-11-29-AltivecFPSplat.ll +++ b/test/CodeGen/PowerPC/2006-11-29-AltivecFPSplat.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 void %glgRunProcessor15() { %tmp26355.i = shufflevector <4 x float> zeroinitializer, <4 x float> < float 0x379FFFE000000000, float 0x379FFFE000000000, float 0x379FFFE000000000, float 0x379FFFE000000000 >, <4 x uint> < uint 0, uint 1, uint 2, uint 7 > ; <<4 x float>> [#uses=1] diff --git a/test/CodeGen/PowerPC/Frames-align.ll b/test/CodeGen/PowerPC/Frames-align.ll index 4172bd465b..5eb6c08016 100644 --- a/test/CodeGen/PowerPC/Frames-align.ll +++ b/test/CodeGen/PowerPC/Frames-align.ll @@ -1,6 +1,6 @@ -; RUN: llvm-as < %s | llc -march=ppc32 | grep 'rlwinm r0, r1, 0, 22, 31' && -; RUN: llvm-as < %s | llc -march=ppc32 | grep 'subfic r0, r0, -17408' && -; RUN: llvm-as < %s | llc -march=ppc64 | grep 'rldicl r0, r1, 0, 54' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep 'rlwinm r0, r1, 0, 22, 31' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep 'subfic r0, r0, -17408' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 | grep 'rldicl r0, r1, 0, 54' implementation diff --git a/test/CodeGen/PowerPC/Frames-alloca.ll b/test/CodeGen/PowerPC/Frames-alloca.ll index 0fcae1a522..91d1806826 100644 --- a/test/CodeGen/PowerPC/Frames-alloca.ll +++ b/test/CodeGen/PowerPC/Frames-alloca.ll @@ -1,19 +1,19 @@ -; RUN: llvm-as < %s | llc -march=ppc32 | grep 'stw r31, 20(r1)' && -; RUN: llvm-as < %s | llc -march=ppc32 | grep 'stwu r1, -64(r1)' && -; RUN: llvm-as < %s | llc -march=ppc32 | grep 'lwz r1, 0(r1)' && -; RUN: llvm-as < %s | llc -march=ppc32 | grep 'lwz r31, 20(r1)' && -; RUN: llvm-as < %s | llc -march=ppc32 -disable-fp-elim | grep 'stw r31, 20(r1)' && -; RUN: llvm-as < %s | llc -march=ppc32 -disable-fp-elim | grep 'stwu r1, -64(r1)' && -; RUN: llvm-as < %s | llc -march=ppc32 -disable-fp-elim | grep 'lwz r1, 0(r1)' && -; RUN: llvm-as < %s | llc -march=ppc32 -disable-fp-elim | grep 'lwz r31, 20(r1)' && -; RUN: llvm-as < %s | llc -march=ppc64 | grep 'std r31, 40(r1)' && -; RUN: llvm-as < %s | llc -march=ppc64 | grep 'stdu r1, -112(r1)' && -; RUN: llvm-as < %s | llc -march=ppc64 | grep 'ld r1, 0(r1)' && -; RUN: llvm-as < %s | llc -march=ppc64 | grep 'ld r31, 40(r1)' && -; RUN: llvm-as < %s | llc -march=ppc64 -disable-fp-elim | grep 'std r31, 40(r1)' && -; RUN: llvm-as < %s | llc -march=ppc64 -disable-fp-elim | grep 'stdu r1, -112(r1)' && -; RUN: llvm-as < %s | llc -march=ppc64 -disable-fp-elim | grep 'ld r1, 0(r1)' && -; RUN: llvm-as < %s | llc -march=ppc64 -disable-fp-elim | grep 'ld r31, 40(r1)' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep 'stw r31, 20(r1)' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep 'stwu r1, -64(r1)' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep 'lwz r1, 0(r1)' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep 'lwz r31, 20(r1)' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -disable-fp-elim | grep 'stw r31, 20(r1)' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -disable-fp-elim | grep 'stwu r1, -64(r1)' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -disable-fp-elim | grep 'lwz r1, 0(r1)' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -disable-fp-elim | grep 'lwz r31, 20(r1)' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 | grep 'std r31, 40(r1)' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 | grep 'stdu r1, -112(r1)' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 | grep 'ld r1, 0(r1)' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 | grep 'ld r31, 40(r1)' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 -disable-fp-elim | grep 'std r31, 40(r1)' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 -disable-fp-elim | grep 'stdu r1, -112(r1)' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 -disable-fp-elim | grep 'ld r1, 0(r1)' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 -disable-fp-elim | grep 'ld r31, 40(r1)' implementation diff --git a/test/CodeGen/PowerPC/Frames-large.ll b/test/CodeGen/PowerPC/Frames-large.ll index d41c8cfb6c..ae27010862 100644 --- a/test/CodeGen/PowerPC/Frames-large.ll +++ b/test/CodeGen/PowerPC/Frames-large.ll @@ -1,27 +1,27 @@ -; RUN: llvm-as < %s | llc -march=ppc32 | not grep 'stw r31, 20(r1)' && -; RUN: llvm-as < %s | llc -march=ppc32 | grep 'lis r0, -1' && -; RUN: llvm-as < %s | llc -march=ppc32 | grep 'ori r0, r0, 32704' && -; RUN: llvm-as < %s | llc -march=ppc32 | grep 'stwux r1, r1, r0' && -; RUN: llvm-as < %s | llc -march=ppc32 | grep 'lwz r1, 0(r1)' && -; RUN: llvm-as < %s | llc -march=ppc32 | not grep 'lwz r31, 20(r1)' && -; RUN: llvm-as < %s | llc -march=ppc32 -disable-fp-elim | grep 'stw r31, 20(r1)' && -; RUN: llvm-as < %s | llc -march=ppc32 -disable-fp-elim | grep 'lis r0, -1' && -; RUN: llvm-as < %s | llc -march=ppc32 -disable-fp-elim | grep 'ori r0, r0, 32704' && -; RUN: llvm-as < %s | llc -march=ppc32 -disable-fp-elim | grep 'stwux r1, r1, r0' && -; RUN: llvm-as < %s | llc -march=ppc32 -disable-fp-elim | grep 'lwz r1, 0(r1)' && -; RUN: llvm-as < %s | llc -march=ppc32 -disable-fp-elim | grep 'lwz r31, 20(r1)' && -; RUN: llvm-as < %s | llc -march=ppc64 | not grep 'std r31, 40(r1)' && -; RUN: llvm-as < %s | llc -march=ppc64 | grep 'lis r0, -1' && -; RUN: llvm-as < %s | llc -march=ppc64 | grep 'ori r0, r0, 32656' && -; RUN: llvm-as < %s | llc -march=ppc64 | grep 'stdux r1, r1, r0' && -; RUN: llvm-as < %s | llc -march=ppc64 | grep 'ld r1, 0(r1)' && -; RUN: llvm-as < %s | llc -march=ppc64 | not grep 'ld r31, 40(r1)' && -; RUN: llvm-as < %s | llc -march=ppc64 -disable-fp-elim | grep 'std r31, 40(r1)' && -; RUN: llvm-as < %s | llc -march=ppc64 -disable-fp-elim | grep 'lis r0, -1' && -; RUN: llvm-as < %s | llc -march=ppc64 -disable-fp-elim | grep 'ori r0, r0, 32656' && -; RUN: llvm-as < %s | llc -march=ppc64 -disable-fp-elim | grep 'stdux r1, r1, r0' && -; RUN: llvm-as < %s | llc -march=ppc64 -disable-fp-elim | grep 'ld r1, 0(r1)' && -; RUN: llvm-as < %s | llc -march=ppc64 -disable-fp-elim | grep 'ld r31, 40(r1)' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep 'stw r31, 20(r1)' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep 'lis r0, -1' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep 'ori r0, r0, 32704' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep 'stwux r1, r1, r0' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep 'lwz r1, 0(r1)' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep 'lwz r31, 20(r1)' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -disable-fp-elim | grep 'stw r31, 20(r1)' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -disable-fp-elim | grep 'lis r0, -1' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -disable-fp-elim | grep 'ori r0, r0, 32704' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -disable-fp-elim | grep 'stwux r1, r1, r0' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -disable-fp-elim | grep 'lwz r1, 0(r1)' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -disable-fp-elim | grep 'lwz r31, 20(r1)' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 | not grep 'std r31, 40(r1)' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 | grep 'lis r0, -1' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 | grep 'ori r0, r0, 32656' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 | grep 'stdux r1, r1, r0' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 | grep 'ld r1, 0(r1)' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 | not grep 'ld r31, 40(r1)' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 -disable-fp-elim | grep 'std r31, 40(r1)' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 -disable-fp-elim | grep 'lis r0, -1' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 -disable-fp-elim | grep 'ori r0, r0, 32656' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 -disable-fp-elim | grep 'stdux r1, r1, r0' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 -disable-fp-elim | grep 'ld r1, 0(r1)' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 -disable-fp-elim | grep 'ld r31, 40(r1)' implementation diff --git a/test/CodeGen/PowerPC/Frames-leaf.ll b/test/CodeGen/PowerPC/Frames-leaf.ll index 29a187b396..933ca121ad 100644 --- a/test/CodeGen/PowerPC/Frames-leaf.ll +++ b/test/CodeGen/PowerPC/Frames-leaf.ll @@ -1,19 +1,19 @@ -; RUN: llvm-as < %s | llc -march=ppc32 | not grep 'stw r31, 20(r1)' && -; RUN: llvm-as < %s | llc -march=ppc32 | not grep 'stwu r1, -.*(r1)' && -; RUN: llvm-as < %s | llc -march=ppc32 | not grep 'addi r1, r1, ' && -; RUN: llvm-as < %s | llc -march=ppc32 | not grep 'lwz r31, 20(r1)' && -; RUN: llvm-as < %s | llc -march=ppc32 -disable-fp-elim | not grep 'stw r31, 20(r1)' && -; RUN: llvm-as < %s | llc -march=ppc32 -disable-fp-elim | not grep 'stwu r1, -.*(r1)' && -; RUN: llvm-as < %s | llc -march=ppc32 -disable-fp-elim | not grep 'addi r1, r1, ' && -; RUN: llvm-as < %s | llc -march=ppc32 -disable-fp-elim | not grep 'lwz r31, 20(r1)' && -; RUN: llvm-as < %s | llc -march=ppc64 | not grep 'std r31, 40(r1)' && -; RUN: llvm-as < %s | llc -march=ppc64 | not grep 'stdu r1, -.*(r1)' && -; RUN: llvm-as < %s | llc -march=ppc64 | not grep 'addi r1, r1, ' && -; RUN: llvm-as < %s | llc -march=ppc64 | not grep 'ld r31, 40(r1)' && -; RUN: llvm-as < %s | llc -march=ppc64 -disable-fp-elim | not grep 'stw r31, 40(r1)' && -; RUN: llvm-as < %s | llc -march=ppc64 -disable-fp-elim | not grep 'stdu r1, -.*(r1)' && -; RUN: llvm-as < %s | llc -march=ppc64 -disable-fp-elim | not grep 'addi r1, r1, ' && -; RUN: llvm-as < %s | llc -march=ppc64 -disable-fp-elim | not grep 'ld r31, 40(r1)' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep 'stw r31, 20(r1)' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep 'stwu r1, -.*(r1)' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep 'addi r1, r1, ' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep 'lwz r31, 20(r1)' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -disable-fp-elim | not grep 'stw r31, 20(r1)' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -disable-fp-elim | not grep 'stwu r1, -.*(r1)' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -disable-fp-elim | not grep 'addi r1, r1, ' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -disable-fp-elim | not grep 'lwz r31, 20(r1)' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 | not grep 'std r31, 40(r1)' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 | not grep 'stdu r1, -.*(r1)' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 | not grep 'addi r1, r1, ' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 | not grep 'ld r31, 40(r1)' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 -disable-fp-elim | not grep 'stw r31, 40(r1)' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 -disable-fp-elim | not grep 'stdu r1, -.*(r1)' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 -disable-fp-elim | not grep 'addi r1, r1, ' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 -disable-fp-elim | not grep 'ld r31, 40(r1)' implementation diff --git a/test/CodeGen/PowerPC/Frames-small.ll b/test/CodeGen/PowerPC/Frames-small.ll index 4f29fb43ad..4911142416 100644 --- a/test/CodeGen/PowerPC/Frames-small.ll +++ b/test/CodeGen/PowerPC/Frames-small.ll @@ -1,19 +1,19 @@ -; RUN: llvm-as < %s | llc -march=ppc32 | not grep 'stw r31, 20(r1)' && -; RUN: llvm-as < %s | llc -march=ppc32 | grep 'stwu r1, -16448(r1)' && -; RUN: llvm-as < %s | llc -march=ppc32 | grep 'addi r1, r1, 16448' && -; RUN: llvm-as < %s | llc -march=ppc32 | not grep 'lwz r31, 20(r1)' && -; RUN: llvm-as < %s | llc -march=ppc32 -disable-fp-elim | grep 'stw r31, 20(r1)' && -; RUN: llvm-as < %s | llc -march=ppc32 -disable-fp-elim | grep 'stwu r1, -16448(r1)' && -; RUN: llvm-as < %s | llc -march=ppc32 -disable-fp-elim | grep 'addi r1, r1, 16448' && -; RUN: llvm-as < %s | llc -march=ppc32 -disable-fp-elim | grep 'lwz r31, 20(r1)' && -; RUN: llvm-as < %s | llc -march=ppc64 | not grep 'std r31, 40(r1)' && -; RUN: llvm-as < %s | llc -march=ppc64 | grep 'stdu r1, -16496(r1)' && -; RUN: llvm-as < %s | llc -march=ppc64 | grep 'addi r1, r1, 16496' && -; RUN: llvm-as < %s | llc -march=ppc64 | not grep 'ld r31, 40(r1)' && -; RUN: llvm-as < %s | llc -march=ppc64 -disable-fp-elim | grep 'std r31, 40(r1)' && -; RUN: llvm-as < %s | llc -march=ppc64 -disable-fp-elim | grep 'stdu r1, -16496(r1)' && -; RUN: llvm-as < %s | llc -march=ppc64 -disable-fp-elim | grep 'addi r1, r1, 16496' && -; RUN: llvm-as < %s | llc -march=ppc64 -disable-fp-elim | grep 'ld r31, 40(r1)' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep 'stw r31, 20(r1)' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep 'stwu r1, -16448(r1)' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep 'addi r1, r1, 16448' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep 'lwz r31, 20(r1)' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -disable-fp-elim | grep 'stw r31, 20(r1)' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -disable-fp-elim | grep 'stwu r1, -16448(r1)' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -disable-fp-elim | grep 'addi r1, r1, 16448' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -disable-fp-elim | grep 'lwz r31, 20(r1)' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 | not grep 'std r31, 40(r1)' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 | grep 'stdu r1, -16496(r1)' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 | grep 'addi r1, r1, 16496' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 | not grep 'ld r31, 40(r1)' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 -disable-fp-elim | grep 'std r31, 40(r1)' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 -disable-fp-elim | grep 'stdu r1, -16496(r1)' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 -disable-fp-elim | grep 'addi r1, r1, 16496' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 -disable-fp-elim | grep 'ld r31, 40(r1)' implementation diff --git a/test/CodeGen/PowerPC/addc.ll b/test/CodeGen/PowerPC/addc.ll index dbf19d9f8c..25f38547cc 100644 --- a/test/CodeGen/PowerPC/addc.ll +++ b/test/CodeGen/PowerPC/addc.ll @@ -1,9 +1,9 @@ ; All of these should be codegen'd without loading immediates -; RUN: llvm-as < %s | llc -march=ppc32 | grep addc | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=ppc32 | grep adde | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=ppc32 | grep addze | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=ppc32 | grep addme | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=ppc32 | grep addic | wc -l | grep 2 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep addc | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep adde | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep addze | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep addme | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep addic | wc -l | grep 2 implementation ; Functions: diff --git a/test/CodeGen/PowerPC/addi-reassoc.ll b/test/CodeGen/PowerPC/addi-reassoc.ll index 7dbbfc7c49..7cfbd8653f 100644 --- a/test/CodeGen/PowerPC/addi-reassoc.ll +++ b/test/CodeGen/PowerPC/addi-reassoc.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=ppc32 && -; RUN: llvm-as < %s | llc -march=ppc32 | not grep addi +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep addi %struct.X = type { [5 x sbyte] } implementation ; Functions: diff --git a/test/CodeGen/PowerPC/align.ll b/test/CodeGen/PowerPC/align.ll index e2045d71e8..e74b609168 100644 --- a/test/CodeGen/PowerPC/align.ll +++ b/test/CodeGen/PowerPC/align.ll @@ -1,6 +1,6 @@ -; RUN: llvm-as < %s | llc -march=ppc32 | grep "align.4" | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=ppc32 | grep "align.2" | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=ppc32 | grep "align.3" | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep "align.4" | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep "align.2" | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep "align.3" | wc -l | grep 1 %A = global <4 x uint> < uint 10, uint 20, uint 30, uint 40 > diff --git a/test/CodeGen/PowerPC/and-branch.ll b/test/CodeGen/PowerPC/and-branch.ll index 676e898e3a..ef53d6c314 100644 --- a/test/CodeGen/PowerPC/and-branch.ll +++ b/test/CodeGen/PowerPC/and-branch.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=ppc32 && -; RUN: llvm-as < %s | llc -march=ppc32 | not grep mfcr +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep mfcr void %foo(int %X, int %Y, int %Z) { entry: diff --git a/test/CodeGen/PowerPC/and-elim.ll b/test/CodeGen/PowerPC/and-elim.ll index d49672d8ce..ae1f57d07d 100644 --- a/test/CodeGen/PowerPC/and-elim.ll +++ b/test/CodeGen/PowerPC/and-elim.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=ppc32 && -; RUN: llvm-as < %s | llc -march=ppc32 | not grep rlwin +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep rlwin void %test(ubyte* %P) { %W = load ubyte* %P diff --git a/test/CodeGen/PowerPC/and-imm.ll b/test/CodeGen/PowerPC/and-imm.ll index 09cc1a27a4..e81f7768a6 100644 --- a/test/CodeGen/PowerPC/and-imm.ll +++ b/test/CodeGen/PowerPC/and-imm.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=ppc32 | not grep 'ori\|lis' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep 'ori\|lis' int %test(int %X) { %Y = and int %X, 32769 ; andi. r3, r3, 32769 diff --git a/test/CodeGen/PowerPC/and_add.ll b/test/CodeGen/PowerPC/and_add.ll index c2293c25f3..dc82fc9440 100644 --- a/test/CodeGen/PowerPC/and_add.ll +++ b/test/CodeGen/PowerPC/and_add.ll @@ -1,6 +1,6 @@ -; RUN: llvm-as < %s | llc -march=ppc32 | grep slwi && -; RUN: llvm-as < %s | llc -march=ppc32 | not grep addi && -; RUN: llvm-as < %s | llc -march=ppc32 | not grep rlwinm +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep slwi && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep addi && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep rlwinm int %test(int %A) { %B = mul int %A, 8 ;; shift diff --git a/test/CodeGen/PowerPC/and_sext.ll b/test/CodeGen/PowerPC/and_sext.ll index 78debf3e86..fa7947f373 100644 --- a/test/CodeGen/PowerPC/and_sext.ll +++ b/test/CodeGen/PowerPC/and_sext.ll @@ -1,7 +1,7 @@ ; These tests should not contain a sign extend. -; RUN: llvm-as < %s | llc -march=ppc32 && -; RUN: llvm-as < %s | llc -march=ppc32 | not grep extsh && -; RUN: llvm-as < %s | llc -march=ppc32 | not grep extsb +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep extsh && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep extsb int %test1(uint %mode.0.i.0) { %tmp.79 = cast uint %mode.0.i.0 to short diff --git a/test/CodeGen/PowerPC/and_sra.ll b/test/CodeGen/PowerPC/and_sra.ll index 6b315e1ed3..abfa9f113a 100644 --- a/test/CodeGen/PowerPC/and_sra.ll +++ b/test/CodeGen/PowerPC/and_sra.ll @@ -1,5 +1,5 @@ ; Neither of these functions should contain algebraic right shifts -; RUN: llvm-as < %s | llc -march=ppc32 | not grep srawi +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep srawi int %test1(uint %mode.0.i.0) { %tmp.79 = cast uint %mode.0.i.0 to int ; <sbyte> [#uses=1] diff --git a/test/CodeGen/PowerPC/branch-opt.ll b/test/CodeGen/PowerPC/branch-opt.ll index a8abec5c8b..7f40a2d866 100644 --- a/test/CodeGen/PowerPC/branch-opt.ll +++ b/test/CodeGen/PowerPC/branch-opt.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=ppc32 && -; RUN: llvm-as < %s | llc -march=ppc32 | grep 'b LBB.*cond_next48.loopexit' | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep 'b LBB.*cond_next48.loopexit' | wc -l | grep 1 target endian = big target pointersize = 32 diff --git a/test/CodeGen/PowerPC/bswap-load-store.ll b/test/CodeGen/PowerPC/bswap-load-store.ll index b8668bb6f0..853abc4255 100644 --- a/test/CodeGen/PowerPC/bswap-load-store.ll +++ b/test/CodeGen/PowerPC/bswap-load-store.ll @@ -1,9 +1,9 @@ -; RUN: llvm-as < %s | llc -march=ppc32 | grep 'stwbrx\|lwbrx\|sthbrx\|lhbrx' | wc -l | grep 4 && -; RUN: llvm-as < %s | llc -march=ppc32 | not grep rlwinm && -; RUN: llvm-as < %s | llc -march=ppc32 | not grep rlwimi && -; RUN: llvm-as < %s | llc -march=ppc64 | grep 'stwbrx\|lwbrx\|sthbrx\|lhbrx' | wc -l | grep 4 && -; RUN: llvm-as < %s | llc -march=ppc64 | not grep rlwinm && -; RUN: llvm-as < %s | llc -march=ppc64 | not grep rlwimi +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep 'stwbrx\|lwbrx\|sthbrx\|lhbrx' | wc -l | grep 4 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep rlwinm && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep rlwimi && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 | grep 'stwbrx\|lwbrx\|sthbrx\|lhbrx' | wc -l | grep 4 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 | not grep rlwinm && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 | not grep rlwimi void %STWBRX(uint %i, sbyte* %ptr, int %off) { %tmp1 = getelementptr sbyte* %ptr, int %off diff --git a/test/CodeGen/PowerPC/buildvec_canonicalize.ll b/test/CodeGen/PowerPC/buildvec_canonicalize.ll index c642d42fc4..6e41a59cee 100644 --- a/test/CodeGen/PowerPC/buildvec_canonicalize.ll +++ b/test/CodeGen/PowerPC/buildvec_canonicalize.ll @@ -1,8 +1,8 @@ ; There should be exactly one vxor here. -; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 --enable-unsafe-fp-math | grep vxor | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 --enable-unsafe-fp-math | grep vxor | wc -l | grep 1 && ; There should be exactly one vsplti here. -; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 --enable-unsafe-fp-math | grep vsplti | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 --enable-unsafe-fp-math | grep vsplti | wc -l | grep 1 void %VXOR(<4 x float>* %P1, <4 x int>* %P2, <4 x float>* %P3) { diff --git a/test/CodeGen/PowerPC/calls.ll b/test/CodeGen/PowerPC/calls.ll index 105f470dee..73aa2aa2d4 100644 --- a/test/CodeGen/PowerPC/calls.ll +++ b/test/CodeGen/PowerPC/calls.ll @@ -1,8 +1,8 @@ ; Test various forms of calls. -; RUN: llvm-as < %s | llc -march=ppc32 | grep 'bl ' | wc -l | grep 2 && -; RUN: llvm-as < %s | llc -march=ppc32 | grep 'bctrl' | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=ppc32 | grep 'bla ' | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep 'bl ' | wc -l | grep 2 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep 'bctrl' | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep 'bla ' | wc -l | grep 1 declare void %foo() diff --git a/test/CodeGen/PowerPC/cmp-cmp.ll b/test/CodeGen/PowerPC/cmp-cmp.ll index 5a9e8e8269..d505736005 100644 --- a/test/CodeGen/PowerPC/cmp-cmp.ll +++ b/test/CodeGen/PowerPC/cmp-cmp.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=ppc32 && -; RUN: llvm-as < %s | llc -march=ppc32 | not grep mfcr +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep mfcr void %test(long %X) { %tmp1 = and long %X, 3 ; <long> [#uses=1] diff --git a/test/CodeGen/PowerPC/constants.ll b/test/CodeGen/PowerPC/constants.ll index 7a285ec284..37164cb4c9 100644 --- a/test/CodeGen/PowerPC/constants.ll +++ b/test/CodeGen/PowerPC/constants.ll @@ -1,7 +1,7 @@ ; All of these routines should be perform optimal load of constants. -; RUN: llvm-as < %s | llc -march=ppc32 | grep lis | wc -l | grep 5 && -; RUN: llvm-as < %s | llc -march=ppc32 | grep ori | wc -l | grep 3 && -; RUN: llvm-as < %s | llc -march=ppc32 | grep 'li ' | wc -l | grep 4 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep lis | wc -l | grep 5 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep ori | wc -l | grep 3 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep 'li ' | wc -l | grep 4 implementation ; Functions: diff --git a/test/CodeGen/PowerPC/cttz.ll b/test/CodeGen/PowerPC/cttz.ll index f860456d64..bfb7b5d2f9 100644 --- a/test/CodeGen/PowerPC/cttz.ll +++ b/test/CodeGen/PowerPC/cttz.ll @@ -1,5 +1,5 @@ ; Make sure this testcase does not use ctpop -; RUN: llvm-as < %s | llc -march=ppc32 | grep -i 'cntlzw' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep -i 'cntlzw' declare int %llvm.cttz(int) diff --git a/test/CodeGen/PowerPC/darwin-labels.ll b/test/CodeGen/PowerPC/darwin-labels.ll index 0c803d55f7..8178c8401c 100644 --- a/test/CodeGen/PowerPC/darwin-labels.ll +++ b/test/CodeGen/PowerPC/darwin-labels.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc | grep 'foo bar":' +; RUN: llvm-upgrade < %s | llvm-as | llc | grep 'foo bar":' target endian = big target pointersize = 32 diff --git a/test/CodeGen/PowerPC/div-2.ll b/test/CodeGen/PowerPC/div-2.ll index 50c56a2cae..d89361820a 100644 --- a/test/CodeGen/PowerPC/div-2.ll +++ b/test/CodeGen/PowerPC/div-2.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=ppc32 | not grep srawi && -; RUN: llvm-as < %s | llc -march=ppc32 | grep blr +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep srawi && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep blr int %test1(int %X) { %Y = and int %X, 15 diff --git a/test/CodeGen/PowerPC/eqv-andc-orc-nor.ll b/test/CodeGen/PowerPC/eqv-andc-orc-nor.ll index d2be3c93eb..a2ab4e1a81 100644 --- a/test/CodeGen/PowerPC/eqv-andc-orc-nor.ll +++ b/test/CodeGen/PowerPC/eqv-andc-orc-nor.ll @@ -1,8 +1,8 @@ -; RUN: llvm-as < %s | llc -march=ppc32 | grep eqv | wc -l | grep 3 && -; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | grep andc | wc -l | grep 3 && -; RUN: llvm-as < %s | llc -march=ppc32 | grep orc | wc -l | grep 2 && -; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | grep nor | wc -l | grep 3 && -; RUN: llvm-as < %s | llc -march=ppc32 | grep nand | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep eqv | wc -l | grep 3 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | grep andc | wc -l | grep 3 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep orc | wc -l | grep 2 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | grep nor | wc -l | grep 3 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep nand | wc -l | grep 1 int %EQV1(int %X, int %Y) { %A = xor int %X, %Y diff --git a/test/CodeGen/PowerPC/extsh.ll b/test/CodeGen/PowerPC/extsh.ll index 4ac7735e68..0f4f512a25 100644 --- a/test/CodeGen/PowerPC/extsh.ll +++ b/test/CodeGen/PowerPC/extsh.ll @@ -1,5 +1,5 @@ ; This should turn into a single extsh -; RUN: llvm-as < %s | llc -march=ppc32 | grep extsh | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep extsh | wc -l | grep 1 int %test(int %X) { %tmp.81 = shl int %X, ubyte 16 ; <int> [#uses=1] %tmp.82 = shr int %tmp.81, ubyte 16 ; <int> [#uses=1] diff --git a/test/CodeGen/PowerPC/fma.ll b/test/CodeGen/PowerPC/fma.ll index afc9af4e68..0e10ad3b2f 100644 --- a/test/CodeGen/PowerPC/fma.ll +++ b/test/CodeGen/PowerPC/fma.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=ppc32 | egrep 'fn?madd|fn?msub' | wc -l | grep 8 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | egrep 'fn?madd|fn?msub' | wc -l | grep 8 double %test_FMADD1(double %A, double %B, double %C) { %D = mul double %A, %B diff --git a/test/CodeGen/PowerPC/fnabs.ll b/test/CodeGen/PowerPC/fnabs.ll index af4c2dee38..5d0ef5f66d 100644 --- a/test/CodeGen/PowerPC/fnabs.ll +++ b/test/CodeGen/PowerPC/fnabs.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=ppc32 | grep fnabs +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep fnabs declare double %fabs(double) diff --git a/test/CodeGen/PowerPC/fnegsel.ll b/test/CodeGen/PowerPC/fnegsel.ll index da644536e2..b1b06453aa 100644 --- a/test/CodeGen/PowerPC/fnegsel.ll +++ b/test/CodeGen/PowerPC/fnegsel.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=ppc32 | not grep fneg +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep fneg double %test_FNEG_sel(double %A, double %B, double %C) { %D = sub double -0.0, %A diff --git a/test/CodeGen/PowerPC/fold-li.ll b/test/CodeGen/PowerPC/fold-li.ll index 725f1d4848..d3647753bc 100644 --- a/test/CodeGen/PowerPC/fold-li.ll +++ b/test/CodeGen/PowerPC/fold-li.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=ppc32 && -; RUN: llvm-as < %s | llc -march=ppc32 | grep -v align | not grep li +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep -v align | not grep li ;; Test that immediates are folded into these instructions correctly. diff --git a/test/CodeGen/PowerPC/fp-branch.ll b/test/CodeGen/PowerPC/fp-branch.ll index 3edda73c69..1a371ed09a 100644 --- a/test/CodeGen/PowerPC/fp-branch.ll +++ b/test/CodeGen/PowerPC/fp-branch.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=ppc32 | grep fcmp | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep fcmp | wc -l | grep 1 declare bool %llvm.isunordered.f64(double, double) diff --git a/test/CodeGen/PowerPC/fp-int-fp.ll b/test/CodeGen/PowerPC/fp-int-fp.ll index 93ca94745f..bcea406ab7 100644 --- a/test/CodeGen/PowerPC/fp-int-fp.ll +++ b/test/CodeGen/PowerPC/fp-int-fp.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 && -; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | not grep r1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | not grep r1 double %test1(double %X) { %Y = cast double %X to long diff --git a/test/CodeGen/PowerPC/fp_to_uint.ll b/test/CodeGen/PowerPC/fp_to_uint.ll index 44d6e9092b..83468a42b8 100644 --- a/test/CodeGen/PowerPC/fp_to_uint.ll +++ b/test/CodeGen/PowerPC/fp_to_uint.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=ppc32 | grep fctiwz | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep fctiwz | wc -l | grep 1 implementation diff --git a/test/CodeGen/PowerPC/fpcopy.ll b/test/CodeGen/PowerPC/fpcopy.ll index 00f2e48a6a..43087bd56d 100644 --- a/test/CodeGen/PowerPC/fpcopy.ll +++ b/test/CodeGen/PowerPC/fpcopy.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=ppc32 && -; RUN: llvm-as < %s | llc -march=ppc32 | not grep fmr +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep fmr double %test(float %F) { %F = cast float %F to double diff --git a/test/CodeGen/PowerPC/fsqrt.ll b/test/CodeGen/PowerPC/fsqrt.ll index 29eed4edac..87eaebbf0b 100644 --- a/test/CodeGen/PowerPC/fsqrt.ll +++ b/test/CodeGen/PowerPC/fsqrt.ll @@ -1,10 +1,10 @@ ; fsqrt should be generated when the fsqrt feature is enabled, but not ; otherwise. -; RUN: llvm-as < %s | llc -march=ppc32 -mattr=+fsqrt | grep 'fsqrt f1, f1' && -; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | grep 'fsqrt f1, f1' && -; RUN: llvm-as < %s | llc -march=ppc32 -mattr=-fsqrt | not grep 'fsqrt f1, f1' && -; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g4 | not grep 'fsqrt f1, f1' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mattr=+fsqrt | grep 'fsqrt f1, f1' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | grep 'fsqrt f1, f1' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mattr=-fsqrt | not grep 'fsqrt f1, f1' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g4 | not grep 'fsqrt f1, f1' declare double %llvm.sqrt(double) double %X(double %Y) { diff --git a/test/CodeGen/PowerPC/i64_fp.ll b/test/CodeGen/PowerPC/i64_fp.ll index 54ccab4ce9..0c76bbd2ee 100644 --- a/test/CodeGen/PowerPC/i64_fp.ll +++ b/test/CodeGen/PowerPC/i64_fp.ll @@ -1,14 +1,14 @@ ; fcfid and fctid should be generated when the 64bit feature is enabled, but not ; otherwise. -; RUN: llvm-as < %s | llc -march=ppc32 -mattr=+64bit | grep 'fcfid' && -; RUN: llvm-as < %s | llc -march=ppc32 -mattr=+64bit | grep 'fctidz' && -; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | grep 'fcfid' && -; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | grep 'fctidz' && -; RUN: llvm-as < %s | llc -march=ppc32 -mattr=-64bit | not grep 'fcfid' && -; RUN: llvm-as < %s | llc -march=ppc32 -mattr=-64bit | not grep 'fctidz' && -; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g4 | not grep 'fcfid' && -; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g4 | not grep 'fctidz' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mattr=+64bit | grep 'fcfid' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mattr=+64bit | grep 'fctidz' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | grep 'fcfid' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | grep 'fctidz' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mattr=-64bit | not grep 'fcfid' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mattr=-64bit | not grep 'fctidz' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g4 | not grep 'fcfid' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g4 | not grep 'fctidz' double %X(double %Y) { %A = cast double %Y to long diff --git a/test/CodeGen/PowerPC/inlineasm-copy.ll b/test/CodeGen/PowerPC/inlineasm-copy.ll index 60775e3c25..8b6aa3331a 100644 --- a/test/CodeGen/PowerPC/inlineasm-copy.ll +++ b/test/CodeGen/PowerPC/inlineasm-copy.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=ppc32 && -; RUN: llvm-as < %s | llc -march=ppc32 | not grep mr +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep mr int %test(int %Y, int %X) { entry: diff --git a/test/CodeGen/PowerPC/inverted-bool-compares.ll b/test/CodeGen/PowerPC/inverted-bool-compares.ll index c51f267312..6c5c288a2b 100644 --- a/test/CodeGen/PowerPC/inverted-bool-compares.ll +++ b/test/CodeGen/PowerPC/inverted-bool-compares.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=ppc32 | not grep xori && -; RUN: llvm-as < %s | llc -march=ppc32 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep xori && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 int %test(bool %B, int* %P) { br bool %B, label %T, label %F diff --git a/test/CodeGen/PowerPC/lha.ll b/test/CodeGen/PowerPC/lha.ll index 158e75ec5a..cc35e8ab9e 100644 --- a/test/CodeGen/PowerPC/lha.ll +++ b/test/CodeGen/PowerPC/lha.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=ppc32 | grep lha +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep lha uint %test(short* %a) { %tmp.1 = load short* %a diff --git a/test/CodeGen/PowerPC/load-constant-addr.ll b/test/CodeGen/PowerPC/load-constant-addr.ll index c4d8f972bc..d7e3d454e4 100644 --- a/test/CodeGen/PowerPC/load-constant-addr.ll +++ b/test/CodeGen/PowerPC/load-constant-addr.ll @@ -1,6 +1,6 @@ ; Should fold the ori into the lfs. -; RUN: llvm-as < %s | llc -march=ppc32 | grep lfs && -; RUN: llvm-as < %s | llc -march=ppc32 | not grep ori +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep lfs && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep ori float %test() { %tmp.i = load float* cast (uint 186018016 to float*) diff --git a/test/CodeGen/PowerPC/mem-rr-addr-mode.ll b/test/CodeGen/PowerPC/mem-rr-addr-mode.ll index 4cb3808109..5d8a3a1a01 100644 --- a/test/CodeGen/PowerPC/mem-rr-addr-mode.ll +++ b/test/CodeGen/PowerPC/mem-rr-addr-mode.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | grep 'li.*16' && -; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | not grep addi +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | grep 'li.*16' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | not grep addi ; Codegen lvx (R+16) as t = li 16, lvx t,R ; This shares the 16 between the two loads. diff --git a/test/CodeGen/PowerPC/mem_update.ll b/test/CodeGen/PowerPC/mem_update.ll index 935740643f..2a8f83fbd3 100644 --- a/test/CodeGen/PowerPC/mem_update.ll +++ b/test/CodeGen/PowerPC/mem_update.ll @@ -1,7 +1,7 @@ -; RUN: llvm-as < %s | llc -march=ppc32 -enable-ppc-preinc && -; RUN: llvm-as < %s | llc -march=ppc32 -enable-ppc-preinc | not grep addi && -; RUN: llvm-as < %s | llc -march=ppc64 -enable-ppc-preinc && -; RUN: llvm-as < %s | llc -march=ppc64 -enable-ppc-preinc | not grep addi +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -enable-ppc-preinc && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -enable-ppc-preinc | not grep addi && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 -enable-ppc-preinc && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 -enable-ppc-preinc | not grep addi %Glob = global ulong 4 int *%test0(int *%X, int *%dest) { diff --git a/test/CodeGen/PowerPC/mul-neg-power-2.ll b/test/CodeGen/PowerPC/mul-neg-power-2.ll index 9b784e361f..cb1f46c672 100644 --- a/test/CodeGen/PowerPC/mul-neg-power-2.ll +++ b/test/CodeGen/PowerPC/mul-neg-power-2.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=ppc32 && -; RUN: llvm-as < %s | llc -march=ppc32 | not grep mul +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep mul int %test1(int %a) { %tmp.1 = mul int %a, -2 ; <int> [#uses=1] diff --git a/test/CodeGen/PowerPC/mulhs.ll b/test/CodeGen/PowerPC/mulhs.ll index 309102a1fa..e5e25e99f4 100644 --- a/test/CodeGen/PowerPC/mulhs.ll +++ b/test/CodeGen/PowerPC/mulhs.ll @@ -1,8 +1,8 @@ ; All of these ands and shifts should be folded into rlwimi's -; RUN: llvm-as < %s | llc -march=ppc32 | not grep mulhwu && -; RUN: llvm-as < %s | llc -march=ppc32 | not grep srawi && -; RUN: llvm-as < %s | llc -march=ppc32 | not grep add && -; RUN: llvm-as < %s | llc -march=ppc32 | grep mulhw | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep mulhwu && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep srawi && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep add && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep mulhw | wc -l | grep 1 implementation ; Functions: diff --git a/test/CodeGen/PowerPC/neg.ll b/test/CodeGen/PowerPC/neg.ll index 59e14dbd70..7119f6c0da 100644 --- a/test/CodeGen/PowerPC/neg.ll +++ b/test/CodeGen/PowerPC/neg.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=ppc32 | grep neg +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep neg int %test(int %X) { %Y = sub int 0, %X diff --git a/test/CodeGen/PowerPC/or-addressing-mode.ll b/test/CodeGen/PowerPC/or-addressing-mode.ll index 0d4fd965e8..9c1d949505 100644 --- a/test/CodeGen/PowerPC/or-addressing-mode.ll +++ b/test/CodeGen/PowerPC/or-addressing-mode.ll @@ -1,6 +1,6 @@ -; RUN: llvm-as < %s | llc && -; RUN: llvm-as < %s | llc | not grep ori && -; RUN: llvm-as < %s | llc | not grep rlwimi +; RUN: llvm-upgrade < %s | llvm-as | llc && +; RUN: llvm-upgrade < %s | llvm-as | llc | not grep ori && +; RUN: llvm-upgrade < %s | llvm-as | llc | not grep rlwimi int %test1(sbyte* %P) { ;; or -> lwzx %tmp.2.i = cast sbyte* %P to uint diff --git a/test/CodeGen/PowerPC/reg-coalesce-simple.ll b/test/CodeGen/PowerPC/reg-coalesce-simple.ll index bc14a2d86c..5f3049d221 100644 --- a/test/CodeGen/PowerPC/reg-coalesce-simple.ll +++ b/test/CodeGen/PowerPC/reg-coalesce-simple.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=ppc32 && -; RUN: llvm-as < %s | llc -march=ppc32 | not grep or +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep or %struct.foo = type { int, int, [0 x ubyte] } int %test(%struct.foo* %X) { diff --git a/test/CodeGen/PowerPC/rlwimi-commute.ll b/test/CodeGen/PowerPC/rlwimi-commute.ll index e6719ebd87..4b2b07f335 100644 --- a/test/CodeGen/PowerPC/rlwimi-commute.ll +++ b/test/CodeGen/PowerPC/rlwimi-commute.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=ppc32 | grep rlwimi && -; RUN: llvm-as < %s | llc -march=ppc32 | not grep 'or ' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep rlwimi && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep 'or ' ; Make sure there is no register-register copies here. diff --git a/test/CodeGen/PowerPC/rlwimi.ll b/test/CodeGen/PowerPC/rlwimi.ll index 7736062903..3b5816b5a0 100644 --- a/test/CodeGen/PowerPC/rlwimi.ll +++ b/test/CodeGen/PowerPC/rlwimi.ll @@ -1,6 +1,6 @@ ; All of these ands and shifts should be folded into rlwimi's -; RUN: llvm-as < %s | llc -march=ppc32 | not grep and && -; RUN: llvm-as < %s | llc -march=ppc32 | grep rlwimi | wc -l | grep 8 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep and && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep rlwimi | wc -l | grep 8 implementation ; Functions: diff --git a/test/CodeGen/PowerPC/rlwimi2.ll b/test/CodeGen/PowerPC/rlwimi2.ll index 0ec630dd99..966705dcff 100644 --- a/test/CodeGen/PowerPC/rlwimi2.ll +++ b/test/CodeGen/PowerPC/rlwimi2.ll @@ -1,7 +1,7 @@ ; All of these ands and shifts should be folded into rlwimi's -; RUN: llvm-as < %s | llc -march=ppc32 | grep rlwimi | wc -l | grep 3 && -; RUN: llvm-as < %s | llc -march=ppc32 | grep srwi | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=ppc32 | not grep slwi +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep rlwimi | wc -l | grep 3 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep srwi | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep slwi implementation ; Functions: diff --git a/test/CodeGen/PowerPC/rlwimi3.ll b/test/CodeGen/PowerPC/rlwimi3.ll index a55d88ba1c..44bc034237 100644 --- a/test/CodeGen/PowerPC/rlwimi3.ll +++ b/test/CodeGen/PowerPC/rlwimi3.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=ppc32 -stats 2>&1 | grep 'Number of machine instrs printed' | grep 12 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -stats 2>&1 | grep 'Number of machine instrs printed' | grep 12 ushort %Trans16Bit(uint %srcA, uint %srcB, uint %alpha) { %tmp1 = shl uint %srcA, ubyte 15 ; <uint> [#uses=1] diff --git a/test/CodeGen/PowerPC/rlwinm.ll b/test/CodeGen/PowerPC/rlwinm.ll index b16b9051dd..45f26d77dd 100644 --- a/test/CodeGen/PowerPC/rlwinm.ll +++ b/test/CodeGen/PowerPC/rlwinm.ll @@ -1,9 +1,9 @@ ; All of these ands and shifts should be folded into rlwimi's -; RUN: llvm-as < %s | llc -march=ppc32 | not grep and && -; RUN: llvm-as < %s | llc -march=ppc32 | not grep srawi && -; RUN: llvm-as < %s | llc -march=ppc32 | not grep srwi && -; RUN: llvm-as < %s | llc -march=ppc32 | not grep slwi && -; RUN: llvm-as < %s | llc -march=ppc32 | grep rlwinm | wc -l | grep 8 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep and && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep srawi && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep srwi && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep slwi && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep rlwinm | wc -l | grep 8 implementation ; Functions: diff --git a/test/CodeGen/PowerPC/rlwinm2.ll b/test/CodeGen/PowerPC/rlwinm2.ll index 8a789ee6e6..70ad636e3b 100644 --- a/test/CodeGen/PowerPC/rlwinm2.ll +++ b/test/CodeGen/PowerPC/rlwinm2.ll @@ -1,10 +1,10 @@ ; All of these ands and shifts should be folded into rlw[i]nm instructions -; RUN: llvm-as < %s | llc -march=ppc32 | not grep and && -; RUN: llvm-as < %s | llc -march=ppc32 | not grep srawi && -; RUN: llvm-as < %s | llc -march=ppc32 | not grep srwi && -; RUN: llvm-as < %s | llc -march=ppc32 | not grep slwi && -; RUN: llvm-as < %s | llc -march=ppc32 | grep rlwnm | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=ppc32 | grep rlwinm | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep and && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep srawi && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep srwi && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep slwi && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep rlwnm | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep rlwinm | wc -l | grep 1 implementation ; Functions: diff --git a/test/CodeGen/PowerPC/rotl.ll b/test/CodeGen/PowerPC/rotl.ll index 76a998942f..fc3a6bc6ac 100644 --- a/test/CodeGen/PowerPC/rotl.ll +++ b/test/CodeGen/PowerPC/rotl.ll @@ -1,6 +1,6 @@ -; RUN: llvm-as < %s | llc -march=ppc32 | not grep or && -; RUN: llvm-as < %s | llc -march=ppc32 | grep rlwnm | wc -l | grep 2 && -; RUN: llvm-as < %s | llc -march=ppc32 | grep rlwinm | wc -l | grep 2 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep or && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep rlwnm | wc -l | grep 2 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep rlwinm | wc -l | grep 2 implementation ; Functions: diff --git a/test/CodeGen/PowerPC/select_lt0.ll b/test/CodeGen/PowerPC/select_lt0.ll index 676c27fe57..bb5213f946 100644 --- a/test/CodeGen/PowerPC/select_lt0.ll +++ b/test/CodeGen/PowerPC/select_lt0.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=ppc32 | not grep cmp +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep cmp int %seli32_1(int %a) { entry: diff --git a/test/CodeGen/PowerPC/setcc_no_zext.ll b/test/CodeGen/PowerPC/setcc_no_zext.ll index e751717e65..00e9bf0710 100644 --- a/test/CodeGen/PowerPC/setcc_no_zext.ll +++ b/test/CodeGen/PowerPC/setcc_no_zext.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=ppc32 | not grep rlwinm +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep rlwinm int %setcc_one_or_zero(int* %a) { entry: diff --git a/test/CodeGen/PowerPC/seteq-0.ll b/test/CodeGen/PowerPC/seteq-0.ll index 292cccf1ee..db57064d03 100644 --- a/test/CodeGen/PowerPC/seteq-0.ll +++ b/test/CodeGen/PowerPC/seteq-0.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=ppc32 | grep 'srwi r., r., 5' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep 'srwi r., r., 5' int %eq0(int %a) { %tmp.1 = seteq int %a, 0 ; <bool> [#uses=1] diff --git a/test/CodeGen/PowerPC/shl_sext.ll b/test/CodeGen/PowerPC/shl_sext.ll index 60fcda58f9..af18338f4b 100644 --- a/test/CodeGen/PowerPC/shl_sext.ll +++ b/test/CodeGen/PowerPC/shl_sext.ll @@ -1,5 +1,5 @@ ; This test should not contain a sign extend -; RUN: llvm-as < %s | llc -march=ppc32 | not grep extsb +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep extsb int %test(uint %mode.0.i.0) { %tmp.79 = cast uint %mode.0.i.0 to sbyte ; <sbyte> [#uses=1] diff --git a/test/CodeGen/PowerPC/small-arguments.ll b/test/CodeGen/PowerPC/small-arguments.ll index a4a886b09a..40217f6556 100644 --- a/test/CodeGen/PowerPC/small-arguments.ll +++ b/test/CodeGen/PowerPC/small-arguments.ll @@ -1,6 +1,6 @@ -; RUN: llvm-as < %s | llc -march=ppc32 && -; RUN: llvm-as < %s | llc -march=ppc32 | not grep 'extsh\|rlwinm' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep 'extsh\|rlwinm' declare short %foo() diff --git a/test/CodeGen/PowerPC/stfiwx.ll b/test/CodeGen/PowerPC/stfiwx.ll index acc9c67aaf..dc0bed8d52 100644 --- a/test/CodeGen/PowerPC/stfiwx.ll +++ b/test/CodeGen/PowerPC/stfiwx.ll @@ -1,7 +1,7 @@ -; RUN: llvm-as < %s | llc -march=ppc32 -mattr=stfiwx | grep stfiwx && -; RUN: llvm-as < %s | llc -march=ppc32 -mattr=stfiwx | not grep r1 && -; RUN: llvm-as < %s | llc -march=ppc32 -mattr=-stfiwx | not grep stfiwx && -; RUN: llvm-as < %s | llc -march=ppc32 -mattr=-stfiwx | grep r1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mattr=stfiwx | grep stfiwx && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mattr=stfiwx | not grep r1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mattr=-stfiwx | not grep stfiwx && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mattr=-stfiwx | grep r1 void %test(float %a, int* %b) { %tmp.2 = cast float %a to int diff --git a/test/CodeGen/PowerPC/store-load-fwd.ll b/test/CodeGen/PowerPC/store-load-fwd.ll index 8ebd02b79f..d4a8a543d1 100644 --- a/test/CodeGen/PowerPC/store-load-fwd.ll +++ b/test/CodeGen/PowerPC/store-load-fwd.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=ppc32 && -; RUN: llvm-as < %s | llc -march=ppc32 | not grep lwz +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep lwz int %test(int* %P) { store int 1, int* %P %V = load int* %P diff --git a/test/CodeGen/PowerPC/subc.ll b/test/CodeGen/PowerPC/subc.ll index 697a9341cf..36e1c0a370 100644 --- a/test/CodeGen/PowerPC/subc.ll +++ b/test/CodeGen/PowerPC/subc.ll @@ -1,9 +1,9 @@ ; All of these should be codegen'd without loading immediates -; RUN: llvm-as < %s | llc -march=ppc32 | grep subfc | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=ppc32 | grep subfe | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=ppc32 | grep subfze | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=ppc32 | grep subfme | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=ppc32 | grep subfic | wc -l | grep 2 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep subfc | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep subfe | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep subfze | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep subfme | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep subfic | wc -l | grep 2 implementation ; Functions: long %sub_ll(long %a, long %b) { diff --git a/test/CodeGen/PowerPC/vcmp-fold.ll b/test/CodeGen/PowerPC/vcmp-fold.ll index 04698d7d20..6ae41a980c 100644 --- a/test/CodeGen/PowerPC/vcmp-fold.ll +++ b/test/CodeGen/PowerPC/vcmp-fold.ll @@ -1,6 +1,6 @@ ; This should fold the "vcmpbfp." and "vcmpbfp" instructions into a single ; "vcmpbfp.". -; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | grep vcmpbfp | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | grep vcmpbfp | wc -l | grep 1 void %test(<4 x float>* %x, <4 x float>* %y, int* %P) { entry: diff --git a/test/CodeGen/PowerPC/vec_br_cmp.ll b/test/CodeGen/PowerPC/vec_br_cmp.ll index 3ce99aa54a..62a9552f08 100644 --- a/test/CodeGen/PowerPC/vec_br_cmp.ll +++ b/test/CodeGen/PowerPC/vec_br_cmp.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | grep vcmpeqfp. && -; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | not grep mfcr +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | grep vcmpeqfp. && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | not grep mfcr ; A predicate compare used immediately by a branch should not generate an mfcr. diff --git a/test/CodeGen/PowerPC/vec_call.ll b/test/CodeGen/PowerPC/vec_call.ll index 5f8faee510..b2b91fe3f4 100644 --- a/test/CodeGen/PowerPC/vec_call.ll +++ b/test/CodeGen/PowerPC/vec_call.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 <4 x int> %test_arg(<4 x int> %A, <4 x int> %B) { %C = add <4 x int> %A, %B diff --git a/test/CodeGen/PowerPC/vec_constants.ll b/test/CodeGen/PowerPC/vec_constants.ll index 59b7f7f6c6..9d51e3c682 100644 --- a/test/CodeGen/PowerPC/vec_constants.ll +++ b/test/CodeGen/PowerPC/vec_constants.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 && -; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | not grep CPI +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | not grep CPI ; Tests spltw(0x80000000) and spltw(0x7FFFFFFF). diff --git a/test/CodeGen/PowerPC/vec_mul.ll b/test/CodeGen/PowerPC/vec_mul.ll index f1d1b2cef7..1f571f4486 100644 --- a/test/CodeGen/PowerPC/vec_mul.ll +++ b/test/CodeGen/PowerPC/vec_mul.ll @@ -1,6 +1,6 @@ -; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 && -; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | not grep mullw && -; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | grep vmsumuhm +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | not grep mullw && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | grep vmsumuhm <4 x int> %test_v4i32(<4 x int>* %X, <4 x int>* %Y) { %tmp = load <4 x int>* %X diff --git a/test/CodeGen/PowerPC/vec_perf_shuffle.ll b/test/CodeGen/PowerPC/vec_perf_shuffle.ll index 4bae1c4a76..4f67f83f7e 100644 --- a/test/CodeGen/PowerPC/vec_perf_shuffle.ll +++ b/test/CodeGen/PowerPC/vec_perf_shuffle.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 && -; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | not grep vperm +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | not grep vperm <4 x float> %test_uu72(<4 x float> *%P1, <4 x float> *%P2) { %V1 = load <4 x float> *%P1 diff --git a/test/CodeGen/PowerPC/vec_shuffle.ll b/test/CodeGen/PowerPC/vec_shuffle.ll index cfb7396f82..8e64aacb94 100644 --- a/test/CodeGen/PowerPC/vec_shuffle.ll +++ b/test/CodeGen/PowerPC/vec_shuffle.ll @@ -1,9 +1,9 @@ -; RUN: llvm-as < %s | opt -instcombine | llc -march=ppc32 -mcpu=g5 | not grep vperm && -; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | grep vsldoi | wc -l | grep 2 && -; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | grep vmrgh | wc -l | grep 7 && -; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | grep vmrgl | wc -l | grep 6 && -; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | grep vpkuhum | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | grep vpkuwum | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llc -march=ppc32 -mcpu=g5 | not grep vperm && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | grep vsldoi | wc -l | grep 2 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | grep vmrgh | wc -l | grep 7 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | grep vmrgl | wc -l | grep 6 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | grep vpkuhum | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | grep vpkuwum | wc -l | grep 1 void %VSLDOI_xy(<8 x short>* %A, <8 x short>* %B) { entry: diff --git a/test/CodeGen/PowerPC/vec_spat.ll b/test/CodeGen/PowerPC/vec_spat.ll index f6587b010e..fb25402b17 100644 --- a/test/CodeGen/PowerPC/vec_spat.ll +++ b/test/CodeGen/PowerPC/vec_spat.ll @@ -1,8 +1,8 @@ ; Test that vectors are scalarized/lowered correctly. -; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | grep vspltw | wc -l | grep 2 && -; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g3 | grep stfs | wc -l | grep 4 && -; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | grep vsplti | wc -l | grep 3 && -; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | grep vsplth | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | grep vspltw | wc -l | grep 2 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g3 | grep stfs | wc -l | grep 4 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | grep vsplti | wc -l | grep 3 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | grep vsplth | wc -l | grep 1 %f4 = type <4 x float> %i4 = type <4 x int> diff --git a/test/CodeGen/PowerPC/vec_vrsave.ll b/test/CodeGen/PowerPC/vec_vrsave.ll index 4cf0e48386..936580aa79 100644 --- a/test/CodeGen/PowerPC/vec_vrsave.ll +++ b/test/CodeGen/PowerPC/vec_vrsave.ll @@ -1,6 +1,6 @@ -; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | grep vrlw && -; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | not grep spr && -; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | not grep vrsave +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | grep vrlw && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | not grep spr && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | not grep vrsave <4 x int> %test_rol() { ret <4 x int> < int -11534337, int -11534337, int -11534337, int -11534337 > diff --git a/test/CodeGen/PowerPC/vec_zero.ll b/test/CodeGen/PowerPC/vec_zero.ll index 09f6e37a53..c845c0e8db 100644 --- a/test/CodeGen/PowerPC/vec_zero.ll +++ b/test/CodeGen/PowerPC/vec_zero.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=ppc32 -mcpu=g5 | grep vxor +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | grep vxor void %foo(<4 x float> *%P) { %T = load <4 x float> * %P diff --git a/test/CodeGen/SPARC/2006-01-22-BitConvertLegalize.ll b/test/CodeGen/SPARC/2006-01-22-BitConvertLegalize.ll index b7238ee23b..d93c839bee 100644 --- a/test/CodeGen/SPARC/2006-01-22-BitConvertLegalize.ll +++ b/test/CodeGen/SPARC/2006-01-22-BitConvertLegalize.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=sparc +; RUN: llvm-upgrade < %s | llvm-as | llc -march=sparc void %execute_list() { %tmp.33.i = div float 0.000000e+00, 0.000000e+00 ; <float> [#uses=1] diff --git a/test/CodeGen/SPARC/basictest.ll b/test/CodeGen/SPARC/basictest.ll index 274f2ce80b..11bbe16bb1 100644 --- a/test/CodeGen/SPARC/basictest.ll +++ b/test/CodeGen/SPARC/basictest.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=sparc +; RUN: llvm-upgrade < %s | llvm-as | llc -march=sparc int %test(int %X) { %tmp.1 = add int %X, 1 ; <int> [#uses=1] diff --git a/test/CodeGen/SPARC/ctpop.ll b/test/CodeGen/SPARC/ctpop.ll index ffe00fcc40..ea88bd2fbc 100644 --- a/test/CodeGen/SPARC/ctpop.ll +++ b/test/CodeGen/SPARC/ctpop.ll @@ -1,7 +1,7 @@ -; RUN: llvm-as < %s | llc -march=sparc -mattr=-v9 && -; RUN: llvm-as < %s | llc -march=sparc -mattr=v9 -enable-sparc-v9-insts && -; RUN: llvm-as < %s | llc -march=sparc -mattr=-v9 | not grep popc && -; RUN: llvm-as < %s | llc -march=sparc -mattr=v9 -enable-sparc-v9-insts | grep popc +; RUN: llvm-upgrade < %s | llvm-as | llc -march=sparc -mattr=-v9 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=sparc -mattr=v9 -enable-sparc-v9-insts && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=sparc -mattr=-v9 | not grep popc && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=sparc -mattr=v9 -enable-sparc-v9-insts | grep popc declare uint %llvm.ctpop.i32(uint) uint %test(uint %X) { diff --git a/test/CodeGen/SPARC/xnor.ll b/test/CodeGen/SPARC/xnor.ll index 3a06a415c2..c3b8010595 100644 --- a/test/CodeGen/SPARC/xnor.ll +++ b/test/CodeGen/SPARC/xnor.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=sparc && -; RUN: llvm-as < %s | llc -march=sparc | grep xnor | wc -l | grep 2 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=sparc && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=sparc | grep xnor | wc -l | grep 2 int %test1(int %X, int %Y) { %A = xor int %X, %Y diff --git a/test/CodeGen/X86/2002-12-23-LocalRAProblem.llx b/test/CodeGen/X86/2002-12-23-LocalRAProblem.llx index afdd20209c..f79781cb7b 100644 --- a/test/CodeGen/X86/2002-12-23-LocalRAProblem.llx +++ b/test/CodeGen/X86/2002-12-23-LocalRAProblem.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 -regalloc=simple +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -regalloc=simple int %main() { %A = add int 0, 0 ; %A = 0 diff --git a/test/CodeGen/X86/2002-12-23-SubProblem.llx b/test/CodeGen/X86/2002-12-23-SubProblem.llx index 744db0ff1b..3d89378609 100644 --- a/test/CodeGen/X86/2002-12-23-SubProblem.llx +++ b/test/CodeGen/X86/2002-12-23-SubProblem.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 -regalloc=simple +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -regalloc=simple int %main(int %B) { ;%B = add int 0, 1 diff --git a/test/CodeGen/X86/2003-08-03-CallArgLiveRanges.llx b/test/CodeGen/X86/2003-08-03-CallArgLiveRanges.llx index 34232b9884..77ac17bc30 100644 --- a/test/CodeGen/X86/2003-08-03-CallArgLiveRanges.llx +++ b/test/CodeGen/X86/2003-08-03-CallArgLiveRanges.llx @@ -3,7 +3,7 @@ ; it makes a ton of annoying overlapping live ranges. This code should not ; cause spills! ; -; RUN: llvm-as < %s | llc -march=x86 -stats 2>&1 | not grep spilled +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -stats 2>&1 | not grep spilled target endian = little target pointersize = 32 diff --git a/test/CodeGen/X86/2003-08-23-DeadBlockTest.llx b/test/CodeGen/X86/2003-08-23-DeadBlockTest.llx index 9efbf09b42..48623b9012 100644 --- a/test/CodeGen/X86/2003-08-23-DeadBlockTest.llx +++ b/test/CodeGen/X86/2003-08-23-DeadBlockTest.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 implementation diff --git a/test/CodeGen/X86/2003-11-03-GlobalBool.llx b/test/CodeGen/X86/2003-11-03-GlobalBool.llx index c9e4bb5865..64236853e4 100644 --- a/test/CodeGen/X86/2003-11-03-GlobalBool.llx +++ b/test/CodeGen/X86/2003-11-03-GlobalBool.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 | not grep '.byte[[:space:]]*true' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep '.byte[[:space:]]*true' %X = global bool true diff --git a/test/CodeGen/X86/2004-02-12-Memcpy.llx b/test/CodeGen/X86/2004-02-12-Memcpy.llx index 13b4bf3112..ab40343258 100644 --- a/test/CodeGen/X86/2004-02-12-Memcpy.llx +++ b/test/CodeGen/X86/2004-02-12-Memcpy.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 | grep movs +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep movs declare sbyte* %llvm.memcpy(sbyte* %A, sbyte* %B, uint %amt, uint %align) %A = global [1000 x int] zeroinitializer diff --git a/test/CodeGen/X86/2004-02-13-FrameReturnAddress.llx b/test/CodeGen/X86/2004-02-13-FrameReturnAddress.llx index d6140caedc..3eec89a032 100644 --- a/test/CodeGen/X86/2004-02-13-FrameReturnAddress.llx +++ b/test/CodeGen/X86/2004-02-13-FrameReturnAddress.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 | grep '(%esp' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep '(%esp' declare sbyte* %llvm.returnaddress(uint) declare sbyte* %llvm.frameaddress(uint) diff --git a/test/CodeGen/X86/2004-02-14-InefficientStackPointer.llx b/test/CodeGen/X86/2004-02-14-InefficientStackPointer.llx index f7e4cc8486..69e4c1d011 100644 --- a/test/CodeGen/X86/2004-02-14-InefficientStackPointer.llx +++ b/test/CodeGen/X86/2004-02-14-InefficientStackPointer.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 | grep ESP | not grep sub +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep ESP | not grep sub int %test(int %X) { ret int %X diff --git a/test/CodeGen/X86/2004-02-22-Casts.llx b/test/CodeGen/X86/2004-02-22-Casts.llx index da860ab941..8f5f5f8671 100644 --- a/test/CodeGen/X86/2004-02-22-Casts.llx +++ b/test/CodeGen/X86/2004-02-22-Casts.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 bool %test1(double %X) { %V = cast double %X to bool diff --git a/test/CodeGen/X86/2004-03-30-Select-Max.llx b/test/CodeGen/X86/2004-03-30-Select-Max.llx index 292762a7eb..5ae8be2b31 100644 --- a/test/CodeGen/X86/2004-03-30-Select-Max.llx +++ b/test/CodeGen/X86/2004-03-30-Select-Max.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 | not grep 'j[lgbe]' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep 'j[lgbe]' int %max(int %A, int %B) { %gt = setgt int %A, %B diff --git a/test/CodeGen/X86/2004-04-09-SameValueCoalescing.llx b/test/CodeGen/X86/2004-04-09-SameValueCoalescing.llx index 981df5a97c..83434f99fc 100644 --- a/test/CodeGen/X86/2004-04-09-SameValueCoalescing.llx +++ b/test/CodeGen/X86/2004-04-09-SameValueCoalescing.llx @@ -2,7 +2,7 @@ ; overlapping live intervals. When two overlapping intervals have the same ; value, they can be joined though. ; -; RUN: llvm-as < %s | llc -march=x86 -regalloc=linearscan | not grep 'mov %[A-Z]\{2,3\}, %[A-Z]\{2,3\}' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -regalloc=linearscan | not grep 'mov %[A-Z]\{2,3\}, %[A-Z]\{2,3\}' long %test(long %x) { entry: diff --git a/test/CodeGen/X86/2004-04-13-FPCMOV-Crash.llx b/test/CodeGen/X86/2004-04-13-FPCMOV-Crash.llx index 47ce1d9f9e..5896c142ee 100644 --- a/test/CodeGen/X86/2004-04-13-FPCMOV-Crash.llx +++ b/test/CodeGen/X86/2004-04-13-FPCMOV-Crash.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 implementation ; Functions: diff --git a/test/CodeGen/X86/2004-06-10-StackifierCrash.llx b/test/CodeGen/X86/2004-06-10-StackifierCrash.llx index 295c1fce4a..3df962b5a3 100644 --- a/test/CodeGen/X86/2004-06-10-StackifierCrash.llx +++ b/test/CodeGen/X86/2004-06-10-StackifierCrash.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 bool %T(double %X) { %V = seteq double %X, %X diff --git a/test/CodeGen/X86/2004-10-08-SelectSetCCFold.llx b/test/CodeGen/X86/2004-10-08-SelectSetCCFold.llx index cf65a26072..6757be2782 100644 --- a/test/CodeGen/X86/2004-10-08-SelectSetCCFold.llx +++ b/test/CodeGen/X86/2004-10-08-SelectSetCCFold.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 bool %test(bool %C, bool %D, int %X, int %Y) { %E = setlt int %X, %Y diff --git a/test/CodeGen/X86/2005-01-17-CycleInDAG.ll b/test/CodeGen/X86/2005-01-17-CycleInDAG.ll index 6925bb01a4..8dbff537f5 100644 --- a/test/CodeGen/X86/2005-01-17-CycleInDAG.ll +++ b/test/CodeGen/X86/2005-01-17-CycleInDAG.ll @@ -3,7 +3,7 @@ ; is invalid code (there is no correct way to order the instruction). Check ; that we do not fold the load into the sub. -; RUN: llvm-as < %s | llc -march=x86 | not grep 'sub.*GLOBAL' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep 'sub.*GLOBAL' %GLOBAL = external global int diff --git a/test/CodeGen/X86/2005-02-14-IllegalAssembler.ll b/test/CodeGen/X86/2005-02-14-IllegalAssembler.ll index a37d202305..4547bff657 100644 --- a/test/CodeGen/X86/2005-02-14-IllegalAssembler.ll +++ b/test/CodeGen/X86/2005-02-14-IllegalAssembler.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 | not grep 18446744073709551612 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep 18446744073709551612 %A = external global int diff --git a/test/CodeGen/X86/2005-05-08-FPStackifierPHI.ll b/test/CodeGen/X86/2005-05-08-FPStackifierPHI.ll index 4cb94b37c9..5a304db3fb 100644 --- a/test/CodeGen/X86/2005-05-08-FPStackifierPHI.ll +++ b/test/CodeGen/X86/2005-05-08-FPStackifierPHI.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 -mcpu=generic +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=generic ; Make sure LLC doesn't crash in the stackifier due to FP PHI nodes. void %radfg_() { diff --git a/test/CodeGen/X86/2005-08-30-RegAllocAliasProblem.ll b/test/CodeGen/X86/2005-08-30-RegAllocAliasProblem.ll index 8aa5f4da5d..eef09d8d73 100644 --- a/test/CodeGen/X86/2005-08-30-RegAllocAliasProblem.ll +++ b/test/CodeGen/X86/2005-08-30-RegAllocAliasProblem.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=intel | not grep 'test.*AL' || \ -; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=intel | not grep 'cmove.*EAX' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | not grep 'test.*AL' || \ +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | not grep 'cmove.*EAX' ; This testcase was compiling to: ; diff --git a/test/CodeGen/X86/2005-12-03-IndirectTailCall.ll b/test/CodeGen/X86/2005-12-03-IndirectTailCall.ll index 4efc4b7ce8..9847a3641d 100644 --- a/test/CodeGen/X86/2005-12-03-IndirectTailCall.ll +++ b/test/CodeGen/X86/2005-12-03-IndirectTailCall.ll @@ -1,5 +1,5 @@ ; XFAIL: * -; RUN: llvm-as < %s | llc -march=x86 -enable-x86-fastcc | grep 'jmp \*ecx' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -enable-x86-fastcc | grep 'jmp \*ecx' declare int %putchar(int) int %main(){ diff --git a/test/CodeGen/X86/2006-01-19-ISelFoldingBug.ll b/test/CodeGen/X86/2006-01-19-ISelFoldingBug.ll index 4dc9165434..7d68747234 100644 --- a/test/CodeGen/X86/2006-01-19-ISelFoldingBug.ll +++ b/test/CodeGen/X86/2006-01-19-ISelFoldingBug.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 | grep 'shld' | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep 'shld' | wc -l | grep 1 ; ; Check that the isel does not fold the shld, which already folds a load ; and has two uses, into a store. diff --git a/test/CodeGen/X86/2006-01-30-LongSetcc.ll b/test/CodeGen/X86/2006-01-30-LongSetcc.ll index 52d25c27a6..2195645f7f 100644 --- a/test/CodeGen/X86/2006-01-30-LongSetcc.ll +++ b/test/CodeGen/X86/2006-01-30-LongSetcc.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 bool %test(long %X) { %B = setlt long %X, 0 ; <bool> [#uses=1] diff --git a/test/CodeGen/X86/2006-03-01-InstrSchedBug.ll b/test/CodeGen/X86/2006-03-01-InstrSchedBug.ll index 0d2eda0556..c9e4b0675e 100644 --- a/test/CodeGen/X86/2006-03-01-InstrSchedBug.ll +++ b/test/CodeGen/X86/2006-03-01-InstrSchedBug.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 | not grep 'subl.*%esp' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep 'subl.*%esp' int %f(int %a, int %b) { %tmp.2 = mul int %a, %a diff --git a/test/CodeGen/X86/2006-03-02-InstrSchedBug.ll b/test/CodeGen/X86/2006-03-02-InstrSchedBug.ll index e9b9946a08..bf96708da2 100644 --- a/test/CodeGen/X86/2006-03-02-InstrSchedBug.ll +++ b/test/CodeGen/X86/2006-03-02-InstrSchedBug.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 -stats 2>&1 | grep 'asm-printer' | grep 7 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -stats 2>&1 | grep 'asm-printer' | grep 7 int %g(int %a, int %b) { %tmp.1 = shl int %b, ubyte 1 diff --git a/test/CodeGen/X86/2006-04-04-CrossBlockCrash.ll b/test/CodeGen/X86/2006-04-04-CrossBlockCrash.ll index d59babf998..5d380b5791 100644 --- a/test/CodeGen/X86/2006-04-04-CrossBlockCrash.ll +++ b/test/CodeGen/X86/2006-04-04-CrossBlockCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 -mcpu=yonah +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=yonah target endian = little target pointersize = 32 diff --git a/test/CodeGen/X86/2006-04-27-ISelFoldingBug.ll b/test/CodeGen/X86/2006-04-27-ISelFoldingBug.ll index 2d4e94f288..25a2ca8452 100644 --- a/test/CodeGen/X86/2006-04-27-ISelFoldingBug.ll +++ b/test/CodeGen/X86/2006-04-27-ISelFoldingBug.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=x86 -mtriple=i686-apple-darwin8 -relocation-model=static | grep 'movl _last' | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=x86 -mtriple=i686-apple-darwin8 -relocation-model=static | grep 'cmpl.*_last' | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mtriple=i686-apple-darwin8 -relocation-model=static | grep 'movl _last' | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mtriple=i686-apple-darwin8 -relocation-model=static | grep 'cmpl.*_last' | wc -l | grep 1 %block = external global ubyte* ; <ubyte**> [#uses=1] %last = external global int ; <int*> [#uses=3] diff --git a/test/CodeGen/X86/2006-05-01-SchedCausingSpills.ll b/test/CodeGen/X86/2006-05-01-SchedCausingSpills.ll index 5015b210df..71b90760e3 100644 --- a/test/CodeGen/X86/2006-05-01-SchedCausingSpills.ll +++ b/test/CodeGen/X86/2006-05-01-SchedCausingSpills.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 -mcpu=yonah -stats 2>&1 | not grep 'Number of register spills' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=yonah -stats 2>&1 | not grep 'Number of register spills' int %foo(<4 x float>* %a, <4 x float>* %b, <4 x float>* %c, <4 x float>* %d) { %tmp44 = load <4 x float>* %a ; <<4 x float>> [#uses=9] diff --git a/test/CodeGen/X86/2006-05-02-InstrSched1.ll b/test/CodeGen/X86/2006-05-02-InstrSched1.ll index e6e8f693b8..631e416836 100644 --- a/test/CodeGen/X86/2006-05-02-InstrSched1.ll +++ b/test/CodeGen/X86/2006-05-02-InstrSched1.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 -relocation-model=static -stats 2>&1 | grep "asm-printer" | grep 14 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -relocation-model=static -stats 2>&1 | grep "asm-printer" | grep 14 %size20 = external global uint ; <uint*> [#uses=1] %in5 = external global ubyte* ; <ubyte**> [#uses=1] diff --git a/test/CodeGen/X86/2006-05-02-InstrSched2.ll b/test/CodeGen/X86/2006-05-02-InstrSched2.ll index 1af301f592..b51ee77012 100644 --- a/test/CodeGen/X86/2006-05-02-InstrSched2.ll +++ b/test/CodeGen/X86/2006-05-02-InstrSched2.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 -stats 2>&1 | grep "asm-printer" | grep 19 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -stats 2>&1 | grep "asm-printer" | grep 19 ; XFAIL: * void %_ZN9__gnu_cxx9hashtableISt4pairIKPKciES3_NS_4hashIS3_EESt10_Select1stIS5_E5eqstrSaIiEE14find_or_insertERKS5__cond_true456.i(sbyte* %tmp435.i, uint* %tmp449.i.out) { diff --git a/test/CodeGen/X86/2006-05-08-CoalesceSubRegClass.ll b/test/CodeGen/X86/2006-05-08-CoalesceSubRegClass.ll index 35efceed7c..009a4bb759 100644 --- a/test/CodeGen/X86/2006-05-08-CoalesceSubRegClass.ll +++ b/test/CodeGen/X86/2006-05-08-CoalesceSubRegClass.ll @@ -1,7 +1,7 @@ ; Coalescing from R32 to a subset R32_. Once another register coalescer bug is ; fixed, the movb should go away as well. -; RUN: llvm-as < %s | llc -march=x86 -relocation-model=static | grep 'movl' | wc -l +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -relocation-model=static | grep 'movl' | wc -l %B = external global uint %C = external global ushort* diff --git a/test/CodeGen/X86/2006-05-08-InstrSched.ll b/test/CodeGen/X86/2006-05-08-InstrSched.ll index 8743909fff..8897692be2 100644 --- a/test/CodeGen/X86/2006-05-08-InstrSched.ll +++ b/test/CodeGen/X86/2006-05-08-InstrSched.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 -relocation-model=static | not grep 'subl.*%esp' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -relocation-model=static | not grep 'subl.*%esp' %A = external global ushort* %B = external global uint diff --git a/test/CodeGen/X86/2006-05-11-InstrSched.ll b/test/CodeGen/X86/2006-05-11-InstrSched.ll index f33716be2c..40dd61a2d1 100644 --- a/test/CodeGen/X86/2006-05-11-InstrSched.ll +++ b/test/CodeGen/X86/2006-05-11-InstrSched.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 -stats 2>&1 | grep 'asm-printer' | grep 39 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 -stats 2>&1 | grep 'asm-printer' | grep 39 void %foo(int* %mc, int* %bp, int* %ms, int* %xmb, int* %mpp, int* %tpmm, int* %ip, int* %tpim, int* %dpp, int* %tpdm, int* %bpi, int %M) { entry: diff --git a/test/CodeGen/X86/2006-05-17-VectorArg.ll b/test/CodeGen/X86/2006-05-17-VectorArg.ll index 7fb1b72c96..1f2af1473a 100644 --- a/test/CodeGen/X86/2006-05-17-VectorArg.ll +++ b/test/CodeGen/X86/2006-05-17-VectorArg.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 <4 x float> %opRSQ(<4 x float> %a) { entry: diff --git a/test/CodeGen/X86/2006-05-22-FPSetEQ.ll b/test/CodeGen/X86/2006-05-22-FPSetEQ.ll index 999716e393..a6f7bd68e2 100644 --- a/test/CodeGen/X86/2006-05-22-FPSetEQ.ll +++ b/test/CodeGen/X86/2006-05-22-FPSetEQ.ll @@ -1,6 +1,6 @@ -; RUN: llvm-as < %s | llc -march=x86 && -; RUN: llvm-as < %s | llc -march=x86 | grep 'setnp' -; RUN: llvm-as < %s | llc -march=x86 -enable-unsafe-fp-math | not grep 'setnp' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep 'setnp' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -enable-unsafe-fp-math | not grep 'setnp' uint %test(float %f) { %tmp = seteq float %f, 0.000000e+00 diff --git a/test/CodeGen/X86/2006-05-25-CycleInDAG.ll b/test/CodeGen/X86/2006-05-25-CycleInDAG.ll index 44deaeb5bd..8258f0b322 100644 --- a/test/CodeGen/X86/2006-05-25-CycleInDAG.ll +++ b/test/CodeGen/X86/2006-05-25-CycleInDAG.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 int %test() { br bool false, label %cond_next33, label %cond_true12 diff --git a/test/CodeGen/X86/2006-07-10-InlineAsmAConstraint.ll b/test/CodeGen/X86/2006-07-10-InlineAsmAConstraint.ll index b1290b186d..d044fd7153 100644 --- a/test/CodeGen/X86/2006-07-10-InlineAsmAConstraint.ll +++ b/test/CodeGen/X86/2006-07-10-InlineAsmAConstraint.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 ; PR825 long %test() { diff --git a/test/CodeGen/X86/2006-07-12-InlineAsmQConstraint.ll b/test/CodeGen/X86/2006-07-12-InlineAsmQConstraint.ll index 5bca651d90..1bacc16573 100644 --- a/test/CodeGen/X86/2006-07-12-InlineAsmQConstraint.ll +++ b/test/CodeGen/X86/2006-07-12-InlineAsmQConstraint.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 ; PR828 target endian = little diff --git a/test/CodeGen/X86/2006-07-19-ATTAsm.ll b/test/CodeGen/X86/2006-07-19-ATTAsm.ll index f33475a922..adfe88c9d1 100644 --- a/test/CodeGen/X86/2006-07-19-ATTAsm.ll +++ b/test/CodeGen/X86/2006-07-19-ATTAsm.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=att +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=att ; PR834 target endian = little diff --git a/test/CodeGen/X86/2006-07-20-InlineAsm.ll b/test/CodeGen/X86/2006-07-20-InlineAsm.ll index 6bf9cc94a4..8f409eb841 100644 --- a/test/CodeGen/X86/2006-07-20-InlineAsm.ll +++ b/test/CodeGen/X86/2006-07-20-InlineAsm.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 ; PR833 %G = weak global int 0 ; <int*> [#uses=3] diff --git a/test/CodeGen/X86/2006-07-28-AsmPrint-Long-As-Pointer.ll b/test/CodeGen/X86/2006-07-28-AsmPrint-Long-As-Pointer.ll index f047a73e44..805de7c62c 100644 --- a/test/CodeGen/X86/2006-07-28-AsmPrint-Long-As-Pointer.ll +++ b/test/CodeGen/X86/2006-07-28-AsmPrint-Long-As-Pointer.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 | grep 4294967240 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep 4294967240 ; PR853 %X = global int* cast (ulong 18446744073709551560 to int*) diff --git a/test/CodeGen/X86/2006-07-31-SingleRegClass.ll b/test/CodeGen/X86/2006-07-31-SingleRegClass.ll index 92eb1cbb8e..99e2f70f59 100644 --- a/test/CodeGen/X86/2006-07-31-SingleRegClass.ll +++ b/test/CodeGen/X86/2006-07-31-SingleRegClass.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=att | grep 'movl 4(%eax),%ebp' && -; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=att | grep 'movl 0(%eax), %ebx' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=att | grep 'movl 4(%eax),%ebp' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=att | grep 'movl 0(%eax), %ebx' ; PR850 diff --git a/test/CodeGen/X86/2006-08-07-CycleInDAG.ll b/test/CodeGen/X86/2006-08-07-CycleInDAG.ll index a8a37325b6..1de402858e 100644 --- a/test/CodeGen/X86/2006-08-07-CycleInDAG.ll +++ b/test/CodeGen/X86/2006-08-07-CycleInDAG.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 fastcc int %test(%struct.foo* %v, %struct.foo* %vi) { br bool false, label %ilog2.exit, label %cond_true.i diff --git a/test/CodeGen/X86/2006-08-16-CycleInDAG.ll b/test/CodeGen/X86/2006-08-16-CycleInDAG.ll index e643a822ca..c0668a9dbd 100644 --- a/test/CodeGen/X86/2006-08-16-CycleInDAG.ll +++ b/test/CodeGen/X86/2006-08-16-CycleInDAG.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 %struct.expr = type { %struct.rtx_def*, int, %struct.expr*, %struct.occr*, %struct.occr*, %struct.rtx_def* } %struct.hash_table = type { %struct.expr**, uint, uint, int } diff --git a/test/CodeGen/X86/2006-08-21-ExtraMovInst.ll b/test/CodeGen/X86/2006-08-21-ExtraMovInst.ll index c2c92c6fa7..c2d905a5e3 100644 --- a/test/CodeGen/X86/2006-08-21-ExtraMovInst.ll +++ b/test/CodeGen/X86/2006-08-21-ExtraMovInst.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 -mcpu=i386 | not grep 'movl %eax, %edx' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=i386 | not grep 'movl %eax, %edx' int %foo(int %t, int %C) { entry: diff --git a/test/CodeGen/X86/2006-09-01-CycleInDAG.ll b/test/CodeGen/X86/2006-09-01-CycleInDAG.ll index 68b5c43139..2e0a69a551 100644 --- a/test/CodeGen/X86/2006-09-01-CycleInDAG.ll +++ b/test/CodeGen/X86/2006-09-01-CycleInDAG.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 target endian = little target pointersize = 32 diff --git a/test/CodeGen/X86/2006-10-02-BoolRetCrash.ll b/test/CodeGen/X86/2006-10-02-BoolRetCrash.ll index d7571d8919..c918ef9312 100644 --- a/test/CodeGen/X86/2006-10-02-BoolRetCrash.ll +++ b/test/CodeGen/X86/2006-10-02-BoolRetCrash.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc && -; RUN: llvm-as < %s | llc -enable-x86-fastcc +; RUN: llvm-upgrade < %s | llvm-as | llc && +; RUN: llvm-upgrade < %s | llvm-as | llc -enable-x86-fastcc ; PR933 fastcc bool %test() { diff --git a/test/CodeGen/X86/2006-10-07-ScalarSSEMiscompile.ll b/test/CodeGen/X86/2006-10-07-ScalarSSEMiscompile.ll index 7bb5a8dcd2..d8b2defea8 100644 --- a/test/CodeGen/X86/2006-10-07-ScalarSSEMiscompile.ll +++ b/test/CodeGen/X86/2006-10-07-ScalarSSEMiscompile.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 -mattr=sse | grep movaps +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=sse | grep movaps ; Test that the load is NOT folded into the intrinsic, which would zero the top ; elts of the loaded vector. diff --git a/test/CodeGen/X86/2006-10-09-CycleInDAG.ll b/test/CodeGen/X86/2006-10-09-CycleInDAG.ll index fab720f599..fbcc5cd078 100644 --- a/test/CodeGen/X86/2006-10-09-CycleInDAG.ll +++ b/test/CodeGen/X86/2006-10-09-CycleInDAG.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 void %_ZN13QFSFileEngine4readEPcx() { %tmp201 = load int* null diff --git a/test/CodeGen/X86/2006-10-10-FindModifiedNodeSlotBug.ll b/test/CodeGen/X86/2006-10-10-FindModifiedNodeSlotBug.ll index 5cb233bd5f..8baba8118c 100644 --- a/test/CodeGen/X86/2006-10-10-FindModifiedNodeSlotBug.ll +++ b/test/CodeGen/X86/2006-10-10-FindModifiedNodeSlotBug.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 | grep shrl +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep shrl ; Bug in FindModifiedNodeSlot cause tmp14 load to become a zextload and shr 31 ; is then optimized away. diff --git a/test/CodeGen/X86/2006-10-12-CycleInDAG.ll b/test/CodeGen/X86/2006-10-12-CycleInDAG.ll index 752b8ecbef..b96ec98fcc 100644 --- a/test/CodeGen/X86/2006-10-12-CycleInDAG.ll +++ b/test/CodeGen/X86/2006-10-12-CycleInDAG.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 %struct.function = type opaque %struct.lang_decl = type opaque %struct.location_t = type { sbyte*, int } diff --git a/test/CodeGen/X86/2006-10-13-CycleInDAG.ll b/test/CodeGen/X86/2006-10-13-CycleInDAG.ll index abf5bcdd64..c2b43fb701 100644 --- a/test/CodeGen/X86/2006-10-13-CycleInDAG.ll +++ b/test/CodeGen/X86/2006-10-13-CycleInDAG.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 %str = external global [18 x sbyte] diff --git a/test/CodeGen/X86/2006-10-19-SwitchUnnecessaryBranching.ll b/test/CodeGen/X86/2006-10-19-SwitchUnnecessaryBranching.ll index 78e38c7c0c..5103679ccc 100644 --- a/test/CodeGen/X86/2006-10-19-SwitchUnnecessaryBranching.ll +++ b/test/CodeGen/X86/2006-10-19-SwitchUnnecessaryBranching.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 | %prcontext je 1 | grep "BB1_4:" +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | %prcontext je 1 | grep "BB1_4:" %str = internal constant [14 x sbyte] c"Hello world!\0A\00" ; <[14 x sbyte]*> [#uses=1] %str = internal constant [13 x sbyte] c"Blah world!\0A\00" ; <[13 x sbyte]*> [#uses=1] diff --git a/test/CodeGen/X86/2006-11-12-CSRetCC.ll b/test/CodeGen/X86/2006-11-12-CSRetCC.ll index e8f761bf3f..04cca162c4 100644 --- a/test/CodeGen/X86/2006-11-12-CSRetCC.ll +++ b/test/CodeGen/X86/2006-11-12-CSRetCC.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 | grep 'subl $4, %esp' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep 'subl $4, %esp' target triple = "i686-pc-linux-gnu" diff --git a/test/CodeGen/X86/2006-11-17-IllegalMove.ll b/test/CodeGen/X86/2006-11-17-IllegalMove.ll index c4b97c9cfd..98543e5679 100644 --- a/test/CodeGen/X86/2006-11-17-IllegalMove.ll +++ b/test/CodeGen/X86/2006-11-17-IllegalMove.ll @@ -1,6 +1,6 @@ -; RUN: llvm-as < %s | llc -march=x86-64 && -; RUN: llvm-as < %s | llc -march=x86-64 | not grep 'movb %sil, %ah' && -; RUN: llvm-as < %s | llc -march=x86-64 | grep 'movzbw %al, %ax' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86-64 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86-64 | not grep 'movb %sil, %ah' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86-64 | grep 'movzbw %al, %ax' void %handle_vector_size_attribute() { entry: diff --git a/test/CodeGen/X86/2006-11-27-SelectLegalize.ll b/test/CodeGen/X86/2006-11-27-SelectLegalize.ll index 368cc34936..5cebff5bac 100644 --- a/test/CodeGen/X86/2006-11-27-SelectLegalize.ll +++ b/test/CodeGen/X86/2006-11-27-SelectLegalize.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 | grep test.*1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep test.*1 ; PR1016 int %test(int %A, int %B, int %C) { diff --git a/test/CodeGen/X86/2006-11-28-Memcpy.ll b/test/CodeGen/X86/2006-11-28-Memcpy.ll index 0726f80de1..f9c0be30ab 100644 --- a/test/CodeGen/X86/2006-11-28-Memcpy.ll +++ b/test/CodeGen/X86/2006-11-28-Memcpy.ll @@ -1,6 +1,6 @@ -; RUN: llvm-as < %s | llc -march=x86 && -; RUN: llvm-as < %s | llc -march=x86 | grep 3721182122 | wc -l | grep 2 && -; RUN: llvm-as < %s | llc -march=x86 | grep 'movl _bytes2' | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep 3721182122 | wc -l | grep 2 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep 'movl _bytes2' | wc -l | grep 1 ; PR1022, 1023 %fmt = constant [4 x sbyte] c"%x\0A\00" diff --git a/test/CodeGen/X86/and-or-fold.ll b/test/CodeGen/X86/and-or-fold.ll index 51a3ac6461..3240bdf25a 100644 --- a/test/CodeGen/X86/and-or-fold.ll +++ b/test/CodeGen/X86/and-or-fold.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 | grep and | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep and | wc -l | grep 1 ; The dag combiner should fold together (x&127)|(y&16711680) -> (x|y)&c1 ; in this case. diff --git a/test/CodeGen/X86/asm-global-imm.ll b/test/CodeGen/X86/asm-global-imm.ll index 725fc94636..aebd457844 100644 --- a/test/CodeGen/X86/asm-global-imm.ll +++ b/test/CodeGen/X86/asm-global-imm.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=x86 -relocation-model=static | grep 'test1 $_GV' && -; RUN: llvm-as < %s | llc -march=x86 -relocation-model=static | grep 'test2 _GV' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -relocation-model=static | grep 'test1 $_GV' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -relocation-model=static | grep 'test2 _GV' ; PR882 target datalayout = "e-p:32:32" diff --git a/test/CodeGen/X86/bswap.ll b/test/CodeGen/X86/bswap.ll index 4285c73008..79467e0838 100644 --- a/test/CodeGen/X86/bswap.ll +++ b/test/CodeGen/X86/bswap.ll @@ -1,7 +1,7 @@ ; bswap should be constant folded when it is passed a constant argument -; RUN: llvm-as < %s | llc -march=x86 | grep bswapl | wc -l | grep 3 && -; RUN: llvm-as < %s | llc -march=x86 | grep rolw | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep bswapl | wc -l | grep 3 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep rolw | wc -l | grep 1 declare ushort %llvm.bswap.i16(ushort) declare uint %llvm.bswap.i32(uint) diff --git a/test/CodeGen/X86/cmp-test.ll b/test/CodeGen/X86/cmp-test.ll index 43430fdeb8..7a7ec08d18 100644 --- a/test/CodeGen/X86/cmp-test.ll +++ b/test/CodeGen/X86/cmp-test.ll @@ -1,6 +1,6 @@ -; RUN: llvm-as < %s | llc -march=x86 && -; RUN: llvm-as < %s | llc -march=x86 | grep cmp | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=x86 | grep test | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep cmp | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep test | wc -l | grep 1 int %f1(int %X, int* %y) { %tmp = load int* %y diff --git a/test/CodeGen/X86/commute-two-addr.ll b/test/CodeGen/X86/commute-two-addr.ll index ac1aa60319..29c22c34a5 100644 --- a/test/CodeGen/X86/commute-two-addr.ll +++ b/test/CodeGen/X86/commute-two-addr.ll @@ -2,7 +2,7 @@ ; insertion of register-register copies. ; Make sure there are only 3 mov's for each testcase -; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=intel | grep 'mov ' | wc -l | grep 6 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | grep 'mov ' | wc -l | grep 6 target triple = "i686-pc-linux-gnu" diff --git a/test/CodeGen/X86/compare-add.ll b/test/CodeGen/X86/compare-add.ll index 5665ad4829..866e36b17d 100644 --- a/test/CodeGen/X86/compare-add.ll +++ b/test/CodeGen/X86/compare-add.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=x86 && -; RUN: llvm-as < %s | llc -march=x86 | not grep add +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep add bool %X(int %X) { %Y = add int %X, 14 %Z = setne int %Y, 12345 diff --git a/test/CodeGen/X86/compare_folding.llx b/test/CodeGen/X86/compare_folding.llx index 5a4471b9da..652057e9bb 100644 --- a/test/CodeGen/X86/compare_folding.llx +++ b/test/CodeGen/X86/compare_folding.llx @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=x86 -mcpu=yonah | grep movsd | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=x86 -mcpu=yonah | grep ucomisd +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=yonah | grep movsd | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=yonah | grep ucomisd declare bool %llvm.isunordered.f64(double,double) bool %test1(double %X, double %Y) { ;; Returns isunordered(X,Y) diff --git a/test/CodeGen/X86/darwin-no-dead-strip.ll b/test/CodeGen/X86/darwin-no-dead-strip.ll index 4a594c6b43..8e671ffccd 100644 --- a/test/CodeGen/X86/darwin-no-dead-strip.ll +++ b/test/CodeGen/X86/darwin-no-dead-strip.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc | grep no_dead_strip +; RUN: llvm-upgrade < %s | llvm-as | llc | grep no_dead_strip target endian = little target pointersize = 32 diff --git a/test/CodeGen/X86/div_const.ll b/test/CodeGen/X86/div_const.ll index 7a3c7d0096..326fd77e51 100644 --- a/test/CodeGen/X86/div_const.ll +++ b/test/CodeGen/X86/div_const.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 | grep 365384439 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep 365384439 uint %f9188_mul365384439_shift27(uint %A) { %tmp1 = div uint %A, 1577682821 ; <uint> [#uses=1] diff --git a/test/CodeGen/X86/extend.ll b/test/CodeGen/X86/extend.ll index 1685d3ba42..fdad790764 100644 --- a/test/CodeGen/X86/extend.ll +++ b/test/CodeGen/X86/extend.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=intel | grep movzx | wc -l | grep 1 -; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=intel | grep movsx | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | grep movzx | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | grep movsx | wc -l | grep 1 %G1 = internal global ubyte 0 ; <ubyte*> [#uses=1] %G2 = internal global sbyte 0 ; <sbyte*> [#uses=1] diff --git a/test/CodeGen/X86/extern_weak.ll b/test/CodeGen/X86/extern_weak.ll index 4200bbf1a8..853a713310 100644 --- a/test/CodeGen/X86/extern_weak.ll +++ b/test/CodeGen/X86/extern_weak.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -mtriple=i686-apple-darwin | grep weak_reference | wc -l | grep 2 +; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=i686-apple-darwin | grep weak_reference | wc -l | grep 2 %Y = global int (sbyte*)* %X declare extern_weak int %X(sbyte*) diff --git a/test/CodeGen/X86/fabs.ll b/test/CodeGen/X86/fabs.ll index ce28c6de8a..221f078f0f 100644 --- a/test/CodeGen/X86/fabs.ll +++ b/test/CodeGen/X86/fabs.ll @@ -1,6 +1,6 @@ ; Make sure this testcase codegens to the fabs instruction, not a call to fabsf -; RUN: llvm-as < %s | llc -march=x86 -mattr=-sse2,-sse3 | grep 'fabs$' | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=x86 -mattr=-sse2,-sse3 -enable-unsafe-fp-math | grep 'fabs$' | wc -l | grep 2 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=-sse2,-sse3 | grep 'fabs$' | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=-sse2,-sse3 -enable-unsafe-fp-math | grep 'fabs$' | wc -l | grep 2 target endian = little target pointersize = 32 diff --git a/test/CodeGen/X86/fast-cc-callee-pops.ll b/test/CodeGen/X86/fast-cc-callee-pops.ll index 51527ceae1..7d5df80123 100644 --- a/test/CodeGen/X86/fast-cc-callee-pops.ll +++ b/test/CodeGen/X86/fast-cc-callee-pops.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=intel -enable-x86-fastcc -mcpu=yonah | grep 'ret 28' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel -enable-x86-fastcc -mcpu=yonah | grep 'ret 28' ; Check that a fastcc function pops its stack variables before returning. diff --git a/test/CodeGen/X86/fast-cc-merge-stack-adj.ll b/test/CodeGen/X86/fast-cc-merge-stack-adj.ll index f31b180b27..e6cd0f0da9 100644 --- a/test/CodeGen/X86/fast-cc-merge-stack-adj.ll +++ b/test/CodeGen/X86/fast-cc-merge-stack-adj.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=intel -enable-x86-fastcc | grep 'add ESP, 8' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel -enable-x86-fastcc | grep 'add ESP, 8' target triple = "i686-pc-linux-gnu" diff --git a/test/CodeGen/X86/fast-cc-pass-in-regs.ll b/test/CodeGen/X86/fast-cc-pass-in-regs.ll index 6899683c4c..ab6248e195 100644 --- a/test/CodeGen/X86/fast-cc-pass-in-regs.ll +++ b/test/CodeGen/X86/fast-cc-pass-in-regs.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=intel -enable-x86-fastcc | grep 'mov EDX, 1' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel -enable-x86-fastcc | grep 'mov EDX, 1' ; check that fastcc is passing stuff in regs. ; Argument reg passing is disabled due to regalloc issues. FIXME! diff --git a/test/CodeGen/X86/fast-cc-tail-call.ll b/test/CodeGen/X86/fast-cc-tail-call.ll index 25ba384b78..b7799793b2 100644 --- a/test/CodeGen/X86/fast-cc-tail-call.ll +++ b/test/CodeGen/X86/fast-cc-tail-call.ll @@ -1,5 +1,5 @@ ; XFAIL: * -; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=intel -enable-x86-fastcc | not grep call +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel -enable-x86-fastcc | not grep call fastcc int %bar(int %X, int(double, int) *%FP) { %Y = tail call fastcc int %FP(double 0.0, int %X) diff --git a/test/CodeGen/X86/fildll.ll b/test/CodeGen/X86/fildll.ll index dbf9aca209..711eedeaac 100644 --- a/test/CodeGen/X86/fildll.ll +++ b/test/CodeGen/X86/fildll.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=att -mattr=-sse2 | grep fildll | wc -l | grep 2 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=att -mattr=-sse2 | grep fildll | wc -l | grep 2 fastcc double %sint64_to_fp(long %X) { %R = cast long %X to double diff --git a/test/CodeGen/X86/fp-immediate-shorten.ll b/test/CodeGen/X86/fp-immediate-shorten.ll index c20a2e8d58..6acc2c2684 100644 --- a/test/CodeGen/X86/fp-immediate-shorten.ll +++ b/test/CodeGen/X86/fp-immediate-shorten.ll @@ -1,5 +1,5 @@ ;; Test that this FP immediate is stored in the constant pool as a float. -; RUN: llvm-as < %s | llc -march=x86 -mattr=-sse2,-sse3 | grep '.long.1123418112' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=-sse2,-sse3 | grep '.long.1123418112' double %D() { ret double 123.0 } diff --git a/test/CodeGen/X86/fp-stack-compare.ll b/test/CodeGen/X86/fp-stack-compare.ll index cc52c41d1a..86286bd20e 100644 --- a/test/CodeGen/X86/fp-stack-compare.ll +++ b/test/CodeGen/X86/fp-stack-compare.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 -mcpu=i386 | grep fucomi.*st.[12] +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=i386 | grep fucomi.*st.[12] ; PR1012 float %foo(float *%col.2.0) { diff --git a/test/CodeGen/X86/fp_constant_op.llx b/test/CodeGen/X86/fp_constant_op.llx index d241235d3c..02c76a84f3 100644 --- a/test/CodeGen/X86/fp_constant_op.llx +++ b/test/CodeGen/X86/fp_constant_op.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=intel | grep ST | not grep 'fadd\|fsub\|fdiv\|fmul' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | grep ST | not grep 'fadd\|fsub\|fdiv\|fmul' ; Test that the load of the constant is folded into the operation. diff --git a/test/CodeGen/X86/fp_load_cast_fold.llx b/test/CodeGen/X86/fp_load_cast_fold.llx index 7459c003c1..b1346958ce 100644 --- a/test/CodeGen/X86/fp_load_cast_fold.llx +++ b/test/CodeGen/X86/fp_load_cast_fold.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 | grep fild | not grep ESP +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep fild | not grep ESP double %short(short* %P) { %V = load short* %P %V2 = cast short %V to double diff --git a/test/CodeGen/X86/fp_load_fold.llx b/test/CodeGen/X86/fp_load_fold.llx index 7e89edf943..c3a00094da 100644 --- a/test/CodeGen/X86/fp_load_fold.llx +++ b/test/CodeGen/X86/fp_load_fold.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=intel | grep ST | not grep 'fadd\|fsub\|fdiv\|fmul' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | grep ST | not grep 'fadd\|fsub\|fdiv\|fmul' ; Test that the load of the memory location is folded into the operation. diff --git a/test/CodeGen/X86/imul-lea.ll b/test/CodeGen/X86/imul-lea.ll index 6f2e3a986e..9d6fd98e33 100644 --- a/test/CodeGen/X86/imul-lea.ll +++ b/test/CodeGen/X86/imul-lea.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 | grep lea +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep lea declare int %foo() int %test() { diff --git a/test/CodeGen/X86/inline-asm.ll b/test/CodeGen/X86/inline-asm.ll index a38596df62..1e96efce3e 100644 --- a/test/CodeGen/X86/inline-asm.ll +++ b/test/CodeGen/X86/inline-asm.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 int %test1() { ; Dest is AX, dest type = i32. diff --git a/test/CodeGen/X86/isnan.llx b/test/CodeGen/X86/isnan.llx index df4390a4ab..fb02c1f5dd 100644 --- a/test/CodeGen/X86/isnan.llx +++ b/test/CodeGen/X86/isnan.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 | not grep call +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep call declare bool %llvm.isunordered(double) bool %test_isnan(double %X) { diff --git a/test/CodeGen/X86/jump_sign.ll b/test/CodeGen/X86/jump_sign.ll index aed39bf8a1..16bd7bc627 100644 --- a/test/CodeGen/X86/jump_sign.ll +++ b/test/CodeGen/X86/jump_sign.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 | grep jns +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep jns int %f(int %X) { entry: %tmp1 = add int %X, 1 ; <int> [#uses=1] diff --git a/test/CodeGen/X86/lea-2.ll b/test/CodeGen/X86/lea-2.ll index ad510c072e..3bbd146915 100644 --- a/test/CodeGen/X86/lea-2.ll +++ b/test/CodeGen/X86/lea-2.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=intel | grep 'lea EAX, DWORD PTR \[... + 4\*... - 5\]' && -; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=intel | not grep add +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | grep 'lea EAX, DWORD PTR \[... + 4\*... - 5\]' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | not grep add int %test1(int %A, int %B) { %tmp1 = shl int %A, ubyte 2 ; <int> [#uses=1] diff --git a/test/CodeGen/X86/lea.ll b/test/CodeGen/X86/lea.ll index dcbf73ea31..675376b63f 100644 --- a/test/CodeGen/X86/lea.ll +++ b/test/CodeGen/X86/lea.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=x86 -; RUN: llvm-as < %s | llc -march=x86 | not grep orl +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep orl int %test(int %x) { %tmp1 = shl int %x, ubyte 3 %tmp2 = add int %tmp1, 7 diff --git a/test/CodeGen/X86/loop-hoist.ll b/test/CodeGen/X86/loop-hoist.ll index 6c6347edce..0eb20a52f5 100644 --- a/test/CodeGen/X86/loop-hoist.ll +++ b/test/CodeGen/X86/loop-hoist.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -relocation-model=dynamic-no-pic -mtriple=i686-apple-darwin8.7.2 | grep L_Arr.non_lazy_ptr && -; RUN: llvm-as < %s | llc -relocation-model=dynamic-no-pic -mtriple=i686-apple-darwin8.7.2 | %prcontext L_Arr.non_lazy_ptr 1 | grep '4(%esp)' +; RUN: llvm-upgrade < %s | llvm-as | llc -relocation-model=dynamic-no-pic -mtriple=i686-apple-darwin8.7.2 | grep L_Arr.non_lazy_ptr && +; RUN: llvm-upgrade < %s | llvm-as | llc -relocation-model=dynamic-no-pic -mtriple=i686-apple-darwin8.7.2 | %prcontext L_Arr.non_lazy_ptr 1 | grep '4(%esp)' %Arr = external global [0 x int] ; <[0 x int]*> [#uses=2] diff --git a/test/CodeGen/X86/loop-strength-reduce.ll b/test/CodeGen/X86/loop-strength-reduce.ll index ae39cc13f6..a54d907e59 100644 --- a/test/CodeGen/X86/loop-strength-reduce.ll +++ b/test/CodeGen/X86/loop-strength-reduce.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 | grep 'A(' | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep 'A(' | wc -l | grep 1 ; ; Make sure the common loop invariant _A(reg) is hoisted up to preheader. diff --git a/test/CodeGen/X86/loop-strength-reduce2.ll b/test/CodeGen/X86/loop-strength-reduce2.ll index eb22383f31..7ed394427e 100644 --- a/test/CodeGen/X86/loop-strength-reduce2.ll +++ b/test/CodeGen/X86/loop-strength-reduce2.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -mtriple=i686-apple-darwin -relocation-model=pic | not grep lea +; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=i686-apple-darwin -relocation-model=pic | not grep lea ; ; Make sure the PIC label flags2-"L1$pb" is not moved up to the preheader. diff --git a/test/CodeGen/X86/mul-shift-reassoc.ll b/test/CodeGen/X86/mul-shift-reassoc.ll index f870f7aa6f..52d188d943 100644 --- a/test/CodeGen/X86/mul-shift-reassoc.ll +++ b/test/CodeGen/X86/mul-shift-reassoc.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=x86 | grep lea -; RUN: llvm-as < %s | llc -march=x86 | not grep add +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep lea +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep add int %test(int %X, int %Y) { ; Push the shl through the mul to allow an LEA to be formed, instead diff --git a/test/CodeGen/X86/negatize_zero.ll b/test/CodeGen/X86/negatize_zero.ll index bb86438d28..3328a6afec 100644 --- a/test/CodeGen/X86/negatize_zero.ll +++ b/test/CodeGen/X86/negatize_zero.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 -mattr=-sse2,-sse3 | grep fchs +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=-sse2,-sse3 | grep fchs double %T() { diff --git a/test/CodeGen/X86/or-branch.ll b/test/CodeGen/X86/or-branch.ll index 5ad7fa14b3..62f7455d53 100644 --- a/test/CodeGen/X86/or-branch.ll +++ b/test/CodeGen/X86/or-branch.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 | not grep set +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep set void %foo(int %X, int %Y, int %Z) { entry: diff --git a/test/CodeGen/X86/overlap-add.ll b/test/CodeGen/X86/overlap-add.ll index c5fc0bd89a..a7150d21e3 100644 --- a/test/CodeGen/X86/overlap-add.ll +++ b/test/CodeGen/X86/overlap-add.ll @@ -6,7 +6,7 @@ ; Check that the shift gets turned into an LEA. -; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=intel | not grep 'mov E.X, E.X' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | not grep 'mov E.X, E.X' ; FIXME: We need live variable information about flags to do this xform safely. :( ; XFAIL: * diff --git a/test/CodeGen/X86/overlap-shift.ll b/test/CodeGen/X86/overlap-shift.ll index 48f91e0cba..14f3546cc1 100644 --- a/test/CodeGen/X86/overlap-shift.ll +++ b/test/CodeGen/X86/overlap-shift.ll @@ -6,7 +6,7 @@ ; Check that the shift gets turned into an LEA. -; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=intel | not grep 'mov E.X, E.X' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | not grep 'mov E.X, E.X' %G = external global int diff --git a/test/CodeGen/X86/pic_jumptable.ll b/test/CodeGen/X86/pic_jumptable.ll index affc933af1..4c38fb8061 100644 --- a/test/CodeGen/X86/pic_jumptable.ll +++ b/test/CodeGen/X86/pic_jumptable.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -relocation-model=pic -march=x86 | not grep -F .text +; RUN: llvm-upgrade < %s | llvm-as | llc -relocation-model=pic -march=x86 | not grep -F .text target endian = little target pointersize = 32 target triple = "i386-linux-gnu" diff --git a/test/CodeGen/X86/rdtsc.ll b/test/CodeGen/X86/rdtsc.ll index 147838350f..1473c77588 100644 --- a/test/CodeGen/X86/rdtsc.ll +++ b/test/CodeGen/X86/rdtsc.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=x86 | grep rdtsc && -; RUN: llvm-as < %s | llc -march=x86-64 | grep rdtsc +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep rdtsc && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86-64 | grep rdtsc declare ulong %llvm.readcyclecounter() diff --git a/test/CodeGen/X86/regpressure.ll b/test/CodeGen/X86/regpressure.ll index 1615f81a92..c3c681c30c 100644 --- a/test/CodeGen/X86/regpressure.ll +++ b/test/CodeGen/X86/regpressure.ll @@ -1,7 +1,7 @@ ;; Both functions in this testcase should codegen to the same function, and ;; neither of them should require spilling anything to the stack. -; RUN: llvm-as < %s | llc -march=x86 -stats 2>&1 | not grep 'Number of register spills' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -stats 2>&1 | not grep 'Number of register spills' ;; This can be compiled to use three registers if the loads are not ;; folded into the multiplies, 2 registers otherwise. diff --git a/test/CodeGen/X86/rem.ll b/test/CodeGen/X86/rem.ll index 905b142393..209f831fc8 100644 --- a/test/CodeGen/X86/rem.ll +++ b/test/CodeGen/X86/rem.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=x86 && -; RUN: llvm-as < %s | llc -march=x86 | not grep div +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep div int %test1(int %X) { %tmp1 = rem int %X, 255 diff --git a/test/CodeGen/X86/rotate.ll b/test/CodeGen/X86/rotate.ll index 59d0291c3e..acd22f5aef 100644 --- a/test/CodeGen/X86/rotate.ll +++ b/test/CodeGen/X86/rotate.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=intel | grep ro[rl] | wc -l | grep 12 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | grep ro[rl] | wc -l | grep 12 uint %rotl32(uint %A, ubyte %Amt) { %B = shl uint %A, ubyte %Amt diff --git a/test/CodeGen/X86/scalar_sse_minmax.ll b/test/CodeGen/X86/scalar_sse_minmax.ll index 6a464e3d85..83401667ed 100644 --- a/test/CodeGen/X86/scalar_sse_minmax.ll +++ b/test/CodeGen/X86/scalar_sse_minmax.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse1,+sse2 | grep mins | wc -l | grep 3 && -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse1,+sse2 | grep maxs | wc -l | grep 2 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse1,+sse2 | grep mins | wc -l | grep 3 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse1,+sse2 | grep maxs | wc -l | grep 2 declare bool %llvm.isunordered.f64( double %x, double %y ) declare bool %llvm.isunordered.f32( float %x, float %y ) diff --git a/test/CodeGen/X86/select.ll b/test/CodeGen/X86/select.ll index 68bac667b4..71f4742c08 100644 --- a/test/CodeGen/X86/select.ll +++ b/test/CodeGen/X86/select.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=x86 -mcpu=yonah && -; RUN: llvm-as < %s | llc -march=x86 -mcpu=pentium +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=yonah && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=pentium bool %boolSel(bool %A, bool %B, bool %C) { %X = select bool %A, bool %B, bool %C diff --git a/test/CodeGen/X86/setuge.ll b/test/CodeGen/X86/setuge.ll index 6d3736b273..0cdade2710 100644 --- a/test/CodeGen/X86/setuge.ll +++ b/test/CodeGen/X86/setuge.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 | not grep 'set' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep 'set' declare bool %llvm.isunordered.f32(float, float) diff --git a/test/CodeGen/X86/shift-coalesce.ll b/test/CodeGen/X86/shift-coalesce.ll index 90295f146c..0945fe13ce 100644 --- a/test/CodeGen/X86/shift-coalesce.ll +++ b/test/CodeGen/X86/shift-coalesce.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=intel | grep 'shld.*CL' && -; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=intel | not grep 'mov CL, BL' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | grep 'shld.*CL' && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | not grep 'mov CL, BL' ; PR687 diff --git a/test/CodeGen/X86/shift-double.llx b/test/CodeGen/X86/shift-double.llx index 4235edebda..41cf79da4c 100644 --- a/test/CodeGen/X86/shift-double.llx +++ b/test/CodeGen/X86/shift-double.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=intel | grep sh[lr]d | wc -l | grep 5 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | grep sh[lr]d | wc -l | grep 5 long %test1(long %X, ubyte %C) { %Y = shl long %X, ubyte %C diff --git a/test/CodeGen/X86/shift-folding.ll b/test/CodeGen/X86/shift-folding.ll index e868128b71..a1ea084201 100644 --- a/test/CodeGen/X86/shift-folding.ll +++ b/test/CodeGen/X86/shift-folding.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 | grep 's[ah][rl]l' | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep 's[ah][rl]l' | wc -l | grep 1 int* %test1(int *%P, uint %X) { %Y = shr uint %X, ubyte 2 diff --git a/test/CodeGen/X86/shift-one.ll b/test/CodeGen/X86/shift-one.ll index 07449e45a6..a91cbbc503 100644 --- a/test/CodeGen/X86/shift-one.ll +++ b/test/CodeGen/X86/shift-one.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 | not grep 'leal' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep 'leal' %x = external global int diff --git a/test/CodeGen/X86/sse-load-ret.ll b/test/CodeGen/X86/sse-load-ret.ll index 71372d0ffa..d5f4d19686 100644 --- a/test/CodeGen/X86/sse-load-ret.ll +++ b/test/CodeGen/X86/sse-load-ret.ll @@ -1,6 +1,6 @@ -; RUN: llvm-as < %s | llc -march=x86 -mcpu=yonah -enable-x86-sse && -; RUN: llvm-as < %s | llc -march=x86 -mcpu=yonah -enable-x86-sse | not grep movss -; RUN: llvm-as < %s | llc -march=x86 -mcpu=yonah -enable-x86-sse | not grep xmm +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=yonah -enable-x86-sse && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=yonah -enable-x86-sse | not grep movss +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=yonah -enable-x86-sse | not grep xmm double %test1(double *%P) { %X = load double* %P diff --git a/test/CodeGen/X86/store-fp-constant.ll b/test/CodeGen/X86/store-fp-constant.ll index 6dc0cb600f..4d1d708a1a 100644 --- a/test/CodeGen/X86/store-fp-constant.ll +++ b/test/CodeGen/X86/store-fp-constant.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 | not grep rodata +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep rodata ; ; Check that no FP constants in this testcase ends up in the ; constant pool. diff --git a/test/CodeGen/X86/store-global-address.ll b/test/CodeGen/X86/store-global-address.ll index c933714ea6..77e344d959 100644 --- a/test/CodeGen/X86/store-global-address.ll +++ b/test/CodeGen/X86/store-global-address.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 | grep movl | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep movl | wc -l | grep 1 %dst = global int 0 %ptr = global int* null diff --git a/test/CodeGen/X86/store_op_load_fold.ll b/test/CodeGen/X86/store_op_load_fold.ll index 3c844be605..d3ad90984c 100644 --- a/test/CodeGen/X86/store_op_load_fold.ll +++ b/test/CodeGen/X86/store_op_load_fold.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 | not grep 'mov' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep 'mov' ; ; Test the add and load are folded into the store instruction. diff --git a/test/CodeGen/X86/store_op_load_fold2.ll b/test/CodeGen/X86/store_op_load_fold2.ll index c20e57213b..c7f720ad90 100644 --- a/test/CodeGen/X86/store_op_load_fold2.ll +++ b/test/CodeGen/X86/store_op_load_fold2.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=intel | grep 'and DWORD PTR' | wc -l | grep 2 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | grep 'and DWORD PTR' | wc -l | grep 2 target endian = little target pointersize = 32 diff --git a/test/CodeGen/X86/test-load-fold.ll b/test/CodeGen/X86/test-load-fold.ll index 5d2d28656d..847d91e03b 100644 --- a/test/CodeGen/X86/test-load-fold.ll +++ b/test/CodeGen/X86/test-load-fold.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc +; RUN: llvm-upgrade < %s | llvm-as | llc %struct._obstack_chunk = type { sbyte*, %struct._obstack_chunk*, [4 x sbyte] } %struct.obstack = type { int, %struct._obstack_chunk*, sbyte*, sbyte*, sbyte*, int, int, %struct._obstack_chunk* (...)*, void (...)*, sbyte*, ubyte } %stmt_obstack = external global %struct.obstack ; <%struct.obstack*> [#uses=1] diff --git a/test/CodeGen/X86/trunc-to-bool.ll b/test/CodeGen/X86/trunc-to-bool.ll index 92a0949308..3e00975b24 100644 --- a/test/CodeGen/X86/trunc-to-bool.ll +++ b/test/CodeGen/X86/trunc-to-bool.ll @@ -1,8 +1,8 @@ ; An integer truncation to bool should be done with an and instruction to make ; sure only the LSBit survives. Test that this is the case both for a returned ; value and as the operand of a branch. -; RUN: llvm-as < %s | llc -march=x86 && -; RUN: llvm-as < %s | llc -march=x86 | grep '\(and\)\|\(test.*\$1\)' | wc -l | grep 6 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep '\(and\)\|\(test.*\$1\)' | wc -l | grep 6 bool %test1(int %X) { %Y = trunc int %X to bool ret bool %Y diff --git a/test/CodeGen/X86/vec_call.ll b/test/CodeGen/X86/vec_call.ll index 9bbff18de9..9fcc11dbb6 100644 --- a/test/CodeGen/X86/vec_call.ll +++ b/test/CodeGen/X86/vec_call.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep 'subl.*60' -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep 'movdqa.*32' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep 'subl.*60' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep 'movdqa.*32' void %test() { tail call void %xx( int 1, int 2, int 3, int 4, int 5, int 6, int 7, <2 x long> cast (<4 x int> < int 4, int 3, int 2, int 1 > to <2 x long>), <2 x long> cast (<4 x int> < int 8, int 7, int 6, int 5 > to <2 x long>), <2 x long> cast (<4 x int> < int 6, int 4, int 2, int 0 > to <2 x long>), <2 x long> cast (<4 x int> < int 8, int 4, int 2, int 1 > to <2 x long>), <2 x long> cast (<4 x int> < int 0, int 1, int 3, int 9 > to <2 x long>) ) diff --git a/test/CodeGen/X86/vec_clear.ll b/test/CodeGen/X86/vec_clear.ll index 1c38825afc..a43d67ccd2 100644 --- a/test/CodeGen/X86/vec_clear.ll +++ b/test/CodeGen/X86/vec_clear.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 && -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | not grep and +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | not grep and <4 x float> %test(<4 x float>* %v1) { %tmp = load <4 x float>* %v1 %tmp15 = cast <4 x float> %tmp to <2 x long> diff --git a/test/CodeGen/X86/vec_extract.ll b/test/CodeGen/X86/vec_extract.ll index 59ca5666a4..2f729ad244 100644 --- a/test/CodeGen/X86/vec_extract.ll +++ b/test/CodeGen/X86/vec_extract.ll @@ -1,7 +1,7 @@ -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep movss | wc -l | grep 3 && -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep movhlps | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep pshufd | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep unpckhpd | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep movss | wc -l | grep 3 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep movhlps | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep pshufd | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep unpckhpd | wc -l | grep 1 void %test1(<4 x float>* %F, float* %f) { %tmp = load <4 x float>* %F diff --git a/test/CodeGen/X86/vec_insert.ll b/test/CodeGen/X86/vec_insert.ll index 933dfc5bd0..fbe604d5a1 100644 --- a/test/CodeGen/X86/vec_insert.ll +++ b/test/CodeGen/X86/vec_insert.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep movss | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep pinsrw | wc -l | grep 2 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep movss | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep pinsrw | wc -l | grep 2 void %test(<4 x float>* %F, int %I) { %tmp = load <4 x float>* %F diff --git a/test/CodeGen/X86/vec_return.ll b/test/CodeGen/X86/vec_return.ll index 9be3416704..2b2d954031 100644 --- a/test/CodeGen/X86/vec_return.ll +++ b/test/CodeGen/X86/vec_return.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 -mcpu=yonah +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=yonah <2 x double> %test() { ret <2 x double> <double 0.0, double 0.0> diff --git a/test/CodeGen/X86/vec_select.ll b/test/CodeGen/X86/vec_select.ll index 266b35872d..05f2a8cdd3 100644 --- a/test/CodeGen/X86/vec_select.ll +++ b/test/CodeGen/X86/vec_select.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse void %test(int %C, <4 x float>* %A, <4 x float>* %B) { %tmp = load <4 x float>* %A diff --git a/test/CodeGen/X86/vec_set-2.ll b/test/CodeGen/X86/vec_set-2.ll index 6e54b6f169..db748f289b 100644 --- a/test/CodeGen/X86/vec_set-2.ll +++ b/test/CodeGen/X86/vec_set-2.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep movss | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep movd | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep movss | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep movd | wc -l | grep 1 <4 x float> %test1(float %a) { %tmp = insertelement <4 x float> zeroinitializer, float %a, uint 0 diff --git a/test/CodeGen/X86/vec_set-3.ll b/test/CodeGen/X86/vec_set-3.ll index 1458d37e00..5cb133c134 100644 --- a/test/CodeGen/X86/vec_set-3.ll +++ b/test/CodeGen/X86/vec_set-3.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep shufps | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep pshufd | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep shufps | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep pshufd | wc -l | grep 1 <4 x float> %test(float %a) { %tmp = insertelement <4 x float> zeroinitializer, float %a, uint 1 diff --git a/test/CodeGen/X86/vec_set-4.ll b/test/CodeGen/X86/vec_set-4.ll index 14d84321d9..745200fab9 100644 --- a/test/CodeGen/X86/vec_set-4.ll +++ b/test/CodeGen/X86/vec_set-4.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep pinsrw | wc -l | grep 2 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep pinsrw | wc -l | grep 2 <2 x long> %test(short %a) { entry: diff --git a/test/CodeGen/X86/vec_set-5.ll b/test/CodeGen/X86/vec_set-5.ll index cf4acd3b02..8761417a98 100644 --- a/test/CodeGen/X86/vec_set-5.ll +++ b/test/CodeGen/X86/vec_set-5.ll @@ -1,6 +1,6 @@ -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep movlhps | wc -l | grep 2 && -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep unpcklps | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep punpckldq | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep movlhps | wc -l | grep 2 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep unpcklps | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep punpckldq | wc -l | grep 1 <4 x float> %test1(float %a, float %b) { %tmp = insertelement <4 x float> zeroinitializer, float %a, uint 0 diff --git a/test/CodeGen/X86/vec_set-6.ll b/test/CodeGen/X86/vec_set-6.ll index 0c325c928a..439febb801 100644 --- a/test/CodeGen/X86/vec_set-6.ll +++ b/test/CodeGen/X86/vec_set-6.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep unpcklps | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep shufps | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep unpcklps | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep shufps | wc -l | grep 1 <4 x float> %test(float %a, float %b, float %c) { %tmp = insertelement <4 x float> zeroinitializer, float %a, uint 1 diff --git a/test/CodeGen/X86/vec_set-7.ll b/test/CodeGen/X86/vec_set-7.ll index b0aff7ccfc..ab342df905 100644 --- a/test/CodeGen/X86/vec_set-7.ll +++ b/test/CodeGen/X86/vec_set-7.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep movq | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep movq | wc -l | grep 1 <2 x long> %test(<2 x long>* %p) { %tmp = cast <2 x long>* %p to double* diff --git a/test/CodeGen/X86/vec_set.ll b/test/CodeGen/X86/vec_set.ll index fcce5f6615..c190e41bd0 100644 --- a/test/CodeGen/X86/vec_set.ll +++ b/test/CodeGen/X86/vec_set.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep punpckl | wc -l | grep 7 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep punpckl | wc -l | grep 7 void %test(<8 x short>* %b, short %a0, short %a1, short %a2, short %a3, short %a4, short %a5, short %a6, short %a7) { %tmp = insertelement <8 x short> zeroinitializer, short %a0, uint 0 diff --git a/test/CodeGen/X86/vec_shuffle-10.ll b/test/CodeGen/X86/vec_shuffle-10.ll index b3fc841a11..ccd1911417 100644 --- a/test/CodeGen/X86/vec_shuffle-10.ll +++ b/test/CodeGen/X86/vec_shuffle-10.ll @@ -1,7 +1,7 @@ -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 && -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep unpcklps | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep unpckhps | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | not grep 'sub.*esp' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep unpcklps | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep unpckhps | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | not grep 'sub.*esp' void %test(<4 x float>* %res, <4 x float>* %A, <4 x float>* %B) { %tmp = load <4 x float>* %B ; <<4 x float>> [#uses=2] diff --git a/test/CodeGen/X86/vec_shuffle-2.ll b/test/CodeGen/X86/vec_shuffle-2.ll index 3e53ed8327..dd4c269e07 100644 --- a/test/CodeGen/X86/vec_shuffle-2.ll +++ b/test/CodeGen/X86/vec_shuffle-2.ll @@ -1,6 +1,6 @@ -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep pshufhw | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep pshuflw | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep movhps | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep pshufhw | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep pshuflw | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep movhps | wc -l | grep 1 void %test1(<2 x long>* %res, <2 x long>* %A) { %tmp = load <2 x long>* %A diff --git a/test/CodeGen/X86/vec_shuffle-3.ll b/test/CodeGen/X86/vec_shuffle-3.ll index a1eac1f1ec..d34a00646c 100644 --- a/test/CodeGen/X86/vec_shuffle-3.ll +++ b/test/CodeGen/X86/vec_shuffle-3.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep movlhps | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep movhlps | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep movlhps | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep movhlps | wc -l | grep 1 <4 x float> %test1(<4 x float>* %x, <4 x float>* %y) { %tmp = load <4 x float>* %y diff --git a/test/CodeGen/X86/vec_shuffle-4.ll b/test/CodeGen/X86/vec_shuffle-4.ll index 1ed8555301..7632992fee 100644 --- a/test/CodeGen/X86/vec_shuffle-4.ll +++ b/test/CodeGen/X86/vec_shuffle-4.ll @@ -1,6 +1,6 @@ -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 && -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep shuf | wc -l | grep 2 && -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | not grep unpck +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep shuf | wc -l | grep 2 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | not grep unpck void %test(<4 x float>* %res, <4 x float>* %A, <4 x float>* %B, <4 x float>* %C) { %tmp3 = load <4 x float>* %B %tmp5 = load <4 x float>* %C diff --git a/test/CodeGen/X86/vec_shuffle-5.ll b/test/CodeGen/X86/vec_shuffle-5.ll index 2480ce0e15..b94769b169 100644 --- a/test/CodeGen/X86/vec_shuffle-5.ll +++ b/test/CodeGen/X86/vec_shuffle-5.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep movhlps | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep shufps | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep movhlps | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep shufps | wc -l | grep 1 void %test() { %tmp1 = load <4 x float>* null diff --git a/test/CodeGen/X86/vec_shuffle-6.ll b/test/CodeGen/X86/vec_shuffle-6.ll index 130fefeaf5..92e141d831 100644 --- a/test/CodeGen/X86/vec_shuffle-6.ll +++ b/test/CodeGen/X86/vec_shuffle-6.ll @@ -1,7 +1,7 @@ -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 && -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep movapd | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep movaps | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep movups | wc -l | grep 2 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep movapd | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep movaps | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep movups | wc -l | grep 2 target triple = "i686-apple-darwin" diff --git a/test/CodeGen/X86/vec_shuffle-7.ll b/test/CodeGen/X86/vec_shuffle-7.ll index a5686d2de8..bd978836c8 100644 --- a/test/CodeGen/X86/vec_shuffle-7.ll +++ b/test/CodeGen/X86/vec_shuffle-7.ll @@ -1,6 +1,6 @@ -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 && -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep xorps | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | not grep shufps +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep xorps | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | not grep shufps void %test() { cast <4 x int> zeroinitializer to <4 x float> diff --git a/test/CodeGen/X86/vec_shuffle-8.ll b/test/CodeGen/X86/vec_shuffle-8.ll index 449a3abd20..13e8b9c22a 100644 --- a/test/CodeGen/X86/vec_shuffle-8.ll +++ b/test/CodeGen/X86/vec_shuffle-8.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 && -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | not grep shufps +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | not grep shufps void %test(<4 x float>* %res, <4 x float>* %A) { %tmp1 = load <4 x float>* %A diff --git a/test/CodeGen/X86/vec_shuffle-9.ll b/test/CodeGen/X86/vec_shuffle-9.ll index 05b3c77c01..a9b325a77b 100644 --- a/test/CodeGen/X86/vec_shuffle-9.ll +++ b/test/CodeGen/X86/vec_shuffle-9.ll @@ -1,6 +1,6 @@ -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 && -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep punpck | wc -l | grep 2 && -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | not grep pextrw +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep punpck | wc -l | grep 2 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | not grep pextrw <4 x int> %test(sbyte** %ptr) { entry: diff --git a/test/CodeGen/X86/vec_shuffle.ll b/test/CodeGen/X86/vec_shuffle.ll index 746fa016d8..65aafe54b3 100644 --- a/test/CodeGen/X86/vec_shuffle.ll +++ b/test/CodeGen/X86/vec_shuffle.ll @@ -1,6 +1,6 @@ -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep shufp | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep movups | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep pshufhw | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep shufp | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep movups | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep pshufhw | wc -l | grep 1 void %test_v4sf(<4 x float>* %P, float %X, float %Y) { %tmp = insertelement <4 x float> zeroinitializer, float %X, uint 0 diff --git a/test/CodeGen/X86/vec_splat-2.ll b/test/CodeGen/X86/vec_splat-2.ll index c1958fde2c..a874500f3d 100644 --- a/test/CodeGen/X86/vec_splat-2.ll +++ b/test/CodeGen/X86/vec_splat-2.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep pshufd | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep pshufd | wc -l | grep 1 void %test(<2 x long>* %P, sbyte %x) { %tmp = insertelement <16 x sbyte> zeroinitializer, sbyte %x, uint 0 ; <<16 x sbyte>> [#uses=1] diff --git a/test/CodeGen/X86/vec_splat.ll b/test/CodeGen/X86/vec_splat.ll index 5d5cdc83e1..bc0ae0327d 100644 --- a/test/CodeGen/X86/vec_splat.ll +++ b/test/CodeGen/X86/vec_splat.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep shufps && -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse3 | grep movddup +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep shufps && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse3 | grep movddup void %test_v4sf(<4 x float>* %P, <4 x float>* %Q, float %X) { %tmp = insertelement <4 x float> zeroinitializer, float %X, uint 0 diff --git a/test/CodeGen/X86/vec_ss_load_fold.ll b/test/CodeGen/X86/vec_ss_load_fold.ll index 6be279af1b..38eb1d1f2e 100644 --- a/test/CodeGen/X86/vec_ss_load_fold.ll +++ b/test/CodeGen/X86/vec_ss_load_fold.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse,+sse2 | grep minss | grep CPI | wc -l | grep 2 && -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse,+sse2 | grep CPI | not grep movss +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse,+sse2 | grep minss | grep CPI | wc -l | grep 2 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse,+sse2 | grep CPI | not grep movss target endian = little target pointersize = 32 diff --git a/test/CodeGen/X86/vec_zero.ll b/test/CodeGen/X86/vec_zero.ll index d9071575e6..f976fc1834 100644 --- a/test/CodeGen/X86/vec_zero.ll +++ b/test/CodeGen/X86/vec_zero.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep xorps | wc -l | grep 2 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep xorps | wc -l | grep 2 void %foo(<4 x float> *%P) { %T = load <4 x float> * %P diff --git a/test/CodeGen/X86/x86-64-mem.ll b/test/CodeGen/X86/x86-64-mem.ll index ffa428ec5a..4426dc2047 100644 --- a/test/CodeGen/X86/x86-64-mem.ll +++ b/test/CodeGen/X86/x86-64-mem.ll @@ -1,11 +1,11 @@ -; RUN: llvm-as < %s | llc -march=x86-64 && -; RUN: llvm-as < %s | llc -march=x86-64 | grep GOTPCREL | wc -l | grep 4 && -; RUN: llvm-as < %s | llc -march=x86-64 | grep rip | wc -l | grep 6 && -; RUN: llvm-as < %s | llc -march=x86-64 | grep movq | wc -l | grep 6 && -; RUN: llvm-as < %s | llc -march=x86-64 | grep leaq | wc -l | grep 1 && -; RUN: llvm-as < %s | llc -march=x86-64 -relocation-model=static | grep rip | wc -l | grep 4 && -; RUN: llvm-as < %s | llc -march=x86-64 -relocation-model=static | grep movl | wc -l | grep 2 && -; RUN: llvm-as < %s | llc -march=x86-64 -relocation-model=static | grep movq | wc -l | grep 2 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86-64 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86-64 | grep GOTPCREL | wc -l | grep 4 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86-64 | grep rip | wc -l | grep 6 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86-64 | grep movq | wc -l | grep 6 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86-64 | grep leaq | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86-64 -relocation-model=static | grep rip | wc -l | grep 4 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86-64 -relocation-model=static | grep movl | wc -l | grep 2 && +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86-64 -relocation-model=static | grep movq | wc -l | grep 2 %ptr = external global int* %src = external global [0 x int] diff --git a/test/CodeGen/X86/xmm-r64.ll b/test/CodeGen/X86/xmm-r64.ll index bf2d61ea52..596e5c9978 100644 --- a/test/CodeGen/X86/xmm-r64.ll +++ b/test/CodeGen/X86/xmm-r64.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86-64 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86-64 <4 x int> %test() { %tmp1039 = call <4 x int> %llvm.x86.sse2.psll.d( <4 x int> zeroinitializer, <4 x int> zeroinitializer ) ; <<4 x int>> [#uses=1] diff --git a/test/ExecutionEngine/2003-05-06-LivenessClobber.llx b/test/ExecutionEngine/2003-05-06-LivenessClobber.llx index 3164dd85c1..ea3f14b512 100644 --- a/test/ExecutionEngine/2003-05-06-LivenessClobber.llx +++ b/test/ExecutionEngine/2003-05-06-LivenessClobber.llx @@ -1,6 +1,6 @@ ; This testcase shoudl return with an exit code of 1. ; -; RUN: llvm-as < %s | not lli +; RUN: llvm-upgrade < %s | llvm-as | not lli %test = global long 0 implementation diff --git a/test/ExecutionEngine/2003-05-07-ArgumentTest.llx b/test/ExecutionEngine/2003-05-07-ArgumentTest.llx index 47b40c387a..e5dd04eafb 100644 --- a/test/ExecutionEngine/2003-05-07-ArgumentTest.llx +++ b/test/ExecutionEngine/2003-05-07-ArgumentTest.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | lli - test +; RUN: llvm-upgrade < %s | llvm-as | lli - test implementation diff --git a/test/ExecutionEngine/2005-12-02-TailCallBug.ll b/test/ExecutionEngine/2005-12-02-TailCallBug.ll index fb3b676458..447f49e9ad 100644 --- a/test/ExecutionEngine/2005-12-02-TailCallBug.ll +++ b/test/ExecutionEngine/2005-12-02-TailCallBug.ll @@ -1,5 +1,5 @@ ; PR672 -; RUN: llvm-as < %s | lli +; RUN: llvm-upgrade < %s | llvm-as | lli int %main(){ %f = cast int (int, int*, int)* %check_tail to int* diff --git a/test/Feature/alignment.ll b/test/Feature/alignment.ll index 6ea7d8d7ff..871592b2ff 100644 --- a/test/Feature/alignment.ll +++ b/test/Feature/alignment.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as %s -o - | llvm-dis > %t1.ll +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll ; RUN: diff %t1.ll %t2.ll diff --git a/test/Feature/basictest.ll b/test/Feature/basictest.ll index cabf6036dc..cf040ec250 100644 --- a/test/Feature/basictest.ll +++ b/test/Feature/basictest.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as %s -o - | llvm-dis > %t1.ll +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll ; RUN: diff %t1.ll %t2.ll @@ -30,4 +30,3 @@ begin Startup: ret int 0 end - diff --git a/test/Feature/callingconventions.ll b/test/Feature/callingconventions.ll index ea50b0a86a..5617f9f26f 100644 --- a/test/Feature/callingconventions.ll +++ b/test/Feature/callingconventions.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as %s -o - | llvm-dis > %t1.ll +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll ; RUN: diff %t1.ll %t2.ll diff --git a/test/Feature/calltest.ll b/test/Feature/calltest.ll index 861d7632d4..090e840007 100644 --- a/test/Feature/calltest.ll +++ b/test/Feature/calltest.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as %s -o - | llvm-dis > %t1.ll +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll ; RUN: diff %t1.ll %t2.ll diff --git a/test/Feature/casttest.ll b/test/Feature/casttest.ll index e7d8756791..96f971a0e8 100644 --- a/test/Feature/casttest.ll +++ b/test/Feature/casttest.ll @@ -1,23 +1,7 @@ -; RUN: llvm-as %s -o - | llvm-dis > %t1.ll +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll ; RUN: diff %t1.ll %t2.ll -void "NewCasts" (short %x) { - %a = zext short %x to int - %b = sext short %x to uint - %c = trunc short %x to ubyte - %d = uitofp short %x to float - %e = sitofp short %x to double - %f = fptoui float %d to short - %g = fptosi double %e to short - %i = fpext float %d to double - %j = fptrunc double %i to float - %k = bitcast int %a to float - %l = inttoptr short %x to int* - %m = ptrtoint int* %l to long - ret void -} - short "FunFunc"(long %x, sbyte %z) begin bb0: ;;<label> diff --git a/test/Feature/cfgstructures.ll b/test/Feature/cfgstructures.ll index b044b5cf52..b16af47af1 100644 --- a/test/Feature/cfgstructures.ll +++ b/test/Feature/cfgstructures.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as %s -o - | llvm-dis > %t1.ll +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll ; RUN: diff %t1.ll %t2.ll diff --git a/test/Feature/constexpr.ll b/test/Feature/constexpr.ll index fe20b9c11b..afbe0cd1f8 100644 --- a/test/Feature/constexpr.ll +++ b/test/Feature/constexpr.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as %s -o - | llvm-dis > %t1.ll +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll ; RUN: diff %t1.ll %t2.ll diff --git a/test/Feature/constpointer.ll b/test/Feature/constpointer.ll index 9a876d2ced..d1dddaadb3 100644 --- a/test/Feature/constpointer.ll +++ b/test/Feature/constpointer.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as %s -o - | llvm-dis > %t1.ll +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll ; RUN: diff %t1.ll %t2.ll diff --git a/test/Feature/escaped_label.ll b/test/Feature/escaped_label.ll index 81011cdc94..4532fe99bc 100644 --- a/test/Feature/escaped_label.ll +++ b/test/Feature/escaped_label.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as %s -o - | llvm-dis > %t1.ll +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll ; RUN: diff %t1.ll %t2.ll diff --git a/test/Feature/float.ll b/test/Feature/float.ll index e16f092e4c..5a53c2c0a3 100644 --- a/test/Feature/float.ll +++ b/test/Feature/float.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as %s -o - | llvm-dis > Output/t1.ll +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > Output/t1.ll ; RUN: llvm-as Output/t1.ll -o - | llvm-dis > Output/t2.ll ; RUN: diff Output/t1.ll Output/t2.ll diff --git a/test/Feature/forwardreftest.ll b/test/Feature/forwardreftest.ll index 4569ee2b30..edb1f281eb 100644 --- a/test/Feature/forwardreftest.ll +++ b/test/Feature/forwardreftest.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as %s -o - | llvm-dis > %t1.ll +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll ; RUN: diff %t1.ll %t2.ll diff --git a/test/Feature/global_section.ll b/test/Feature/global_section.ll index 179d99bba8..08a2c323dd 100644 --- a/test/Feature/global_section.ll +++ b/test/Feature/global_section.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as %s -o - | llvm-dis > %t1.ll +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll ; RUN: diff %t1.ll %t2.ll diff --git a/test/Feature/globalredefinition.ll b/test/Feature/globalredefinition.ll index 8e5bbe24ba..e7b37eedc6 100644 --- a/test/Feature/globalredefinition.ll +++ b/test/Feature/globalredefinition.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as %s -o - | llvm-dis > %t1.ll +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll ; RUN: diff %t1.ll %t2.ll diff --git a/test/Feature/globalvars.ll b/test/Feature/globalvars.ll index b5001627c6..26259dad4c 100644 --- a/test/Feature/globalvars.ll +++ b/test/Feature/globalvars.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as %s -o - | llvm-dis > %t1.ll +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll ; RUN: diff %t1.ll %t2.ll diff --git a/test/Feature/indirectcall.ll b/test/Feature/indirectcall.ll index cdc2651e70..2d1855b903 100644 --- a/test/Feature/indirectcall.ll +++ b/test/Feature/indirectcall.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as %s -o - | llvm-dis > %t1.ll +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll ; RUN: diff %t1.ll %t2.ll diff --git a/test/Feature/indirectcall2.ll b/test/Feature/indirectcall2.ll index 08e49ecd5e..d16c737374 100644 --- a/test/Feature/indirectcall2.ll +++ b/test/Feature/indirectcall2.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as %s -o - | llvm-dis > %t1.ll +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll ; RUN: diff %t1.ll %t2.ll diff --git a/test/Feature/inlineasm.ll b/test/Feature/inlineasm.ll index 9043b494ea..c34324a3ee 100644 --- a/test/Feature/inlineasm.ll +++ b/test/Feature/inlineasm.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as %s -o /dev/null -f && -; RUN: llvm-as %s -o - | llvm-dis > Output/t1.ll && +; RUN: llvm-upgrade %s -o - | llvm-as -o /dev/null -f && +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > Output/t1.ll && ; RUN: llvm-as Output/t1.ll -o - | llvm-dis > Output/t2.ll && ; RUN: diff Output/t1.ll Output/t2.ll diff --git a/test/Feature/instructions.ll b/test/Feature/instructions.ll index 99cec7699c..281dafb5a2 100644 --- a/test/Feature/instructions.ll +++ b/test/Feature/instructions.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as %s -o - | llvm-dis > %t1.ll +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll ; RUN: diff %t1.ll %t2.ll diff --git a/test/Feature/intrinsics.ll b/test/Feature/intrinsics.ll index 6733e37119..3cb8728c2d 100644 --- a/test/Feature/intrinsics.ll +++ b/test/Feature/intrinsics.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as %s -o - | llvm-dis > %t1.ll +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll ; RUN: diff %t1.ll %t2.ll diff --git a/test/Feature/newcasts.ll b/test/Feature/newcasts.ll new file mode 100644 index 0000000000..6b297961aa --- /dev/null +++ b/test/Feature/newcasts.ll @@ -0,0 +1,21 @@ +; RUN: llvm-as < %s | llvm-dis > %t1.ll +; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll +; RUN: diff %t1.ll %t2.ll + +void "NewCasts" (short %x) { + %a = zext short %x to int + %b = sext short %x to uint + %c = trunc short %x to ubyte + %d = uitofp short %x to float + %e = sitofp short %x to double + %f = fptoui float %d to short + %g = fptosi double %e to short + %i = fpext float %d to double + %j = fptrunc double %i to float + %k = bitcast int %a to float + %l = inttoptr short %x to int* + %m = ptrtoint int* %l to long + ret void +} + + diff --git a/test/Feature/opaquetypes.ll b/test/Feature/opaquetypes.ll index 1873a00af9..92efaebfd0 100644 --- a/test/Feature/opaquetypes.ll +++ b/test/Feature/opaquetypes.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as %s -o - | llvm-dis > %t1.ll +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll ; RUN: diff %t1.ll %t2.ll diff --git a/test/Feature/packed.ll b/test/Feature/packed.ll index bc50d26015..a3591dffe8 100755 --- a/test/Feature/packed.ll +++ b/test/Feature/packed.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as %s -o - | llvm-dis > %t1.ll +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll ; RUN: diff %t1.ll %t2.ll diff --git a/test/Feature/properties.ll b/test/Feature/properties.ll index fc88f239dc..e906f22b18 100644 --- a/test/Feature/properties.ll +++ b/test/Feature/properties.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as %s -o - | llvm-dis > %t1.ll +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll ; RUN: diff %t1.ll %t2.ll diff --git a/test/Feature/prototype.ll b/test/Feature/prototype.ll index a97f8129b1..9bab73f7fb 100644 --- a/test/Feature/prototype.ll +++ b/test/Feature/prototype.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as %s -o - | llvm-dis > %t1.ll +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll ; RUN: diff %t1.ll %t2.ll diff --git a/test/Feature/recursivetype.ll b/test/Feature/recursivetype.ll index e91d49e815..9ea3484842 100644 --- a/test/Feature/recursivetype.ll +++ b/test/Feature/recursivetype.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as %s -o - | llvm-dis > %t1.ll +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll ; RUN: diff %t1.ll %t2.ll diff --git a/test/Feature/simplecalltest.ll b/test/Feature/simplecalltest.ll index 37fa6c62ab..6f0b72e901 100644 --- a/test/Feature/simplecalltest.ll +++ b/test/Feature/simplecalltest.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as %s -o - | llvm-dis > %t1.ll +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll ; RUN: diff %t1.ll %t2.ll diff --git a/test/Feature/small.ll b/test/Feature/small.ll index 5d80e2003a..6ef37c7083 100644 --- a/test/Feature/small.ll +++ b/test/Feature/small.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as %s -o - | llvm-dis > %t1.ll +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll ; RUN: diff %t1.ll %t2.ll diff --git a/test/Feature/smallest.ll b/test/Feature/smallest.ll index a7ad71c384..910af3c88f 100644 --- a/test/Feature/smallest.ll +++ b/test/Feature/smallest.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as %s -o - | llvm-dis > %t1.ll +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll ; RUN: diff %t1.ll %t2.ll diff --git a/test/Feature/testalloca.ll b/test/Feature/testalloca.ll index 5a13bada72..d05b70d0c3 100644 --- a/test/Feature/testalloca.ll +++ b/test/Feature/testalloca.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as %s -o - | llvm-dis > %t1.ll +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll ; RUN: diff %t1.ll %t2.ll diff --git a/test/Feature/testconstants.ll b/test/Feature/testconstants.ll index 49d2d152ae..3df2a2971e 100644 --- a/test/Feature/testconstants.ll +++ b/test/Feature/testconstants.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as %s -o - | llvm-dis > %t1.ll +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll ; RUN: diff %t1.ll %t2.ll diff --git a/test/Feature/testlogical.ll b/test/Feature/testlogical.ll index 97452b4557..887699ab5f 100644 --- a/test/Feature/testlogical.ll +++ b/test/Feature/testlogical.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as %s -o - | llvm-dis > %t1.ll +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll ; RUN: diff %t1.ll %t2.ll diff --git a/test/Feature/testmemory.ll b/test/Feature/testmemory.ll index 573ee982d7..ce48e57606 100644 --- a/test/Feature/testmemory.ll +++ b/test/Feature/testmemory.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as %s -o - | llvm-dis > %t1.ll +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll ; RUN: diff %t1.ll %t2.ll diff --git a/test/Feature/testswitch.ll b/test/Feature/testswitch.ll index 484ff2abc1..8664ace55a 100644 --- a/test/Feature/testswitch.ll +++ b/test/Feature/testswitch.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as %s -o - | llvm-dis > %t1.ll +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll ; RUN: diff %t1.ll %t2.ll diff --git a/test/Feature/testvarargs.ll b/test/Feature/testvarargs.ll index 5806f2899a..196ab01e40 100644 --- a/test/Feature/testvarargs.ll +++ b/test/Feature/testvarargs.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as %s -o - | llvm-dis > %t1.ll +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll ; RUN: diff %t1.ll %t2.ll diff --git a/test/Feature/undefined.ll b/test/Feature/undefined.ll index cdbec03d39..dc1b7c547a 100644 --- a/test/Feature/undefined.ll +++ b/test/Feature/undefined.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as %s -o - | llvm-dis > %t1.ll +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll ; RUN: diff %t1.ll %t2.ll diff --git a/test/Feature/unreachable.ll b/test/Feature/unreachable.ll index de7beb93ae..48558dded0 100644 --- a/test/Feature/unreachable.ll +++ b/test/Feature/unreachable.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as %s -o - | llvm-dis > %t1.ll +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll ; RUN: diff %t1.ll %t2.ll diff --git a/test/Feature/varargs.ll b/test/Feature/varargs.ll index d75a49d8ed..672d96a428 100644 --- a/test/Feature/varargs.ll +++ b/test/Feature/varargs.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as %s -o - | llvm-dis > %t1.ll +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll ; RUN: diff %t1.ll %t2.ll @@ -6,18 +6,19 @@ ; the va_arg instruction. implementation -declare sbyte* %llvm.va_start() -declare sbyte* %llvm.va_copy(sbyte*) -declare void %llvm.va_end(sbyte*) +declare void %llvm.va_start(sbyte** %ap) +declare void %llvm.va_copy(sbyte** %aq, sbyte** %ap) +declare void %llvm.va_end(sbyte** %ap) int %test(int %X, ...) { - %ap = call sbyte* %llvm.va_start() - %aq = call sbyte* %llvm.va_copy(sbyte* %ap) - call void %llvm.va_end(sbyte* %aq) - - %tmp = vaarg sbyte* %ap, int - %ap2 = vanext sbyte* %ap, int + %ap = alloca sbyte* + call void %llvm.va_start(sbyte** %ap) + %tmp = va_arg sbyte** %ap, int - call void %llvm.va_end(sbyte* %ap2) + %aq = alloca sbyte* + call void %llvm.va_copy(sbyte** %aq, sbyte** %ap) + call void %llvm.va_end(sbyte** %aq) + + call void %llvm.va_end(sbyte** %ap) ret int %tmp } diff --git a/test/Feature/varargs_new.ll b/test/Feature/varargs_new.ll index 995076e1a0..a0e8c46af6 100644 --- a/test/Feature/varargs_new.ll +++ b/test/Feature/varargs_new.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as %s -o - | llvm-dis > %t1.ll +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll ; RUN: diff %t1.ll %t2.ll diff --git a/test/Feature/weirdnames.ll b/test/Feature/weirdnames.ll index c8a45c34a6..54046480ae 100644 --- a/test/Feature/weirdnames.ll +++ b/test/Feature/weirdnames.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as %s -o - | llvm-dis > %t1.ll +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll ; RUN: diff %t1.ll %t2.ll diff --git a/test/Other/2002-01-31-CallGraph.ll b/test/Other/2002-01-31-CallGraph.ll index 279369de66..61c1277d64 100644 --- a/test/Other/2002-01-31-CallGraph.ll +++ b/test/Other/2002-01-31-CallGraph.ll @@ -1,6 +1,6 @@ ; Call graph construction crash: Not handling indirect calls right ; -; RUN: llvm-as < %s | opt -analyze -callgraph +; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -callgraph ; %FunTy = type int(int) diff --git a/test/Other/2002-01-31-PostDomSet-2.ll b/test/Other/2002-01-31-PostDomSet-2.ll index cd11a24cb5..234bf4df34 100644 --- a/test/Other/2002-01-31-PostDomSet-2.ll +++ b/test/Other/2002-01-31-PostDomSet-2.ll @@ -1,6 +1,6 @@ ; Crash in post dominator set construction. ; -; RUN: llvm-as < %s | opt -analyze -postdomset +; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -postdomset ; implementation diff --git a/test/Other/2002-01-31-PostDomSet.ll b/test/Other/2002-01-31-PostDomSet.ll index cf15e97cff..69a11ba76e 100644 --- a/test/Other/2002-01-31-PostDomSet.ll +++ b/test/Other/2002-01-31-PostDomSet.ll @@ -1,6 +1,6 @@ ; Crash in post dominator set construction. ; -; RUN: llvm-as < %s | opt -analyze -postdomset +; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -postdomset ; implementation diff --git a/test/Other/2002-02-24-InlineBrokePHINodes.ll b/test/Other/2002-02-24-InlineBrokePHINodes.ll index 1088205cdc..cb02ea486e 100644 --- a/test/Other/2002-02-24-InlineBrokePHINodes.ll +++ b/test/Other/2002-02-24-InlineBrokePHINodes.ll @@ -1,7 +1,7 @@ ; Inlining used to break PHI nodes. This tests that they are correctly updated ; when a node is split around the call instruction. The verifier caught the error. ; -; RUN: llvm-as < %s | opt -inline +; RUN: llvm-upgrade < %s | llvm-as | opt -inline ; implementation diff --git a/test/Other/2002-03-11-ConstPropCrash.ll b/test/Other/2002-03-11-ConstPropCrash.ll index 62435747c2..91bea5324d 100644 --- a/test/Other/2002-03-11-ConstPropCrash.ll +++ b/test/Other/2002-03-11-ConstPropCrash.ll @@ -5,7 +5,7 @@ ; ; Fixed by adding new arguments to ConstantFoldTerminator ; -; RUN: llvm-as < %s | opt -constprop +; RUN: llvm-upgrade < %s | llvm-as | opt -constprop implementation diff --git a/test/Other/2002-08-02-DomSetProblem.ll b/test/Other/2002-08-02-DomSetProblem.ll index ed7c86a480..f62135d3f1 100644 --- a/test/Other/2002-08-02-DomSetProblem.ll +++ b/test/Other/2002-08-02-DomSetProblem.ll @@ -2,7 +2,7 @@ ; blocks. These blocks should at least dominate themselves. This is ; fouling up the verify pass. ; -; RUN: llvm-as < %s | opt -analyze -domset | grep BB +; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -domset | grep BB void %test() { ret void diff --git a/test/Other/2003-02-19-LoopInfoNestingBug.ll b/test/Other/2003-02-19-LoopInfoNestingBug.ll index e4fe0818fb..bf71f5f22e 100644 --- a/test/Other/2003-02-19-LoopInfoNestingBug.ll +++ b/test/Other/2003-02-19-LoopInfoNestingBug.ll @@ -2,7 +2,7 @@ ; figure out that loop "Inner" should be nested inside of leep "LoopHeader", ; and instead nests it just inside loop "Top" ; -; RUN: llvm-as < %s | opt -analyze -loops | grep ' Loop Containing:[ ]*%Inner' +; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -loops | grep ' Loop Containing:[ ]*%Inner' ; implementation diff --git a/test/Other/2004-08-16-LowerPacked.ll b/test/Other/2004-08-16-LowerPacked.ll index 4c11f82c37..1d8da1d557 100644 --- a/test/Other/2004-08-16-LowerPacked.ll +++ b/test/Other/2004-08-16-LowerPacked.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -lower-packed | llvm-dis +; RUN: llvm-upgrade < %s | llvm-as | opt -lower-packed | llvm-dis %foo = uninitialized global <2 x int>; %bar = uninitialized global <2 x int>; diff --git a/test/Other/2004-08-16-PackedConstantInlineStore.ll b/test/Other/2004-08-16-PackedConstantInlineStore.ll index 2d447f92ee..6f94d9925d 100644 --- a/test/Other/2004-08-16-PackedConstantInlineStore.ll +++ b/test/Other/2004-08-16-PackedConstantInlineStore.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llvm-dis +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis %bar = external global <2 x int> ; <<2 x int>*> [#uses=1] diff --git a/test/Other/2004-08-16-PackedGlobalConstant.ll b/test/Other/2004-08-16-PackedGlobalConstant.ll index 9a8c21c596..01b0d5dd40 100644 --- a/test/Other/2004-08-16-PackedGlobalConstant.ll +++ b/test/Other/2004-08-16-PackedGlobalConstant.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llvm-dis +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis %foo = global <2 x int> <int 0, int 1>; %bar = uninitialized global <2 x int>; diff --git a/test/Other/2004-08-16-PackedSelect.ll b/test/Other/2004-08-16-PackedSelect.ll index 94a6c38efa..5bbf20caa5 100644 --- a/test/Other/2004-08-16-PackedSelect.ll +++ b/test/Other/2004-08-16-PackedSelect.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llvm-dis +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis %foo = uninitialized global <4 x float>; %bar = uninitialized global <4 x float>; diff --git a/test/Other/2004-08-16-PackedSimple.ll b/test/Other/2004-08-16-PackedSimple.ll index 10cee3823a..9835199ba7 100644 --- a/test/Other/2004-08-16-PackedSimple.ll +++ b/test/Other/2004-08-16-PackedSimple.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llvm-dis +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis %foo = uninitialized global <4 x float>; %bar = uninitialized global <4 x float>; diff --git a/test/Other/2004-08-20-PackedControlFlow.ll b/test/Other/2004-08-20-PackedControlFlow.ll index 8c03f9affb..d2566b1563 100644 --- a/test/Other/2004-08-20-PackedControlFlow.ll +++ b/test/Other/2004-08-20-PackedControlFlow.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llvm-dis | llvm-as > /dev/null +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | llvm-as > /dev/null %v4f = type <4 x float> diff --git a/test/Transforms/ADCE/2002-01-31-UseStuckAround.ll b/test/Transforms/ADCE/2002-01-31-UseStuckAround.ll index 162b0508fd..f902bc97b8 100644 --- a/test/Transforms/ADCE/2002-01-31-UseStuckAround.ll +++ b/test/Transforms/ADCE/2002-01-31-UseStuckAround.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -adce +; RUN: llvm-upgrade < %s | llvm-as | opt -adce implementation diff --git a/test/Transforms/ADCE/2002-05-22-PHITest.ll b/test/Transforms/ADCE/2002-05-22-PHITest.ll index e13536cac0..cf9872e2e1 100644 --- a/test/Transforms/ADCE/2002-05-22-PHITest.ll +++ b/test/Transforms/ADCE/2002-05-22-PHITest.ll @@ -1,6 +1,6 @@ ; It is illegal to remove BB1 because it will mess up the PHI node! ; -; RUN: llvm-as < %s | opt -adce | llvm-dis | grep BB1 +; RUN: llvm-upgrade < %s | llvm-as | opt -adce | llvm-dis | grep BB1 int "test"(bool %C, int %A, int %B) { diff --git a/test/Transforms/ADCE/2002-05-23-ZeroArgPHITest.ll b/test/Transforms/ADCE/2002-05-23-ZeroArgPHITest.ll index e3f8de2f15..999675b55a 100644 --- a/test/Transforms/ADCE/2002-05-23-ZeroArgPHITest.ll +++ b/test/Transforms/ADCE/2002-05-23-ZeroArgPHITest.ll @@ -4,7 +4,7 @@ ; removed even though there were uses still around. Now the uses are filled ; in with a dummy value before the PHI is deleted. ; -; RUN: llvm-as < %s | opt -adce +; RUN: llvm-upgrade < %s | llvm-as | opt -adce %node_t = type { double*, %node_t*, %node_t**, double**, double*, int, int } diff --git a/test/Transforms/ADCE/2002-05-28-Crash-distilled.ll b/test/Transforms/ADCE/2002-05-28-Crash-distilled.ll index 1fcf609786..0d5adf907f 100644 --- a/test/Transforms/ADCE/2002-05-28-Crash-distilled.ll +++ b/test/Transforms/ADCE/2002-05-28-Crash-distilled.ll @@ -1,6 +1,6 @@ ; This testcase is a distilled form of: 2002-05-28-Crash.ll -; RUN: llvm-as < %s | opt -adce +; RUN: llvm-upgrade < %s | llvm-as | opt -adce float "test"(int %i) { %F = cast int %i to float ; This BB is not dead diff --git a/test/Transforms/ADCE/2002-05-28-Crash.ll b/test/Transforms/ADCE/2002-05-28-Crash.ll index 5b4acda062..b6340d540b 100644 --- a/test/Transforms/ADCE/2002-05-28-Crash.ll +++ b/test/Transforms/ADCE/2002-05-28-Crash.ll @@ -11,7 +11,7 @@ ; return !s; ;} ; -; RUN: llvm-as < %s | opt -adce +; RUN: llvm-upgrade < %s | llvm-as | opt -adce implementation ; Functions: diff --git a/test/Transforms/ADCE/2002-07-17-AssertionFailure.ll b/test/Transforms/ADCE/2002-07-17-AssertionFailure.ll index 36db7fb5de..61b140233d 100644 --- a/test/Transforms/ADCE/2002-07-17-AssertionFailure.ll +++ b/test/Transforms/ADCE/2002-07-17-AssertionFailure.ll @@ -3,7 +3,7 @@ ; block in this function, it would work fine, but that would be the part we ; have to fix now, wouldn't it.... ; -; RUN: llvm-as < %s | opt -adce +; RUN: llvm-upgrade < %s | llvm-as | opt -adce void %foo(sbyte* %reg5481) { %cast611 = cast sbyte* %reg5481 to sbyte** ; <sbyte**> [#uses=1] diff --git a/test/Transforms/ADCE/2002-07-17-PHIAssertion.ll b/test/Transforms/ADCE/2002-07-17-PHIAssertion.ll index bd88884756..6d15fae8ef 100644 --- a/test/Transforms/ADCE/2002-07-17-PHIAssertion.ll +++ b/test/Transforms/ADCE/2002-07-17-PHIAssertion.ll @@ -1,6 +1,6 @@ ; This testcase was extracted from the gzip SPEC benchmark ; -; RUN: llvm-as < %s | opt -adce +; RUN: llvm-upgrade < %s | llvm-as | opt -adce %bk = external global uint ; <uint*> [#uses=2] %hufts = external global uint ; <uint*> [#uses=1] diff --git a/test/Transforms/ADCE/2003-01-22-PredecessorProblem.ll b/test/Transforms/ADCE/2003-01-22-PredecessorProblem.ll index 5023f94246..d8c6448570 100644 --- a/test/Transforms/ADCE/2003-01-22-PredecessorProblem.ll +++ b/test/Transforms/ADCE/2003-01-22-PredecessorProblem.ll @@ -1,5 +1,5 @@ ; Testcase reduced from 197.parser by bugpoint -; RUN: llvm-as < %s | opt -adce +; RUN: llvm-upgrade < %s | llvm-as | opt -adce implementation ; Functions: void %conjunction_prune() { diff --git a/test/Transforms/ADCE/2003-04-25-PHIPostDominateProblem.ll b/test/Transforms/ADCE/2003-04-25-PHIPostDominateProblem.ll index 1a71ffe02e..92d7cad770 100644 --- a/test/Transforms/ADCE/2003-04-25-PHIPostDominateProblem.ll +++ b/test/Transforms/ADCE/2003-04-25-PHIPostDominateProblem.ll @@ -2,7 +2,7 @@ ; entries for it's postdominator. But I think this can only happen when the ; PHI node is dead, so we just avoid patching up dead PHI nodes. -; RUN: llvm-as < %s | opt -adce +; RUN: llvm-upgrade < %s | llvm-as | opt -adce target endian = little target pointersize = 32 diff --git a/test/Transforms/ADCE/2003-06-11-InvalidCFG.ll b/test/Transforms/ADCE/2003-06-11-InvalidCFG.ll index 9f28fc113a..590089d1c9 100644 --- a/test/Transforms/ADCE/2003-06-11-InvalidCFG.ll +++ b/test/Transforms/ADCE/2003-06-11-InvalidCFG.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -adce -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -adce -disable-output %G = external global int* implementation ; Functions: diff --git a/test/Transforms/ADCE/2003-06-24-BadSuccessor.ll b/test/Transforms/ADCE/2003-06-24-BadSuccessor.ll index 567aca793e..1a730194ff 100644 --- a/test/Transforms/ADCE/2003-06-24-BadSuccessor.ll +++ b/test/Transforms/ADCE/2003-06-24-BadSuccessor.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -adce -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -adce -disable-output target endian = little target pointersize = 32 diff --git a/test/Transforms/ADCE/2003-06-24-BasicFunctionality.ll b/test/Transforms/ADCE/2003-06-24-BasicFunctionality.ll index 4591261815..ac62699863 100644 --- a/test/Transforms/ADCE/2003-06-24-BasicFunctionality.ll +++ b/test/Transforms/ADCE/2003-06-24-BasicFunctionality.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -adce -simplifycfg | llvm-dis | not grep then: +; RUN: llvm-upgrade < %s | llvm-as | opt -adce -simplifycfg | llvm-dis | not grep then: void %dead_test8(int* %data.1, int %idx.1) { entry: ; No predecessors! diff --git a/test/Transforms/ADCE/2003-09-10-UnwindInstFail.ll b/test/Transforms/ADCE/2003-09-10-UnwindInstFail.ll index 72b87bb05d..a88e04155b 100644 --- a/test/Transforms/ADCE/2003-09-10-UnwindInstFail.ll +++ b/test/Transforms/ADCE/2003-09-10-UnwindInstFail.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -adce -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -adce -disable-output implementation ; Functions: diff --git a/test/Transforms/ADCE/2003-09-15-InfLoopCrash.ll b/test/Transforms/ADCE/2003-09-15-InfLoopCrash.ll index 13b4f91cd6..c61bd6d385 100644 --- a/test/Transforms/ADCE/2003-09-15-InfLoopCrash.ll +++ b/test/Transforms/ADCE/2003-09-15-InfLoopCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -adce -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -adce -disable-output int %main() { br label %loop diff --git a/test/Transforms/ADCE/2003-11-16-MissingPostDominanceInfo.ll b/test/Transforms/ADCE/2003-11-16-MissingPostDominanceInfo.ll index adeeaa6d56..cf7b08835b 100644 --- a/test/Transforms/ADCE/2003-11-16-MissingPostDominanceInfo.ll +++ b/test/Transforms/ADCE/2003-11-16-MissingPostDominanceInfo.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -adce -simplifycfg | llvm-dis | grep call +; RUN: llvm-upgrade < %s | llvm-as | opt -adce -simplifycfg | llvm-dis | grep call declare void %exit(int) int %main(int %argc) { diff --git a/test/Transforms/ADCE/2003-12-19-MergeReturn.llx b/test/Transforms/ADCE/2003-12-19-MergeReturn.llx index 541f2abe97..6b8b547fc7 100644 --- a/test/Transforms/ADCE/2003-12-19-MergeReturn.llx +++ b/test/Transforms/ADCE/2003-12-19-MergeReturn.llx @@ -1,7 +1,7 @@ ; This testcase was failing because without merging the return blocks, ADCE ; didn't know that it could get rid of the then.0 block. -; RUN: llvm-as < %s | opt -adce | llvm-dis | not grep load +; RUN: llvm-upgrade < %s | llvm-as | opt -adce | llvm-dis | not grep load implementation ; Functions: diff --git a/test/Transforms/ADCE/2004-05-04-UnreachableBlock.llx b/test/Transforms/ADCE/2004-05-04-UnreachableBlock.llx index b08fdfe10a..56f2b2b002 100644 --- a/test/Transforms/ADCE/2004-05-04-UnreachableBlock.llx +++ b/test/Transforms/ADCE/2004-05-04-UnreachableBlock.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -adce -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -adce -disable-output void %test() { entry: diff --git a/test/Transforms/ADCE/2005-02-17-PHI-Invoke-Crash.ll b/test/Transforms/ADCE/2005-02-17-PHI-Invoke-Crash.ll index 6e439a7b20..b7a901b468 100644 --- a/test/Transforms/ADCE/2005-02-17-PHI-Invoke-Crash.ll +++ b/test/Transforms/ADCE/2005-02-17-PHI-Invoke-Crash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -adce -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -adce -disable-output implementation ; Functions: diff --git a/test/Transforms/ADCE/adcetest.ll b/test/Transforms/ADCE/adcetest.ll index 28b5852606..f0d78433af 100644 --- a/test/Transforms/ADCE/adcetest.ll +++ b/test/Transforms/ADCE/adcetest.ll @@ -1,7 +1,7 @@ ; This is the test case taken from Appel's book that illustrates a hard case ; that SCCP gets right, and when followed by ADCE, is completely eliminated ; -; RUN: llvm-as < %s | opt -sccp -adce -simplifycfg | llvm-dis | not grep br +; RUN: llvm-upgrade < %s | llvm-as | opt -sccp -adce -simplifycfg | llvm-dis | not grep br int "test function"(int %i0, int %j0) { BB1: diff --git a/test/Transforms/ADCE/basictest.ll b/test/Transforms/ADCE/basictest.ll index 737f77526b..6be744ef5e 100644 --- a/test/Transforms/ADCE/basictest.ll +++ b/test/Transforms/ADCE/basictest.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -adce -simplifycfg | llvm-dis +; RUN: llvm-upgrade < %s | llvm-as | opt -adce -simplifycfg | llvm-dis int "Test"(int %A, int %B) { BB1: diff --git a/test/Transforms/ADCE/basictest1.ll b/test/Transforms/ADCE/basictest1.ll index 77a34df66e..7d511e8f70 100644 --- a/test/Transforms/ADCE/basictest1.ll +++ b/test/Transforms/ADCE/basictest1.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -adce -simplifycfg | llvm-dis +; RUN: llvm-upgrade < %s | llvm-as | opt -adce -simplifycfg | llvm-dis %FILE = type { int, ubyte*, ubyte*, ubyte, ubyte, uint, uint, uint } %spec_fd_t = type { int, int, int, ubyte* } diff --git a/test/Transforms/ADCE/basictest2.ll b/test/Transforms/ADCE/basictest2.ll index ffb2c1ddbe..75b1d952b6 100644 --- a/test/Transforms/ADCE/basictest2.ll +++ b/test/Transforms/ADCE/basictest2.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -adce -simplifycfg | llvm-dis +; RUN: llvm-upgrade < %s | llvm-as | opt -adce -simplifycfg | llvm-dis %FILE = type { int, ubyte*, ubyte*, ubyte, ubyte, uint, uint, uint } %spec_fd_t = type { int, int, int, ubyte* } diff --git a/test/Transforms/ADCE/dce_pure_call.ll b/test/Transforms/ADCE/dce_pure_call.ll index dad2912702..79a360c268 100644 --- a/test/Transforms/ADCE/dce_pure_call.ll +++ b/test/Transforms/ADCE/dce_pure_call.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -adce | llvm-dis | not grep call +; RUN: llvm-upgrade < %s | llvm-as | opt -adce | llvm-dis | not grep call declare int %strlen(sbyte*) diff --git a/test/Transforms/ADCE/dce_pure_invoke.ll b/test/Transforms/ADCE/dce_pure_invoke.ll index 608c655412..9604defb3b 100644 --- a/test/Transforms/ADCE/dce_pure_invoke.ll +++ b/test/Transforms/ADCE/dce_pure_invoke.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -adce | llvm-dis | not grep null +; RUN: llvm-upgrade < %s | llvm-as | opt -adce | llvm-dis | not grep null declare int %strlen(sbyte*) diff --git a/test/Transforms/ADCE/dead-phi-edge.ll b/test/Transforms/ADCE/dead-phi-edge.ll index b4a10b2699..a0c0705f33 100644 --- a/test/Transforms/ADCE/dead-phi-edge.ll +++ b/test/Transforms/ADCE/dead-phi-edge.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -adce | llvm-dis | not grep call +; RUN: llvm-upgrade < %s | llvm-as | opt -adce | llvm-dis | not grep call ; The call is not live just because the PHI uses the call retval! diff --git a/test/Transforms/ADCE/unreachable-function.ll b/test/Transforms/ADCE/unreachable-function.ll index 353276fe2f..0c10253300 100644 --- a/test/Transforms/ADCE/unreachable-function.ll +++ b/test/Transforms/ADCE/unreachable-function.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -adce -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -adce -disable-output void %test() { unreachable diff --git a/test/Transforms/ArgumentPromotion/aggregate-promote.ll b/test/Transforms/ArgumentPromotion/aggregate-promote.ll index b43b168b7b..19cbb6df2d 100644 --- a/test/Transforms/ArgumentPromotion/aggregate-promote.ll +++ b/test/Transforms/ArgumentPromotion/aggregate-promote.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -argpromotion -instcombine | not grep load +; RUN: llvm-upgrade < %s | llvm-as | opt -argpromotion -instcombine | not grep load %QuadTy = type {int, int, int, int} diff --git a/test/Transforms/ArgumentPromotion/basictest.ll b/test/Transforms/ArgumentPromotion/basictest.ll index dd7a785d7d..474202727a 100644 --- a/test/Transforms/ArgumentPromotion/basictest.ll +++ b/test/Transforms/ArgumentPromotion/basictest.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -argpromotion -mem2reg | llvm-dis | not grep alloca +; RUN: llvm-upgrade < %s | llvm-as | opt -argpromotion -mem2reg | llvm-dis | not grep alloca implementation diff --git a/test/Transforms/ArgumentPromotion/chained.ll b/test/Transforms/ArgumentPromotion/chained.ll index 3adfbf9d84..d6055e2768 100644 --- a/test/Transforms/ArgumentPromotion/chained.ll +++ b/test/Transforms/ArgumentPromotion/chained.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -argpromotion -instcombine | llvm-dis | not grep load +; RUN: llvm-upgrade < %s | llvm-as | opt -argpromotion -instcombine | llvm-dis | not grep load %G1 = constant int 0 %G2 = constant int* %G1 diff --git a/test/Transforms/ArgumentPromotion/control-flow.ll b/test/Transforms/ArgumentPromotion/control-flow.ll index 3907ed0f78..bff9153a43 100644 --- a/test/Transforms/ArgumentPromotion/control-flow.ll +++ b/test/Transforms/ArgumentPromotion/control-flow.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -argpromotion | llvm-dis | not grep 'load int\* null' +; RUN: llvm-upgrade < %s | llvm-as | opt -argpromotion | llvm-dis | not grep 'load int\* null' implementation diff --git a/test/Transforms/ArgumentPromotion/control-flow2.ll b/test/Transforms/ArgumentPromotion/control-flow2.ll index d68d207725..ba777768ed 100644 --- a/test/Transforms/ArgumentPromotion/control-flow2.ll +++ b/test/Transforms/ArgumentPromotion/control-flow2.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -argpromotion | llvm-dis | grep 'load int\* %A' +; RUN: llvm-upgrade < %s | llvm-as | opt -argpromotion | llvm-dis | grep 'load int\* %A' implementation diff --git a/test/Transforms/ArgumentPromotion/recursion.ll b/test/Transforms/ArgumentPromotion/recursion.ll index ca07d3ab08..306b969a5d 100644 --- a/test/Transforms/ArgumentPromotion/recursion.ll +++ b/test/Transforms/ArgumentPromotion/recursion.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -argpromotion | llvm-dis | grep x.val +; RUN: llvm-upgrade < %s | llvm-as | opt -argpromotion | llvm-dis | grep x.val ; XFAIL: * implementation ; Functions: diff --git a/test/Transforms/BlockPlacement/basictest.ll b/test/Transforms/BlockPlacement/basictest.ll index 34db1eeb06..4dafa4f095 100644 --- a/test/Transforms/BlockPlacement/basictest.ll +++ b/test/Transforms/BlockPlacement/basictest.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -block-placement -disable-output -print +; RUN: llvm-upgrade < %s | llvm-as | opt -block-placement -disable-output -print int %test() { diff --git a/test/Transforms/CodeExtractor/2004-03-13-LoopExtractorCrash.ll b/test/Transforms/CodeExtractor/2004-03-13-LoopExtractorCrash.ll index 7e9007912d..3100d649ba 100644 --- a/test/Transforms/CodeExtractor/2004-03-13-LoopExtractorCrash.ll +++ b/test/Transforms/CodeExtractor/2004-03-13-LoopExtractorCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -loop-extract -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -loop-extract -disable-output void %solve() { entry: diff --git a/test/Transforms/CodeExtractor/2004-03-14-DominanceProblem.ll b/test/Transforms/CodeExtractor/2004-03-14-DominanceProblem.ll index 5dffe4b5ad..186466dc9b 100644 --- a/test/Transforms/CodeExtractor/2004-03-14-DominanceProblem.ll +++ b/test/Transforms/CodeExtractor/2004-03-14-DominanceProblem.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -loop-extract -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -loop-extract -disable-output ; This testcase is failing the loop extractor because not all exit blocks ; are dominated by all of the live-outs. diff --git a/test/Transforms/CodeExtractor/2004-03-14-NoSwitchSupport.ll b/test/Transforms/CodeExtractor/2004-03-14-NoSwitchSupport.ll index 71445557f4..3efcea56ac 100644 --- a/test/Transforms/CodeExtractor/2004-03-14-NoSwitchSupport.ll +++ b/test/Transforms/CodeExtractor/2004-03-14-NoSwitchSupport.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -loop-extract-single -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -loop-extract-single -disable-output void %ab() { entry: diff --git a/test/Transforms/CodeExtractor/2004-03-17-MissedLiveIns.ll b/test/Transforms/CodeExtractor/2004-03-17-MissedLiveIns.ll index 3c65f9d70d..67756b5ab5 100644 --- a/test/Transforms/CodeExtractor/2004-03-17-MissedLiveIns.ll +++ b/test/Transforms/CodeExtractor/2004-03-17-MissedLiveIns.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -loop-extract -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -loop-extract -disable-output void %sendMTFValues() { entry: diff --git a/test/Transforms/CodeExtractor/2004-03-17-OutputMismatch.ll b/test/Transforms/CodeExtractor/2004-03-17-OutputMismatch.ll index ca5cbf120e..23ca986bc7 100644 --- a/test/Transforms/CodeExtractor/2004-03-17-OutputMismatch.ll +++ b/test/Transforms/CodeExtractor/2004-03-17-OutputMismatch.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -loop-extract -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -loop-extract -disable-output %struct.node_t = type { double*, %struct.node_t*, %struct.node_t**, double**, double*, int, int } %struct.table_t = type { [1 x %struct.node_t**], [1 x %struct.node_t**] } diff --git a/test/Transforms/CodeExtractor/2004-03-17-UpdatePHIsOutsideRegion.ll b/test/Transforms/CodeExtractor/2004-03-17-UpdatePHIsOutsideRegion.ll index 3a91e1d40e..0ff309191a 100644 --- a/test/Transforms/CodeExtractor/2004-03-17-UpdatePHIsOutsideRegion.ll +++ b/test/Transforms/CodeExtractor/2004-03-17-UpdatePHIsOutsideRegion.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -loop-extract -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -loop-extract -disable-output void %maketree() { diff --git a/test/Transforms/CodeExtractor/2004-03-18-InvokeHandling.ll b/test/Transforms/CodeExtractor/2004-03-18-InvokeHandling.ll index a128dda014..70d1e0aa8c 100644 --- a/test/Transforms/CodeExtractor/2004-03-18-InvokeHandling.ll +++ b/test/Transforms/CodeExtractor/2004-03-18-InvokeHandling.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -loop-extract -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -loop-extract -disable-output implementation ; Functions: diff --git a/test/Transforms/CodeExtractor/2004-08-12-BlockExtractPHI.ll b/test/Transforms/CodeExtractor/2004-08-12-BlockExtractPHI.ll index 4f695844ee..c9c23d48e5 100644 --- a/test/Transforms/CodeExtractor/2004-08-12-BlockExtractPHI.ll +++ b/test/Transforms/CodeExtractor/2004-08-12-BlockExtractPHI.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -extract-blocks -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -extract-blocks -disable-output implementation diff --git a/test/Transforms/CodeExtractor/2004-11-12-InvokeExtract.ll b/test/Transforms/CodeExtractor/2004-11-12-InvokeExtract.ll index b654266f07..4ada2aeb28 100644 --- a/test/Transforms/CodeExtractor/2004-11-12-InvokeExtract.ll +++ b/test/Transforms/CodeExtractor/2004-11-12-InvokeExtract.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -extract-blocks -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -extract-blocks -disable-output int %foo() { br label %EB EB: diff --git a/test/Transforms/CondProp/2006-08-14-SingleEntryPhiCrash.ll b/test/Transforms/CondProp/2006-08-14-SingleEntryPhiCrash.ll index 698f8100d4..e029831390 100644 --- a/test/Transforms/CondProp/2006-08-14-SingleEntryPhiCrash.ll +++ b/test/Transforms/CondProp/2006-08-14-SingleEntryPhiCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -condprop -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -condprop -disable-output ; PR877 target endian = big diff --git a/test/Transforms/CondProp/2006-11-01-PhiNodeCrash.ll b/test/Transforms/CondProp/2006-11-01-PhiNodeCrash.ll index 8d7ea26d53..5221319f9a 100644 --- a/test/Transforms/CondProp/2006-11-01-PhiNodeCrash.ll +++ b/test/Transforms/CondProp/2006-11-01-PhiNodeCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -condprop -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -condprop -disable-output ; PR979 target datalayout = "e-p:32:32" target endian = little diff --git a/test/Transforms/CondProp/basictest.ll b/test/Transforms/CondProp/basictest.ll index 2e33e9e708..adc16f8cdd 100644 --- a/test/Transforms/CondProp/basictest.ll +++ b/test/Transforms/CondProp/basictest.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -condprop | llvm-dis | not grep 'br label' +; RUN: llvm-upgrade < %s | llvm-as | opt -condprop | llvm-dis | not grep 'br label' int %test(bool %C) { br bool %C, label %T1, label %F1 diff --git a/test/Transforms/CondProp/phisimplify.ll b/test/Transforms/CondProp/phisimplify.ll index 818bcab40d..a4728eb191 100644 --- a/test/Transforms/CondProp/phisimplify.ll +++ b/test/Transforms/CondProp/phisimplify.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -condprop | llvm-dis | not grep phi +; RUN: llvm-upgrade < %s | llvm-as | opt -condprop | llvm-dis | not grep phi int %test(uint %C, bool %Val) { switch uint %C, label %T1 [ diff --git a/test/Transforms/CondProp/phisimplify2.ll b/test/Transforms/CondProp/phisimplify2.ll index 177dac540b..4c83fa38a5 100644 --- a/test/Transforms/CondProp/phisimplify2.ll +++ b/test/Transforms/CondProp/phisimplify2.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -condprop | llvm-dis | not grep phi +; RUN: llvm-upgrade < %s | llvm-as | opt -condprop | llvm-dis | not grep phi declare bool %foo() diff --git a/test/Transforms/ConstProp/2002-05-03-DivideByZeroException.ll b/test/Transforms/ConstProp/2002-05-03-DivideByZeroException.ll index 85bac18c11..331501adb3 100644 --- a/test/Transforms/ConstProp/2002-05-03-DivideByZeroException.ll +++ b/test/Transforms/ConstProp/2002-05-03-DivideByZeroException.ll @@ -1,6 +1,6 @@ ; Make sure that the constant propogator doesn't divide by zero! ; -; RUN: llvm-as < %s | opt -constprop +; RUN: llvm-upgrade < %s | llvm-as | opt -constprop ; int "test"() { diff --git a/test/Transforms/ConstProp/2002-05-03-NotOperator.ll b/test/Transforms/ConstProp/2002-05-03-NotOperator.ll index 91e495d7bc..d028dfbadc 100644 --- a/test/Transforms/ConstProp/2002-05-03-NotOperator.ll +++ b/test/Transforms/ConstProp/2002-05-03-NotOperator.ll @@ -4,7 +4,7 @@ ; Fix #2: The unary not instruction now no longer exists. Change to xor. -; RUN: llvm-as < %s | opt -constprop | llvm-dis | not grep 'int 0' +; RUN: llvm-upgrade < %s | llvm-as | opt -constprop | llvm-dis | not grep 'int 0' int "test1"() { %R = xor int 123, -1 diff --git a/test/Transforms/ConstProp/2002-09-03-SetCC-Bools.ll b/test/Transforms/ConstProp/2002-09-03-SetCC-Bools.ll index 1d08e6f2d5..6b6b340097 100644 --- a/test/Transforms/ConstProp/2002-09-03-SetCC-Bools.ll +++ b/test/Transforms/ConstProp/2002-09-03-SetCC-Bools.ll @@ -1,6 +1,6 @@ ; SetCC on boolean values was not implemented! -; RUN: llvm-as < %s | opt -constprop -die | llvm-dis | not grep 'set' +; RUN: llvm-upgrade < %s | llvm-as | opt -constprop -die | llvm-dis | not grep 'set' bool "test1"() { %A = setle bool true, false diff --git a/test/Transforms/ConstProp/2003-05-12-DivideError.ll b/test/Transforms/ConstProp/2003-05-12-DivideError.ll index d926a43465..289384bfc5 100644 --- a/test/Transforms/ConstProp/2003-05-12-DivideError.ll +++ b/test/Transforms/ConstProp/2003-05-12-DivideError.ll @@ -1,6 +1,6 @@ ; Make sure that the constant propagator doesn't cause a sigfpe ; -; RUN: llvm-as < %s | opt -constprop +; RUN: llvm-upgrade < %s | llvm-as | opt -constprop ; int "test"() { diff --git a/test/Transforms/ConstProp/2005-01-28-SetCCGEP.ll b/test/Transforms/ConstProp/2005-01-28-SetCCGEP.ll index b4984a8172..9a06a458b9 100644 --- a/test/Transforms/ConstProp/2005-01-28-SetCCGEP.ll +++ b/test/Transforms/ConstProp/2005-01-28-SetCCGEP.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -constprop | llvm-dis | not grep 'ret bool false' +; RUN: llvm-upgrade < %s | llvm-as | opt -constprop | llvm-dis | not grep 'ret bool false' %b = external global [2 x { }] diff --git a/test/Transforms/ConstProp/2006-11-30-vector-cast.ll b/test/Transforms/ConstProp/2006-11-30-vector-cast.ll index ae8d3ab98c..0e7db79002 100644 --- a/test/Transforms/ConstProp/2006-11-30-vector-cast.ll +++ b/test/Transforms/ConstProp/2006-11-30-vector-cast.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | opt -constprop | llvm-dis | grep 4294967295 && -; RUN: llvm-as < %s | opt -constprop | llvm-dis | not grep zeroinitializer +; RUN: llvm-upgrade < %s | llvm-as | opt -constprop | llvm-dis | grep 4294967295 && +; RUN: llvm-upgrade < %s | llvm-as | opt -constprop | llvm-dis | not grep zeroinitializer < 4 x uint> %test() { %tmp40 = bitcast <2 x long> bitcast (<4 x int> < int 0, int 0, int -1, int 0 > to <2 x long>) to <4 x uint> diff --git a/test/Transforms/ConstProp/2006-12-01-TruncBoolBug.ll b/test/Transforms/ConstProp/2006-12-01-TruncBoolBug.ll index c7b2c6fa6d..659900ba89 100644 --- a/test/Transforms/ConstProp/2006-12-01-TruncBoolBug.ll +++ b/test/Transforms/ConstProp/2006-12-01-TruncBoolBug.ll @@ -1,4 +1,4 @@ -; 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' bool %test() { %X = trunc uint 320 to bool ret bool %X diff --git a/test/Transforms/ConstProp/2006-12-01-bool-casts.ll b/test/Transforms/ConstProp/2006-12-01-bool-casts.ll index 94dc5c6262..a2d6feb260 100644 --- a/test/Transforms/ConstProp/2006-12-01-bool-casts.ll +++ b/test/Transforms/ConstProp/2006-12-01-bool-casts.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | opt -constprop | llvm-dis | grep 'ret int -1' && -; RUN: llvm-as < %s | opt -constprop | llvm-dis | grep 'ret uint 1' +; RUN: llvm-upgrade < %s | llvm-as | opt -constprop | llvm-dis | grep 'ret int -1' && +; RUN: llvm-upgrade < %s | llvm-as | opt -constprop | llvm-dis | grep 'ret uint 1' int %test1() { %A = sext bool true to int diff --git a/test/Transforms/ConstProp/basictest.ll b/test/Transforms/ConstProp/basictest.ll index c75cc51d89..178467d83e 100644 --- a/test/Transforms/ConstProp/basictest.ll +++ b/test/Transforms/ConstProp/basictest.ll @@ -1,7 +1,7 @@ ; This is a basic sanity check for constant propogation. The add instruction ; should be eliminated. -; RUN: llvm-as < %s | opt -constprop -die | llvm-dis | not grep add +; RUN: llvm-upgrade < %s | llvm-as | opt -constprop -die | llvm-dis | not grep add int %test(bool %B) { br bool %B, label %BB1, label %BB2 diff --git a/test/Transforms/ConstProp/bswap.ll b/test/Transforms/ConstProp/bswap.ll index 2d7f96449f..d31fa9d793 100644 --- a/test/Transforms/ConstProp/bswap.ll +++ b/test/Transforms/ConstProp/bswap.ll @@ -1,6 +1,6 @@ ; bswap should be constant folded when it is passed a constant argument -; RUN: llvm-as < %s | opt -constprop | llvm-dis | not grep call +; RUN: llvm-upgrade < %s | llvm-as | opt -constprop | llvm-dis | not grep call declare ushort %llvm.bswap.i16(ushort) declare uint %llvm.bswap.i32(uint) diff --git a/test/Transforms/ConstProp/calls.ll b/test/Transforms/ConstProp/calls.ll index fb924d8b55..35efe8dfed 100644 --- a/test/Transforms/ConstProp/calls.ll +++ b/test/Transforms/ConstProp/calls.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -constprop | llvm-dis | not grep call +; RUN: llvm-upgrade < %s | llvm-as | opt -constprop | llvm-dis | not grep call declare double %cos(double) declare double %sin(double) diff --git a/test/Transforms/ConstProp/float-to-ptr-cast.ll b/test/Transforms/ConstProp/float-to-ptr-cast.ll index 39e0fc7a52..dc6c391976 100644 --- a/test/Transforms/ConstProp/float-to-ptr-cast.ll +++ b/test/Transforms/ConstProp/float-to-ptr-cast.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -constprop | llvm-dis | grep -F 'ret int* null' | wc -l | grep 2 +; RUN: llvm-upgrade < %s | llvm-as | opt -constprop | llvm-dis | grep -F 'ret int* null' | wc -l | grep 2 int* %test1() { %X = cast float 0.0 to int* ret int* %X diff --git a/test/Transforms/ConstProp/logicaltest.ll b/test/Transforms/ConstProp/logicaltest.ll index 082bcaa3da..dfd45869b2 100644 --- a/test/Transforms/ConstProp/logicaltest.ll +++ b/test/Transforms/ConstProp/logicaltest.ll @@ -1,6 +1,6 @@ ; Ensure constant propogation of logical instructions is working correctly. -; RUN: llvm-as < %s | opt -constprop -die | llvm-dis | not egrep 'and|or|xor' +; RUN: llvm-upgrade < %s | llvm-as | opt -constprop -die | llvm-dis | not egrep 'and|or|xor' int "test1"() { %R = and int 4,1234 ret int %R } diff --git a/test/Transforms/ConstProp/nottest.ll b/test/Transforms/ConstProp/nottest.ll index fe9b09480a..022a513ae4 100644 --- a/test/Transforms/ConstProp/nottest.ll +++ b/test/Transforms/ConstProp/nottest.ll @@ -1,6 +1,6 @@ ; Ensure constant propogation of 'not' instructions is working correctly. -; RUN: llvm-as < %s | opt -constprop -die | llvm-dis | not grep xor +; RUN: llvm-upgrade < %s | llvm-as | opt -constprop -die | llvm-dis | not grep xor int "test1"() { %R = xor int 4, -1 diff --git a/test/Transforms/ConstProp/phi.ll b/test/Transforms/ConstProp/phi.ll index e2c7d5b24d..d7624dcacf 100644 --- a/test/Transforms/ConstProp/phi.ll +++ b/test/Transforms/ConstProp/phi.ll @@ -1,7 +1,7 @@ ; This is a basic sanity check for constant propogation. The add instruction ; should be eliminated. -; RUN: llvm-as < %s | opt -constprop -die | llvm-dis | not grep phi +; RUN: llvm-upgrade < %s | llvm-as | opt -constprop -die | llvm-dis | not grep phi int %test(bool %B) { BB0: diff --git a/test/Transforms/ConstProp/remtest.ll b/test/Transforms/ConstProp/remtest.ll index e278386dd7..905f4b724f 100644 --- a/test/Transforms/ConstProp/remtest.ll +++ b/test/Transforms/ConstProp/remtest.ll @@ -1,6 +1,6 @@ ; Ensure constant propagation of remainder instructions is working correctly. -; RUN: llvm-as < %s | opt -constprop -die | llvm-dis | not grep rem +; RUN: llvm-upgrade < %s | llvm-as | opt -constprop -die | llvm-dis | not grep rem int %test1() { %R = rem int 4, 3 diff --git a/test/Transforms/ConstantMerge/2002-09-23-CPR-Update.ll b/test/Transforms/ConstantMerge/2002-09-23-CPR-Update.ll index ce15a43cb8..8d3d434d89 100644 --- a/test/Transforms/ConstantMerge/2002-09-23-CPR-Update.ll +++ b/test/Transforms/ConstantMerge/2002-09-23-CPR-Update.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -constmerge > /dev/null +; RUN: llvm-upgrade < %s | llvm-as | opt -constmerge > /dev/null %foo = internal constant {int} {int 7} %bar = internal constant {int} {int 7} diff --git a/test/Transforms/ConstantMerge/2003-10-28-MergeExternalConstants.ll b/test/Transforms/ConstantMerge/2003-10-28-MergeExternalConstants.ll index 8cad0019b0..72f8ecf7d1 100644 --- a/test/Transforms/ConstantMerge/2003-10-28-MergeExternalConstants.ll +++ b/test/Transforms/ConstantMerge/2003-10-28-MergeExternalConstants.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -constmerge | llvm-dis | %prcontext foo 2 | grep bar +; RUN: llvm-upgrade < %s | llvm-as | opt -constmerge | llvm-dis | %prcontext foo 2 | grep bar %foo = constant int 6 %bar = constant int 6 diff --git a/test/Transforms/ConstantMerge/2006-03-07-DontMergeDiffSections.ll b/test/Transforms/ConstantMerge/2006-03-07-DontMergeDiffSections.ll index d11b783dc4..36786d9262 100644 --- a/test/Transforms/ConstantMerge/2006-03-07-DontMergeDiffSections.ll +++ b/test/Transforms/ConstantMerge/2006-03-07-DontMergeDiffSections.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | opt -constmerge | llvm-dis | grep foo -; RUN: llvm-as < %s | opt -constmerge | llvm-dis | grep bar +; RUN: llvm-upgrade < %s | llvm-as | opt -constmerge | llvm-dis | grep foo +; RUN: llvm-upgrade < %s | llvm-as | opt -constmerge | llvm-dis | grep bar ; Don't merge constants in different sections. diff --git a/test/Transforms/CorrelatedExprs/2002-09-23-PHIUpdateBug.ll b/test/Transforms/CorrelatedExprs/2002-09-23-PHIUpdateBug.ll index 93cdecc0cd..5873a638a6 100644 --- a/test/Transforms/CorrelatedExprs/2002-09-23-PHIUpdateBug.ll +++ b/test/Transforms/CorrelatedExprs/2002-09-23-PHIUpdateBug.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -cee +; RUN: llvm-upgrade < %s | llvm-as | opt -cee implementation diff --git a/test/Transforms/CorrelatedExprs/2002-10-03-PHIPropogate.ll b/test/Transforms/CorrelatedExprs/2002-10-03-PHIPropogate.ll index 249680504c..a9d5f0c016 100644 --- a/test/Transforms/CorrelatedExprs/2002-10-03-PHIPropogate.ll +++ b/test/Transforms/CorrelatedExprs/2002-10-03-PHIPropogate.ll @@ -12,7 +12,7 @@ ; } ; } ; -; RUN: llvm-as < %s | opt -cee -simplifycfg | llvm-dis | not grep bb3 +; RUN: llvm-upgrade < %s | llvm-as | opt -cee -simplifycfg | llvm-dis | not grep bb3 implementation declare void %bar() diff --git a/test/Transforms/CorrelatedExprs/2002-10-04-ForwardingBug.ll b/test/Transforms/CorrelatedExprs/2002-10-04-ForwardingBug.ll index 420373f3bc..7dd89d4a64 100644 --- a/test/Transforms/CorrelatedExprs/2002-10-04-ForwardingBug.ll +++ b/test/Transforms/CorrelatedExprs/2002-10-04-ForwardingBug.ll @@ -1,6 +1,6 @@ ; Testcase distilled from bisort where we tried to perform branch target ; forwarding where it was not safe. -; RUN: llvm-as < %s | opt -cee +; RUN: llvm-upgrade < %s | llvm-as | opt -cee ; %HANDLE = type { int, %HANDLE*, %HANDLE* } %struct.node = type { int, %HANDLE*, %HANDLE* } diff --git a/test/Transforms/CorrelatedExprs/2002-10-07-DominatorProblem.ll b/test/Transforms/CorrelatedExprs/2002-10-07-DominatorProblem.ll index 0267f2b3fb..716db54b6a 100644 --- a/test/Transforms/CorrelatedExprs/2002-10-07-DominatorProblem.ll +++ b/test/Transforms/CorrelatedExprs/2002-10-07-DominatorProblem.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -cee +; RUN: llvm-upgrade < %s | llvm-as | opt -cee ; ; The 'cee' pass is breaking SSA form when it blindly forwards the branch from ; Eq to branch to "Forwarded" instead. diff --git a/test/Transforms/CorrelatedExprs/2002-10-07-NoImmediateDominator.ll b/test/Transforms/CorrelatedExprs/2002-10-07-NoImmediateDominator.ll index 9d40953ee9..f5ce0454e3 100644 --- a/test/Transforms/CorrelatedExprs/2002-10-07-NoImmediateDominator.ll +++ b/test/Transforms/CorrelatedExprs/2002-10-07-NoImmediateDominator.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -cee +; RUN: llvm-upgrade < %s | llvm-as | opt -cee ; ; This testcase causes an assertion error. ; diff --git a/test/Transforms/CorrelatedExprs/2002-10-08-DominatorTest.ll b/test/Transforms/CorrelatedExprs/2002-10-08-DominatorTest.ll index ee8a6198cf..2f39701adc 100644 --- a/test/Transforms/CorrelatedExprs/2002-10-08-DominatorTest.ll +++ b/test/Transforms/CorrelatedExprs/2002-10-08-DominatorTest.ll @@ -1,5 +1,5 @@ ; Test to make sure that SSA is correctly updated -; RUN: llvm-as < %s | opt -cee +; RUN: llvm-upgrade < %s | llvm-as | opt -cee ; implementation ; Functions: diff --git a/test/Transforms/CorrelatedExprs/2002-10-08-DominatorTest2.ll b/test/Transforms/CorrelatedExprs/2002-10-08-DominatorTest2.ll index de37831e10..0348e4011f 100644 --- a/test/Transforms/CorrelatedExprs/2002-10-08-DominatorTest2.ll +++ b/test/Transforms/CorrelatedExprs/2002-10-08-DominatorTest2.ll @@ -1,5 +1,5 @@ ; Simple test to make sure dominators are updated properly -; RUN: llvm-as < %s | opt -cee +; RUN: llvm-upgrade < %s | llvm-as | opt -cee implementation ; Functions: diff --git a/test/Transforms/CorrelatedExprs/basictest.ll b/test/Transforms/CorrelatedExprs/basictest.ll index 2f57c6e6bb..b403c30c97 100644 --- a/test/Transforms/CorrelatedExprs/basictest.ll +++ b/test/Transforms/CorrelatedExprs/basictest.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -cee -constprop -instcombine -dce | llvm-dis | not grep 'REMOVE' +; RUN: llvm-upgrade < %s | llvm-as | opt -cee -constprop -instcombine -dce | llvm-dis | not grep 'REMOVE' int %test1(int %A) { %cond = seteq int %A, 40 diff --git a/test/Transforms/CorrelatedExprs/looptest.ll b/test/Transforms/CorrelatedExprs/looptest.ll index c9895d15a5..7fe09031c7 100644 --- a/test/Transforms/CorrelatedExprs/looptest.ll +++ b/test/Transforms/CorrelatedExprs/looptest.ll @@ -12,7 +12,7 @@ ; Note that this is a "feature" test, not a correctness test. ; ; XFAIL: * -; RUN: llvm-as < %s | opt -cee -simplifycfg | llvm-dis | not grep cond213 +; RUN: llvm-upgrade < %s | llvm-as | opt -cee -simplifycfg | llvm-dis | not grep cond213 ; implementation ; Functions: diff --git a/test/Transforms/CorrelatedExprs/nullpointer.ll b/test/Transforms/CorrelatedExprs/nullpointer.ll index bec083a093..c6829aaeab 100644 --- a/test/Transforms/CorrelatedExprs/nullpointer.ll +++ b/test/Transforms/CorrelatedExprs/nullpointer.ll @@ -2,7 +2,7 @@ ; Any succeeding uses of the pointer should get this info ; ; XFAIL: * -; RUN: llvm-as < %s | opt -cee -instcombine -simplifycfg | llvm-dis | not grep br +; RUN: llvm-upgrade < %s | llvm-as | opt -cee -instcombine -simplifycfg | llvm-dis | not grep br implementation ; Functions: diff --git a/test/Transforms/CorrelatedExprs/switch.ll b/test/Transforms/CorrelatedExprs/switch.ll index 8bf8964920..d8fad3e190 100644 --- a/test/Transforms/CorrelatedExprs/switch.ll +++ b/test/Transforms/CorrelatedExprs/switch.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -cee -constprop -instcombine -dce | llvm-dis | not grep 'REMOVE' +; RUN: llvm-upgrade < %s | llvm-as | opt -cee -constprop -instcombine -dce | llvm-dis | not grep 'REMOVE' int %test_case_values_should_propagate(int %A) { switch int %A, label %D [ diff --git a/test/Transforms/CorrelatedExprs/whet.ll b/test/Transforms/CorrelatedExprs/whet.ll index 8a5339bb35..ded1e1996a 100644 --- a/test/Transforms/CorrelatedExprs/whet.ll +++ b/test/Transforms/CorrelatedExprs/whet.ll @@ -11,7 +11,7 @@ ; ; This should eliminate all BB's except BB0, BB9, BB10 ; -; RUN: llvm-as < %s | opt -cee -instcombine -simplifycfg | llvm-dis | not grep 'bb[2-8]' +; RUN: llvm-upgrade < %s | llvm-as | opt -cee -instcombine -simplifycfg | llvm-dis | not grep 'bb[2-8]' implementation ; Functions: diff --git a/test/Transforms/DSAnalysis/arraymerge.ll b/test/Transforms/DSAnalysis/arraymerge.ll index da379ef9eb..f1f251e443 100644 --- a/test/Transforms/DSAnalysis/arraymerge.ll +++ b/test/Transforms/DSAnalysis/arraymerge.ll @@ -2,7 +2,7 @@ ; folded completely away if possible. This is a very common case, so it should ; be efficient. ; -; RUN: llvm-as < %s | opt -analyze -tddatastructure +; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -tddatastructure ; implementation diff --git a/test/Transforms/DSAnalysis/arraytest.ll b/test/Transforms/DSAnalysis/arraytest.ll index 19410efe0b..a7a3b4d7d0 100644 --- a/test/Transforms/DSAnalysis/arraytest.ll +++ b/test/Transforms/DSAnalysis/arraytest.ll @@ -1,5 +1,5 @@ ; -; RUN: llvm-as < %s | opt -analyze -tddatastructure +; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -tddatastructure %crazy = type [2 x { [2 x sbyte], short } ] implementation diff --git a/test/Transforms/DSAnalysis/badcases.ll b/test/Transforms/DSAnalysis/badcases.ll index 2c0689228b..571107bf5d 100644 --- a/test/Transforms/DSAnalysis/badcases.ll +++ b/test/Transforms/DSAnalysis/badcases.ll @@ -1,6 +1,6 @@ ; This file contains a list of situations where node folding should happen... ; -; RUN: llvm-as < %s | opt -analyze -tddatastructure +; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -tddatastructure implementation diff --git a/test/Transforms/DSAnalysis/basictest.ll b/test/Transforms/DSAnalysis/basictest.ll index 3191441bd8..d2a02a8a7f 100644 --- a/test/Transforms/DSAnalysis/basictest.ll +++ b/test/Transforms/DSAnalysis/basictest.ll @@ -1,6 +1,6 @@ ; very simple test ; -; RUN: llvm-as < %s | opt -analyze -tddatastructure +; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -tddatastructure implementation diff --git a/test/Transforms/DSAnalysis/fieldmerge.ll b/test/Transforms/DSAnalysis/fieldmerge.ll index a95fbdd432..dc0c3bc94c 100644 --- a/test/Transforms/DSAnalysis/fieldmerge.ll +++ b/test/Transforms/DSAnalysis/fieldmerge.ll @@ -1,5 +1,5 @@ ; -; RUN: llvm-as < %s | opt -analyze -tddatastructure +; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -tddatastructure %str = type { int*, int* } diff --git a/test/Transforms/DSAnalysis/goodcases.ll b/test/Transforms/DSAnalysis/goodcases.ll index 26066056ee..c7e3a246af 100644 --- a/test/Transforms/DSAnalysis/goodcases.ll +++ b/test/Transforms/DSAnalysis/goodcases.ll @@ -1,6 +1,6 @@ ; This file contains a list of cases where node folding should NOT happen ; -; RUN: llvm-as < %s | opt -analyze -tddatastructure +; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -tddatastructure ; implementation diff --git a/test/Transforms/DSAnalysis/indcalltest.ll b/test/Transforms/DSAnalysis/indcalltest.ll index 71925c0c41..79ed1ae773 100644 --- a/test/Transforms/DSAnalysis/indcalltest.ll +++ b/test/Transforms/DSAnalysis/indcalltest.ll @@ -1,5 +1,5 @@ ; -; RUN: llvm-as < %s | opt -analyze -tddatastructure +; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -tddatastructure %G = global int 2 ; <int*> [#uses=1] %H = global int* null diff --git a/test/Transforms/DSAnalysis/misctests.ll b/test/Transforms/DSAnalysis/misctests.ll index 0e01c6b7d2..0ed847096c 100644 --- a/test/Transforms/DSAnalysis/misctests.ll +++ b/test/Transforms/DSAnalysis/misctests.ll @@ -1,5 +1,5 @@ ; -; RUN: llvm-as < %s | opt -analyze -tddatastructure +; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -tddatastructure int* %test1(int *%A) { %R = getelementptr int* %A, long 1 diff --git a/test/Transforms/DSAnalysis/physicalsubtype.ll b/test/Transforms/DSAnalysis/physicalsubtype.ll index e46dbdd4f4..d16943024a 100644 --- a/test/Transforms/DSAnalysis/physicalsubtype.ll +++ b/test/Transforms/DSAnalysis/physicalsubtype.ll @@ -1,6 +1,6 @@ ; A test for "physical subtyping" used in some C programs... ; -; RUN: llvm-as < %s | opt -analyze -tddatastructure +; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -tddatastructure ; %ST = type { int, int* } ; "Subtype" %DT = type { int, int*, int } ; "derived type" diff --git a/test/Transforms/DSAnalysis/recursion.ll b/test/Transforms/DSAnalysis/recursion.ll index 4e686a6f84..c79183f3b0 100644 --- a/test/Transforms/DSAnalysis/recursion.ll +++ b/test/Transforms/DSAnalysis/recursion.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -analyze -tddatastructure +; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -tddatastructure implementation ; Functions: diff --git a/test/Transforms/DSAnalysis/simplest-test.ll b/test/Transforms/DSAnalysis/simplest-test.ll index 47c18b9c93..f28ffe92b2 100644 --- a/test/Transforms/DSAnalysis/simplest-test.ll +++ b/test/Transforms/DSAnalysis/simplest-test.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -analyze -tddatastructure +; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -tddatastructure void %foo(int* %X) { store int 4, int* %X diff --git a/test/Transforms/DSAnalysis/simpletest.ll b/test/Transforms/DSAnalysis/simpletest.ll index 9e6a2c240b..c82b38bbe9 100644 --- a/test/Transforms/DSAnalysis/simpletest.ll +++ b/test/Transforms/DSAnalysis/simpletest.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -analyze -tddatastructure +; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -tddatastructure implementation diff --git a/test/Transforms/DSAnalysis/structpadding.ll b/test/Transforms/DSAnalysis/structpadding.ll index f776b5c8e0..8b5cc37d9a 100644 --- a/test/Transforms/DSAnalysis/structpadding.ll +++ b/test/Transforms/DSAnalysis/structpadding.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -analyze -tddatastructure +; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -tddatastructure %str = type { int, int* } diff --git a/test/Transforms/DeadArgElim/2006-06-27-struct-ret.ll b/test/Transforms/DeadArgElim/2006-06-27-struct-ret.ll index 80bbce0c05..2a7b3a1f04 100644 --- a/test/Transforms/DeadArgElim/2006-06-27-struct-ret.ll +++ b/test/Transforms/DeadArgElim/2006-06-27-struct-ret.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -deadargelim -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -deadargelim -disable-output implementation diff --git a/test/Transforms/DeadArgElim/basictest.ll b/test/Transforms/DeadArgElim/basictest.ll index 424f8e54d3..a3a4235400 100644 --- a/test/Transforms/DeadArgElim/basictest.ll +++ b/test/Transforms/DeadArgElim/basictest.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -deadargelim | llvm-dis | not grep DEADARG +; RUN: llvm-upgrade < %s | llvm-as | opt -deadargelim | llvm-dis | not grep DEADARG implementation diff --git a/test/Transforms/DeadArgElim/dead_vaargs.ll b/test/Transforms/DeadArgElim/dead_vaargs.ll index edd3163c61..c615ed0650 100644 --- a/test/Transforms/DeadArgElim/dead_vaargs.ll +++ b/test/Transforms/DeadArgElim/dead_vaargs.ll @@ -1,6 +1,6 @@ -; RUN: llvm-as < %s | opt -deadargelim -disable-output && -; RUN: llvm-as < %s | opt -deadargelim | llvm-dis | not grep 47 && -; RUN: llvm-as < %s | opt -deadargelim | llvm-dis | not grep 1.0 +; RUN: llvm-upgrade < %s | llvm-as | opt -deadargelim -disable-output && +; RUN: llvm-upgrade < %s | llvm-as | opt -deadargelim | llvm-dis | not grep 47 && +; RUN: llvm-upgrade < %s | llvm-as | opt -deadargelim | llvm-dis | not grep 1.0 int %bar(int %A) { %tmp4 = tail call int (int, ...)* %foo( int %A, int %A, int %A, int %A, ulong 47, double 1.000000e+00 ) diff --git a/test/Transforms/DeadArgElim/deadretval.ll b/test/Transforms/DeadArgElim/deadretval.ll index 33b4bd7cb6..ccfbc2f739 100644 --- a/test/Transforms/DeadArgElim/deadretval.ll +++ b/test/Transforms/DeadArgElim/deadretval.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -deadargelim | llvm-dis | not grep DEAD +; RUN: llvm-upgrade < %s | llvm-as | opt -deadargelim | llvm-dis | not grep DEAD implementation diff --git a/test/Transforms/DeadArgElim/deadretval2.ll b/test/Transforms/DeadArgElim/deadretval2.ll index 2596fa66fa..4f129ab1d0 100644 --- a/test/Transforms/DeadArgElim/deadretval2.ll +++ b/test/Transforms/DeadArgElim/deadretval2.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -deadargelim -die | llvm-dis | not grep DEAD +; RUN: llvm-upgrade < %s | llvm-as | opt -deadargelim -die | llvm-dis | not grep DEAD %P = external global int diff --git a/test/Transforms/DeadStoreElimination/2004-11-28-LiveStoreDeleted.ll b/test/Transforms/DeadStoreElimination/2004-11-28-LiveStoreDeleted.ll index 31adce1428..f963b9aa39 100644 --- a/test/Transforms/DeadStoreElimination/2004-11-28-LiveStoreDeleted.ll +++ b/test/Transforms/DeadStoreElimination/2004-11-28-LiveStoreDeleted.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -dse -scalarrepl -instcombine | llvm-dis | not grep 'ret int undef' +; RUN: llvm-upgrade < %s | llvm-as | opt -dse -scalarrepl -instcombine | llvm-dis | not grep 'ret int undef' int %test(double %__x) { %__u = alloca { [3 x int] } diff --git a/test/Transforms/DeadStoreElimination/2004-12-28-PartialStore.ll b/test/Transforms/DeadStoreElimination/2004-12-28-PartialStore.ll index d9160e5222..b78be884dc 100644 --- a/test/Transforms/DeadStoreElimination/2004-12-28-PartialStore.ll +++ b/test/Transforms/DeadStoreElimination/2004-12-28-PartialStore.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -dse | llvm-dis | grep 'store int 1234567' +; RUN: llvm-upgrade < %s | llvm-as | opt -dse | llvm-dis | grep 'store int 1234567' ; Do not delete stores that are only partially killed. diff --git a/test/Transforms/DeadStoreElimination/2005-11-30-vaarg.ll b/test/Transforms/DeadStoreElimination/2005-11-30-vaarg.ll index 4a6ebdf1cf..58b253c9f4 100644 --- a/test/Transforms/DeadStoreElimination/2005-11-30-vaarg.ll +++ b/test/Transforms/DeadStoreElimination/2005-11-30-vaarg.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -dse | llvm-dis | grep store +; RUN: llvm-upgrade < %s | llvm-as | opt -dse | llvm-dis | grep store double %foo(sbyte* %X) { %X_addr = alloca sbyte* diff --git a/test/Transforms/DeadStoreElimination/2006-06-27-AST-Remove.ll b/test/Transforms/DeadStoreElimination/2006-06-27-AST-Remove.ll index 1d9e8a9ecc..1d1be152bf 100644 --- a/test/Transforms/DeadStoreElimination/2006-06-27-AST-Remove.ll +++ b/test/Transforms/DeadStoreElimination/2006-06-27-AST-Remove.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -globalsmodref-aa -dse -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -globalsmodref-aa -dse -disable-output target endian = big target pointersize = 32 target triple = "powerpc-apple-darwin8" diff --git a/test/Transforms/DeadStoreElimination/PartialStore.ll b/test/Transforms/DeadStoreElimination/PartialStore.ll index bc8fd3ab6b..a9b3366b1a 100644 --- a/test/Transforms/DeadStoreElimination/PartialStore.ll +++ b/test/Transforms/DeadStoreElimination/PartialStore.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -dse | llvm-dis | not grep 'store sbyte' +; RUN: llvm-upgrade < %s | llvm-as | opt -dse | llvm-dis | not grep 'store sbyte' ; Ensure that the dead store is deleted in this case. It is wholely ; overwritten by the second store. int %test() { diff --git a/test/Transforms/DeadStoreElimination/alloca.llx b/test/Transforms/DeadStoreElimination/alloca.llx index c75a618d3d..d7aacb5e94 100644 --- a/test/Transforms/DeadStoreElimination/alloca.llx +++ b/test/Transforms/DeadStoreElimination/alloca.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -dse | llvm-dis | not grep DEAD +; RUN: llvm-upgrade < %s | llvm-as | opt -dse | llvm-dis | not grep DEAD void %test(int* %Q) { %P = alloca int diff --git a/test/Transforms/DeadStoreElimination/context-sensitive.llx b/test/Transforms/DeadStoreElimination/context-sensitive.llx index 428030c8e2..54396d48ba 100644 --- a/test/Transforms/DeadStoreElimination/context-sensitive.llx +++ b/test/Transforms/DeadStoreElimination/context-sensitive.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -dse | llvm-dis | not grep DEAD +; RUN: llvm-upgrade < %s | llvm-as | opt -dse | llvm-dis | not grep DEAD declare void %ext() diff --git a/test/Transforms/DeadStoreElimination/free.llx b/test/Transforms/DeadStoreElimination/free.llx index afcb5cb641..3f0db04f7b 100644 --- a/test/Transforms/DeadStoreElimination/free.llx +++ b/test/Transforms/DeadStoreElimination/free.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -dse | llvm-dis | not grep DEAD +; RUN: llvm-upgrade < %s | llvm-as | opt -dse | llvm-dis | not grep DEAD void %test(int* %Q, int* %P) { %DEAD = load int* %Q diff --git a/test/Transforms/DeadStoreElimination/simple.llx b/test/Transforms/DeadStoreElimination/simple.llx index da1131a4e8..e0ce12d0ac 100644 --- a/test/Transforms/DeadStoreElimination/simple.llx +++ b/test/Transforms/DeadStoreElimination/simple.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -dse | llvm-dis | not grep DEAD +; RUN: llvm-upgrade < %s | llvm-as | opt -dse | llvm-dis | not grep DEAD void %test(int* %Q, int* %P) { %DEAD = load int* %Q diff --git a/test/Transforms/FunctionResolve/2002-08-19-ResolveGlobalVars.ll b/test/Transforms/FunctionResolve/2002-08-19-ResolveGlobalVars.ll index 129138a49f..e17e9d740f 100644 --- a/test/Transforms/FunctionResolve/2002-08-19-ResolveGlobalVars.ll +++ b/test/Transforms/FunctionResolve/2002-08-19-ResolveGlobalVars.ll @@ -1,7 +1,7 @@ ; Test that: extern int X[] and int X[] = { 1, 2, 3, 4 } are resolved ; correctly. ; -; RUN: llvm-as < %s | opt -funcresolve | llvm-dis | not grep external +; RUN: llvm-upgrade < %s | llvm-as | opt -funcresolve | llvm-dis | not grep external %X = external global [0 x int] %X = global [4 x int] [ int 1, int 2, int 3, int 4 ] diff --git a/test/Transforms/FunctionResolve/2002-08-19-ResolveGlobalVarsEasier.ll b/test/Transforms/FunctionResolve/2002-08-19-ResolveGlobalVarsEasier.ll index cdd63494e6..e9c1d8ce7a 100644 --- a/test/Transforms/FunctionResolve/2002-08-19-ResolveGlobalVarsEasier.ll +++ b/test/Transforms/FunctionResolve/2002-08-19-ResolveGlobalVarsEasier.ll @@ -1,7 +1,7 @@ ; Test that: extern int X[] and int X[] = { 1, 2, 3, 4 } are resolved ; correctly. This doesn't have constantexprs ; -; RUN: llvm-as < %s | opt -funcresolve | llvm-dis | not grep external +; RUN: llvm-upgrade < %s | llvm-as | opt -funcresolve | llvm-dis | not grep external ; %X = external global [0 x int] diff --git a/test/Transforms/FunctionResolve/2002-11-07-RetMismatch.ll b/test/Transforms/FunctionResolve/2002-11-07-RetMismatch.ll index 8be06812f7..2ca82686fb 100644 --- a/test/Transforms/FunctionResolve/2002-11-07-RetMismatch.ll +++ b/test/Transforms/FunctionResolve/2002-11-07-RetMismatch.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -funcresolve -funcresolve | llvm-dis | not grep declare +; RUN: llvm-upgrade < %s | llvm-as | opt -funcresolve -funcresolve | llvm-dis | not grep declare declare void %qsortg(sbyte*, int, int) diff --git a/test/Transforms/FunctionResolve/2002-11-09-ExternFn.ll b/test/Transforms/FunctionResolve/2002-11-09-ExternFn.ll index 8a1723abf0..d5eb0ca9b3 100644 --- a/test/Transforms/FunctionResolve/2002-11-09-ExternFn.ll +++ b/test/Transforms/FunctionResolve/2002-11-09-ExternFn.ll @@ -1,6 +1,6 @@ ; XFAIL: * ; -; RUN: llvm-as < %s | opt -funcresolve -instcombine | llvm-dis | not grep '\.\.\.' +; RUN: llvm-upgrade < %s | llvm-as | opt -funcresolve -instcombine | llvm-dis | not grep '\.\.\.' declare int %foo(...) declare int %foo(int) diff --git a/test/Transforms/FunctionResolve/2003-04-18-ForwardDeclGlobal.ll b/test/Transforms/FunctionResolve/2003-04-18-ForwardDeclGlobal.ll index 1434bb9102..663d3eb18f 100644 --- a/test/Transforms/FunctionResolve/2003-04-18-ForwardDeclGlobal.ll +++ b/test/Transforms/FunctionResolve/2003-04-18-ForwardDeclGlobal.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -funcresolve -disable-output 2>&1 | not grep WARNING +; RUN: llvm-upgrade < %s | llvm-as | opt -funcresolve -disable-output 2>&1 | not grep WARNING %__popcount_tab = external constant [0 x ubyte] %__popcount_tab = constant [4 x ubyte] c"\00\01\01\02" diff --git a/test/Transforms/FunctionResolve/2003-05-21-MissingArguments.ll b/test/Transforms/FunctionResolve/2003-05-21-MissingArguments.ll index 48b5d4690c..b54d595c5f 100644 --- a/test/Transforms/FunctionResolve/2003-05-21-MissingArguments.ll +++ b/test/Transforms/FunctionResolve/2003-05-21-MissingArguments.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -funcresolve -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -funcresolve -disable-output void %foo(int, int) { ret void diff --git a/test/Transforms/FunctionResolve/2003-05-31-FuncPointerResolve.ll b/test/Transforms/FunctionResolve/2003-05-31-FuncPointerResolve.ll index d65e89fabd..51b0001023 100644 --- a/test/Transforms/FunctionResolve/2003-05-31-FuncPointerResolve.ll +++ b/test/Transforms/FunctionResolve/2003-05-31-FuncPointerResolve.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -funcresolve | llvm-dis | not grep declare +; RUN: llvm-upgrade < %s | llvm-as | opt -funcresolve | llvm-dis | not grep declare %Table = constant int(...)* %foo diff --git a/test/Transforms/FunctionResolve/2003-05-31-InternalDecl.ll b/test/Transforms/FunctionResolve/2003-05-31-InternalDecl.ll index 9c27d84992..c8d2de6d23 100644 --- a/test/Transforms/FunctionResolve/2003-05-31-InternalDecl.ll +++ b/test/Transforms/FunctionResolve/2003-05-31-InternalDecl.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -funcresolve | llvm-dis | grep declare +; RUN: llvm-upgrade < %s | llvm-as | opt -funcresolve | llvm-dis | grep declare declare void %test(...) diff --git a/test/Transforms/FunctionResolve/2003-06-18-TypePromotion.ll b/test/Transforms/FunctionResolve/2003-06-18-TypePromotion.ll index 11e385e146..9c22cbfca3 100644 --- a/test/Transforms/FunctionResolve/2003-06-18-TypePromotion.ll +++ b/test/Transforms/FunctionResolve/2003-06-18-TypePromotion.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -funcresolve | dis | not grep declare +; RUN: llvm-upgrade < %s | llvm-as | opt -funcresolve | dis | not grep declare declare void %test(int) diff --git a/test/Transforms/FunctionResolve/2003-07-23-CPR-Reference.ll b/test/Transforms/FunctionResolve/2003-07-23-CPR-Reference.ll index 353b74fca2..e1a29ec282 100644 --- a/test/Transforms/FunctionResolve/2003-07-23-CPR-Reference.ll +++ b/test/Transforms/FunctionResolve/2003-07-23-CPR-Reference.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -funcresolve | llvm-dis | not grep foo +; RUN: llvm-upgrade < %s | llvm-as | opt -funcresolve | llvm-dis | not grep foo ; The funcresolve pass was resolving the two foo's together in this test, ; adding a ConstantPointerRef to one of them. Then because of this diff --git a/test/Transforms/FunctionResolve/2003-08-23-ArgumentWarning.ll b/test/Transforms/FunctionResolve/2003-08-23-ArgumentWarning.ll index 8d89c7d4a4..4e0a4aff9d 100644 --- a/test/Transforms/FunctionResolve/2003-08-23-ArgumentWarning.ll +++ b/test/Transforms/FunctionResolve/2003-08-23-ArgumentWarning.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -funcresolve -disable-output 2>&1 | not grep WARNING +; RUN: llvm-upgrade < %s | llvm-as | opt -funcresolve -disable-output 2>&1 | not grep WARNING declare int %foo(int *%X) declare int %foo(float *%X) diff --git a/test/Transforms/FunctionResolve/2003-10-21-GlobalResolveHack.ll b/test/Transforms/FunctionResolve/2003-10-21-GlobalResolveHack.ll index 8386dfa9a8..0865f0d923 100644 --- a/test/Transforms/FunctionResolve/2003-10-21-GlobalResolveHack.ll +++ b/test/Transforms/FunctionResolve/2003-10-21-GlobalResolveHack.ll @@ -1,7 +1,7 @@ ; This tests a hack put into place specifically for the C++ libstdc++ library. ; It uses an ugly hack which is cleaned up by the funcresolve pass. -; RUN: llvm-as < %s | opt -funcresolve | llvm-dis | grep %X | grep '{' +; RUN: llvm-upgrade < %s | llvm-as | opt -funcresolve | llvm-dis | grep %X | grep '{' %X = external global { int } %X = global [ 4 x sbyte ] zeroinitializer diff --git a/test/Transforms/FunctionResolve/2003-11-20-BogusResolveWarning.ll b/test/Transforms/FunctionResolve/2003-11-20-BogusResolveWarning.ll index 2736a53a96..cc481f5143 100644 --- a/test/Transforms/FunctionResolve/2003-11-20-BogusResolveWarning.ll +++ b/test/Transforms/FunctionResolve/2003-11-20-BogusResolveWarning.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -funcresolve -disable-output 2>&1 | not grep WARNING +; RUN: llvm-upgrade < %s | llvm-as | opt -funcresolve -disable-output 2>&1 | not grep WARNING void %test() { diff --git a/test/Transforms/FunctionResolve/basictest.ll b/test/Transforms/FunctionResolve/basictest.ll index 7e94687132..866ae8e54b 100644 --- a/test/Transforms/FunctionResolve/basictest.ll +++ b/test/Transforms/FunctionResolve/basictest.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -funcresolve -instcombine | llvm-dis | grep '\.\.\.' | not grep call +; RUN: llvm-upgrade < %s | llvm-as | opt -funcresolve -instcombine | llvm-dis | grep '\.\.\.' | not grep call declare int %foo(...) diff --git a/test/Transforms/FunctionResolve/retmismatch1.ll b/test/Transforms/FunctionResolve/retmismatch1.ll index 6895fb557f..51aeff851c 100644 --- a/test/Transforms/FunctionResolve/retmismatch1.ll +++ b/test/Transforms/FunctionResolve/retmismatch1.ll @@ -1,6 +1,6 @@ ; This shows where the function is called with the prototype indicating a ; return type exists, but it really doesn't. -; RUN: llvm-as < %s | opt -funcresolve -instcombine | llvm-dis | grep '\.\.\.' | not grep call +; RUN: llvm-upgrade < %s | llvm-as | opt -funcresolve -instcombine | llvm-dis | grep '\.\.\.' | not grep call declare int %foo(...) diff --git a/test/Transforms/FunctionResolve/retmismatch2.ll b/test/Transforms/FunctionResolve/retmismatch2.ll index 433f5bb79b..749ca40db8 100644 --- a/test/Transforms/FunctionResolve/retmismatch2.ll +++ b/test/Transforms/FunctionResolve/retmismatch2.ll @@ -1,7 +1,7 @@ ; This shows where the function is called with the prototype indicating a ; return type doesn't exists, but it really does. ; -; RUN: llvm-as < %s | opt -funcresolve -instcombine | llvm-dis | grep '\.\.\.' | not grep call +; RUN: llvm-upgrade < %s | llvm-as | opt -funcresolve -instcombine | llvm-dis | grep '\.\.\.' | not grep call declare void %foo(...) diff --git a/test/Transforms/FunctionResolve/retmismatch3.ll b/test/Transforms/FunctionResolve/retmismatch3.ll index d85da646d4..f9850d67a7 100644 --- a/test/Transforms/FunctionResolve/retmismatch3.ll +++ b/test/Transforms/FunctionResolve/retmismatch3.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -funcresolve +; RUN: llvm-upgrade < %s | llvm-as | opt -funcresolve declare int %read(...) diff --git a/test/Transforms/GCSE/2002-05-21-NoSharedDominator.ll b/test/Transforms/GCSE/2002-05-21-NoSharedDominator.ll index 9d09911ac1..2c78695e41 100644 --- a/test/Transforms/GCSE/2002-05-21-NoSharedDominator.ll +++ b/test/Transforms/GCSE/2002-05-21-NoSharedDominator.ll @@ -1,7 +1,7 @@ ; This testcase shows a bug where an common subexpression exists, but there ; is no shared dominator block that the expression can be hoisted out to. ; -; RUN: llvm-as < %s | opt -gcse | llvm-dis +; RUN: llvm-upgrade < %s | llvm-as | opt -gcse | llvm-dis int "test"(int %X, int %Y) { %Z = add int %X, %Y diff --git a/test/Transforms/GCSE/2003-06-13-LoadStoreEliminate.ll b/test/Transforms/GCSE/2003-06-13-LoadStoreEliminate.ll index 3c3b17da5d..4ebb66c378 100644 --- a/test/Transforms/GCSE/2003-06-13-LoadStoreEliminate.ll +++ b/test/Transforms/GCSE/2003-06-13-LoadStoreEliminate.ll @@ -1,7 +1,7 @@ ; This testcase shows a bug where an common subexpression exists, but there ; is no shared dominator block that the expression can be hoisted out to. ; -; RUN: llvm-as < %s | opt -load-vn -gcse | llvm-dis | not grep load +; RUN: llvm-upgrade < %s | llvm-as | opt -load-vn -gcse | llvm-dis | not grep load int %test(int* %P) { store int 5, int* %P diff --git a/test/Transforms/GCSE/gcsetests.ll b/test/Transforms/GCSE/gcsetests.ll index 8ae62d6fed..b866bb7eda 100644 --- a/test/Transforms/GCSE/gcsetests.ll +++ b/test/Transforms/GCSE/gcsetests.ll @@ -1,6 +1,6 @@ ; Various test cases to ensure basic functionality is working for GCSE -; RUN: llvm-as < %s | opt -gcse +; RUN: llvm-upgrade < %s | llvm-as | opt -gcse implementation diff --git a/test/Transforms/GCSE/vectorops.ll b/test/Transforms/GCSE/vectorops.ll index 4178960544..3804c290d7 100644 --- a/test/Transforms/GCSE/vectorops.ll +++ b/test/Transforms/GCSE/vectorops.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | opt -gcse -instcombine -disable-output && -; RUN: llvm-as < %s | opt -gcse -instcombine | llvm-dis | not grep sub +; RUN: llvm-upgrade < %s | llvm-as | opt -gcse -instcombine -disable-output && +; RUN: llvm-upgrade < %s | llvm-as | opt -gcse -instcombine | llvm-dis | not grep sub uint %test_extractelement(<4 x uint> %V) { %R = extractelement <4 x uint> %V, uint 1 diff --git a/test/Transforms/GlobalDCE/2002-07-17-CastRef.ll b/test/Transforms/GlobalDCE/2002-07-17-CastRef.ll index 56d949471f..3679d51611 100644 --- a/test/Transforms/GlobalDCE/2002-07-17-CastRef.ll +++ b/test/Transforms/GlobalDCE/2002-07-17-CastRef.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -globaldce +; RUN: llvm-upgrade < %s | llvm-as | opt -globaldce ; implementation diff --git a/test/Transforms/GlobalDCE/2002-07-17-ConstantRef.ll b/test/Transforms/GlobalDCE/2002-07-17-ConstantRef.ll index 47a8a54cd7..8bb6da55b9 100644 --- a/test/Transforms/GlobalDCE/2002-07-17-ConstantRef.ll +++ b/test/Transforms/GlobalDCE/2002-07-17-ConstantRef.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -globaldce +; RUN: llvm-upgrade < %s | llvm-as | opt -globaldce ; %X = global void() * %func implementation diff --git a/test/Transforms/GlobalDCE/2002-08-17-FunctionDGE.ll b/test/Transforms/GlobalDCE/2002-08-17-FunctionDGE.ll index cf22be0ee4..e0af3c2c48 100644 --- a/test/Transforms/GlobalDCE/2002-08-17-FunctionDGE.ll +++ b/test/Transforms/GlobalDCE/2002-08-17-FunctionDGE.ll @@ -1,7 +1,7 @@ ; Make sure that functions are removed successfully if they are referred to by ; a global that is dead. Make sure any globals they refer to die as well. -; RUN: llvm-as < %s | opt -globaldce | llvm-dis | not grep foo +; RUN: llvm-upgrade < %s | llvm-as | opt -globaldce | llvm-dis | not grep foo %b = internal global int ()* %foo ;; Unused, kills %foo diff --git a/test/Transforms/GlobalDCE/2002-08-17-WorkListTest.ll b/test/Transforms/GlobalDCE/2002-08-17-WorkListTest.ll index cbc783e06d..493e30c309 100644 --- a/test/Transforms/GlobalDCE/2002-08-17-WorkListTest.ll +++ b/test/Transforms/GlobalDCE/2002-08-17-WorkListTest.ll @@ -1,7 +1,7 @@ ; This testcase tests that a worklist is being used, and that globals can be ; removed if they are the subject of a constexpr and ConstantPointerRef -; RUN: llvm-as < %s | opt -globaldce | llvm-dis | not grep global +; RUN: llvm-upgrade < %s | llvm-as | opt -globaldce | llvm-dis | not grep global %t0 = internal global [4 x sbyte] c"foo\00" %t1 = internal global [4 x sbyte] c"bar\00" diff --git a/test/Transforms/GlobalDCE/2002-09-12-Redeletion.ll b/test/Transforms/GlobalDCE/2002-09-12-Redeletion.ll index 0f7f075520..bc650d2e89 100644 --- a/test/Transforms/GlobalDCE/2002-09-12-Redeletion.ll +++ b/test/Transforms/GlobalDCE/2002-09-12-Redeletion.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -globaldce +; RUN: llvm-upgrade < %s | llvm-as | opt -globaldce %foo = internal global int 7 ;; Should die when function %foo is killed diff --git a/test/Transforms/GlobalDCE/2003-07-01-SelfReference.ll b/test/Transforms/GlobalDCE/2003-07-01-SelfReference.ll index e306d9a4af..afdc1cd12d 100644 --- a/test/Transforms/GlobalDCE/2003-07-01-SelfReference.ll +++ b/test/Transforms/GlobalDCE/2003-07-01-SelfReference.ll @@ -1,5 +1,5 @@ ; distilled from 255.vortex -; RUN: llvm-as < %s | opt -globaldce | llvm-dis | not grep testfunc +; RUN: llvm-upgrade < %s | llvm-as | opt -globaldce | llvm-dis | not grep testfunc implementation diff --git a/test/Transforms/GlobalDCE/2003-10-09-PreserveWeakGlobals.ll b/test/Transforms/GlobalDCE/2003-10-09-PreserveWeakGlobals.ll index 43ca809abe..4c45e7208c 100644 --- a/test/Transforms/GlobalDCE/2003-10-09-PreserveWeakGlobals.ll +++ b/test/Transforms/GlobalDCE/2003-10-09-PreserveWeakGlobals.ll @@ -1,6 +1,6 @@ ; Weak variables should be preserved by global DCE! -; RUN: llvm-as < %s | opt -globaldce | llvm-dis | grep %A +; RUN: llvm-upgrade < %s | llvm-as | opt -globaldce | llvm-dis | grep %A %A = weak global int 54 diff --git a/test/Transforms/GlobalDCE/basicvariabletest.ll b/test/Transforms/GlobalDCE/basicvariabletest.ll index 8990ba3798..0b5c8b6fae 100644 --- a/test/Transforms/GlobalDCE/basicvariabletest.ll +++ b/test/Transforms/GlobalDCE/basicvariabletest.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -globaldce | llvm-dis | not grep global +; RUN: llvm-upgrade < %s | llvm-as | opt -globaldce | llvm-dis | not grep global %X = uninitialized global int %Y = internal global int 7 diff --git a/test/Transforms/GlobalOpt/2004-10-10-CastStoreOnce.llx b/test/Transforms/GlobalOpt/2004-10-10-CastStoreOnce.llx index 67d0dbc266..8150c52bc7 100644 --- a/test/Transforms/GlobalOpt/2004-10-10-CastStoreOnce.llx +++ b/test/Transforms/GlobalOpt/2004-10-10-CastStoreOnce.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -globalopt +; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt %V = global float 12.0 %G = internal global int* null diff --git a/test/Transforms/GlobalOpt/2005-06-15-LocalizeConstExprCrash.ll b/test/Transforms/GlobalOpt/2005-06-15-LocalizeConstExprCrash.ll index 1d9b3bf48a..19458c7885 100644 --- a/test/Transforms/GlobalOpt/2005-06-15-LocalizeConstExprCrash.ll +++ b/test/Transforms/GlobalOpt/2005-06-15-LocalizeConstExprCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -globalopt -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt -disable-output ; PR579 %g_40507551 = internal global short 31038 ; <short*> [#uses=1] diff --git a/test/Transforms/GlobalOpt/2005-09-27-Crash.ll b/test/Transforms/GlobalOpt/2005-09-27-Crash.ll index 422ddad77d..948687724f 100644 --- a/test/Transforms/GlobalOpt/2005-09-27-Crash.ll +++ b/test/Transforms/GlobalOpt/2005-09-27-Crash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -globalopt -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt -disable-output %RPyString = type { int, %arraytype.Char } %arraytype.Char = type { int, [0 x sbyte] } %arraytype.Signed = type { int, [0 x int] } diff --git a/test/Transforms/GlobalOpt/2006-11-01-ShrinkGlobalPhiCrash.ll b/test/Transforms/GlobalOpt/2006-11-01-ShrinkGlobalPhiCrash.ll index bba399a589..cd76681a10 100644 --- a/test/Transforms/GlobalOpt/2006-11-01-ShrinkGlobalPhiCrash.ll +++ b/test/Transforms/GlobalOpt/2006-11-01-ShrinkGlobalPhiCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -globalopt -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt -disable-output %struct._list = type { int*, %struct._list* } %struct._play = type { int, int*, %struct._list*, %struct._play* } %nrow = internal global int 0 ; <int*> [#uses=2] diff --git a/test/Transforms/GlobalOpt/basictest.llx b/test/Transforms/GlobalOpt/basictest.llx index 46fac76433..1f97fc03aa 100644 --- a/test/Transforms/GlobalOpt/basictest.llx +++ b/test/Transforms/GlobalOpt/basictest.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -globalopt | llvm-dis | not grep global +; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt | llvm-dis | not grep global %X = internal global int 4 diff --git a/test/Transforms/GlobalOpt/ctor-list-opt.ll b/test/Transforms/GlobalOpt/ctor-list-opt.ll index f402fac106..8f75deb61b 100644 --- a/test/Transforms/GlobalOpt/ctor-list-opt.ll +++ b/test/Transforms/GlobalOpt/ctor-list-opt.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | opt -globalopt -disable-output && -; RUN: llvm-as < %s | opt -globalopt | llvm-dis | not grep CTOR +; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt -disable-output && +; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt | llvm-dis | not grep CTOR %llvm.global_ctors = appending global [10 x { int, void ()* }] [ { int, void ()* } { int 65535, void ()* %CTOR1 }, diff --git a/test/Transforms/GlobalOpt/deadglobal-2.llx b/test/Transforms/GlobalOpt/deadglobal-2.llx index d426aff5c6..5fa98250a4 100644 --- a/test/Transforms/GlobalOpt/deadglobal-2.llx +++ b/test/Transforms/GlobalOpt/deadglobal-2.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -globalopt | llvm-dis | not grep internal +; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt | llvm-dis | not grep internal ; This is a harder case to delete as the GEP has a variable index. diff --git a/test/Transforms/GlobalOpt/deadglobal.llx b/test/Transforms/GlobalOpt/deadglobal.llx index c0819c0c64..a7397bf0fd 100644 --- a/test/Transforms/GlobalOpt/deadglobal.llx +++ b/test/Transforms/GlobalOpt/deadglobal.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -globalopt | llvm-dis | not grep internal +; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt | llvm-dis | not grep internal %G = internal global int 123 diff --git a/test/Transforms/GlobalOpt/globalsra-partial.llx b/test/Transforms/GlobalOpt/globalsra-partial.llx index 9b3788e463..e060565b11 100644 --- a/test/Transforms/GlobalOpt/globalsra-partial.llx +++ b/test/Transforms/GlobalOpt/globalsra-partial.llx @@ -1,6 +1,6 @@ ; In this case, the global can only be broken up by one level. -; RUN: llvm-as < %s | opt -globalopt | llvm-dis | not grep 12345 +; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt | llvm-dis | not grep 12345 %G = internal global { int, [4 x float] } zeroinitializer diff --git a/test/Transforms/GlobalOpt/globalsra.llx b/test/Transforms/GlobalOpt/globalsra.llx index 920abb13c7..a87b954988 100644 --- a/test/Transforms/GlobalOpt/globalsra.llx +++ b/test/Transforms/GlobalOpt/globalsra.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -globalopt | llvm-dis | not grep global +; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt | llvm-dis | not grep global %G = internal global { int, float, {double} } { int 1, float 1.0, {double} {double 17.27} } diff --git a/test/Transforms/GlobalOpt/integer-bool.ll b/test/Transforms/GlobalOpt/integer-bool.ll index 2daf9550f6..4c1fcb6ece 100644 --- a/test/Transforms/GlobalOpt/integer-bool.ll +++ b/test/Transforms/GlobalOpt/integer-bool.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -globalopt -instcombine | llvm-dis | grep 'ret bool true' +; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt -instcombine | llvm-dis | grep 'ret bool true' ;; check that global opt turns integers that only hold 0 or 1 into bools. diff --git a/test/Transforms/GlobalOpt/iterate.llx b/test/Transforms/GlobalOpt/iterate.llx index 1d4680844c..e4e59c63a4 100644 --- a/test/Transforms/GlobalOpt/iterate.llx +++ b/test/Transforms/GlobalOpt/iterate.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -globalopt | llvm-dis | not grep %G +; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt | llvm-dis | not grep %G %G = internal global int 0 %H = internal global { int* } { int* %G } diff --git a/test/Transforms/GlobalOpt/load-store-global.llx b/test/Transforms/GlobalOpt/load-store-global.llx index 2d79dd1ac3..bf5d3a256a 100644 --- a/test/Transforms/GlobalOpt/load-store-global.llx +++ b/test/Transforms/GlobalOpt/load-store-global.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -globalopt | llvm-dis | not grep G +; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt | llvm-dis | not grep G %G = internal global int 17 diff --git a/test/Transforms/GlobalOpt/malloc-promote-1.llx b/test/Transforms/GlobalOpt/malloc-promote-1.llx index 423c51e937..068e96fc2c 100644 --- a/test/Transforms/GlobalOpt/malloc-promote-1.llx +++ b/test/Transforms/GlobalOpt/malloc-promote-1.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -globalopt | llvm-dis | not grep global +; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt | llvm-dis | not grep global %G = internal global int* null diff --git a/test/Transforms/GlobalOpt/malloc-promote-2.llx b/test/Transforms/GlobalOpt/malloc-promote-2.llx index f231963f57..12d4c6d5bb 100644 --- a/test/Transforms/GlobalOpt/malloc-promote-2.llx +++ b/test/Transforms/GlobalOpt/malloc-promote-2.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -globalopt | llvm-dis | not grep malloc +; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt | llvm-dis | not grep malloc %G = internal global int* null diff --git a/test/Transforms/GlobalOpt/malloc-promote-3.llx b/test/Transforms/GlobalOpt/malloc-promote-3.llx index f2aad76e2b..85ce6bdbc8 100644 --- a/test/Transforms/GlobalOpt/malloc-promote-3.llx +++ b/test/Transforms/GlobalOpt/malloc-promote-3.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -globalopt | llvm-dis | not grep malloc +; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt | llvm-dis | not grep malloc %G = internal global int* null diff --git a/test/Transforms/GlobalOpt/memcpy.ll b/test/Transforms/GlobalOpt/memcpy.ll index 1611c8efb4..253aaec631 100644 --- a/test/Transforms/GlobalOpt/memcpy.ll +++ b/test/Transforms/GlobalOpt/memcpy.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -globalopt | llvm-dis | grep 'G1 = internal constant' +; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt | llvm-dis | grep 'G1 = internal constant' %G1 = internal global [58 x sbyte] c"asdlfkajsdlfkajsd;lfkajds;lfkjasd;flkajsd;lkfja;sdlkfjasd\00" diff --git a/test/Transforms/GlobalOpt/memset.ll b/test/Transforms/GlobalOpt/memset.ll index ff6c421924..5159d2861e 100644 --- a/test/Transforms/GlobalOpt/memset.ll +++ b/test/Transforms/GlobalOpt/memset.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -globalopt | llvm-dis | not grep internal +; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt | llvm-dis | not grep internal ; both globals are write only, delete them. %G0 = internal global [58 x sbyte] c"asdlfkajsdlfkajsd;lfkajds;lfkjasd;flkajsd;lkfja;sdlkfjasd\00" diff --git a/test/Transforms/GlobalOpt/phi-select.llx b/test/Transforms/GlobalOpt/phi-select.llx index 29890600de..2389c0a8bc 100644 --- a/test/Transforms/GlobalOpt/phi-select.llx +++ b/test/Transforms/GlobalOpt/phi-select.llx @@ -1,7 +1,7 @@ ; Test that PHI nodes and select instructions do not necessarily make stuff ; non-constant. -; RUN: llvm-as < %s | opt -globalopt | llvm-dis | not grep global +; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt | llvm-dis | not grep global %X = internal global int 4 %Y = internal global int 5 diff --git a/test/Transforms/GlobalOpt/storepointer-compare.llx b/test/Transforms/GlobalOpt/storepointer-compare.llx index a6e8ea3d2e..5340feed38 100644 --- a/test/Transforms/GlobalOpt/storepointer-compare.llx +++ b/test/Transforms/GlobalOpt/storepointer-compare.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -globalopt | llvm-dis | grep 'call void %Actual' +; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt | llvm-dis | grep 'call void %Actual' ; Check that a comparison does not prevent an indirect call from being made ; direct. The global will still remain, but indirect call elim is still good. diff --git a/test/Transforms/GlobalOpt/storepointer.llx b/test/Transforms/GlobalOpt/storepointer.llx index c10ee7cbf6..a424d255bd 100644 --- a/test/Transforms/GlobalOpt/storepointer.llx +++ b/test/Transforms/GlobalOpt/storepointer.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -globalopt | llvm-dis | not grep global +; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt | llvm-dis | not grep global %G = internal global void ()* null diff --git a/test/Transforms/GlobalOpt/trivialstore.llx b/test/Transforms/GlobalOpt/trivialstore.llx index af2d61287c..8b1f1ce525 100644 --- a/test/Transforms/GlobalOpt/trivialstore.llx +++ b/test/Transforms/GlobalOpt/trivialstore.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -globalopt | llvm-dis | not grep G +; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt | llvm-dis | not grep G %G = internal global int 17 diff --git a/test/Transforms/GlobalOpt/undef-init.llx b/test/Transforms/GlobalOpt/undef-init.llx index f4e110130e..2f073c2ff0 100644 --- a/test/Transforms/GlobalOpt/undef-init.llx +++ b/test/Transforms/GlobalOpt/undef-init.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -globalopt | llvm-dis | not grep store +; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt | llvm-dis | not grep store %llvm.global_ctors = appending global [1 x { int, void ()* }] [ { int, void ()* } { int 65535, void ()* %_GLOBAL__I__Z3foov } ] ; <[1 x { int, void ()* }]*> [#uses=0] %X.0 = internal global int undef ; <int*> [#uses=2] diff --git a/test/Transforms/IPConstantProp/deadarg.ll b/test/Transforms/IPConstantProp/deadarg.ll index e28796acda..5e41ade2b6 100644 --- a/test/Transforms/IPConstantProp/deadarg.ll +++ b/test/Transforms/IPConstantProp/deadarg.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -ipconstprop -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -ipconstprop -disable-output implementation internal void %foo(int %X) { diff --git a/test/Transforms/IPConstantProp/recursion.ll b/test/Transforms/IPConstantProp/recursion.ll index ac36eabcd3..10f18e591c 100644 --- a/test/Transforms/IPConstantProp/recursion.ll +++ b/test/Transforms/IPConstantProp/recursion.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -ipconstprop -deadargelim | llvm-dis | not grep %X +; RUN: llvm-upgrade < %s | llvm-as | opt -ipconstprop -deadargelim | llvm-dis | not grep %X implementation diff --git a/test/Transforms/IPConstantProp/return-constant.ll b/test/Transforms/IPConstantProp/return-constant.ll index 50c55d88bf..3518a25c16 100644 --- a/test/Transforms/IPConstantProp/return-constant.ll +++ b/test/Transforms/IPConstantProp/return-constant.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -ipconstprop -instcombine | llvm-dis | grep 'ret bool true' +; RUN: llvm-upgrade < %s | llvm-as | opt -ipconstprop -instcombine | llvm-dis | grep 'ret bool true' implementation internal int %foo(bool %C) { diff --git a/test/Transforms/IndVarsSimplify/2002-09-09-PointerIndVar.ll b/test/Transforms/IndVarsSimplify/2002-09-09-PointerIndVar.ll index 81a02771a7..4c80e4851f 100644 --- a/test/Transforms/IndVarsSimplify/2002-09-09-PointerIndVar.ll +++ b/test/Transforms/IndVarsSimplify/2002-09-09-PointerIndVar.ll @@ -1,7 +1,7 @@ ; Induction variable pass is doing bad things with pointer induction vars, ; trying to do arithmetic on them directly. ; -; RUN: llvm-as < %s | opt -indvars +; RUN: llvm-upgrade < %s | llvm-as | opt -indvars ; void %test(int %A, uint %S, sbyte* %S) { diff --git a/test/Transforms/IndVarsSimplify/2003-04-16-ExprAnalysis.ll b/test/Transforms/IndVarsSimplify/2003-04-16-ExprAnalysis.ll index b21e3bbf6c..2f198255eb 100644 --- a/test/Transforms/IndVarsSimplify/2003-04-16-ExprAnalysis.ll +++ b/test/Transforms/IndVarsSimplify/2003-04-16-ExprAnalysis.ll @@ -1,7 +1,7 @@ ; This is a test case for the expression analysis code, not really indvars. ; It was assuming any constant of int type was a ConstantInteger. ; -; RUN: llvm-as < %s | opt -indvars +; RUN: llvm-upgrade < %s | llvm-as | opt -indvars %X = global int 7 diff --git a/test/Transforms/IndVarsSimplify/2003-09-12-MultiplePred.ll b/test/Transforms/IndVarsSimplify/2003-09-12-MultiplePred.ll index e5c7874df5..ea1e585490 100644 --- a/test/Transforms/IndVarsSimplify/2003-09-12-MultiplePred.ll +++ b/test/Transforms/IndVarsSimplify/2003-09-12-MultiplePred.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -indvars | llvm-dis | grep indvar +; RUN: llvm-upgrade < %s | llvm-as | opt -indvars | llvm-dis | grep indvar int %test() { br bool true, label %LoopHead, label %LoopHead diff --git a/test/Transforms/IndVarsSimplify/2003-09-23-NotAtTop.ll b/test/Transforms/IndVarsSimplify/2003-09-23-NotAtTop.ll index ccb5787372..d715f688f1 100644 --- a/test/Transforms/IndVarsSimplify/2003-09-23-NotAtTop.ll +++ b/test/Transforms/IndVarsSimplify/2003-09-23-NotAtTop.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -indvars | llvm-dis | %prcontext Loop: 1 | grep %indvar +; RUN: llvm-upgrade < %s | llvm-as | opt -indvars | llvm-dis | %prcontext Loop: 1 | grep %indvar ; The indvar simplification code should ensure that the first PHI in the block ; is the canonical one! diff --git a/test/Transforms/IndVarsSimplify/2003-12-10-IndVarDeadCode.ll b/test/Transforms/IndVarsSimplify/2003-12-10-IndVarDeadCode.ll index 87ed4c59ff..743827df3f 100644 --- a/test/Transforms/IndVarsSimplify/2003-12-10-IndVarDeadCode.ll +++ b/test/Transforms/IndVarsSimplify/2003-12-10-IndVarDeadCode.ll @@ -1,7 +1,7 @@ ; The induction variable canonicalization pass shouldn't leave dead ; instructions laying around! ; -; RUN: llvm-as < %s | opt -indvars | llvm-dis | not grep '#uses=0' +; RUN: llvm-upgrade < %s | llvm-as | opt -indvars | llvm-dis | not grep '#uses=0' int %mul(int %x, int %y) { entry: diff --git a/test/Transforms/IndVarsSimplify/2003-12-10-RemoveInstrCrash.llx b/test/Transforms/IndVarsSimplify/2003-12-10-RemoveInstrCrash.llx index 114dff52a0..09d384ebb9 100644 --- a/test/Transforms/IndVarsSimplify/2003-12-10-RemoveInstrCrash.llx +++ b/test/Transforms/IndVarsSimplify/2003-12-10-RemoveInstrCrash.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -indvars -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -indvars -disable-output void %test() { entry: diff --git a/test/Transforms/IndVarsSimplify/2003-12-15-Crash.llx b/test/Transforms/IndVarsSimplify/2003-12-15-Crash.llx index a74bc8d00a..372472811e 100644 --- a/test/Transforms/IndVarsSimplify/2003-12-15-Crash.llx +++ b/test/Transforms/IndVarsSimplify/2003-12-15-Crash.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -indvars -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -indvars -disable-output void %_ZN17CoinFactorization7cleanupEv() { entry: br bool false, label %loopexit.14, label %cond_continue.3 diff --git a/test/Transforms/IndVarsSimplify/2003-12-21-IndVarSize.ll b/test/Transforms/IndVarsSimplify/2003-12-21-IndVarSize.ll index 7ebd89067e..26fecf45ee 100644 --- a/test/Transforms/IndVarsSimplify/2003-12-21-IndVarSize.ll +++ b/test/Transforms/IndVarsSimplify/2003-12-21-IndVarSize.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -indvars | llvm-dis | grep indvar | not grep uint +; RUN: llvm-upgrade < %s | llvm-as | opt -indvars | llvm-dis | grep indvar | not grep uint %G = global long 0 diff --git a/test/Transforms/IndVarsSimplify/2004-03-10-PHIInsertionBug.ll b/test/Transforms/IndVarsSimplify/2004-03-10-PHIInsertionBug.ll index dda6d9d4d2..88c393ea39 100644 --- a/test/Transforms/IndVarsSimplify/2004-03-10-PHIInsertionBug.ll +++ b/test/Transforms/IndVarsSimplify/2004-03-10-PHIInsertionBug.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -indvars -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -indvars -disable-output implementation ; Functions: diff --git a/test/Transforms/IndVarsSimplify/2004-04-05-InvokeCastCrash.llx b/test/Transforms/IndVarsSimplify/2004-04-05-InvokeCastCrash.llx index 40b1b2be5f..c0d841024c 100644 --- a/test/Transforms/IndVarsSimplify/2004-04-05-InvokeCastCrash.llx +++ b/test/Transforms/IndVarsSimplify/2004-04-05-InvokeCastCrash.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -indvars -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -indvars -disable-output %struct.__false_type = type { ubyte } "struct.__gnu_cxx::_Hashtable_node<const llvm::Constant*>" = type { "struct.__gnu_cxx::_Hashtable_node<const llvm::Constant*>"*, "struct.llvm::Constant"* } diff --git a/test/Transforms/IndVarsSimplify/2004-04-07-ScalarEvolutionCrash.llx b/test/Transforms/IndVarsSimplify/2004-04-07-ScalarEvolutionCrash.llx index f4ee707f9e..82212d5c72 100644 --- a/test/Transforms/IndVarsSimplify/2004-04-07-ScalarEvolutionCrash.llx +++ b/test/Transforms/IndVarsSimplify/2004-04-07-ScalarEvolutionCrash.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -indvars -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -indvars -disable-output void %.outPlank_21() { entry: diff --git a/test/Transforms/IndVarsSimplify/2005-02-11-InvokeCrash.ll b/test/Transforms/IndVarsSimplify/2005-02-11-InvokeCrash.ll index df925d14cb..92a48308b2 100644 --- a/test/Transforms/IndVarsSimplify/2005-02-11-InvokeCrash.ll +++ b/test/Transforms/IndVarsSimplify/2005-02-11-InvokeCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -indvars -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -indvars -disable-output void %_ZN5ArrayISt7complexIdEEC2ERK10dim_vector() { entry: diff --git a/test/Transforms/IndVarsSimplify/2005-02-17-TruncateExprCrash.ll b/test/Transforms/IndVarsSimplify/2005-02-17-TruncateExprCrash.ll index 36987cac7d..5ba8bdb622 100644 --- a/test/Transforms/IndVarsSimplify/2005-02-17-TruncateExprCrash.ll +++ b/test/Transforms/IndVarsSimplify/2005-02-17-TruncateExprCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -indvars -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -indvars -disable-output implementation ; Functions: diff --git a/test/Transforms/IndVarsSimplify/2005-02-26-ExitValueCompute.ll b/test/Transforms/IndVarsSimplify/2005-02-26-ExitValueCompute.ll index 57f1feeaaa..7bda152b4f 100644 --- a/test/Transforms/IndVarsSimplify/2005-02-26-ExitValueCompute.ll +++ b/test/Transforms/IndVarsSimplify/2005-02-26-ExitValueCompute.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -indvars | llvm-dis | grep 'ret int 152' +; RUN: llvm-upgrade < %s | llvm-as | opt -indvars | llvm-dis | grep 'ret int 152' int %main() { entry: diff --git a/test/Transforms/IndVarsSimplify/2005-06-15-InstMoveCrash.ll b/test/Transforms/IndVarsSimplify/2005-06-15-InstMoveCrash.ll index 0ff77ef33a..896482c29b 100644 --- a/test/Transforms/IndVarsSimplify/2005-06-15-InstMoveCrash.ll +++ b/test/Transforms/IndVarsSimplify/2005-06-15-InstMoveCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -indvars -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -indvars -disable-output void %main() { entry: diff --git a/test/Transforms/IndVarsSimplify/2005-11-18-Crash.ll b/test/Transforms/IndVarsSimplify/2005-11-18-Crash.ll index b7b0fcad5b..9960e5cdb2 100644 --- a/test/Transforms/IndVarsSimplify/2005-11-18-Crash.ll +++ b/test/Transforms/IndVarsSimplify/2005-11-18-Crash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -indvars -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -indvars -disable-output %fixtab = external global [29 x [29 x [2 x uint]]] ; <[29 x [29 x [2 x uint]]]*> [#uses=1] diff --git a/test/Transforms/IndVarsSimplify/2006-03-31-NegativeStride.ll b/test/Transforms/IndVarsSimplify/2006-03-31-NegativeStride.ll index 5401740480..30f0c95b9f 100644 --- a/test/Transforms/IndVarsSimplify/2006-03-31-NegativeStride.ll +++ b/test/Transforms/IndVarsSimplify/2006-03-31-NegativeStride.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -indvars | llvm-dis | grep 'ret int 27' +; RUN: llvm-upgrade < %s | llvm-as | opt -indvars | llvm-dis | grep 'ret int 27' ; Make sure to compute the right exit value based on negative strides. ; PR726 diff --git a/test/Transforms/IndVarsSimplify/2006-06-16-Indvar-LCSSA-Crash.ll b/test/Transforms/IndVarsSimplify/2006-06-16-Indvar-LCSSA-Crash.ll index 1f71c4e7d7..1fe8026ef4 100644 --- a/test/Transforms/IndVarsSimplify/2006-06-16-Indvar-LCSSA-Crash.ll +++ b/test/Transforms/IndVarsSimplify/2006-06-16-Indvar-LCSSA-Crash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -indvars -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -indvars -disable-output void %get_block() { endif.0: ; preds = %entry diff --git a/test/Transforms/IndVarsSimplify/2006-09-20-LFTR-Crash.ll b/test/Transforms/IndVarsSimplify/2006-09-20-LFTR-Crash.ll index eb3b6594df..88872f67c9 100644 --- a/test/Transforms/IndVarsSimplify/2006-09-20-LFTR-Crash.ll +++ b/test/Transforms/IndVarsSimplify/2006-09-20-LFTR-Crash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -indvars -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -indvars -disable-output %struct.p7prior_s = type { int, int, [200 x float], [200 x [7 x float]], int, [200 x float], [200 x [20 x float]], int, [200 x float], [200 x [20 x float]] } diff --git a/test/Transforms/IndVarsSimplify/complex-scev.ll b/test/Transforms/IndVarsSimplify/complex-scev.ll index 2311f20e68..773d71a20c 100644 --- a/test/Transforms/IndVarsSimplify/complex-scev.ll +++ b/test/Transforms/IndVarsSimplify/complex-scev.ll @@ -1,7 +1,7 @@ ; The i induction variable looks like a wrap-around, but it really is just ; a simple affine IV. Make sure that indvars eliminates it. -; RUN: llvm-as < %s | opt -indvars | llvm-dis | grep phi | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | opt -indvars | llvm-dis | grep phi | wc -l | grep 1 void %foo() { entry: diff --git a/test/Transforms/IndVarsSimplify/exit_value_tests.llx b/test/Transforms/IndVarsSimplify/exit_value_tests.llx index 3f527ca369..7d5d366864 100644 --- a/test/Transforms/IndVarsSimplify/exit_value_tests.llx +++ b/test/Transforms/IndVarsSimplify/exit_value_tests.llx @@ -2,7 +2,7 @@ ; these loops all have predictable exit values we can replace the use outside ; of the loop with a closed-form computation, making the loop dead. ; -; RUN: llvm-as < %s | opt -indvars -adce -simplifycfg | llvm-dis | not grep br +; RUN: llvm-upgrade < %s | llvm-as | opt -indvars -adce -simplifycfg | llvm-dis | not grep br int %polynomial_constant() { br label %Loop diff --git a/test/Transforms/IndVarsSimplify/lftr_simple.llx b/test/Transforms/IndVarsSimplify/lftr_simple.llx index 6ffd148352..2265e57c6a 100644 --- a/test/Transforms/IndVarsSimplify/lftr_simple.llx +++ b/test/Transforms/IndVarsSimplify/lftr_simple.llx @@ -1,6 +1,6 @@ ; LFTR should eliminate the need for the computation of i*i completely. It ; is only used to compute the exit value. -; RUN: llvm-as < %s | opt -indvars -dce | llvm-dis | not grep mul +; RUN: llvm-upgrade < %s | llvm-as | opt -indvars -dce | llvm-dis | not grep mul %A = external global int diff --git a/test/Transforms/IndVarsSimplify/loop_evaluate_1.ll b/test/Transforms/IndVarsSimplify/loop_evaluate_1.ll index 9fb4d3e5c8..ead9b916a2 100644 --- a/test/Transforms/IndVarsSimplify/loop_evaluate_1.ll +++ b/test/Transforms/IndVarsSimplify/loop_evaluate_1.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -indvars -adce -simplifycfg | llvm-dis | not grep br +; RUN: llvm-upgrade < %s | llvm-as | opt -indvars -adce -simplifycfg | llvm-dis | not grep br ; ; Testcase distilled from 256.bzip2 diff --git a/test/Transforms/IndVarsSimplify/pointer-indvars.ll b/test/Transforms/IndVarsSimplify/pointer-indvars.ll index b5eb106b10..57f7d2470f 100644 --- a/test/Transforms/IndVarsSimplify/pointer-indvars.ll +++ b/test/Transforms/IndVarsSimplify/pointer-indvars.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -indvars | llvm-dis | grep indvar +; RUN: llvm-upgrade < %s | llvm-as | opt -indvars | llvm-dis | grep indvar %G = global int* null diff --git a/test/Transforms/IndVarsSimplify/subtract.ll b/test/Transforms/IndVarsSimplify/subtract.ll index 49f4089172..9cff198ff5 100644 --- a/test/Transforms/IndVarsSimplify/subtract.ll +++ b/test/Transforms/IndVarsSimplify/subtract.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -indvars | llvm-dis | grep indvar +; RUN: llvm-upgrade < %s | llvm-as | opt -indvars | llvm-dis | grep indvar %G = global long 0 diff --git a/test/Transforms/IndVarsSimplify/tripcount_compute.llx b/test/Transforms/IndVarsSimplify/tripcount_compute.llx index ae30c15b4e..733fa1d3ef 100644 --- a/test/Transforms/IndVarsSimplify/tripcount_compute.llx +++ b/test/Transforms/IndVarsSimplify/tripcount_compute.llx @@ -3,7 +3,7 @@ ; the exit value of the loop will be for some value, allowing us to substitute ; it directly into users outside of the loop, making the loop dead. ; -; RUN: llvm-as < %s | opt -indvars -adce -simplifycfg | llvm-dis | not grep br +; RUN: llvm-upgrade < %s | llvm-as | opt -indvars -adce -simplifycfg | llvm-dis | not grep br int %linear_setne() { ;; for (i = 0; i != 100; ++i) entry: diff --git a/test/Transforms/IndVarsSimplify/tripcount_infinite.llx b/test/Transforms/IndVarsSimplify/tripcount_infinite.llx index 85364c68c7..d20e85532a 100644 --- a/test/Transforms/IndVarsSimplify/tripcount_infinite.llx +++ b/test/Transforms/IndVarsSimplify/tripcount_infinite.llx @@ -1,8 +1,8 @@ ; These tests have an infinite trip count. We obviously shouldn't remove the ; loops! :) ; -; RUN: llvm-as < %s | opt -indvars -adce -simplifycfg | llvm-dis | grep set | wc -l > %t2 -; RUN: llvm-as < %s | llvm-dis | grep set | wc -l > %t1 +; RUN: llvm-upgrade < %s | llvm-as | opt -indvars -adce -simplifycfg | llvm-dis | grep set | wc -l > %t2 +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | grep set | wc -l > %t1 ; RUN: diff %t1 %t2 int %infinite_linear() { ;; test for (i = 1; i != 100; i += 2) diff --git a/test/Transforms/IndVarsSimplify/variable-stride-ivs.ll b/test/Transforms/IndVarsSimplify/variable-stride-ivs.ll index d04968d4ea..a8883ffa9f 100644 --- a/test/Transforms/IndVarsSimplify/variable-stride-ivs.ll +++ b/test/Transforms/IndVarsSimplify/variable-stride-ivs.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -indvars -instcombine | llvm-dis | grep 'store int 0' +; RUN: llvm-upgrade < %s | llvm-as | opt -indvars -instcombine | llvm-dis | grep 'store int 0' ; Test that -indvars can reduce variable stride IVs. If it can reduce variable ; stride iv's, it will make %iv. and %m.0.0 isomorphic to each other without ; cycles, allowing the tmp.21 subtraction to be eliminated. diff --git a/test/Transforms/Inline/2003-09-14-InlineValue.ll b/test/Transforms/Inline/2003-09-14-InlineValue.ll index f81b402296..48d563366b 100644 --- a/test/Transforms/Inline/2003-09-14-InlineValue.ll +++ b/test/Transforms/Inline/2003-09-14-InlineValue.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -inline -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -inline -disable-output declare int %External() diff --git a/test/Transforms/Inline/2003-09-22-PHINodeInlineFail.ll b/test/Transforms/Inline/2003-09-22-PHINodeInlineFail.ll index d1db941f09..6e4d1b39e7 100644 --- a/test/Transforms/Inline/2003-09-22-PHINodeInlineFail.ll +++ b/test/Transforms/Inline/2003-09-22-PHINodeInlineFail.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -inline -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -inline -disable-output implementation int %main() { diff --git a/test/Transforms/Inline/2003-09-22-PHINodesInExceptionDest.ll b/test/Transforms/Inline/2003-09-22-PHINodesInExceptionDest.ll index 248f3d8490..e73199c29c 100644 --- a/test/Transforms/Inline/2003-09-22-PHINodesInExceptionDest.ll +++ b/test/Transforms/Inline/2003-09-22-PHINodesInExceptionDest.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -inline -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -inline -disable-output implementation diff --git a/test/Transforms/Inline/2003-09-22-PHINodesInNormalInvokeDest.ll b/test/Transforms/Inline/2003-09-22-PHINodesInNormalInvokeDest.ll index 090b779943..774639b744 100644 --- a/test/Transforms/Inline/2003-09-22-PHINodesInNormalInvokeDest.ll +++ b/test/Transforms/Inline/2003-09-22-PHINodesInNormalInvokeDest.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -inline -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -inline -disable-output implementation int %main() { diff --git a/test/Transforms/Inline/2003-10-13-AllocaDominanceProblem.ll b/test/Transforms/Inline/2003-10-13-AllocaDominanceProblem.ll index 3aa271c7ac..ca163edc5c 100644 --- a/test/Transforms/Inline/2003-10-13-AllocaDominanceProblem.ll +++ b/test/Transforms/Inline/2003-10-13-AllocaDominanceProblem.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -inline -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -inline -disable-output implementation ; Functions: diff --git a/test/Transforms/Inline/2003-10-26-InlineInvokeExceptionDestPhi.ll b/test/Transforms/Inline/2003-10-26-InlineInvokeExceptionDestPhi.ll index 20b4052f9c..785a425b12 100644 --- a/test/Transforms/Inline/2003-10-26-InlineInvokeExceptionDestPhi.ll +++ b/test/Transforms/Inline/2003-10-26-InlineInvokeExceptionDestPhi.ll @@ -2,7 +2,7 @@ ; node in the exception destination, and the inlined function contains an ; unwind instruction. -; RUN: llvm-as < %s | opt -inline -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -inline -disable-output implementation diff --git a/test/Transforms/Inline/2004-04-15-InlineDeletesCall.ll b/test/Transforms/Inline/2004-04-15-InlineDeletesCall.ll index 8ac123f32c..e1ecaed83e 100644 --- a/test/Transforms/Inline/2004-04-15-InlineDeletesCall.ll +++ b/test/Transforms/Inline/2004-04-15-InlineDeletesCall.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -inline -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -inline -disable-output ; Inlining the first call caused the inliner function to delete the second ; call. Then the inliner tries to inline the second call, which no longer diff --git a/test/Transforms/Inline/2004-04-20-InlineLinkOnce.llx b/test/Transforms/Inline/2004-04-20-InlineLinkOnce.llx index bfd3e1dfba..4fab1c9934 100644 --- a/test/Transforms/Inline/2004-04-20-InlineLinkOnce.llx +++ b/test/Transforms/Inline/2004-04-20-InlineLinkOnce.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -inline -prune-eh -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -inline -prune-eh -disable-output implementation diff --git a/test/Transforms/Inline/2004-10-17-InlineFunctionWithoutReturn.ll b/test/Transforms/Inline/2004-10-17-InlineFunctionWithoutReturn.ll index caae0836bd..016fc5a4ab 100644 --- a/test/Transforms/Inline/2004-10-17-InlineFunctionWithoutReturn.ll +++ b/test/Transforms/Inline/2004-10-17-InlineFunctionWithoutReturn.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -inline -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -inline -disable-output int %test() { unwind diff --git a/test/Transforms/Inline/2006-01-14-CallGraphUpdate.ll b/test/Transforms/Inline/2006-01-14-CallGraphUpdate.ll index c40fe6fc88..cb9241154e 100644 --- a/test/Transforms/Inline/2006-01-14-CallGraphUpdate.ll +++ b/test/Transforms/Inline/2006-01-14-CallGraphUpdate.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -inline -prune-eh -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -inline -prune-eh -disable-output "struct.std::__codecvt_abstract_base<char,char,__mbstate_t>" = type { "struct.std::locale::facet" } "struct.std::basic_streambuf<wchar_t,std::char_traits<wchar_t> >" = type { int (...)**, int*, int*, int*, int*, int*, int*, "struct.std::locale" } diff --git a/test/Transforms/Inline/2006-07-12-InlinePruneCGUpdate.ll b/test/Transforms/Inline/2006-07-12-InlinePruneCGUpdate.ll index 2baa6e5096..8429e7c45a 100644 --- a/test/Transforms/Inline/2006-07-12-InlinePruneCGUpdate.ll +++ b/test/Transforms/Inline/2006-07-12-InlinePruneCGUpdate.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -inline -prune-eh -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -inline -prune-eh -disable-output ; PR827 %_ZTV8CRjii = internal global [1 x int (...)*] [ int (...)* %_ZN8CRjii12NlFeeEPN5Jr7sE ] ; <[1 x int (...)*]*> [#uses=0] diff --git a/test/Transforms/Inline/2006-11-09-InlineCGUpdate-2.ll b/test/Transforms/Inline/2006-11-09-InlineCGUpdate-2.ll index 0dc55474f0..705961b65b 100644 --- a/test/Transforms/Inline/2006-11-09-InlineCGUpdate-2.ll +++ b/test/Transforms/Inline/2006-11-09-InlineCGUpdate-2.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -inline -prune-eh -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -inline -prune-eh -disable-output ; PR993 target endian = little target pointersize = 32 diff --git a/test/Transforms/Inline/2006-11-09-InlineCGUpdate.ll b/test/Transforms/Inline/2006-11-09-InlineCGUpdate.ll index d7eb057e3f..1b137cf5f0 100644 --- a/test/Transforms/Inline/2006-11-09-InlineCGUpdate.ll +++ b/test/Transforms/Inline/2006-11-09-InlineCGUpdate.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -inline -prune-eh -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -inline -prune-eh -disable-output ; PR992 target datalayout = "e-p:32:32" target endian = little diff --git a/test/Transforms/Inline/alloca_test.ll b/test/Transforms/Inline/alloca_test.ll index 4b474908ee..35ded4f0d7 100644 --- a/test/Transforms/Inline/alloca_test.ll +++ b/test/Transforms/Inline/alloca_test.ll @@ -1,7 +1,7 @@ ; This test ensures that alloca instructions in the entry block for an inlined ; function are moved to the top of the function they are inlined into. ; -; RUN: llvm-as < %s | opt -inline | llvm-dis | %prcontext alloca 1 | grep Entry: +; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | %prcontext alloca 1 | grep Entry: int %func(int %i) { %X = alloca int diff --git a/test/Transforms/Inline/basictest.ll b/test/Transforms/Inline/basictest.ll index e32007839b..30d87b25bc 100644 --- a/test/Transforms/Inline/basictest.ll +++ b/test/Transforms/Inline/basictest.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -inline -disable-output -print +; RUN: llvm-upgrade < %s | llvm-as | opt -inline -disable-output -print int %func(int %i) { ret int %i diff --git a/test/Transforms/Inline/casts.ll b/test/Transforms/Inline/casts.ll index 8b597adca0..c201a457bc 100644 --- a/test/Transforms/Inline/casts.ll +++ b/test/Transforms/Inline/casts.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -inline | llvm-dis | grep 'ret int 1' +; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | grep 'ret int 1' ; ModuleID = 'short.opt.bc' implementation ; Functions: diff --git a/test/Transforms/Inline/cfg_preserve_test.ll b/test/Transforms/Inline/cfg_preserve_test.ll index 7548b52dde..c444f3a229 100644 --- a/test/Transforms/Inline/cfg_preserve_test.ll +++ b/test/Transforms/Inline/cfg_preserve_test.ll @@ -1,6 +1,6 @@ ; This test ensures that inlining an "empty" function does not destroy the CFG ; -; RUN: llvm-as < %s | opt -inline | llvm-dis | not grep br +; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | not grep br int %func(int %i) { ret int %i diff --git a/test/Transforms/Inline/dynamic_alloca_test.ll b/test/Transforms/Inline/dynamic_alloca_test.ll index 27c7d717a1..2b30b30ab7 100644 --- a/test/Transforms/Inline/dynamic_alloca_test.ll +++ b/test/Transforms/Inline/dynamic_alloca_test.ll @@ -1,9 +1,9 @@ ; Test that functions with dynamic allocas get inlined in a case where ; naively inlining it would result in a miscompilation. -; RUN: llvm-as < %s | opt -inline && -; RUN: llvm-as < %s | opt -inline | llvm-dis | grep llvm.stacksave && -; RUN: llvm-as < %s | opt -inline | llvm-dis | not grep callee +; RUN: llvm-upgrade < %s | llvm-as | opt -inline && +; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | grep llvm.stacksave && +; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | not grep callee declare void %ext(int*) implementation diff --git a/test/Transforms/Inline/inline-tail.ll b/test/Transforms/Inline/inline-tail.ll index f5eb62900d..31e036fe65 100644 --- a/test/Transforms/Inline/inline-tail.ll +++ b/test/Transforms/Inline/inline-tail.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -inline | llvm-dis | not grep tail +; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | not grep tail implementation diff --git a/test/Transforms/Inline/inline_cleanup.ll b/test/Transforms/Inline/inline_cleanup.ll index a26045061d..f0c153b4ca 100644 --- a/test/Transforms/Inline/inline_cleanup.ll +++ b/test/Transforms/Inline/inline_cleanup.ll @@ -1,9 +1,9 @@ ; Test that the inliner doesn't leave around dead allocas, and that it folds ; uncond branches away after it is done specializing. -; RUN: llvm-as < %s | opt -inline -disable-output && -; RUN: llvm-as < %s | opt -inline | llvm-dis | not grep 'alloca.*uses=0' && -; RUN: llvm-as < %s | opt -inline | llvm-dis | not grep 'br label' +; RUN: llvm-upgrade < %s | llvm-as | opt -inline -disable-output && +; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | not grep 'alloca.*uses=0' && +; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | not grep 'br label' %A = weak global int 0 ; <int*> [#uses=1] %B = weak global int 0 ; <int*> [#uses=1] diff --git a/test/Transforms/Inline/inline_constprop.ll b/test/Transforms/Inline/inline_constprop.ll index edfb0905f9..d76a88be37 100644 --- a/test/Transforms/Inline/inline_constprop.ll +++ b/test/Transforms/Inline/inline_constprop.ll @@ -1,6 +1,6 @@ -; RUN: llvm-as < %s | opt -inline -disable-output && -; RUN: llvm-as < %s | opt -inline | llvm-dis | not grep callee && -; RUN: llvm-as < %s | opt -inline | llvm-dis | not grep div +; RUN: llvm-upgrade < %s | llvm-as | opt -inline -disable-output && +; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | not grep callee && +; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | not grep div implementation diff --git a/test/Transforms/Inline/inline_dce.ll b/test/Transforms/Inline/inline_dce.ll index bcad01c883..9dc7a774ae 100644 --- a/test/Transforms/Inline/inline_dce.ll +++ b/test/Transforms/Inline/inline_dce.ll @@ -1,7 +1,7 @@ ; This checks to ensure that the inline pass deletes functions if they get ; inlined into all of their callers. -; RUN: llvm-as < %s | opt -inline | llvm-dis | not grep %reallysmall +; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | not grep %reallysmall implementation diff --git a/test/Transforms/Inline/inline_prune.ll b/test/Transforms/Inline/inline_prune.ll index fdbdf8346f..dff38802e1 100644 --- a/test/Transforms/Inline/inline_prune.ll +++ b/test/Transforms/Inline/inline_prune.ll @@ -1,6 +1,6 @@ -; RUN: llvm-as < %s | opt -inline -disable-output && -; RUN: llvm-as < %s | opt -inline | llvm-dis | not grep 'callee[12](' && -; RUN: llvm-as < %s | opt -inline | llvm-dis | not grep mul +; RUN: llvm-upgrade < %s | llvm-as | opt -inline -disable-output && +; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | not grep 'callee[12](' && +; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | not grep mul implementation diff --git a/test/Transforms/Inline/invoke_test-1.ll b/test/Transforms/Inline/invoke_test-1.ll index 023563a98a..8409a21561 100644 --- a/test/Transforms/Inline/invoke_test-1.ll +++ b/test/Transforms/Inline/invoke_test-1.ll @@ -1,7 +1,7 @@ ; Test that we can inline a simple function, turning the calls in it into invoke ; instructions -; RUN: llvm-as < %s | opt -inline | llvm-dis | not grep 'call[^e]' +; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | not grep 'call[^e]' declare void %might_throw() diff --git a/test/Transforms/Inline/invoke_test-2.ll b/test/Transforms/Inline/invoke_test-2.ll index 9c2a8548ca..0913f7c24d 100644 --- a/test/Transforms/Inline/invoke_test-2.ll +++ b/test/Transforms/Inline/invoke_test-2.ll @@ -1,7 +1,7 @@ ; Test that if an invoked function is inlined, and if that function cannot ; throw, that the dead handler is now unreachable. -; RUN: llvm-as < %s | opt -inline -simplifycfg | llvm-dis | not grep UnreachableExceptionHandler +; RUN: llvm-upgrade < %s | llvm-as | opt -inline -simplifycfg | llvm-dis | not grep UnreachableExceptionHandler declare void %might_throw() diff --git a/test/Transforms/Inline/invoke_test-3.ll b/test/Transforms/Inline/invoke_test-3.ll index 5601a4b90a..b471afe2fb 100644 --- a/test/Transforms/Inline/invoke_test-3.ll +++ b/test/Transforms/Inline/invoke_test-3.ll @@ -1,7 +1,7 @@ ; Test that any rethrown exceptions in an inlined function are automatically ; turned into branches to the invoke destination. -; RUN: llvm-as < %s | opt -inline | llvm-dis | not grep unwind$ +; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | not grep unwind$ declare void %might_throw() 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 diff --git a/test/Transforms/LCSSA/2006-06-03-IncorrectIDFPhis.ll b/test/Transforms/LCSSA/2006-06-03-IncorrectIDFPhis.ll index e2c73f832d..fb36b4b7e3 100644 --- a/test/Transforms/LCSSA/2006-06-03-IncorrectIDFPhis.ll +++ b/test/Transforms/LCSSA/2006-06-03-IncorrectIDFPhis.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | opt -lcssa | llvm-dis | grep "%SJE.0.0.lcssa = phi .struct.SetJmpMapEntry" && -; RUN: llvm-as < %s | opt -lcssa | llvm-dis | grep "%SJE.0.0.lcssa1 = phi .struct.SetJmpMapEntry" +; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa | llvm-dis | grep "%SJE.0.0.lcssa = phi .struct.SetJmpMapEntry" && +; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa | llvm-dis | grep "%SJE.0.0.lcssa1 = phi .struct.SetJmpMapEntry" %struct.SetJmpMapEntry = type { sbyte*, uint, %struct.SetJmpMapEntry* } diff --git a/test/Transforms/LCSSA/2006-06-12-MultipleExitsSameBlock.ll b/test/Transforms/LCSSA/2006-06-12-MultipleExitsSameBlock.ll index 83a0f9f380..e694ecf1de 100644 --- a/test/Transforms/LCSSA/2006-06-12-MultipleExitsSameBlock.ll +++ b/test/Transforms/LCSSA/2006-06-12-MultipleExitsSameBlock.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | opt -lcssa | llvm-dis | grep "%X.1.lcssa" && -; RUN: llvm-as < %s | opt -lcssa | llvm-dis | not grep "%X.1.lcssa1" +; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa | llvm-dis | grep "%X.1.lcssa" && +; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa | llvm-dis | not grep "%X.1.lcssa1" declare bool %c1() declare bool %c2() diff --git a/test/Transforms/LCSSA/2006-07-09-NoDominator.ll b/test/Transforms/LCSSA/2006-07-09-NoDominator.ll index 54211390ee..f90f6644af 100644 --- a/test/Transforms/LCSSA/2006-07-09-NoDominator.ll +++ b/test/Transforms/LCSSA/2006-07-09-NoDominator.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -lcssa +; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa %struct.SetJmpMapEntry = type { sbyte*, uint, %struct.SetJmpMapEntry* } diff --git a/test/Transforms/LCSSA/2006-10-31-UnreachableBlock-2.ll b/test/Transforms/LCSSA/2006-10-31-UnreachableBlock-2.ll index 55c233a07d..ac40ad5fd6 100644 --- a/test/Transforms/LCSSA/2006-10-31-UnreachableBlock-2.ll +++ b/test/Transforms/LCSSA/2006-10-31-UnreachableBlock-2.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -lcssa -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa -disable-output ; PR977 declare int %opost_block() diff --git a/test/Transforms/LCSSA/2006-10-31-UnreachableBlock.ll b/test/Transforms/LCSSA/2006-10-31-UnreachableBlock.ll index f70d5c8039..9178411ece 100644 --- a/test/Transforms/LCSSA/2006-10-31-UnreachableBlock.ll +++ b/test/Transforms/LCSSA/2006-10-31-UnreachableBlock.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -lcssa -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa -disable-output ; PR977 void %process_backlog() { diff --git a/test/Transforms/LCSSA/basictest.ll b/test/Transforms/LCSSA/basictest.ll index e0a8eaeecf..05a0ad1eb2 100644 --- a/test/Transforms/LCSSA/basictest.ll +++ b/test/Transforms/LCSSA/basictest.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | opt -lcssa | llvm-dis | grep "X3.lcssa = phi int" && -; RUN: llvm-as < %s | opt -lcssa | llvm-dis | grep "%X4 = add int 3, %X3.lcssa" +; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa | llvm-dis | grep "X3.lcssa = phi int" && +; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa | llvm-dis | grep "%X4 = add int 3, %X3.lcssa" void %lcssa(bool %S2) { entry: diff --git a/test/Transforms/LICM/2003-02-26-LoopExitNotDominated.ll b/test/Transforms/LICM/2003-02-26-LoopExitNotDominated.ll index 43430d8573..b437034e6d 100644 --- a/test/Transforms/LICM/2003-02-26-LoopExitNotDominated.ll +++ b/test/Transforms/LICM/2003-02-26-LoopExitNotDominated.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -basicaa -licm -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -basicaa -licm -disable-output ;%MoveArray = external global [64 x ulong] diff --git a/test/Transforms/LICM/2003-02-27-NestedLoopExitBlocks.ll b/test/Transforms/LICM/2003-02-27-NestedLoopExitBlocks.ll index edc51472ff..d0830bc6d0 100644 --- a/test/Transforms/LICM/2003-02-27-NestedLoopExitBlocks.ll +++ b/test/Transforms/LICM/2003-02-27-NestedLoopExitBlocks.ll @@ -1,6 +1,6 @@ ; Exit blocks need to be updated for all nested loops... -; RUN: llvm-as < %s | opt -loopsimplify +; RUN: llvm-upgrade < %s | llvm-as | opt -loopsimplify implementation ; Functions: diff --git a/test/Transforms/LICM/2003-02-27-PreheaderExitNodeUpdate.ll b/test/Transforms/LICM/2003-02-27-PreheaderExitNodeUpdate.ll index c082a596ba..224116f89c 100644 --- a/test/Transforms/LICM/2003-02-27-PreheaderExitNodeUpdate.ll +++ b/test/Transforms/LICM/2003-02-27-PreheaderExitNodeUpdate.ll @@ -1,7 +1,7 @@ ; This testcase fails because preheader insertion is not updating exit node ; information for loops. -; RUN: llvm-as < %s | opt -licm +; RUN: llvm-upgrade < %s | llvm-as | opt -licm int %main(int %argc, sbyte** %argv) { bb0: ; No predecessors! diff --git a/test/Transforms/LICM/2003-02-27-PreheaderProblem.ll b/test/Transforms/LICM/2003-02-27-PreheaderProblem.ll index d1a15c7023..96e11c3337 100644 --- a/test/Transforms/LICM/2003-02-27-PreheaderProblem.ll +++ b/test/Transforms/LICM/2003-02-27-PreheaderProblem.ll @@ -3,7 +3,7 @@ ; happens because preheader insertion doesn't insert a preheader for this ; case... bad. -; RUN: llvm-as < %s | opt -licm -adce -simplifycfg | llvm-dis | not grep 'br ' +; RUN: llvm-upgrade < %s | llvm-as | opt -licm -adce -simplifycfg | llvm-dis | not grep 'br ' int %main(int %argc) { br label %bb5 diff --git a/test/Transforms/LICM/2003-02-27-StoreSinkPHIs.ll b/test/Transforms/LICM/2003-02-27-StoreSinkPHIs.ll index d0ec438dc7..caf50eb5fa 100644 --- a/test/Transforms/LICM/2003-02-27-StoreSinkPHIs.ll +++ b/test/Transforms/LICM/2003-02-27-StoreSinkPHIs.ll @@ -1,6 +1,6 @@ ; LICM is adding stores before phi nodes. bad. -; RUN: llvm-as < %s | opt -licm +; RUN: llvm-upgrade < %s | llvm-as | opt -licm bool %test(bool %c) { br bool %c, label %Loop, label %Out diff --git a/test/Transforms/LICM/2003-02-28-PromoteDifferentType.ll b/test/Transforms/LICM/2003-02-28-PromoteDifferentType.ll index 4f7cbeade7..360871b82f 100644 --- a/test/Transforms/LICM/2003-02-28-PromoteDifferentType.ll +++ b/test/Transforms/LICM/2003-02-28-PromoteDifferentType.ll @@ -1,6 +1,6 @@ ; Test that hoisting is disabled for pointers of different types... ; -; RUN: llvm-as < %s | opt -licm +; RUN: llvm-upgrade < %s | llvm-as | opt -licm void %test(int* %P) { br label %Loop diff --git a/test/Transforms/LICM/2003-05-02-LoadHoist.ll b/test/Transforms/LICM/2003-05-02-LoadHoist.ll index 90a64e834c..ce13e6d57e 100644 --- a/test/Transforms/LICM/2003-05-02-LoadHoist.ll +++ b/test/Transforms/LICM/2003-05-02-LoadHoist.ll @@ -3,7 +3,7 @@ ; loaded from. Basically if the load gets hoisted, the subtract gets turned ; into a constant zero. ; -; RUN: llvm-as < %s | opt -licm -load-vn -gcse -instcombine | llvm-dis | grep load +; RUN: llvm-upgrade < %s | llvm-as | opt -licm -load-vn -gcse -instcombine | llvm-dis | grep load %X = global int 7 declare void %foo() diff --git a/test/Transforms/LICM/2003-08-04-TrappingInstHoist.ll b/test/Transforms/LICM/2003-08-04-TrappingInstHoist.ll index 2173b76d5b..63a4ac0097 100644 --- a/test/Transforms/LICM/2003-08-04-TrappingInstHoist.ll +++ b/test/Transforms/LICM/2003-08-04-TrappingInstHoist.ll @@ -1,7 +1,7 @@ ; This testcase tests for a problem where LICM hoists ; potentially trapping instructions when they are not guaranteed to execute. ; -; RUN: llvm-as < %s | opt -licm | llvm-dis | %prcontext "IfUnEqual" 2 | grep div +; RUN: llvm-upgrade < %s | llvm-as | opt -licm | llvm-dis | %prcontext "IfUnEqual" 2 | grep div %X = global int 0 declare void %foo() diff --git a/test/Transforms/LICM/2003-08-04-TrappingInstOkHoist.ll b/test/Transforms/LICM/2003-08-04-TrappingInstOkHoist.ll index 7e2f233a43..2c784c0061 100644 --- a/test/Transforms/LICM/2003-08-04-TrappingInstOkHoist.ll +++ b/test/Transforms/LICM/2003-08-04-TrappingInstOkHoist.ll @@ -1,7 +1,7 @@ ; This testcase tests to make sure a trapping instruction is hoisted when ; it is guaranteed to execute. ; -; RUN: llvm-as < %s | opt -licm | llvm-dis | %prcontext "test" 2 | grep div +; RUN: llvm-upgrade < %s | llvm-as | opt -licm | llvm-dis | %prcontext "test" 2 | grep div %X = global int 0 declare void %foo(int) diff --git a/test/Transforms/LICM/2003-12-11-SinkingToPHI.ll b/test/Transforms/LICM/2003-12-11-SinkingToPHI.ll index ecbc130e87..955e70b8e9 100644 --- a/test/Transforms/LICM/2003-12-11-SinkingToPHI.ll +++ b/test/Transforms/LICM/2003-12-11-SinkingToPHI.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -licm | lli +; RUN: llvm-upgrade < %s | llvm-as | opt -licm | lli implementation ; Functions: diff --git a/test/Transforms/LICM/2003-12-13-VolatilePromote.ll b/test/Transforms/LICM/2003-12-13-VolatilePromote.ll index 66102992a2..916a6e3833 100644 --- a/test/Transforms/LICM/2003-12-13-VolatilePromote.ll +++ b/test/Transforms/LICM/2003-12-13-VolatilePromote.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -licm | llvm-dis | %prcontext volatile 1 | grep Loop +; RUN: llvm-upgrade < %s | llvm-as | opt -licm | llvm-dis | %prcontext volatile 1 | grep Loop %X = global int 7 diff --git a/test/Transforms/LICM/2004-09-14-AliasAnalysisInvalidate.llx b/test/Transforms/LICM/2004-09-14-AliasAnalysisInvalidate.llx index 253a980f89..f4dd108a0e 100644 --- a/test/Transforms/LICM/2004-09-14-AliasAnalysisInvalidate.llx +++ b/test/Transforms/LICM/2004-09-14-AliasAnalysisInvalidate.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -globalsmodref-aa -licm -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -globalsmodref-aa -licm -disable-output %PL_regcomp_parse = internal global sbyte* null diff --git a/test/Transforms/LICM/2004-11-17-UndefIndexCrash.ll b/test/Transforms/LICM/2004-11-17-UndefIndexCrash.ll index 7bd4258890..848dd46549 100644 --- a/test/Transforms/LICM/2004-11-17-UndefIndexCrash.ll +++ b/test/Transforms/LICM/2004-11-17-UndefIndexCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -licm -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -licm -disable-output %struct.roadlet = type { sbyte*, %struct.vehicle*, [8 x %struct.roadlet*], [8 x %struct.roadlet* (%struct.roadlet*, %struct.vehicle*, int)*] } %struct.vehicle = type { %struct.roadlet*, sbyte*, int, int, %union.._631., int } diff --git a/test/Transforms/LICM/2005-03-24-LICM-Aggregate-Crash.ll b/test/Transforms/LICM/2005-03-24-LICM-Aggregate-Crash.ll index 6c5b1a57e1..544dee3a28 100644 --- a/test/Transforms/LICM/2005-03-24-LICM-Aggregate-Crash.ll +++ b/test/Transforms/LICM/2005-03-24-LICM-Aggregate-Crash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -licm -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -licm -disable-output void %test({int}* %P) { br label %Loop diff --git a/test/Transforms/LICM/2006-09-12-DeadUserOfSunkInstr.ll b/test/Transforms/LICM/2006-09-12-DeadUserOfSunkInstr.ll index fe69e5ed09..8eca08c793 100644 --- a/test/Transforms/LICM/2006-09-12-DeadUserOfSunkInstr.ll +++ b/test/Transforms/LICM/2006-09-12-DeadUserOfSunkInstr.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -licm -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -licm -disable-output ; PR908 %struct.alloc_chain = type { sbyte*, %struct.alloc_chain* } diff --git a/test/Transforms/LICM/basictest.ll b/test/Transforms/LICM/basictest.ll index 328687da01..6458f035c2 100644 --- a/test/Transforms/LICM/basictest.ll +++ b/test/Transforms/LICM/basictest.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -licm | llvm-dis +; RUN: llvm-upgrade < %s | llvm-as | opt -licm | llvm-dis void "testfunc"(int %i) { diff --git a/test/Transforms/LICM/call_sink_const_function.ll b/test/Transforms/LICM/call_sink_const_function.ll index a81e7c399f..a8a4b72d6d 100644 --- a/test/Transforms/LICM/call_sink_const_function.ll +++ b/test/Transforms/LICM/call_sink_const_function.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -basicaa -licm | llvm-dis | %prcontext sin 1 | grep Out: +; RUN: llvm-upgrade < %s | llvm-as | opt -basicaa -licm | llvm-dis | %prcontext sin 1 | grep Out: declare double %sin(double) declare void %foo() diff --git a/test/Transforms/LICM/call_sink_pure_function.ll b/test/Transforms/LICM/call_sink_pure_function.ll index 80ad8e18fd..e5857a62a6 100644 --- a/test/Transforms/LICM/call_sink_pure_function.ll +++ b/test/Transforms/LICM/call_sink_pure_function.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -basicaa -licm | llvm-dis | %prcontext strlen 1 | grep Out: +; RUN: llvm-upgrade < %s | llvm-as | opt -basicaa -licm | llvm-dis | %prcontext strlen 1 | grep Out: declare int %strlen(sbyte*) declare void %foo() diff --git a/test/Transforms/LICM/no-preheader-test.ll b/test/Transforms/LICM/no-preheader-test.ll index 8d2eef9933..954857ae3b 100644 --- a/test/Transforms/LICM/no-preheader-test.ll +++ b/test/Transforms/LICM/no-preheader-test.ll @@ -1,5 +1,5 @@ ; Test that LICM works when there is not a loop-preheader -; RUN: llvm-as < %s | opt -licm | llvm-dis +; RUN: llvm-upgrade < %s | llvm-as | opt -licm | llvm-dis void "testfunc"(int %i, bool %ifcond) { br bool %ifcond, label %Then, label %Else diff --git a/test/Transforms/LICM/scalar_promote.ll b/test/Transforms/LICM/scalar_promote.ll index 02fa57d26b..219b16bad0 100644 --- a/test/Transforms/LICM/scalar_promote.ll +++ b/test/Transforms/LICM/scalar_promote.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -licm -stats 2>&1 | grep "memory locations promoted to register" +; RUN: llvm-upgrade < %s | llvm-as | opt -licm -stats 2>&1 | grep "memory locations promoted to register" %X = global int 7 diff --git a/test/Transforms/LICM/sink_critical_edge.ll b/test/Transforms/LICM/sink_critical_edge.ll index 1ed66523d2..bc8f2b2cf2 100644 --- a/test/Transforms/LICM/sink_critical_edge.ll +++ b/test/Transforms/LICM/sink_critical_edge.ll @@ -1,7 +1,7 @@ ; This testcase checks to make sure the sinker does not cause problems with ; critical edges. -; RUN: llvm-as < %s | opt -licm | llvm-dis | %prcontext add 1 | grep Exit +; RUN: llvm-upgrade < %s | llvm-as | opt -licm | llvm-dis | %prcontext add 1 | grep Exit implementation ; Functions: diff --git a/test/Transforms/LICM/sink_inst.ll b/test/Transforms/LICM/sink_inst.ll index 0cb2c25d7d..82d93571e7 100644 --- a/test/Transforms/LICM/sink_inst.ll +++ b/test/Transforms/LICM/sink_inst.ll @@ -2,7 +2,7 @@ ; the instruction to the exit blocks instead of executing it on every ; iteration of the loop. ; -; RUN: llvm-as < %s | opt -licm | llvm-dis | %prcontext mul 1 | grep Out: +; RUN: llvm-upgrade < %s | llvm-as | opt -licm | llvm-dis | %prcontext mul 1 | grep Out: int %test(int %N) { Entry: diff --git a/test/Transforms/LICM/sink_load.ll b/test/Transforms/LICM/sink_load.ll index a0bfc7f9f7..5b19b6ffb7 100644 --- a/test/Transforms/LICM/sink_load.ll +++ b/test/Transforms/LICM/sink_load.ll @@ -2,7 +2,7 @@ ; result of the load is only used outside of the loop, sink the load instead of ; hoisting it! ; -; RUN: llvm-as < %s | opt -licm | llvm-dis | %prcontext load 1 | grep Out: +; RUN: llvm-upgrade < %s | llvm-as | opt -licm | llvm-dis | %prcontext load 1 | grep Out: %X = global int 5 diff --git a/test/Transforms/LICM/sink_multiple.ll b/test/Transforms/LICM/sink_multiple.ll index a98a17fbd5..61cf6909e6 100644 --- a/test/Transforms/LICM/sink_multiple.ll +++ b/test/Transforms/LICM/sink_multiple.ll @@ -3,7 +3,7 @@ ; instructions from the loop. Instead they got hoisted, which is better than ; leaving them in the loop, but increases register pressure pointlessly. -; RUN: llvm-as < %s | opt -licm | llvm-dis | %prcontext getelementptr 1 | grep Out: +; RUN: llvm-upgrade < %s | llvm-as | opt -licm | llvm-dis | %prcontext getelementptr 1 | grep Out: %Ty = type { int, int } %X = external global %Ty diff --git a/test/Transforms/LICM/sink_multiple_exits.ll b/test/Transforms/LICM/sink_multiple_exits.ll index d7f1514a4e..860d7306d5 100644 --- a/test/Transforms/LICM/sink_multiple_exits.ll +++ b/test/Transforms/LICM/sink_multiple_exits.ll @@ -1,7 +1,7 @@ ; This testcase ensures that we can sink instructions from loops with ; multiple exits. ; -; RUN: llvm-as < %s | opt -licm | llvm-dis | %prcontext mul 1 | grep 'Out[12]:' +; RUN: llvm-upgrade < %s | llvm-as | opt -licm | llvm-dis | %prcontext mul 1 | grep 'Out[12]:' int %test(int %N, bool %C) { Entry: diff --git a/test/Transforms/LICM/sink_only_some_exits.ll b/test/Transforms/LICM/sink_only_some_exits.ll index 6415c8a1f0..e82166a685 100644 --- a/test/Transforms/LICM/sink_only_some_exits.ll +++ b/test/Transforms/LICM/sink_only_some_exits.ll @@ -2,7 +2,7 @@ ; some exits out of the loop, and that we can do so without breaking dominator ; info. ; -; RUN: llvm-as < %s | opt -licm | llvm-dis | %prcontext add 1 | grep exit2: +; RUN: llvm-upgrade < %s | llvm-as | opt -licm | llvm-dis | %prcontext add 1 | grep exit2: implementation ; Functions: diff --git a/test/Transforms/LICM/sink_phi_node_use.ll b/test/Transforms/LICM/sink_phi_node_use.ll index c1d5844e7e..d50f54e47f 100644 --- a/test/Transforms/LICM/sink_phi_node_use.ll +++ b/test/Transforms/LICM/sink_phi_node_use.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -licm | llvm-dis | %prcontext add 1 | grep preheader.loopexit: +; RUN: llvm-upgrade < %s | llvm-as | opt -licm | llvm-dis | %prcontext add 1 | grep preheader.loopexit: implementation diff --git a/test/Transforms/LICM/sink_trapping_inst.ll b/test/Transforms/LICM/sink_trapping_inst.ll index 4842331d23..8e67c005f5 100644 --- a/test/Transforms/LICM/sink_trapping_inst.ll +++ b/test/Transforms/LICM/sink_trapping_inst.ll @@ -1,7 +1,7 @@ ; Potentially trapping instructions may be sunk as long as they are guaranteed ; to be executed. ; -; RUN: llvm-as < %s | opt -licm | llvm-dis | %prcontext div 1 | grep Out: +; RUN: llvm-upgrade < %s | llvm-as | opt -licm | llvm-dis | %prcontext div 1 | grep Out: int %test(int %N) { Entry: diff --git a/test/Transforms/LevelRaise/2002-02-11-ArrayShape.ll b/test/Transforms/LevelRaise/2002-02-11-ArrayShape.ll index 1bb63dd778..73dfa1f5a1 100644 --- a/test/Transforms/LevelRaise/2002-02-11-ArrayShape.ll +++ b/test/Transforms/LevelRaise/2002-02-11-ArrayShape.ll @@ -18,7 +18,7 @@ ; equivelent form. ; ; XFAIL: * -; RUN: llvm-as < %s | opt -q -raise > Output/%s.raised.bc +; RUN: llvm-upgrade < %s | llvm-as | opt -q -raise > Output/%s.raised.bc ; RUN: lli -force-interpreter -array-checks < Output/%s.raised.bc ; diff --git a/test/Transforms/LevelRaise/2002-02-14-BadAssertion.ll b/test/Transforms/LevelRaise/2002-02-14-BadAssertion.ll index 44ccfcc680..546b6544f8 100644 --- a/test/Transforms/LevelRaise/2002-02-14-BadAssertion.ll +++ b/test/Transforms/LevelRaise/2002-02-14-BadAssertion.ll @@ -1,6 +1,6 @@ ; An invalid assertion killed the level raiser. Fixed. ; -; RUN: llvm-as < %s | opt -raise +; RUN: llvm-upgrade < %s | llvm-as | opt -raise implementation diff --git a/test/Transforms/LevelRaise/2002-03-11-Calls.ll b/test/Transforms/LevelRaise/2002-03-11-Calls.ll index 26fedff040..3e8a58fc36 100644 --- a/test/Transforms/LevelRaise/2002-03-11-Calls.ll +++ b/test/Transforms/LevelRaise/2002-03-11-Calls.ll @@ -2,7 +2,7 @@ ; method pointer type into a call. In doing so, it would have to change the ; types of the arguments to the call, but broke doing so. ; -; RUN: llvm-as < %s | opt -raise +; RUN: llvm-upgrade < %s | llvm-as | opt -raise implementation diff --git a/test/Transforms/LevelRaise/2002-03-14-ConvertableToGEPHang.ll b/test/Transforms/LevelRaise/2002-03-14-ConvertableToGEPHang.ll index c740f4b889..895d5ae110 100644 --- a/test/Transforms/LevelRaise/2002-03-14-ConvertableToGEPHang.ll +++ b/test/Transforms/LevelRaise/2002-03-14-ConvertableToGEPHang.ll @@ -2,7 +2,7 @@ ; Note that this code is actually miscompiled from the input source, but despite ; that, level raise should not hang! ; -; RUN: llvm-as < %s | opt -raise +; RUN: llvm-upgrade < %s | llvm-as | opt -raise %Disjunct = type { \2 *, short, sbyte, sbyte *, { short, short, sbyte, sbyte, \2, sbyte * } *, { short, short, sbyte, sbyte, \2, sbyte * } * } %chosen_disjuncts = uninitialized global %Disjunct * * ; <%Disjunct * * *> [#uses=1] diff --git a/test/Transforms/LevelRaise/2002-03-20-BadCodegen.ll b/test/Transforms/LevelRaise/2002-03-20-BadCodegen.ll index a6d33eeff3..96961e330c 100644 --- a/test/Transforms/LevelRaise/2002-03-20-BadCodegen.ll +++ b/test/Transforms/LevelRaise/2002-03-20-BadCodegen.ll @@ -2,7 +2,7 @@ ; getelementptr instruction... with a bad level raise pass, this code ; will segfault on execution. ; -; RUN: llvm-as < %s | opt -raise |lli +; RUN: llvm-upgrade < %s | llvm-as | opt -raise |lli %Village = type { [4 x \3 *], \2 *, { \2 *, { int, int, int, \5 * } *, \2 * }, { int, int, int, { \2 *, { int, int, int, \6 * } *, \2 * }, { \2 *, { int, int, int, \6 * } *, \2 * }, { \2 *, { int, int, int, \6 * } *, \2 * }, { \2 *, { int, int, int, \6 * } *, \2 * } }, int, int } diff --git a/test/Transforms/LevelRaise/2002-03-20-Crash.ll b/test/Transforms/LevelRaise/2002-03-20-Crash.ll index bd5c18e32a..35f4c8df60 100644 --- a/test/Transforms/LevelRaise/2002-03-20-Crash.ll +++ b/test/Transforms/LevelRaise/2002-03-20-Crash.ll @@ -1,7 +1,7 @@ ; Level raise is making an incorrect transformation, which causes incorrect ; bytecode to be generated. ; -; RUN: llvm-as < %s | opt -raise | llvm-dis +; RUN: llvm-upgrade < %s | llvm-as | opt -raise | llvm-dis ; %Village = type { [4 x \3 *], \2 *, { \2 *, { int, int, int, \5 * } *, \2 * }, { int, int, int, { \2 *, { int, int, int, \6 * } *, \2 * }, { \2 *, { int, int, int, \6 * } *, \2 * }, { \2 *, { int, int, int, \6 * } *, \2 * }, { \2 *, { int, int, int, \6 * } *, \2 * } }, int, int } diff --git a/test/Transforms/LevelRaise/2002-03-21-MissedRaise.ll b/test/Transforms/LevelRaise/2002-03-21-MissedRaise.ll index 5f6250ef33..440f9ea5ff 100644 --- a/test/Transforms/LevelRaise/2002-03-21-MissedRaise.ll +++ b/test/Transforms/LevelRaise/2002-03-21-MissedRaise.ll @@ -2,7 +2,7 @@ ; LevelRaise should eliminate all cast instructions from this testcase. ; ; XFAIL: * -; RUN: llvm-as < %s | opt -raise | llvm-dis | notcast +; RUN: llvm-upgrade < %s | llvm-as | opt -raise | llvm-dis | notcast %Hash = type { { uint, sbyte *, \2 } * *, int (uint) *, int } * %hash = type { { uint, sbyte *, \2 } * *, int (uint) *, int } diff --git a/test/Transforms/LevelRaise/2002-03-21-MissedRaise2.ll b/test/Transforms/LevelRaise/2002-03-21-MissedRaise2.ll index 4a778ea0e5..e3b533c282 100644 --- a/test/Transforms/LevelRaise/2002-03-21-MissedRaise2.ll +++ b/test/Transforms/LevelRaise/2002-03-21-MissedRaise2.ll @@ -3,7 +3,7 @@ ; prevented reg115 from being able to change. ; ; XFAIL: * -; RUN: llvm-as < %s | opt -raise | llvm-dis | not grep bitcast +; RUN: llvm-upgrade < %s | llvm-as | opt -raise | llvm-dis | not grep bitcast %Hash = type { { uint, sbyte *, \2 } * *, int (uint) *, int } * %HashEntry = type { uint, sbyte *, \2 } * diff --git a/test/Transforms/LevelRaise/2002-03-21-MissedRaise3.ll b/test/Transforms/LevelRaise/2002-03-21-MissedRaise3.ll index 6379ab5848..310f34fb81 100644 --- a/test/Transforms/LevelRaise/2002-03-21-MissedRaise3.ll +++ b/test/Transforms/LevelRaise/2002-03-21-MissedRaise3.ll @@ -1,5 +1,5 @@ ; XFAIL: * -; RUN: llvm-as < %s | opt -raise | llvm-dis | not grep bitcast +; RUN: llvm-upgrade < %s | llvm-as | opt -raise | llvm-dis | not grep bitcast %Hash = type { { uint, sbyte *, \2 } * *, int (uint) *, int } * %HashEntry = type { uint, sbyte *, \2 } * diff --git a/test/Transforms/LevelRaise/2002-04-16-MissedRaise.ll b/test/Transforms/LevelRaise/2002-04-16-MissedRaise.ll index 1fa2fd8253..3fa7320a20 100644 --- a/test/Transforms/LevelRaise/2002-04-16-MissedRaise.ll +++ b/test/Transforms/LevelRaise/2002-04-16-MissedRaise.ll @@ -6,7 +6,7 @@ ; return (int*)malloc(i+j); ; } -; RUN: llvm-as < %s | opt -raise | llvm-dis | not grep bitcast +; RUN: llvm-upgrade < %s | llvm-as | opt -raise | llvm-dis | not grep bitcast implementation diff --git a/test/Transforms/LevelRaise/2002-05-02-BadCastElimination.ll b/test/Transforms/LevelRaise/2002-05-02-BadCastElimination.ll index ef5a30d63d..444d9d4236 100644 --- a/test/Transforms/LevelRaise/2002-05-02-BadCastElimination.ll +++ b/test/Transforms/LevelRaise/2002-05-02-BadCastElimination.ll @@ -3,7 +3,7 @@ ; to a 32 bit version of the number with all upper 16 bits clear (ushort->uint ; involves no sign extension). Optimizing this to a single cast is invalid! ; -; RUN: llvm-as < %s | opt -raise -q | lli +; RUN: llvm-upgrade < %s | llvm-as | opt -raise -q | lli ; implementation diff --git a/test/Transforms/LevelRaise/2002-05-02-MissedRaise.ll b/test/Transforms/LevelRaise/2002-05-02-MissedRaise.ll index 64000918de..7335af090d 100644 --- a/test/Transforms/LevelRaise/2002-05-02-MissedRaise.ll +++ b/test/Transforms/LevelRaise/2002-05-02-MissedRaise.ll @@ -1,6 +1,6 @@ ; This testcase is not level raised properly... ; XFAIL: * -; RUN: llvm-as < %s | opt -raise | llvm-dis | not grep bitcast +; RUN: llvm-upgrade < %s | llvm-as | opt -raise | llvm-dis | not grep bitcast %List = type { int, %List* } diff --git a/test/Transforms/LevelRaise/2002-05-10-LoadPeephole.ll b/test/Transforms/LevelRaise/2002-05-10-LoadPeephole.ll index 102b57431f..640415408d 100644 --- a/test/Transforms/LevelRaise/2002-05-10-LoadPeephole.ll +++ b/test/Transforms/LevelRaise/2002-05-10-LoadPeephole.ll @@ -1,7 +1,7 @@ ; This testcase should have the cast propogated through the load ; just like a store does... ; -; RUN: llvm-as < %s | opt -raise | llvm-dis | not grep 'bitcast uint \*' +; RUN: llvm-upgrade < %s | llvm-as | opt -raise | llvm-dis | not grep 'bitcast uint \*' int "test"(uint * %Ptr) { %P2 = cast uint *%Ptr to int * diff --git a/test/Transforms/LevelRaise/2002-05-23-MissedRaise.ll b/test/Transforms/LevelRaise/2002-05-23-MissedRaise.ll index 59a4248d5a..cbb77870e3 100644 --- a/test/Transforms/LevelRaise/2002-05-23-MissedRaise.ll +++ b/test/Transforms/LevelRaise/2002-05-23-MissedRaise.ll @@ -1,5 +1,5 @@ ; XFAIL: * -; RUN: llvm-as < %s | opt -raise | llvm-dis | not grep bitcast +; RUN: llvm-upgrade < %s | llvm-as | opt -raise | llvm-dis | not grep bitcast %FILE = type { int, ubyte*, ubyte*, ubyte, ubyte, uint, uint, uint } diff --git a/test/Transforms/LevelRaise/2002-07-16-MissedRaise.ll b/test/Transforms/LevelRaise/2002-07-16-MissedRaise.ll index a5ed52ccb5..456b09fb6a 100644 --- a/test/Transforms/LevelRaise/2002-07-16-MissedRaise.ll +++ b/test/Transforms/LevelRaise/2002-07-16-MissedRaise.ll @@ -5,7 +5,7 @@ ; This could be fixed by making all stores add themselves to a list, and check ; their arguments are consistent AFTER all other values are propogated. ; XFAIL: * -; RUN: llvm-as < %s | opt -raise | llvm-dis | notcast +; RUN: llvm-upgrade < %s | llvm-as | opt -raise | llvm-dis | notcast %Tree = type %struct.tree* %struct.tree = type { int, double, double, %Tree, %Tree, %Tree, %Tree } diff --git a/test/Transforms/LevelRaise/2002-07-16-RaiseCrash.ll b/test/Transforms/LevelRaise/2002-07-16-RaiseCrash.ll index 5f528a006d..ad8a1dc673 100644 --- a/test/Transforms/LevelRaise/2002-07-16-RaiseCrash.ll +++ b/test/Transforms/LevelRaise/2002-07-16-RaiseCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -raise +; RUN: llvm-upgrade < %s | llvm-as | opt -raise %Tree = type %struct.tree* %struct.tree = type { int, double, double, %Tree, %Tree, %Tree, %Tree } diff --git a/test/Transforms/LevelRaise/2002-07-16-RaiseCrash2.ll b/test/Transforms/LevelRaise/2002-07-16-RaiseCrash2.ll index 6ca0b1343c..9c03684d95 100644 --- a/test/Transforms/LevelRaise/2002-07-16-RaiseCrash2.ll +++ b/test/Transforms/LevelRaise/2002-07-16-RaiseCrash2.ll @@ -1,6 +1,6 @@ ; This crashes raise, with an cast<> failure -; RUN: llvm-as < %s | opt -raise +; RUN: llvm-upgrade < %s | llvm-as | opt -raise implementation sbyte* %test(int* %ptr) { diff --git a/test/Transforms/LevelRaise/2002-07-16-SourceAndDestCrash.ll b/test/Transforms/LevelRaise/2002-07-16-SourceAndDestCrash.ll index 792a035651..18121634dd 100644 --- a/test/Transforms/LevelRaise/2002-07-16-SourceAndDestCrash.ll +++ b/test/Transforms/LevelRaise/2002-07-16-SourceAndDestCrash.ll @@ -2,7 +2,7 @@ ; because both the source and the destination of the %Y cast are converted ; to a new type, which causes massive problems. -; RUN: llvm-as < %s | opt -raise -raise-start-inst=W +; RUN: llvm-upgrade < %s | llvm-as | opt -raise -raise-start-inst=W int **%test(sbyte **%S) { BB0: diff --git a/test/Transforms/LevelRaise/2002-07-18-MissedAllocaRaise.ll b/test/Transforms/LevelRaise/2002-07-18-MissedAllocaRaise.ll index 91301f0510..7ab4ea360d 100644 --- a/test/Transforms/LevelRaise/2002-07-18-MissedAllocaRaise.ll +++ b/test/Transforms/LevelRaise/2002-07-18-MissedAllocaRaise.ll @@ -1,6 +1,6 @@ ; Looks like we don't raise alloca's like we do mallocs ; XFAIL: * -; RUN: llvm-as < %s | opt -raise | llvm-dis | not grep bitcast +; RUN: llvm-upgrade < %s | llvm-as | opt -raise | llvm-dis | not grep bitcast implementation ; Functions: diff --git a/test/Transforms/LevelRaise/2002-07-31-AssertionFailure.ll b/test/Transforms/LevelRaise/2002-07-31-AssertionFailure.ll index e165cf6edf..d875b1e71c 100644 --- a/test/Transforms/LevelRaise/2002-07-31-AssertionFailure.ll +++ b/test/Transforms/LevelRaise/2002-07-31-AssertionFailure.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -raise -raise-start-inst=cast271 +; RUN: llvm-upgrade < %s | llvm-as | opt -raise -raise-start-inst=cast271 %CON_list = type { %CON_list*, %CON_node* } %CON_node = type { %DIS_list*, %DIS_list*, int } diff --git a/test/Transforms/LevelRaise/2002-09-10-PointerAdds.ll b/test/Transforms/LevelRaise/2002-09-10-PointerAdds.ll index 64c08a2416..6a2bc50ef2 100644 --- a/test/Transforms/LevelRaise/2002-09-10-PointerAdds.ll +++ b/test/Transforms/LevelRaise/2002-09-10-PointerAdds.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -raise +; RUN: llvm-upgrade < %s | llvm-as | opt -raise int* %test(int* %P, int* %Q) { %P = cast int* %P to ulong diff --git a/test/Transforms/LevelRaise/2002-10-02-SignExtensionProblem.ll b/test/Transforms/LevelRaise/2002-10-02-SignExtensionProblem.ll index 0e3505899f..d3b24304b7 100644 --- a/test/Transforms/LevelRaise/2002-10-02-SignExtensionProblem.ll +++ b/test/Transforms/LevelRaise/2002-10-02-SignExtensionProblem.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -raise | llvm-dis | grep -v uint | not grep 4294967295 +; RUN: llvm-upgrade < %s | llvm-as | opt -raise | llvm-dis | grep -v uint | not grep 4294967295 %length_code = uninitialized global [256 x ubyte] diff --git a/test/Transforms/LevelRaise/2002-10-08-VarArgCall.ll b/test/Transforms/LevelRaise/2002-10-08-VarArgCall.ll index 94ad671fb2..6ddcc45c0b 100644 --- a/test/Transforms/LevelRaise/2002-10-08-VarArgCall.ll +++ b/test/Transforms/LevelRaise/2002-10-08-VarArgCall.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -raise | llvm-dis | grep call | not grep '\.\.\.' +; RUN: llvm-upgrade < %s | llvm-as | opt -raise | llvm-dis | grep call | not grep '\.\.\.' implementation diff --git a/test/Transforms/LevelRaise/2002-10-08-VarArgCallInfLoop.ll b/test/Transforms/LevelRaise/2002-10-08-VarArgCallInfLoop.ll index b9ebe6322a..a7ac87144f 100644 --- a/test/Transforms/LevelRaise/2002-10-08-VarArgCallInfLoop.ll +++ b/test/Transforms/LevelRaise/2002-10-08-VarArgCallInfLoop.ll @@ -1,6 +1,6 @@ ; Due to a recent change, this testcase now sends the raise pass into an infinite loop ; -; RUN: llvm-as < %s | opt -raise +; RUN: llvm-upgrade < %s | llvm-as | opt -raise implementation diff --git a/test/Transforms/LevelRaise/2002-11-13-PointerFunction.ll b/test/Transforms/LevelRaise/2002-11-13-PointerFunction.ll index 4d5f08142e..2d51811501 100644 --- a/test/Transforms/LevelRaise/2002-11-13-PointerFunction.ll +++ b/test/Transforms/LevelRaise/2002-11-13-PointerFunction.ll @@ -1,6 +1,6 @@ ; This testcase should be able to eliminate at least one of the casts. ; -; RUN: llvm-as < %s | opt -raise | llvm-dis | not grep 'REMOVE' +; RUN: llvm-upgrade < %s | llvm-as | opt -raise | llvm-dis | not grep 'REMOVE' int %foo(sbyte * %PF) { %UPF = cast sbyte* %PF to uint()* diff --git a/test/Transforms/LevelRaise/2003-01-22-GEPProblem.ll b/test/Transforms/LevelRaise/2003-01-22-GEPProblem.ll index 2dfe07ce0f..540ffa26b9 100644 --- a/test/Transforms/LevelRaise/2003-01-22-GEPProblem.ll +++ b/test/Transforms/LevelRaise/2003-01-22-GEPProblem.ll @@ -1,5 +1,5 @@ ; Testcase reduced from 197.parser by bugpoint -; RUN: llvm-as < %s | opt -raise -raise-start-inst=cast455 > /dev/null +; RUN: llvm-upgrade < %s | llvm-as | opt -raise -raise-start-inst=cast455 > /dev/null void %conjunction_prune() { ; <label>:0 ; No predecessors! diff --git a/test/Transforms/LevelRaise/2003-01-30-ShiftCrash.ll b/test/Transforms/LevelRaise/2003-01-30-ShiftCrash.ll index 7720f6bd42..18c0900c88 100644 --- a/test/Transforms/LevelRaise/2003-01-30-ShiftCrash.ll +++ b/test/Transforms/LevelRaise/2003-01-30-ShiftCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -raise -raise-start-inst=cast459 +; RUN: llvm-upgrade < %s | llvm-as | opt -raise -raise-start-inst=cast459 int %deflateInit2_({ ubyte*, uint, ulong, ubyte*, uint, ulong, sbyte*, { \4, int, ubyte*, ulong, ubyte*, int, int, ubyte, ubyte, int, uint, uint, uint, ubyte*, ulong, ushort*, ushort*, uint, uint, uint, uint, uint, long, uint, uint, int, uint, uint, uint, uint, uint, uint, int, int, uint, int, [573 x { { ushort }, { ushort } }], [61 x { { ushort }, { ushort } }], [39 x { { ushort }, { ushort } }], { { { ushort }, { ushort } }*, int, { int }* }, { { { ushort }, { ushort } }*, int, { int }* }, { { { ushort }, { ushort } }*, int, { int }* }, [16 x ushort], [573 x int], int, int, [573 x ubyte], ubyte*, uint, uint, ushort*, ulong, ulong, uint, int, ushort, int }*, sbyte* (sbyte*, uint, uint)*, void (sbyte*, sbyte*)*, sbyte*, int, ulong, ulong }* %strm, int %level, int %method, int %windowBits, int %memLevel, int %strategy, sbyte* %version, int %stream_size) { bb0: ; No predecessors! diff --git a/test/Transforms/LevelRaise/2003-02-13-CallRaise.ll b/test/Transforms/LevelRaise/2003-02-13-CallRaise.ll index b752b0ff76..c52fc56294 100644 --- a/test/Transforms/LevelRaise/2003-02-13-CallRaise.ll +++ b/test/Transforms/LevelRaise/2003-02-13-CallRaise.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -raise +; RUN: llvm-upgrade < %s | llvm-as | opt -raise declare void %foo() diff --git a/test/Transforms/LevelRaise/2003-05-01-CallCast.ll b/test/Transforms/LevelRaise/2003-05-01-CallCast.ll index ee2a0440de..7ab0f6f17d 100644 --- a/test/Transforms/LevelRaise/2003-05-01-CallCast.ll +++ b/test/Transforms/LevelRaise/2003-05-01-CallCast.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -raise | llvm-dis | notcast +; RUN: llvm-upgrade < %s | llvm-as | opt -raise | llvm-dis | notcast void %test(...) { ret void } diff --git a/test/Transforms/LevelRaise/2003-06-07-EmptyArrayTest.ll b/test/Transforms/LevelRaise/2003-06-07-EmptyArrayTest.ll index 7a294ef46a..141b807362 100644 --- a/test/Transforms/LevelRaise/2003-06-07-EmptyArrayTest.ll +++ b/test/Transforms/LevelRaise/2003-06-07-EmptyArrayTest.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -raise -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -raise -disable-output %T = type { [0 x ubyte] } diff --git a/test/Transforms/LevelRaise/2003-06-25-ExprAnalysis.ll b/test/Transforms/LevelRaise/2003-06-25-ExprAnalysis.ll index 131ade06a1..f507e72909 100644 --- a/test/Transforms/LevelRaise/2003-06-25-ExprAnalysis.ll +++ b/test/Transforms/LevelRaise/2003-06-25-ExprAnalysis.ll @@ -1,6 +1,6 @@ ; The expr analysis routines were being too aggressive across cast instructions! -; RUN: llvm-as < %s | opt -raise | llvm-dis | not grep 4294967295 +; RUN: llvm-upgrade < %s | llvm-as | opt -raise | llvm-dis | not grep 4294967295 target endian = big target pointersize = 64 diff --git a/test/Transforms/LevelRaise/2003-11-28-IllegalTypeConversion.ll b/test/Transforms/LevelRaise/2003-11-28-IllegalTypeConversion.ll index 8c1aef7a40..0addb212d7 100644 --- a/test/Transforms/LevelRaise/2003-11-28-IllegalTypeConversion.ll +++ b/test/Transforms/LevelRaise/2003-11-28-IllegalTypeConversion.ll @@ -1,6 +1,6 @@ ; The program should not just cast 2143289344 to float and store it! ; -; RUN: llvm-as < %s | opt -raise | llvm-dis | not grep 41DFF +; RUN: llvm-upgrade < %s | llvm-as | opt -raise | llvm-dis | not grep 41DFF void %test() { %mem_tmp = alloca float diff --git a/test/Transforms/LoopSimplify/2003-04-25-AssertFail.ll b/test/Transforms/LoopSimplify/2003-04-25-AssertFail.ll index 8a07caba57..90de721fe0 100644 --- a/test/Transforms/LoopSimplify/2003-04-25-AssertFail.ll +++ b/test/Transforms/LoopSimplify/2003-04-25-AssertFail.ll @@ -1,7 +1,7 @@ ; This testcase exposed a problem with the loop identification pass (LoopInfo). ; Basically, it was incorrectly calculating the loop nesting information. ; -; RUN: llvm-as < %s | opt -loopsimplify +; RUN: llvm-upgrade < %s | llvm-as | opt -loopsimplify implementation ; Functions: diff --git a/test/Transforms/LoopSimplify/2003-05-12-PreheaderExitOfChild.ll b/test/Transforms/LoopSimplify/2003-05-12-PreheaderExitOfChild.ll index 4bff954484..0880da6f54 100644 --- a/test/Transforms/LoopSimplify/2003-05-12-PreheaderExitOfChild.ll +++ b/test/Transforms/LoopSimplify/2003-05-12-PreheaderExitOfChild.ll @@ -2,7 +2,7 @@ ; inserted for the "fail" loop, but the exit block of a loop is not updated ; to be the preheader instead of the exit loop itself. -; RUN: llvm-as < %s | opt -loopsimplify +; RUN: llvm-upgrade < %s | llvm-as | opt -loopsimplify int %re_match_2() { br label %loopentry.1 diff --git a/test/Transforms/LoopSimplify/2003-08-15-PreheadersFail.ll b/test/Transforms/LoopSimplify/2003-08-15-PreheadersFail.ll index f7bb283fa3..59f49e3771 100644 --- a/test/Transforms/LoopSimplify/2003-08-15-PreheadersFail.ll +++ b/test/Transforms/LoopSimplify/2003-08-15-PreheadersFail.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -tailduplicate -instcombine -simplifycfg -licm -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -tailduplicate -instcombine -simplifycfg -licm -disable-output target endian = little target pointersize = 32 diff --git a/test/Transforms/LoopSimplify/2003-12-10-ExitBlocksProblem.ll b/test/Transforms/LoopSimplify/2003-12-10-ExitBlocksProblem.ll index a65143b9de..e47112bb9b 100644 --- a/test/Transforms/LoopSimplify/2003-12-10-ExitBlocksProblem.ll +++ b/test/Transforms/LoopSimplify/2003-12-10-ExitBlocksProblem.ll @@ -4,7 +4,7 @@ ; ; This is distilled from a monsterous crafty example. -; RUN: llvm-as < %s | opt -licm -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -licm -disable-output %G = weak global int 0 ; <int*> [#uses=13] diff --git a/test/Transforms/LoopSimplify/2004-02-05-DominatorInfoCorruption.ll b/test/Transforms/LoopSimplify/2004-02-05-DominatorInfoCorruption.ll index 4d26b2cb0e..f25460e5d3 100644 --- a/test/Transforms/LoopSimplify/2004-02-05-DominatorInfoCorruption.ll +++ b/test/Transforms/LoopSimplify/2004-02-05-DominatorInfoCorruption.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -loopsimplify -verify -licm -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -loopsimplify -verify -licm -disable-output implementation ; Functions: void %.subst_48() { diff --git a/test/Transforms/LoopSimplify/2004-03-15-IncorrectDomUpdate.ll b/test/Transforms/LoopSimplify/2004-03-15-IncorrectDomUpdate.ll index 8e1337993f..607f1fea1f 100644 --- a/test/Transforms/LoopSimplify/2004-03-15-IncorrectDomUpdate.ll +++ b/test/Transforms/LoopSimplify/2004-03-15-IncorrectDomUpdate.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -loopsimplify -licm -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -loopsimplify -licm -disable-output void %main() { entry: br bool false, label %Out, label %loop diff --git a/test/Transforms/LoopSimplify/2004-04-01-IncorrectDomUpdate.ll b/test/Transforms/LoopSimplify/2004-04-01-IncorrectDomUpdate.ll index 45648645b1..b98431357e 100644 --- a/test/Transforms/LoopSimplify/2004-04-01-IncorrectDomUpdate.ll +++ b/test/Transforms/LoopSimplify/2004-04-01-IncorrectDomUpdate.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -loopsimplify -licm -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -loopsimplify -licm -disable-output ; This is PR306 diff --git a/test/Transforms/LoopSimplify/2004-04-12-LoopSimplify-SwitchBackedges.ll b/test/Transforms/LoopSimplify/2004-04-12-LoopSimplify-SwitchBackedges.ll index f963780a21..12250b78eb 100644 --- a/test/Transforms/LoopSimplify/2004-04-12-LoopSimplify-SwitchBackedges.ll +++ b/test/Transforms/LoopSimplify/2004-04-12-LoopSimplify-SwitchBackedges.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -loopsimplify -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -loopsimplify -disable-output implementation diff --git a/test/Transforms/LoopSimplify/2004-04-13-LoopSimplifyUpdateDomFrontier.ll b/test/Transforms/LoopSimplify/2004-04-13-LoopSimplifyUpdateDomFrontier.ll index 14921c22c9..7f16400d44 100644 --- a/test/Transforms/LoopSimplify/2004-04-13-LoopSimplifyUpdateDomFrontier.ll +++ b/test/Transforms/LoopSimplify/2004-04-13-LoopSimplifyUpdateDomFrontier.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -scalarrepl -loopsimplify -licm -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl -loopsimplify -licm -disable-output implementation ; Functions: diff --git a/test/Transforms/LoopSimplify/basictest.ll b/test/Transforms/LoopSimplify/basictest.ll index a8835df64f..2b01b475fc 100644 --- a/test/Transforms/LoopSimplify/basictest.ll +++ b/test/Transforms/LoopSimplify/basictest.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -loopsimplify +; RUN: llvm-upgrade < %s | llvm-as | opt -loopsimplify implementation diff --git a/test/Transforms/LoopSimplify/hardertest.ll b/test/Transforms/LoopSimplify/hardertest.ll index 04a2739ade..a4465b75de 100644 --- a/test/Transforms/LoopSimplify/hardertest.ll +++ b/test/Transforms/LoopSimplify/hardertest.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -loopsimplify +; RUN: llvm-upgrade < %s | llvm-as | opt -loopsimplify void %foo(bool %C) { br bool %C, label %T, label %F diff --git a/test/Transforms/LoopSimplify/phi-node-simplify.ll b/test/Transforms/LoopSimplify/phi-node-simplify.ll index 52d102390d..aa52d66cf9 100644 --- a/test/Transforms/LoopSimplify/phi-node-simplify.ll +++ b/test/Transforms/LoopSimplify/phi-node-simplify.ll @@ -1,5 +1,5 @@ ; Loop Simplify should turn phi nodes like X = phi [X, Y] into just Y, eliminating them. -; RUN: llvm-as < %s | opt -loopsimplify | llvm-dis | grep phi | wc -l | grep 6 +; RUN: llvm-upgrade < %s | llvm-as | opt -loopsimplify | llvm-dis | grep phi | wc -l | grep 6 %A = weak global [3000000 x int] zeroinitializer ; <[3000000 x int]*> [#uses=1] %B = weak global [20000 x int] zeroinitializer ; <[20000 x int]*> [#uses=1] diff --git a/test/Transforms/LoopSimplify/single-backedge.ll b/test/Transforms/LoopSimplify/single-backedge.ll index be3d182fcc..53a6ffbf98 100644 --- a/test/Transforms/LoopSimplify/single-backedge.ll +++ b/test/Transforms/LoopSimplify/single-backedge.ll @@ -2,7 +2,7 @@ ; for all loops. This allows the -indvars pass to recognize the %IV ; induction variable in this testcase. -; RUN: llvm-as < %s | opt -indvars | llvm-dis | grep indvar +; RUN: llvm-upgrade < %s | llvm-as | opt -indvars | llvm-dis | grep indvar int %test(bool %C) { br label %Loop diff --git a/test/Transforms/LoopStrengthReduce/2005-08-15-AddRecIV.ll b/test/Transforms/LoopStrengthReduce/2005-08-15-AddRecIV.ll index 2fcb1cc6df..b2104051c9 100644 --- a/test/Transforms/LoopStrengthReduce/2005-08-15-AddRecIV.ll +++ b/test/Transforms/LoopStrengthReduce/2005-08-15-AddRecIV.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -loop-reduce -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce -disable-output void %try_swap() { entry: diff --git a/test/Transforms/LoopStrengthReduce/2005-08-17-OutOfLoopVariant.ll b/test/Transforms/LoopStrengthReduce/2005-08-17-OutOfLoopVariant.ll index 77d118ac11..5724bad72c 100644 --- a/test/Transforms/LoopStrengthReduce/2005-08-17-OutOfLoopVariant.ll +++ b/test/Transforms/LoopStrengthReduce/2005-08-17-OutOfLoopVariant.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -loop-reduce -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce -disable-output int %image_to_texture(uint %indvar454) { loopentry.1.outer: diff --git a/test/Transforms/LoopStrengthReduce/2005-09-12-UsesOutOutsideOfLoop.ll b/test/Transforms/LoopStrengthReduce/2005-09-12-UsesOutOutsideOfLoop.ll index 0a84302d8f..81d3c25128 100644 --- a/test/Transforms/LoopStrengthReduce/2005-09-12-UsesOutOutsideOfLoop.ll +++ b/test/Transforms/LoopStrengthReduce/2005-09-12-UsesOutOutsideOfLoop.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -loop-reduce -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce -disable-output void %main() { entry: diff --git a/test/Transforms/LoopStrengthReduce/different-type-ivs.ll b/test/Transforms/LoopStrengthReduce/different-type-ivs.ll index b8cda5a807..1383fd692f 100644 --- a/test/Transforms/LoopStrengthReduce/different-type-ivs.ll +++ b/test/Transforms/LoopStrengthReduce/different-type-ivs.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -loop-reduce -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce -disable-output ; Test to make sure that loop-reduce never crashes on IV's ; with different types but identical strides. diff --git a/test/Transforms/LoopStrengthReduce/dont-hoist-simple-loop-constants.ll b/test/Transforms/LoopStrengthReduce/dont-hoist-simple-loop-constants.ll index b53ce9571c..b8f318b307 100644 --- a/test/Transforms/LoopStrengthReduce/dont-hoist-simple-loop-constants.ll +++ b/test/Transforms/LoopStrengthReduce/dont-hoist-simple-loop-constants.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -loop-reduce | llvm-dis | not grep 'cast uint 1 to uint' +; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | not grep 'cast uint 1 to uint' ; The setlt wants to use a value that is incremented one more than the dominant ; IV. Don't insert the 1 outside the loop, preventing folding it into the add. diff --git a/test/Transforms/LoopStrengthReduce/dont_insert_redundant_ops.ll b/test/Transforms/LoopStrengthReduce/dont_insert_redundant_ops.ll index 86fd05edab..aecade80d7 100644 --- a/test/Transforms/LoopStrengthReduce/dont_insert_redundant_ops.ll +++ b/test/Transforms/LoopStrengthReduce/dont_insert_redundant_ops.ll @@ -1,5 +1,5 @@ ; Check that this test makes INDVAR and related stuff dead. -; RUN: llvm-as < %s | opt -loop-reduce | llvm-dis | grep phi | wc -l | grep 2 +; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | grep phi | wc -l | grep 2 declare bool %pred() diff --git a/test/Transforms/LoopStrengthReduce/dont_reduce_bytes.ll b/test/Transforms/LoopStrengthReduce/dont_reduce_bytes.ll index fcb5fa1cfa..2c679800a7 100644 --- a/test/Transforms/LoopStrengthReduce/dont_reduce_bytes.ll +++ b/test/Transforms/LoopStrengthReduce/dont_reduce_bytes.ll @@ -1,7 +1,7 @@ ; Don't reduce the byte access to P[i], at least not on targets that ; support an efficient 'mem[r1+r2]' addressing mode. -; RUN: llvm-as < %s | opt -loop-reduce -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce -disable-output declare bool %pred(int) diff --git a/test/Transforms/LoopStrengthReduce/exit_compare_live_range.ll b/test/Transforms/LoopStrengthReduce/exit_compare_live_range.ll index 4599de5f9e..3976f5d04a 100644 --- a/test/Transforms/LoopStrengthReduce/exit_compare_live_range.ll +++ b/test/Transforms/LoopStrengthReduce/exit_compare_live_range.ll @@ -2,7 +2,7 @@ ; having overlapping live ranges that result in copies. We want the setcc instruction ; immediately before the conditional branch. ; -; RUN: llvm-as < %s | opt -loop-reduce | llvm-dis | %prcontext 'br bool' 1 | grep set +; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | %prcontext 'br bool' 1 | grep set void %foo(float* %D, uint %E) { entry: diff --git a/test/Transforms/LoopStrengthReduce/invariant_value_first.ll b/test/Transforms/LoopStrengthReduce/invariant_value_first.ll index 8f16210c7a..5e05e75550 100644 --- a/test/Transforms/LoopStrengthReduce/invariant_value_first.ll +++ b/test/Transforms/LoopStrengthReduce/invariant_value_first.ll @@ -1,5 +1,5 @@ ; Check that the index of 'P[outer]' is pulled out of the loop. -; RUN: llvm-as < %s | opt -loop-reduce | llvm-dis | not grep 'getelementptr.*%outer.*%INDVAR' +; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | not grep 'getelementptr.*%outer.*%INDVAR' declare bool %pred() declare int %foo() diff --git a/test/Transforms/LoopStrengthReduce/invariant_value_first_arg.ll b/test/Transforms/LoopStrengthReduce/invariant_value_first_arg.ll index 7bbd8dae66..0289badddc 100644 --- a/test/Transforms/LoopStrengthReduce/invariant_value_first_arg.ll +++ b/test/Transforms/LoopStrengthReduce/invariant_value_first_arg.ll @@ -1,5 +1,5 @@ ; Check that the index of 'P[outer]' is pulled out of the loop. -; RUN: llvm-as < %s | opt -loop-reduce | llvm-dis | not grep 'getelementptr.*%outer.*%INDVAR' +; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | not grep 'getelementptr.*%outer.*%INDVAR' declare bool %pred() diff --git a/test/Transforms/LoopStrengthReduce/nested-reduce.ll b/test/Transforms/LoopStrengthReduce/nested-reduce.ll index ebef2f0fdf..3caa366b06 100644 --- a/test/Transforms/LoopStrengthReduce/nested-reduce.ll +++ b/test/Transforms/LoopStrengthReduce/nested-reduce.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | opt -loop-reduce && -; RUN: llvm-as < %s | opt -loop-reduce | llvm-dis | not grep mul +; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce && +; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | not grep mul ; Make sure we don't get a multiply by 6 in this loop. diff --git a/test/Transforms/LoopStrengthReduce/ops_after_indvar.ll b/test/Transforms/LoopStrengthReduce/ops_after_indvar.ll index b4bda7e537..59da48b9e5 100644 --- a/test/Transforms/LoopStrengthReduce/ops_after_indvar.ll +++ b/test/Transforms/LoopStrengthReduce/ops_after_indvar.ll @@ -1,7 +1,7 @@ ; Check that this test makes INDVAR and related stuff dead, because P[indvar] ; gets reduced, making INDVAR dead. -; RUN: llvm-as < %s | opt -loop-reduce | llvm-dis | not grep INDVAR +; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | not grep INDVAR declare bool %pred() declare int %getidx() diff --git a/test/Transforms/LoopStrengthReduce/phi_node_update_multiple_preds.ll b/test/Transforms/LoopStrengthReduce/phi_node_update_multiple_preds.ll index bf2346113d..cd0afe1936 100644 --- a/test/Transforms/LoopStrengthReduce/phi_node_update_multiple_preds.ll +++ b/test/Transforms/LoopStrengthReduce/phi_node_update_multiple_preds.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -loop-reduce -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce -disable-output ; LSR should not crash on this. fastcc void %loadloop() { diff --git a/test/Transforms/LoopStrengthReduce/related_indvars.ll b/test/Transforms/LoopStrengthReduce/related_indvars.ll index f2470d9434..783433663b 100644 --- a/test/Transforms/LoopStrengthReduce/related_indvars.ll +++ b/test/Transforms/LoopStrengthReduce/related_indvars.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -loop-reduce | llvm-dis | grep phi | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | grep phi | wc -l | grep 1 ; This should only result in one PHI node! diff --git a/test/Transforms/LoopStrengthReduce/remove_indvar.ll b/test/Transforms/LoopStrengthReduce/remove_indvar.ll index 646776af05..517180b7f0 100644 --- a/test/Transforms/LoopStrengthReduce/remove_indvar.ll +++ b/test/Transforms/LoopStrengthReduce/remove_indvar.ll @@ -1,5 +1,5 @@ ; Check that this test makes INDVAR and related stuff dead. -; RUN: llvm-as < %s | opt -loop-reduce | llvm-dis | not grep INDVAR +; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | not grep INDVAR declare bool %pred() diff --git a/test/Transforms/LoopStrengthReduce/share_code_in_preheader.ll b/test/Transforms/LoopStrengthReduce/share_code_in_preheader.ll index 532fe820ac..ba897c401f 100644 --- a/test/Transforms/LoopStrengthReduce/share_code_in_preheader.ll +++ b/test/Transforms/LoopStrengthReduce/share_code_in_preheader.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -loop-reduce | llvm-dis | grep mul | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | grep mul | wc -l | grep 1 ; LSR should not make two copies of the Q*L expression in the preheader! sbyte %test(sbyte* %A, sbyte* %B, int %L, int %Q, int %N) { diff --git a/test/Transforms/LoopStrengthReduce/share_ivs.ll b/test/Transforms/LoopStrengthReduce/share_ivs.ll index d44cf0f1e7..76bfe1d529 100644 --- a/test/Transforms/LoopStrengthReduce/share_ivs.ll +++ b/test/Transforms/LoopStrengthReduce/share_ivs.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -loop-reduce | llvm-dis | grep phi | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | grep phi | wc -l | grep 1 ; This testcase should have ONE stride 18 indvar, the other use should have a ; loop invariant value (B) added to it inside of the loop, instead of having diff --git a/test/Transforms/LoopStrengthReduce/use_postinc_value_outside_loop.ll b/test/Transforms/LoopStrengthReduce/use_postinc_value_outside_loop.ll index 13f4701f4b..4a6e9b2a13 100644 --- a/test/Transforms/LoopStrengthReduce/use_postinc_value_outside_loop.ll +++ b/test/Transforms/LoopStrengthReduce/use_postinc_value_outside_loop.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -loop-reduce | llvm-dis | grep 'add uint %iv.*inc, 1' +; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | grep 'add uint %iv.*inc, 1' ; ; Make sure that the use of the IV outside of the loop (the store) uses the ; post incremented value of the IV, not the preincremented value. This diff --git a/test/Transforms/LoopStrengthReduce/var_stride_used_by_compare.ll b/test/Transforms/LoopStrengthReduce/var_stride_used_by_compare.ll index 4f619cd65f..7b4f022aa3 100644 --- a/test/Transforms/LoopStrengthReduce/var_stride_used_by_compare.ll +++ b/test/Transforms/LoopStrengthReduce/var_stride_used_by_compare.ll @@ -1,10 +1,10 @@ -; RUN: llvm-as < %s | opt -loop-reduce | llvm-dis && +; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis && ; Base should not be i*3, it should be i*2. -; RUN: llvm-as < %s | opt -loop-reduce | llvm-dis | not grep 'mul.*%i, 3' && +; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | not grep 'mul.*%i, 3' && ; Indvar should not start at zero: -; RUN: llvm-as < %s | opt -loop-reduce | llvm-dis | not grep 'phi uint .* 0' +; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | not grep 'phi uint .* 0' ; mul uint %i, 3 diff --git a/test/Transforms/LoopStrengthReduce/variable_stride.ll b/test/Transforms/LoopStrengthReduce/variable_stride.ll index 25103bff1a..83aeaa6a9c 100644 --- a/test/Transforms/LoopStrengthReduce/variable_stride.ll +++ b/test/Transforms/LoopStrengthReduce/variable_stride.ll @@ -1,5 +1,5 @@ ; Check that variable strides are reduced to adds instead of multiplies. -; RUN: llvm-as < %s | opt -loop-reduce | llvm-dis | not grep 'mul' +; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | not grep 'mul' declare bool %pred(int) diff --git a/test/Transforms/LoopUnroll/2004-05-13-DontUnrollTooMuch.ll b/test/Transforms/LoopUnroll/2004-05-13-DontUnrollTooMuch.ll index 6edf281283..8c3e697c89 100644 --- a/test/Transforms/LoopUnroll/2004-05-13-DontUnrollTooMuch.ll +++ b/test/Transforms/LoopUnroll/2004-05-13-DontUnrollTooMuch.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -loop-unroll -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -loop-unroll -disable-output int %main() { entry: diff --git a/test/Transforms/LoopUnroll/2005-03-06-BadLoopInfoUpdate.ll b/test/Transforms/LoopUnroll/2005-03-06-BadLoopInfoUpdate.ll index b587259ec6..1681506acb 100644 --- a/test/Transforms/LoopUnroll/2005-03-06-BadLoopInfoUpdate.ll +++ b/test/Transforms/LoopUnroll/2005-03-06-BadLoopInfoUpdate.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -loop-unroll -loopsimplify -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -loop-unroll -loopsimplify -disable-output implementation ; Functions: diff --git a/test/Transforms/LoopUnroll/2006-08-24-MultiBlockLoop.ll b/test/Transforms/LoopUnroll/2006-08-24-MultiBlockLoop.ll index b2f2ae6af6..c21ae484db 100644 --- a/test/Transforms/LoopUnroll/2006-08-24-MultiBlockLoop.ll +++ b/test/Transforms/LoopUnroll/2006-08-24-MultiBlockLoop.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -loop-unroll | llvm-dis | grep "bb72.2" +; RUN: llvm-upgrade < %s | llvm-as | opt -loop-unroll | llvm-dis | grep "bb72.2" void %vorbis_encode_noisebias_setup() { entry: diff --git a/test/Transforms/LoopUnswitch/2006-02-14-LoopSimplifyCrash.ll b/test/Transforms/LoopUnswitch/2006-02-14-LoopSimplifyCrash.ll index 1d1cd6d292..ac0b798094 100644 --- a/test/Transforms/LoopUnswitch/2006-02-14-LoopSimplifyCrash.ll +++ b/test/Transforms/LoopUnswitch/2006-02-14-LoopSimplifyCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -loop-unswitch -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -loop-unswitch -disable-output target endian = big target pointersize = 32 diff --git a/test/Transforms/LoopUnswitch/2006-02-22-UnswitchCrash.ll b/test/Transforms/LoopUnswitch/2006-02-22-UnswitchCrash.ll index 7b028874a6..469c6d755a 100644 --- a/test/Transforms/LoopUnswitch/2006-02-22-UnswitchCrash.ll +++ b/test/Transforms/LoopUnswitch/2006-02-22-UnswitchCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -loop-unswitch -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -loop-unswitch -disable-output void %sort_Eq(int * %S2) { entry: diff --git a/test/Transforms/LoopUnswitch/2006-06-13-SingleEntryPHI.ll b/test/Transforms/LoopUnswitch/2006-06-13-SingleEntryPHI.ll index 6523f65da9..072ad20967 100644 --- a/test/Transforms/LoopUnswitch/2006-06-13-SingleEntryPHI.ll +++ b/test/Transforms/LoopUnswitch/2006-06-13-SingleEntryPHI.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -loop-unswitch -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -loop-unswitch -disable-output %struct.BLEND_MAP = type { short, short, short, int, %struct.BLEND_MAP_ENTRY* } %struct.BLEND_MAP_ENTRY = type { float, ubyte, { [5 x float], [4 x ubyte] } } diff --git a/test/Transforms/LoopUnswitch/2006-06-27-DeadSwitchCase.ll b/test/Transforms/LoopUnswitch/2006-06-27-DeadSwitchCase.ll index b7c6df83a0..0d5a452da2 100644 --- a/test/Transforms/LoopUnswitch/2006-06-27-DeadSwitchCase.ll +++ b/test/Transforms/LoopUnswitch/2006-06-27-DeadSwitchCase.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -loop-unswitch -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -loop-unswitch -disable-output implementation ; Functions: void %init_caller_save() { diff --git a/test/Transforms/LoopUnswitch/basictest.ll b/test/Transforms/LoopUnswitch/basictest.ll index 12fef813b8..c0c14b9500 100644 --- a/test/Transforms/LoopUnswitch/basictest.ll +++ b/test/Transforms/LoopUnswitch/basictest.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -loop-unswitch -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -loop-unswitch -disable-output implementation ; Functions: int %test(int* %A, bool %C) { diff --git a/test/Transforms/LowerInvoke/2003-12-10-Crash.llx b/test/Transforms/LowerInvoke/2003-12-10-Crash.llx index f068ae1317..495099ae94 100644 --- a/test/Transforms/LowerInvoke/2003-12-10-Crash.llx +++ b/test/Transforms/LowerInvoke/2003-12-10-Crash.llx @@ -1,6 +1,6 @@ ; This testcase was reduced from Shootout-C++/reversefile.cpp by bugpoint -; RUN: llvm-as < %s | opt -lowerinvoke -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -lowerinvoke -disable-output declare void %baz() diff --git a/test/Transforms/LowerInvoke/2004-02-29-PHICrash.llx b/test/Transforms/LowerInvoke/2004-02-29-PHICrash.llx index 5454eae5f9..90182574e0 100644 --- a/test/Transforms/LowerInvoke/2004-02-29-PHICrash.llx +++ b/test/Transforms/LowerInvoke/2004-02-29-PHICrash.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -lowerinvoke -enable-correct-eh-support -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -lowerinvoke -enable-correct-eh-support -disable-output void %_ZNKSt11__use_cacheISt16__numpunct_cacheIcEEclERKSt6locale() { entry: diff --git a/test/Transforms/LowerInvoke/2005-08-03-InvokeWithPHI.ll b/test/Transforms/LowerInvoke/2005-08-03-InvokeWithPHI.ll index a0d21860ca..51f3fb2a02 100644 --- a/test/Transforms/LowerInvoke/2005-08-03-InvokeWithPHI.ll +++ b/test/Transforms/LowerInvoke/2005-08-03-InvokeWithPHI.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -lowerinvoke -enable-correct-eh-support -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -lowerinvoke -enable-correct-eh-support -disable-output implementation ; Functions: diff --git a/test/Transforms/LowerInvoke/2005-08-03-InvokeWithPHIUse.ll b/test/Transforms/LowerInvoke/2005-08-03-InvokeWithPHIUse.ll index 22bfa0f0fb..636625743a 100644 --- a/test/Transforms/LowerInvoke/2005-08-03-InvokeWithPHIUse.ll +++ b/test/Transforms/LowerInvoke/2005-08-03-InvokeWithPHIUse.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -lowerinvoke -enable-correct-eh-support -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -lowerinvoke -enable-correct-eh-support -disable-output declare fastcc int %ll_listnext__listiterPtr() diff --git a/test/Transforms/LowerInvoke/basictest.ll b/test/Transforms/LowerInvoke/basictest.ll index 93022f5b31..4150ad3efb 100644 --- a/test/Transforms/LowerInvoke/basictest.ll +++ b/test/Transforms/LowerInvoke/basictest.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | opt -lowerinvoke -disable-output && -; RUN: llvm-as < %s | opt -lowerinvoke -disable-output -enable-correct-eh-support +; RUN: llvm-upgrade < %s | llvm-as | opt -lowerinvoke -disable-output && +; RUN: llvm-upgrade < %s | llvm-as | opt -lowerinvoke -disable-output -enable-correct-eh-support implementation diff --git a/test/Transforms/LowerSetJmp/2003-11-05-DominanceProperties.ll b/test/Transforms/LowerSetJmp/2003-11-05-DominanceProperties.ll index aa1e4d4fef..4eb2133628 100644 --- a/test/Transforms/LowerSetJmp/2003-11-05-DominanceProperties.ll +++ b/test/Transforms/LowerSetJmp/2003-11-05-DominanceProperties.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -lowersetjmp -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -lowersetjmp -disable-output %struct.jmpenv = type { int, sbyte } implementation diff --git a/test/Transforms/LowerSetJmp/2005-05-05-OldUses.ll b/test/Transforms/LowerSetJmp/2005-05-05-OldUses.ll index 72b756c566..efbf1ddeb3 100644 --- a/test/Transforms/LowerSetJmp/2005-05-05-OldUses.ll +++ b/test/Transforms/LowerSetJmp/2005-05-05-OldUses.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -lowersetjmp +; RUN: llvm-upgrade < %s | llvm-as | opt -lowersetjmp %lldb.compile_unit = type { uint, ushort, ushort, sbyte*, sbyte*, sbyte*, { }* } %d.compile_unit = external global %lldb.compile_unit ; <%lldb.compile_unit*> [#uses=1] diff --git a/test/Transforms/LowerSetJmp/simpletest.ll b/test/Transforms/LowerSetJmp/simpletest.ll index 94a607a23e..d749d5ff13 100644 --- a/test/Transforms/LowerSetJmp/simpletest.ll +++ b/test/Transforms/LowerSetJmp/simpletest.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -lowersetjmp | llvm-dis | grep invoke +; RUN: llvm-upgrade < %s | llvm-as | opt -lowersetjmp | llvm-dis | grep invoke %JmpBuf = type int %.str_1 = internal constant [13 x sbyte] c"returned %d\0A\00" diff --git a/test/Transforms/LowerSwitch/2003-05-01-PHIProblem.ll b/test/Transforms/LowerSwitch/2003-05-01-PHIProblem.ll index c17f8ce542..0ff1f5c6d5 100644 --- a/test/Transforms/LowerSwitch/2003-05-01-PHIProblem.ll +++ b/test/Transforms/LowerSwitch/2003-05-01-PHIProblem.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -lowerswitch +; RUN: llvm-upgrade < %s | llvm-as | opt -lowerswitch void %child(int %ct.1) { entry: ; No predecessors! diff --git a/test/Transforms/LowerSwitch/2003-08-23-EmptySwitch.ll b/test/Transforms/LowerSwitch/2003-08-23-EmptySwitch.ll index e858f34d43..a193cd4645 100644 --- a/test/Transforms/LowerSwitch/2003-08-23-EmptySwitch.ll +++ b/test/Transforms/LowerSwitch/2003-08-23-EmptySwitch.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -lowerswitch +; RUN: llvm-upgrade < %s | llvm-as | opt -lowerswitch void %test() { switch uint 0, label %Next [] diff --git a/test/Transforms/LowerSwitch/2004-03-13-SwitchIsDefaultCrash.ll b/test/Transforms/LowerSwitch/2004-03-13-SwitchIsDefaultCrash.ll index 4c412aaa44..1cbe853557 100644 --- a/test/Transforms/LowerSwitch/2004-03-13-SwitchIsDefaultCrash.ll +++ b/test/Transforms/LowerSwitch/2004-03-13-SwitchIsDefaultCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -lowerswitch -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -lowerswitch -disable-output void %solve() { entry: diff --git a/test/Transforms/Mem2Reg/2002-03-28-UninitializedVal.ll b/test/Transforms/Mem2Reg/2002-03-28-UninitializedVal.ll index 9f401b3e35..b2776592a9 100644 --- a/test/Transforms/Mem2Reg/2002-03-28-UninitializedVal.ll +++ b/test/Transforms/Mem2Reg/2002-03-28-UninitializedVal.ll @@ -1,6 +1,6 @@ ; Uninitialized values are not handled correctly. ; -; RUN: llvm-as < %s | opt -mem2reg +; RUN: llvm-upgrade < %s | llvm-as | opt -mem2reg ; implementation diff --git a/test/Transforms/Mem2Reg/2002-05-01-ShouldNotPromoteThisAlloca.ll b/test/Transforms/Mem2Reg/2002-05-01-ShouldNotPromoteThisAlloca.ll index c51d09522b..c3d803c34f 100644 --- a/test/Transforms/Mem2Reg/2002-05-01-ShouldNotPromoteThisAlloca.ll +++ b/test/Transforms/Mem2Reg/2002-05-01-ShouldNotPromoteThisAlloca.ll @@ -1,7 +1,7 @@ ; This input caused the mem2reg pass to die because it was trying to promote ; the %r alloca, even though it is invalid to do so in this case! ; -; RUN: llvm-as < %s | opt -mem2reg +; RUN: llvm-upgrade < %s | llvm-as | opt -mem2reg implementation diff --git a/test/Transforms/Mem2Reg/2003-04-10-DFNotFound.ll b/test/Transforms/Mem2Reg/2003-04-10-DFNotFound.ll index 05990b1b45..918431adf1 100644 --- a/test/Transforms/Mem2Reg/2003-04-10-DFNotFound.ll +++ b/test/Transforms/Mem2Reg/2003-04-10-DFNotFound.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -mem2reg +; RUN: llvm-upgrade < %s | llvm-as | opt -mem2reg implementation ; Functions: diff --git a/test/Transforms/Mem2Reg/2003-04-18-DeadBlockProblem.ll b/test/Transforms/Mem2Reg/2003-04-18-DeadBlockProblem.ll index bdf155a4d4..d6f1b779e1 100644 --- a/test/Transforms/Mem2Reg/2003-04-18-DeadBlockProblem.ll +++ b/test/Transforms/Mem2Reg/2003-04-18-DeadBlockProblem.ll @@ -1,5 +1,5 @@ ; This testcases makes sure that mem2reg can handle unreachable blocks. -; RUN: llvm-as < %s | opt -mem2reg +; RUN: llvm-upgrade < %s | llvm-as | opt -mem2reg int %test() { %X = alloca int diff --git a/test/Transforms/Mem2Reg/2003-04-24-MultipleIdenticalSuccessors.ll b/test/Transforms/Mem2Reg/2003-04-24-MultipleIdenticalSuccessors.ll index 9e23466df9..7cd38c2f0c 100644 --- a/test/Transforms/Mem2Reg/2003-04-24-MultipleIdenticalSuccessors.ll +++ b/test/Transforms/Mem2Reg/2003-04-24-MultipleIdenticalSuccessors.ll @@ -1,7 +1,7 @@ ; Mem2reg used to only add one incoming value to a PHI node, even if it had ; multiple incoming edges from a block. ; -; RUN: llvm-as < %s | opt -mem2reg -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -mem2reg -disable-output int %test(bool %c1, bool %c2) { %X = alloca int diff --git a/test/Transforms/Mem2Reg/2003-06-26-IterativePromote.ll b/test/Transforms/Mem2Reg/2003-06-26-IterativePromote.ll index 3b63efa446..ce274fa327 100644 --- a/test/Transforms/Mem2Reg/2003-06-26-IterativePromote.ll +++ b/test/Transforms/Mem2Reg/2003-06-26-IterativePromote.ll @@ -1,5 +1,5 @@ ; Promoting some values allows promotion of other values. -; RUN: llvm-as < %s | opt -mem2reg | llvm-dis | not grep alloca +; RUN: llvm-upgrade < %s | llvm-as | opt -mem2reg | llvm-dis | not grep alloca int %test2() { %result = alloca int ; ty=int* diff --git a/test/Transforms/Mem2Reg/2003-10-05-DeadPHIInsertion.ll b/test/Transforms/Mem2Reg/2003-10-05-DeadPHIInsertion.ll index a9b87fd1f4..ab4b6619dc 100644 --- a/test/Transforms/Mem2Reg/2003-10-05-DeadPHIInsertion.ll +++ b/test/Transforms/Mem2Reg/2003-10-05-DeadPHIInsertion.ll @@ -1,7 +1,7 @@ ; Mem2reg should not insert dead PHI nodes! The naive algorithm inserts a PHI ; node in L3, even though there is no load of %A in anything dominated by L3. -; RUN: llvm-as < %s | opt -mem2reg | llvm-dis | not grep phi +; RUN: llvm-upgrade < %s | llvm-as | opt -mem2reg | llvm-dis | not grep phi void %test(int %B, bool %C) { %A = alloca int diff --git a/test/Transforms/Mem2Reg/2005-06-30-ReadBeforeWrite.ll b/test/Transforms/Mem2Reg/2005-06-30-ReadBeforeWrite.ll index a6d46967d4..c64d848a61 100644 --- a/test/Transforms/Mem2Reg/2005-06-30-ReadBeforeWrite.ll +++ b/test/Transforms/Mem2Reg/2005-06-30-ReadBeforeWrite.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -mem2reg -instcombine | llvm-dis | grep store +; RUN: llvm-upgrade < %s | llvm-as | opt -mem2reg -instcombine | llvm-dis | grep store ; PR590 void %zero(sbyte* %p, int %n) { diff --git a/test/Transforms/Mem2Reg/2005-11-28-Crash.ll b/test/Transforms/Mem2Reg/2005-11-28-Crash.ll index 1facf21dc7..01e8b851be 100644 --- a/test/Transforms/Mem2Reg/2005-11-28-Crash.ll +++ b/test/Transforms/Mem2Reg/2005-11-28-Crash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -mem2reg -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -mem2reg -disable-output ; PR670 void %printk(int, ...) { diff --git a/test/Transforms/Mem2Reg/DifferingTypes.ll b/test/Transforms/Mem2Reg/DifferingTypes.ll index 8cf793c85e..f859808c2f 100644 --- a/test/Transforms/Mem2Reg/DifferingTypes.ll +++ b/test/Transforms/Mem2Reg/DifferingTypes.ll @@ -2,7 +2,7 @@ ; generated code should perform the appropriate masking operations required ; depending on the endianness of the target... ; XFAIL: * -; RUN: llvm-as < %s | opt -mem2reg | llvm-dis | not grep 'alloca' +; RUN: llvm-upgrade < %s | llvm-as | opt -mem2reg | llvm-dis | not grep 'alloca' implementation diff --git a/test/Transforms/Mem2Reg/PromoteMemToRegister.ll b/test/Transforms/Mem2Reg/PromoteMemToRegister.ll index b540a291ce..49de1b6bce 100644 --- a/test/Transforms/Mem2Reg/PromoteMemToRegister.ll +++ b/test/Transforms/Mem2Reg/PromoteMemToRegister.ll @@ -1,5 +1,5 @@ ; Simple sanity check testcase. Both alloca's should be eliminated. -; RUN: llvm-as < %s | opt -mem2reg | llvm-dis | not grep 'alloca' +; RUN: llvm-upgrade < %s | llvm-as | opt -mem2reg | llvm-dis | not grep 'alloca' implementation diff --git a/test/Transforms/Mem2Reg/UndefValuesMerge.ll b/test/Transforms/Mem2Reg/UndefValuesMerge.ll index 2da7013cd5..dc2f011e24 100644 --- a/test/Transforms/Mem2Reg/UndefValuesMerge.ll +++ b/test/Transforms/Mem2Reg/UndefValuesMerge.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -mem2reg | llvm-dis | not grep phi +; RUN: llvm-upgrade < %s | llvm-as | opt -mem2reg | llvm-dis | not grep phi implementation diff --git a/test/Transforms/PredicateSimplifier/2006-08-02-Switch.ll b/test/Transforms/PredicateSimplifier/2006-08-02-Switch.ll index 97f2a5a5f6..1d19516f0e 100644 --- a/test/Transforms/PredicateSimplifier/2006-08-02-Switch.ll +++ b/test/Transforms/PredicateSimplifier/2006-08-02-Switch.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -predsimplify -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -predsimplify -disable-output fastcc void %_ov_splice(int %n1, int %n2, int %ch2) { entry: diff --git a/test/Transforms/PredicateSimplifier/2006-08-07-LeaderOffByOne.ll b/test/Transforms/PredicateSimplifier/2006-08-07-LeaderOffByOne.ll index 244fe79ee4..1322b90f48 100644 --- a/test/Transforms/PredicateSimplifier/2006-08-07-LeaderOffByOne.ll +++ b/test/Transforms/PredicateSimplifier/2006-08-07-LeaderOffByOne.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -predsimplify -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -predsimplify -disable-output void %safe_strcpy(uint %size1) { entry: diff --git a/test/Transforms/PredicateSimplifier/2006-09-20-ResolveCycle.ll b/test/Transforms/PredicateSimplifier/2006-09-20-ResolveCycle.ll index 6b456b9502..83e5eacced 100644 --- a/test/Transforms/PredicateSimplifier/2006-09-20-ResolveCycle.ll +++ b/test/Transforms/PredicateSimplifier/2006-09-20-ResolveCycle.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -predsimplify -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -predsimplify -disable-output void %gs_image_next() { entry: diff --git a/test/Transforms/PredicateSimplifier/2006-09-20-SetCC.ll b/test/Transforms/PredicateSimplifier/2006-09-20-SetCC.ll index 67bc715c91..8f2fdbd79a 100644 --- a/test/Transforms/PredicateSimplifier/2006-09-20-SetCC.ll +++ b/test/Transforms/PredicateSimplifier/2006-09-20-SetCC.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -predsimplify | llvm-dis | grep br | grep return.i.bb8_crit_edge | grep false +; RUN: llvm-upgrade < %s | llvm-as | opt -predsimplify | llvm-dis | grep br | grep return.i.bb8_crit_edge | grep false %str = external global [4 x sbyte] ; <[4 x sbyte]*> [#uses=1] diff --git a/test/Transforms/PredicateSimplifier/2006-10-22-IntOr.ll b/test/Transforms/PredicateSimplifier/2006-10-22-IntOr.ll index 1af33655e8..0cdd58085b 100644 --- a/test/Transforms/PredicateSimplifier/2006-10-22-IntOr.ll +++ b/test/Transforms/PredicateSimplifier/2006-10-22-IntOr.ll @@ -1,6 +1,6 @@ -; RUN: llvm-as < %s | opt -predsimplify -instcombine -simplifycfg -disable-output && -; RUN: llvm-as < %s | opt -predsimplify -instcombine -simplifycfg | llvm-dis | grep -v declare | not grep fail && -; RUN: llvm-as < %s | opt -predsimplify -instcombine -simplifycfg | llvm-dis | grep -v declare | grep -c pass | grep 3 +; RUN: llvm-upgrade < %s | llvm-as | opt -predsimplify -instcombine -simplifycfg -disable-output && +; RUN: llvm-upgrade < %s | llvm-as | opt -predsimplify -instcombine -simplifycfg | llvm-dis | grep -v declare | not grep fail && +; RUN: llvm-upgrade < %s | llvm-as | opt -predsimplify -instcombine -simplifycfg | llvm-dis | grep -v declare | grep -c pass | grep 3 int %test1(int %x, int %y) { entry: diff --git a/test/Transforms/PredicateSimplifier/2006-10-25-AddSetCC.ll b/test/Transforms/PredicateSimplifier/2006-10-25-AddSetCC.ll index 503d327cac..5c5a4a48d4 100644 --- a/test/Transforms/PredicateSimplifier/2006-10-25-AddSetCC.ll +++ b/test/Transforms/PredicateSimplifier/2006-10-25-AddSetCC.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | opt -predsimplify -instcombine -simplifycfg -disable-output && -; RUN: llvm-as < %s | opt -predsimplify -instcombine -simplifycfg | llvm-dis | grep -v declare | grep -c pass | grep 2 +; RUN: llvm-upgrade < %s | llvm-as | opt -predsimplify -instcombine -simplifycfg -disable-output && +; RUN: llvm-upgrade < %s | llvm-as | opt -predsimplify -instcombine -simplifycfg | llvm-dis | grep -v declare | grep -c pass | grep 2 int %test(int %x, int %y) { entry: diff --git a/test/Transforms/PredicateSimplifier/2006-11-04-ImpossibleGT.ll b/test/Transforms/PredicateSimplifier/2006-11-04-ImpossibleGT.ll index c401bfe256..32ed49554f 100644 --- a/test/Transforms/PredicateSimplifier/2006-11-04-ImpossibleGT.ll +++ b/test/Transforms/PredicateSimplifier/2006-11-04-ImpossibleGT.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -predsimplify -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -predsimplify -disable-output void %readMotionInfoFromNAL() { entry: diff --git a/test/Transforms/PredicateSimplifier/2006-11-04-ReplacingZeros.ll b/test/Transforms/PredicateSimplifier/2006-11-04-ReplacingZeros.ll index f3c17c38cf..74daa7e82b 100644 --- a/test/Transforms/PredicateSimplifier/2006-11-04-ReplacingZeros.ll +++ b/test/Transforms/PredicateSimplifier/2006-11-04-ReplacingZeros.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -predsimplify -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -predsimplify -disable-output int %test_wp_B_slice(int %select_method) { entry: diff --git a/test/Transforms/PredicateSimplifier/2006-11-05-CycleGTLT.ll b/test/Transforms/PredicateSimplifier/2006-11-05-CycleGTLT.ll index 5aaf503dd1..fccc6db6ca 100644 --- a/test/Transforms/PredicateSimplifier/2006-11-05-CycleGTLT.ll +++ b/test/Transforms/PredicateSimplifier/2006-11-05-CycleGTLT.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -predsimplify -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -predsimplify -disable-output void %diff(int %N) { entry: diff --git a/test/Transforms/PredicateSimplifier/2006-11-11-Squeeze.ll b/test/Transforms/PredicateSimplifier/2006-11-11-Squeeze.ll index d260ae35d7..cf748cd920 100644 --- a/test/Transforms/PredicateSimplifier/2006-11-11-Squeeze.ll +++ b/test/Transforms/PredicateSimplifier/2006-11-11-Squeeze.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -predsimplify -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -predsimplify -disable-output %struct.cube_struct = type { int, int, int, int*, int*, int*, int*, int*, uint*, uint*, uint**, uint**, uint*, uint*, uint, int, int*, int, int } %cube = external global %struct.cube_struct ; <%struct.cube_struct*> [#uses=2] diff --git a/test/Transforms/PredicateSimplifier/2006-11-12-MergeNodes.ll b/test/Transforms/PredicateSimplifier/2006-11-12-MergeNodes.ll index 134dd0fb1b..5f143ed4a8 100644 --- a/test/Transforms/PredicateSimplifier/2006-11-12-MergeNodes.ll +++ b/test/Transforms/PredicateSimplifier/2006-11-12-MergeNodes.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -predsimplify -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -predsimplify -disable-output ; ModuleID = 'b.bc' target datalayout = "e-p:32:32" diff --git a/test/Transforms/PredicateSimplifier/predsimplify.ll b/test/Transforms/PredicateSimplifier/predsimplify.ll index af6cd155a8..efe28d184a 100644 --- a/test/Transforms/PredicateSimplifier/predsimplify.ll +++ b/test/Transforms/PredicateSimplifier/predsimplify.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | opt -predsimplify -instcombine -simplifycfg | llvm-dis | grep -v declare | not grep fail && -; RUN: llvm-as < %s | opt -predsimplify -instcombine -simplifycfg | llvm-dis | grep -v declare | grep -c pass | grep 4 +; RUN: llvm-upgrade < %s | llvm-as | opt -predsimplify -instcombine -simplifycfg | llvm-dis | grep -v declare | not grep fail && +; RUN: llvm-upgrade < %s | llvm-as | opt -predsimplify -instcombine -simplifycfg | llvm-dis | grep -v declare | grep -c pass | grep 4 void %test1(int %x) { entry: diff --git a/test/Transforms/PredicateSimplifier/predsimplify.reg1.ll b/test/Transforms/PredicateSimplifier/predsimplify.reg1.ll index a7fd4cabed..caa41b3280 100644 --- a/test/Transforms/PredicateSimplifier/predsimplify.reg1.ll +++ b/test/Transforms/PredicateSimplifier/predsimplify.reg1.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -predsimplify -verify +; RUN: llvm-upgrade < %s | llvm-as | opt -predsimplify -verify void %dgefa() { entry: diff --git a/test/Transforms/PredicateSimplifier/predsimplify.reg2.ll b/test/Transforms/PredicateSimplifier/predsimplify.reg2.ll index a5e77aa9e4..e7593fa7ba 100644 --- a/test/Transforms/PredicateSimplifier/predsimplify.reg2.ll +++ b/test/Transforms/PredicateSimplifier/predsimplify.reg2.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -predsimplify -verify +; RUN: llvm-upgrade < %s | llvm-as | opt -predsimplify -verify ; ModuleID = 'bugpoint-reduced-simplified.bc' target endian = little diff --git a/test/Transforms/PredicateSimplifier/predsimplify.reg3.ll b/test/Transforms/PredicateSimplifier/predsimplify.reg3.ll index facf336fa1..82e48b744a 100644 --- a/test/Transforms/PredicateSimplifier/predsimplify.reg3.ll +++ b/test/Transforms/PredicateSimplifier/predsimplify.reg3.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -predsimplify -simplifycfg | llvm-dis | grep pass +; RUN: llvm-upgrade < %s | llvm-as | opt -predsimplify -simplifycfg | llvm-dis | grep pass void %regtest(int %x) { entry: diff --git a/test/Transforms/PredicateSimplifier/predsimplify.reg4.ll b/test/Transforms/PredicateSimplifier/predsimplify.reg4.ll index ebf58ca72e..3817e87cde 100644 --- a/test/Transforms/PredicateSimplifier/predsimplify.reg4.ll +++ b/test/Transforms/PredicateSimplifier/predsimplify.reg4.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -predsimplify -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -predsimplify -disable-output ; ModuleID = '<stdin>' target endian = little diff --git a/test/Transforms/PruneEH/2003-09-14-ExternalCall.llx b/test/Transforms/PruneEH/2003-09-14-ExternalCall.llx index c42ddd228c..0ca05d6e42 100644 --- a/test/Transforms/PruneEH/2003-09-14-ExternalCall.llx +++ b/test/Transforms/PruneEH/2003-09-14-ExternalCall.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -prune-eh | llvm-dis | grep invoke +; RUN: llvm-upgrade < %s | llvm-as | opt -prune-eh | llvm-dis | grep invoke declare void %External() diff --git a/test/Transforms/PruneEH/2003-11-21-PHIUpdate.llx b/test/Transforms/PruneEH/2003-11-21-PHIUpdate.llx index d71259c181..3b272fce3f 100644 --- a/test/Transforms/PruneEH/2003-11-21-PHIUpdate.llx +++ b/test/Transforms/PruneEH/2003-11-21-PHIUpdate.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -prune-eh -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -prune-eh -disable-output implementation diff --git a/test/Transforms/PruneEH/recursivetest.llx b/test/Transforms/PruneEH/recursivetest.llx index fc2b952de0..0ef33b54eb 100644 --- a/test/Transforms/PruneEH/recursivetest.llx +++ b/test/Transforms/PruneEH/recursivetest.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -prune-eh | llvm-dis | not grep invoke +; RUN: llvm-upgrade < %s | llvm-as | opt -prune-eh | llvm-dis | not grep invoke implementation diff --git a/test/Transforms/PruneEH/simplenoreturntest.ll b/test/Transforms/PruneEH/simplenoreturntest.ll index 29cf9e5c82..cc3a86d985 100644 --- a/test/Transforms/PruneEH/simplenoreturntest.ll +++ b/test/Transforms/PruneEH/simplenoreturntest.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -prune-eh | llvm-dis | not grep 'ret int' +; RUN: llvm-upgrade < %s | llvm-as | opt -prune-eh | llvm-dis | not grep 'ret int' void %noreturn() { unwind diff --git a/test/Transforms/PruneEH/simpletest.llx b/test/Transforms/PruneEH/simpletest.llx index 4c6f8bad54..c368534eda 100644 --- a/test/Transforms/PruneEH/simpletest.llx +++ b/test/Transforms/PruneEH/simpletest.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -prune-eh | llvm-dis | not grep invoke +; RUN: llvm-upgrade < %s | llvm-as | opt -prune-eh | llvm-dis | not grep invoke implementation diff --git a/test/Transforms/RaiseAllocations/2004-11-08-FreeUseCrash.ll b/test/Transforms/RaiseAllocations/2004-11-08-FreeUseCrash.ll index 0e229c69a9..389047edc4 100644 --- a/test/Transforms/RaiseAllocations/2004-11-08-FreeUseCrash.ll +++ b/test/Transforms/RaiseAllocations/2004-11-08-FreeUseCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -raiseallocs -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -raiseallocs -disable-output implementation ; Functions: void %main() { diff --git a/test/Transforms/RaiseAllocations/FreeCastConstantExpr.ll b/test/Transforms/RaiseAllocations/FreeCastConstantExpr.ll index 3b700ffd45..008aea4fe2 100644 --- a/test/Transforms/RaiseAllocations/FreeCastConstantExpr.ll +++ b/test/Transforms/RaiseAllocations/FreeCastConstantExpr.ll @@ -1,6 +1,6 @@ ; This situation can occur due to the funcresolve pass. ; -; RUN: llvm-as < %s | opt -raiseallocs | llvm-dis | not grep call +; RUN: llvm-upgrade < %s | llvm-as | opt -raiseallocs | llvm-dis | not grep call declare void %free(sbyte*) diff --git a/test/Transforms/Reassociate/2002-05-15-AgressiveSubMove.ll b/test/Transforms/Reassociate/2002-05-15-AgressiveSubMove.ll index 0a176be6e3..a7b0df1e8b 100644 --- a/test/Transforms/Reassociate/2002-05-15-AgressiveSubMove.ll +++ b/test/Transforms/Reassociate/2002-05-15-AgressiveSubMove.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -reassociate -instcombine -constprop -dce | llvm-dis | not grep add +; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -instcombine -constprop -dce | llvm-dis | not grep add int %test(int %A) { %X = add int %A, 1 diff --git a/test/Transforms/Reassociate/2002-05-15-MissedTree.ll b/test/Transforms/Reassociate/2002-05-15-MissedTree.ll index fce2cdec0e..176948a7f9 100644 --- a/test/Transforms/Reassociate/2002-05-15-MissedTree.ll +++ b/test/Transforms/Reassociate/2002-05-15-MissedTree.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -reassociate -instcombine -constprop -die | llvm-dis | not grep 5 +; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -instcombine -constprop -die | llvm-dis | not grep 5 int %test(int %A, int %B) { %W = add int %B, -5 diff --git a/test/Transforms/Reassociate/2002-05-15-SubReassociate.ll b/test/Transforms/Reassociate/2002-05-15-SubReassociate.ll index f3e6bfa785..be204e9214 100644 --- a/test/Transforms/Reassociate/2002-05-15-SubReassociate.ll +++ b/test/Transforms/Reassociate/2002-05-15-SubReassociate.ll @@ -1,6 +1,6 @@ ; With sub reassociation, constant folding can eliminate all of the constants. ; -; RUN: llvm-as < %s | opt -reassociate -constprop -instcombine -dce | llvm-dis | not grep add +; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -constprop -instcombine -dce | llvm-dis | not grep add int %test(int %A, int %B) { %W = add int 5, %B diff --git a/test/Transforms/Reassociate/2002-05-15-SubReassociate2.ll b/test/Transforms/Reassociate/2002-05-15-SubReassociate2.ll index 85e746bfe1..c46cc2ebb1 100644 --- a/test/Transforms/Reassociate/2002-05-15-SubReassociate2.ll +++ b/test/Transforms/Reassociate/2002-05-15-SubReassociate2.ll @@ -1,6 +1,6 @@ ; With sub reassociation, constant folding can eliminate the two 12 constants. ; -; RUN: llvm-as < %s | opt -reassociate -constprop -dce | llvm-dis | not grep 12 +; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -constprop -dce | llvm-dis | not grep 12 int "test"(int %A, int %B, int %C, int %D) { %M = add int %A, 12 diff --git a/test/Transforms/Reassociate/2002-07-09-DominanceProblem.ll b/test/Transforms/Reassociate/2002-07-09-DominanceProblem.ll index 3829148699..6a0ef53279 100644 --- a/test/Transforms/Reassociate/2002-07-09-DominanceProblem.ll +++ b/test/Transforms/Reassociate/2002-07-09-DominanceProblem.ll @@ -1,6 +1,6 @@ ; The reassociate pass is not preserving dominance properties correctly ; -; RUN: llvm-as < %s | opt -reassociate +; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate int %compute_dist(int %i, int %j) { %reg119 = sub int %j, %i diff --git a/test/Transforms/Reassociate/2003-08-12-InfiniteLoop.ll b/test/Transforms/Reassociate/2003-08-12-InfiniteLoop.ll index 59e482d95e..a84297b8b4 100644 --- a/test/Transforms/Reassociate/2003-08-12-InfiniteLoop.ll +++ b/test/Transforms/Reassociate/2003-08-12-InfiniteLoop.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -reassociate -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -disable-output implementation ; Functions: diff --git a/test/Transforms/Reassociate/2005-08-24-Crash.ll b/test/Transforms/Reassociate/2005-08-24-Crash.ll index c1d5259ed5..7e8e5d5a3f 100644 --- a/test/Transforms/Reassociate/2005-08-24-Crash.ll +++ b/test/Transforms/Reassociate/2005-08-24-Crash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -reassociate -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -disable-output void %test(int %a, int %b, int %c, int %d) { %tmp.2 = xor int %a, %b ; <int> [#uses=1] diff --git a/test/Transforms/Reassociate/2005-09-01-ArrayOutOfBounds.ll b/test/Transforms/Reassociate/2005-09-01-ArrayOutOfBounds.ll index 958f9797a2..e51c8cc1ec 100644 --- a/test/Transforms/Reassociate/2005-09-01-ArrayOutOfBounds.ll +++ b/test/Transforms/Reassociate/2005-09-01-ArrayOutOfBounds.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -reassociate -instcombine | llvm-dis | grep 'ret int 0' +; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -instcombine | llvm-dis | grep 'ret int 0' int %f(int %a0, int %a1, int %a2, int %a3, int %a4) { %tmp.2 = add int %a4, %a3 ; <int> [#uses=1] diff --git a/test/Transforms/Reassociate/2006-04-27-ReassociateVector.ll b/test/Transforms/Reassociate/2006-04-27-ReassociateVector.ll index 30c8426b4d..2a5b5cd981 100644 --- a/test/Transforms/Reassociate/2006-04-27-ReassociateVector.ll +++ b/test/Transforms/Reassociate/2006-04-27-ReassociateVector.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -reassociate -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -disable-output void %foo() { %tmp162 = sub <4 x float> zeroinitializer, zeroinitializer diff --git a/test/Transforms/Reassociate/basictest.ll b/test/Transforms/Reassociate/basictest.ll index 6372d988c3..a7ff84a65e 100644 --- a/test/Transforms/Reassociate/basictest.ll +++ b/test/Transforms/Reassociate/basictest.ll @@ -1,6 +1,6 @@ ; With reassociation, constant folding can eliminate the 12 and -12 constants. ; -; RUN: llvm-as < %s | opt -reassociate -constprop -instcombine -die | llvm-dis | not grep add +; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -constprop -instcombine -die | llvm-dis | not grep add int %test(int %arg) { %tmp1 = sub int -12, %arg diff --git a/test/Transforms/Reassociate/basictest2.ll b/test/Transforms/Reassociate/basictest2.ll index c7a3687642..7efa3cca81 100644 --- a/test/Transforms/Reassociate/basictest2.ll +++ b/test/Transforms/Reassociate/basictest2.ll @@ -1,6 +1,6 @@ ; With reassociation, constant folding can eliminate the +/- 30 constants. ; -; RUN: llvm-as < %s | opt -reassociate -constprop -instcombine -die | llvm-dis | not grep 30 +; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -constprop -instcombine -die | llvm-dis | not grep 30 int "test"(int %reg109, int %reg1111) { %reg115 = add int %reg109, -30 ; <int> [#uses=1] diff --git a/test/Transforms/Reassociate/basictest3.ll b/test/Transforms/Reassociate/basictest3.ll index c82b0176ab..a3da5a0400 100644 --- a/test/Transforms/Reassociate/basictest3.ll +++ b/test/Transforms/Reassociate/basictest3.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -reassociate -gcse | llvm-dis | grep add | wc -l | grep 6 +; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -gcse | llvm-dis | grep add | wc -l | grep 6 ; Each of these functions should turn into two adds each. %e = external global int diff --git a/test/Transforms/Reassociate/basictest4.ll b/test/Transforms/Reassociate/basictest4.ll index 4f75e167c6..dcf7a55bcd 100644 --- a/test/Transforms/Reassociate/basictest4.ll +++ b/test/Transforms/Reassociate/basictest4.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -reassociate -gcse -instcombine | llvm-dis | not grep add +; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -gcse -instcombine | llvm-dis | not grep add %a = weak global int 0 %b = weak global int 0 diff --git a/test/Transforms/Reassociate/inverses.ll b/test/Transforms/Reassociate/inverses.ll index 0ce704698a..eff3e6b34b 100644 --- a/test/Transforms/Reassociate/inverses.ll +++ b/test/Transforms/Reassociate/inverses.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -reassociate -dce | llvm-dis | not grep '\(and\|sub\)' +; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -dce | llvm-dis | not grep '\(and\|sub\)' int %test1(int %a, int %b) { %tmp.2 = and int %b, %a diff --git a/test/Transforms/Reassociate/looptest.ll b/test/Transforms/Reassociate/looptest.ll index aa7000f9fa..97127bb950 100644 --- a/test/Transforms/Reassociate/looptest.ll +++ b/test/Transforms/Reassociate/looptest.ll @@ -12,7 +12,7 @@ ; In this case, we want to reassociate the specified expr so that i+j can be ; hoisted out of the inner most loop. ; -; RUN: llvm-as < %s | opt -reassociate | llvm-dis | grep 115 | not grep 117 +; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate | llvm-dis | grep 115 | not grep 117 %.LC0 = internal global [4 x sbyte] c"%d\0A\00" ; <[4 x sbyte]*> [#uses=1] diff --git a/test/Transforms/Reassociate/mul-factor3.ll b/test/Transforms/Reassociate/mul-factor3.ll index 773569e3df..5e06fbca84 100644 --- a/test/Transforms/Reassociate/mul-factor3.ll +++ b/test/Transforms/Reassociate/mul-factor3.ll @@ -1,7 +1,7 @@ ; This should be one add and two multiplies. -; RUN: llvm-as < %s | opt -reassociate -instcombine | llvm-dis | grep mul | wc -l | grep 2 && -; RUN: llvm-as < %s | opt -reassociate -instcombine | llvm-dis | grep add | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -instcombine | llvm-dis | grep mul | wc -l | grep 2 && +; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -instcombine | llvm-dis | grep add | wc -l | grep 1 int %test(int %A, int %B, int %C) { %aa = mul int %A, %A diff --git a/test/Transforms/Reassociate/mul-neg-add.ll b/test/Transforms/Reassociate/mul-neg-add.ll index 79eeb198ac..d7c39a5808 100644 --- a/test/Transforms/Reassociate/mul-neg-add.ll +++ b/test/Transforms/Reassociate/mul-neg-add.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -reassociate -instcombine | llvm-dis | not grep 'sub int 0' +; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -instcombine | llvm-dis | not grep 'sub int 0' int %test(int %X, int %Y, int %Z) { %A = sub int 0, %X diff --git a/test/Transforms/Reassociate/mulfactor.ll b/test/Transforms/Reassociate/mulfactor.ll index 76db242128..bb7efc3f7a 100644 --- a/test/Transforms/Reassociate/mulfactor.ll +++ b/test/Transforms/Reassociate/mulfactor.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -reassociate -instcombine | llvm-dis | grep mul | wc -l | grep 2 +; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -instcombine | llvm-dis | grep mul | wc -l | grep 2 ; This should have exactly 2 multiplies when we're done. diff --git a/test/Transforms/Reassociate/mulfactor2.ll b/test/Transforms/Reassociate/mulfactor2.ll index 20a28a45a0..062e3af4f5 100644 --- a/test/Transforms/Reassociate/mulfactor2.ll +++ b/test/Transforms/Reassociate/mulfactor2.ll @@ -1,7 +1,7 @@ ; This should turn into one multiply and one add. -; RUN: llvm-as < %s | opt -instcombine -reassociate -instcombine | llvm-dis | grep mul | wc -l | grep 1 && -; RUN: llvm-as < %s | opt -instcombine -reassociate -instcombine | llvm-dis | grep add | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -reassociate -instcombine | llvm-dis | grep mul | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -reassociate -instcombine | llvm-dis | grep add | wc -l | grep 1 int %main(int %t) { %tmp.3 = mul int %t, 12 ; <int> [#uses=1] %tmp.4 = add int %tmp.3, 5 ; <int> [#uses=1] diff --git a/test/Transforms/Reassociate/negation.ll b/test/Transforms/Reassociate/negation.ll index ba7fe6fbeb..56e087a1fc 100644 --- a/test/Transforms/Reassociate/negation.ll +++ b/test/Transforms/Reassociate/negation.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -reassociate -instcombine | llvm-dis | not grep sub +; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -instcombine | llvm-dis | not grep sub ; Test that we can turn things like X*-(Y*Z) -> X*-1*Y*Z. diff --git a/test/Transforms/Reassociate/otherops.ll b/test/Transforms/Reassociate/otherops.ll index 0a205e32ca..9e99d2c858 100644 --- a/test/Transforms/Reassociate/otherops.ll +++ b/test/Transforms/Reassociate/otherops.ll @@ -1,6 +1,6 @@ ; Reassociation should apply to Add, Mul, And, Or, & Xor ; -; RUN: llvm-as < %s | opt -reassociate -constprop -instcombine -die | llvm-dis | not grep 12 +; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -constprop -instcombine -die | llvm-dis | not grep 12 int "test_mul"(int %arg) { %tmp1 = mul int 12, %arg diff --git a/test/Transforms/Reassociate/shift-factor.ll b/test/Transforms/Reassociate/shift-factor.ll index b0499f5cb2..51513c2895 100644 --- a/test/Transforms/Reassociate/shift-factor.ll +++ b/test/Transforms/Reassociate/shift-factor.ll @@ -1,6 +1,6 @@ ; There should be exactly one shift and one add left. -; RUN: llvm-as < %s | opt -reassociate -instcombine | llvm-dis | grep shl | wc -l | grep 1 && -; RUN: llvm-as < %s | opt -reassociate -instcombine | llvm-dis | grep add | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -instcombine | llvm-dis | grep shl | wc -l | grep 1 && +; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -instcombine | llvm-dis | grep add | wc -l | grep 1 int %test(int %X, int %Y) { %tmp.2 = shl int %X, ubyte 1 ; <int> [#uses=1] diff --git a/test/Transforms/Reassociate/shifttest.ll b/test/Transforms/Reassociate/shifttest.ll index 6ca6622467..6a65aafb18 100644 --- a/test/Transforms/Reassociate/shifttest.ll +++ b/test/Transforms/Reassociate/shifttest.ll @@ -1,6 +1,6 @@ ; With shl->mul reassociation, we can see that this is (shl A, 9) * A ; -; RUN: llvm-as < %s | opt -reassociate -instcombine | llvm-dis | grep 'shl .*, ubyte 9' +; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -instcombine | llvm-dis | grep 'shl .*, ubyte 9' int %test(int %A, int %B) { %X = shl int %A, ubyte 5 diff --git a/test/Transforms/Reassociate/subtest.ll b/test/Transforms/Reassociate/subtest.ll index fe2d46f910..097c355aaa 100644 --- a/test/Transforms/Reassociate/subtest.ll +++ b/test/Transforms/Reassociate/subtest.ll @@ -1,6 +1,6 @@ ; With sub reassociation, constant folding can eliminate the 12 and -12 constants. ; -; RUN: llvm-as < %s | opt -reassociate -constprop -instcombine -die | llvm-dis | not grep 12 +; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -constprop -instcombine -die | llvm-dis | not grep 12 int "test"(int %A, int %B) { %X = add int -12, %A diff --git a/test/Transforms/SCCP/2002-05-02-EdgeFailure.ll b/test/Transforms/SCCP/2002-05-02-EdgeFailure.ll index 9eeca70123..2136ca644c 100644 --- a/test/Transforms/SCCP/2002-05-02-EdgeFailure.ll +++ b/test/Transforms/SCCP/2002-05-02-EdgeFailure.ll @@ -5,7 +5,7 @@ ; real benchmark (mst from Olden benchmark, MakeGraph function). When SCCP is ; fixed, this should be eliminated by a single SCCP application. ; -; RUN: llvm-as < %s | opt -sccp | llvm-dis | not grep loop +; RUN: llvm-upgrade < %s | llvm-as | opt -sccp | llvm-dis | not grep loop int* %test() { bb1: diff --git a/test/Transforms/SCCP/2002-05-02-MissSecondInst.ll b/test/Transforms/SCCP/2002-05-02-MissSecondInst.ll index 183e5bc4d7..24e99b19e3 100644 --- a/test/Transforms/SCCP/2002-05-02-MissSecondInst.ll +++ b/test/Transforms/SCCP/2002-05-02-MissSecondInst.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -sccp | llvm-dis | not grep sub +; RUN: llvm-upgrade < %s | llvm-as | opt -sccp | llvm-dis | not grep sub void %test3(int, int) { add int 0, 0 diff --git a/test/Transforms/SCCP/2002-05-20-MissedIncomingValue.ll b/test/Transforms/SCCP/2002-05-20-MissedIncomingValue.ll index 448d1b52e1..c851efdb0e 100644 --- a/test/Transforms/SCCP/2002-05-20-MissedIncomingValue.ll +++ b/test/Transforms/SCCP/2002-05-20-MissedIncomingValue.ll @@ -1,7 +1,7 @@ ; This test shows a case where SCCP is incorrectly eliminating the PHI node ; because it thinks it has a constant 0 value, when it really doesn't. -; RUN: llvm-as < %s | opt -sccp | llvm-dis | grep phi +; RUN: llvm-upgrade < %s | llvm-as | opt -sccp | llvm-dis | grep phi int "test"(int %A, bool %c) { bb1: diff --git a/test/Transforms/SCCP/2002-05-21-InvalidSimplify.ll b/test/Transforms/SCCP/2002-05-21-InvalidSimplify.ll index 6b0f369e2c..c31a421d0e 100644 --- a/test/Transforms/SCCP/2002-05-21-InvalidSimplify.ll +++ b/test/Transforms/SCCP/2002-05-21-InvalidSimplify.ll @@ -2,7 +2,7 @@ ; this is in fact NOT the case, so the return should still be alive in the code ; after sccp and CFG simplification have been performed. ; -; RUN: llvm-as < %s | opt -sccp -simplifycfg | llvm-dis | grep ret +; RUN: llvm-upgrade < %s | llvm-as | opt -sccp -simplifycfg | llvm-dis | grep ret void "old_main"() { diff --git a/test/Transforms/SCCP/2002-08-30-GetElementPtrTest.ll b/test/Transforms/SCCP/2002-08-30-GetElementPtrTest.ll index 1d1b1f702d..dad9c7e70d 100644 --- a/test/Transforms/SCCP/2002-08-30-GetElementPtrTest.ll +++ b/test/Transforms/SCCP/2002-08-30-GetElementPtrTest.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -sccp | llvm-dis | not grep '%X' +; RUN: llvm-upgrade < %s | llvm-as | opt -sccp | llvm-dis | not grep '%X' %G = uninitialized global [40x int] diff --git a/test/Transforms/SCCP/2003-06-24-OverdefinedPHIValue.ll b/test/Transforms/SCCP/2003-06-24-OverdefinedPHIValue.ll index f554b000ce..bf33950e34 100644 --- a/test/Transforms/SCCP/2003-06-24-OverdefinedPHIValue.ll +++ b/test/Transforms/SCCP/2003-06-24-OverdefinedPHIValue.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -sccp -simplifycfg | llvm-dis | not grep then: +; RUN: llvm-upgrade < %s | llvm-as | opt -sccp -simplifycfg | llvm-dis | not grep then: void %cprop_test11(int* %data.1) { entry: ; No predecessors! diff --git a/test/Transforms/SCCP/2003-08-26-InvokeHandling.ll b/test/Transforms/SCCP/2003-08-26-InvokeHandling.ll index 14c41d7558..36bfba4a40 100644 --- a/test/Transforms/SCCP/2003-08-26-InvokeHandling.ll +++ b/test/Transforms/SCCP/2003-08-26-InvokeHandling.ll @@ -1,5 +1,5 @@ ; The PHI cannot be eliminated from this testcase, SCCP is mishandling invoke's! -; RUN: llvm-as < %s | opt -sccp | llvm-dis | grep phi +; RUN: llvm-upgrade < %s | llvm-as | opt -sccp | llvm-dis | grep phi declare void %foo() int %test(bool %cond) { diff --git a/test/Transforms/SCCP/2004-11-16-DeadInvoke.ll b/test/Transforms/SCCP/2004-11-16-DeadInvoke.ll index 7ca86536bd..544edc0b3c 100644 --- a/test/Transforms/SCCP/2004-11-16-DeadInvoke.ll +++ b/test/Transforms/SCCP/2004-11-16-DeadInvoke.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -sccp -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -sccp -disable-output implementation diff --git a/test/Transforms/SCCP/2004-12-10-UndefBranchBug.ll b/test/Transforms/SCCP/2004-12-10-UndefBranchBug.ll index be6944ce00..9d08137df1 100644 --- a/test/Transforms/SCCP/2004-12-10-UndefBranchBug.ll +++ b/test/Transforms/SCCP/2004-12-10-UndefBranchBug.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -sccp | llvm-dis | grep 'ret int 1' +; RUN: llvm-upgrade < %s | llvm-as | opt -sccp | llvm-dis | grep 'ret int 1' ; This function definitely returns 1, even if we don't know the direction ; of the branch. diff --git a/test/Transforms/SCCP/2006-10-23-IPSCCP-Crash.ll b/test/Transforms/SCCP/2006-10-23-IPSCCP-Crash.ll index 34a0a76370..edfbe016c4 100644 --- a/test/Transforms/SCCP/2006-10-23-IPSCCP-Crash.ll +++ b/test/Transforms/SCCP/2006-10-23-IPSCCP-Crash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -sccp -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -sccp -disable-output target endian = big target pointersize = 32 diff --git a/test/Transforms/SCCP/basictest.ll b/test/Transforms/SCCP/basictest.ll index 0825d0dbd8..417f847e64 100644 --- a/test/Transforms/SCCP/basictest.ll +++ b/test/Transforms/SCCP/basictest.ll @@ -1,7 +1,7 @@ ; This is a basic sanity check for constant propogation. The add instruction ; should be eliminated. -; RUN: llvm-as < %s | opt -sccp | llvm-dis | not grep add +; RUN: llvm-upgrade < %s | llvm-as | opt -sccp | llvm-dis | not grep add int %test(bool %B) { br bool %B, label %BB1, label %BB2 diff --git a/test/Transforms/SCCP/calltest.ll b/test/Transforms/SCCP/calltest.ll index e88914d8dc..2e46b69183 100644 --- a/test/Transforms/SCCP/calltest.ll +++ b/test/Transforms/SCCP/calltest.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -sccp -adce -simplifycfg | llvm-dis | not grep br +; RUN: llvm-upgrade < %s | llvm-as | opt -sccp -adce -simplifycfg | llvm-dis | not grep br ; No matter how hard you try, sqrt(1.0) is always 1.0. This allows the ; optimizer to delete this loop. diff --git a/test/Transforms/SCCP/ipsccp-basic.ll b/test/Transforms/SCCP/ipsccp-basic.ll index a5736bea52..18bfd8ec02 100644 --- a/test/Transforms/SCCP/ipsccp-basic.ll +++ b/test/Transforms/SCCP/ipsccp-basic.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -ipsccp | llvm-dis | grep -v 'ret int 17' | grep -v 'ret int undef' | not grep ret +; RUN: llvm-upgrade < %s | llvm-as | opt -ipsccp | llvm-dis | grep -v 'ret int 17' | grep -v 'ret int undef' | not grep ret implementation diff --git a/test/Transforms/SCCP/ipsccp-conditional.ll b/test/Transforms/SCCP/ipsccp-conditional.ll index 27fdf05a88..fceb31e132 100644 --- a/test/Transforms/SCCP/ipsccp-conditional.ll +++ b/test/Transforms/SCCP/ipsccp-conditional.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -ipsccp | llvm-dis | grep -v 'ret int 0' | grep -v 'ret int undef' | not grep ret +; RUN: llvm-upgrade < %s | llvm-as | opt -ipsccp | llvm-dis | grep -v 'ret int 0' | grep -v 'ret int undef' | not grep ret implementation diff --git a/test/Transforms/SCCP/ipsccp-gvar.ll b/test/Transforms/SCCP/ipsccp-gvar.ll index add1ee6663..d76b4810cb 100644 --- a/test/Transforms/SCCP/ipsccp-gvar.ll +++ b/test/Transforms/SCCP/ipsccp-gvar.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -ipsccp | llvm-dis | not grep global +; RUN: llvm-upgrade < %s | llvm-as | opt -ipsccp | llvm-dis | not grep global %G = internal global int undef diff --git a/test/Transforms/SCCP/loadtest.ll b/test/Transforms/SCCP/loadtest.ll index c663627c3d..99da7285cf 100644 --- a/test/Transforms/SCCP/loadtest.ll +++ b/test/Transforms/SCCP/loadtest.ll @@ -1,7 +1,7 @@ ; This test makes sure that these instructions are properly constant propagated. ; -; RUN: llvm-as < %s | opt -sccp | llvm-dis | not grep load +; RUN: llvm-upgrade < %s | llvm-as | opt -sccp | llvm-dis | not grep load %X = constant int 42 %Y = constant [2 x { int, float }] [ { int, float } { int 12, float 1.0 }, diff --git a/test/Transforms/SCCP/logical-nuke.ll b/test/Transforms/SCCP/logical-nuke.ll index 5b4f842600..446e99e039 100644 --- a/test/Transforms/SCCP/logical-nuke.ll +++ b/test/Transforms/SCCP/logical-nuke.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -sccp | llvm-dis | grep 'ret int 0' +; RUN: llvm-upgrade < %s | llvm-as | opt -sccp | llvm-dis | grep 'ret int 0' ; Test that SCCP has basic knowledge of when and/or nuke overdefined values. diff --git a/test/Transforms/SCCP/phitest.ll b/test/Transforms/SCCP/phitest.ll index 18f862a1a2..cdbdb2ce08 100644 --- a/test/Transforms/SCCP/phitest.ll +++ b/test/Transforms/SCCP/phitest.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -sccp -dce -simplifycfg | llvm-dis | not grep br +; RUN: llvm-upgrade < %s | llvm-as | opt -sccp -dce -simplifycfg | llvm-dis | not grep br int %test(int %param) { entry: diff --git a/test/Transforms/SCCP/sccptest.ll b/test/Transforms/SCCP/sccptest.ll index f2f87f9760..6fae7ce957 100644 --- a/test/Transforms/SCCP/sccptest.ll +++ b/test/Transforms/SCCP/sccptest.ll @@ -1,7 +1,7 @@ ; This is the test case taken from appel's book that illustrates a hard case ; that SCCP gets right. BB3 should be completely eliminated. ; -; RUN: llvm-as < %s | opt -sccp -constprop -dce -cfgsimplify | llvm-dis | not grep BB3 +; RUN: llvm-upgrade < %s | llvm-as | opt -sccp -constprop -dce -cfgsimplify | llvm-dis | not grep BB3 int %testfunction(int %i0, int %j0) { BB1: diff --git a/test/Transforms/SCCP/select.ll b/test/Transforms/SCCP/select.ll index 6b5446805e..0209681c78 100644 --- a/test/Transforms/SCCP/select.ll +++ b/test/Transforms/SCCP/select.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | opt -sccp -disable-output && -; RUN: llvm-as < %s | opt -sccp | llvm-dis | not grep select +; RUN: llvm-upgrade < %s | llvm-as | opt -sccp -disable-output && +; RUN: llvm-upgrade < %s | llvm-as | opt -sccp | llvm-dis | not grep select int %test1(bool %C) { %X = select bool %C, int 0, int 0 diff --git a/test/Transforms/ScalarRepl/2003-05-29-ArrayFail.ll b/test/Transforms/ScalarRepl/2003-05-29-ArrayFail.ll index e964dc8bff..fb6b1dad4e 100644 --- a/test/Transforms/ScalarRepl/2003-05-29-ArrayFail.ll +++ b/test/Transforms/ScalarRepl/2003-05-29-ArrayFail.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -scalarrepl | llvm-dis | grep alloca | grep '4 x' +; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl | llvm-dis | grep alloca | grep '4 x' ; Test that an array is not incorrectly deconstructed... diff --git a/test/Transforms/ScalarRepl/2003-05-30-InvalidIndices.ll b/test/Transforms/ScalarRepl/2003-05-30-InvalidIndices.ll index cda4403b9b..a66e575e88 100644 --- a/test/Transforms/ScalarRepl/2003-05-30-InvalidIndices.ll +++ b/test/Transforms/ScalarRepl/2003-05-30-InvalidIndices.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -scalarrepl +; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl void %main() { %E = alloca { { int, float, double, long }, { int, float, double, long } } ; <{ { int, float, double, long }, { int, float, double, long } }*> [#uses=1] diff --git a/test/Transforms/ScalarRepl/2003-05-30-MultiLevel.ll b/test/Transforms/ScalarRepl/2003-05-30-MultiLevel.ll index afba5683de..20beadc502 100644 --- a/test/Transforms/ScalarRepl/2003-05-30-MultiLevel.ll +++ b/test/Transforms/ScalarRepl/2003-05-30-MultiLevel.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -scalarrepl +; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl int %test() { %X = alloca { [ 4 x int] } diff --git a/test/Transforms/ScalarRepl/2003-09-12-IncorrectPromote.ll b/test/Transforms/ScalarRepl/2003-09-12-IncorrectPromote.ll index a8965b5652..5bf1c5358b 100644 --- a/test/Transforms/ScalarRepl/2003-09-12-IncorrectPromote.ll +++ b/test/Transforms/ScalarRepl/2003-09-12-IncorrectPromote.ll @@ -1,6 +1,6 @@ ; Scalar replacement was incorrectly promoting this alloca!! ; -; RUN: llvm-as < %s | opt -scalarrepl | llvm-dis | sed 's/;.*//g' | grep '\[' +; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl | llvm-dis | sed 's/;.*//g' | grep '\[' sbyte *%test() { %A = alloca [30 x sbyte] diff --git a/test/Transforms/ScalarRepl/2003-10-29-ArrayProblem.ll b/test/Transforms/ScalarRepl/2003-10-29-ArrayProblem.ll index cfeff456b2..742db46f29 100644 --- a/test/Transforms/ScalarRepl/2003-10-29-ArrayProblem.ll +++ b/test/Transforms/ScalarRepl/2003-10-29-ArrayProblem.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -scalarrepl | llvm-dis | grep alloca | grep '{' +; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl | llvm-dis | grep alloca | grep '{' implementation ; Functions: declare int %.callback_1(sbyte*) diff --git a/test/Transforms/ScalarRepl/2005-12-14-UnionPromoteCrash.ll b/test/Transforms/ScalarRepl/2005-12-14-UnionPromoteCrash.ll index 647311bae4..f7f1593248 100644 --- a/test/Transforms/ScalarRepl/2005-12-14-UnionPromoteCrash.ll +++ b/test/Transforms/ScalarRepl/2005-12-14-UnionPromoteCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -scalarrepl -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl -disable-output target endian = big target pointersize = 32 %struct.rtx_def = type { [2 x ubyte], int, [1 x %union.rtunion_def] } diff --git a/test/Transforms/ScalarRepl/2006-01-24-IllegalUnionPromoteCrash.ll b/test/Transforms/ScalarRepl/2006-01-24-IllegalUnionPromoteCrash.ll index 58f7c04e05..d974931941 100644 --- a/test/Transforms/ScalarRepl/2006-01-24-IllegalUnionPromoteCrash.ll +++ b/test/Transforms/ScalarRepl/2006-01-24-IllegalUnionPromoteCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -scalarrepl -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl -disable-output target endian = big target pointersize = 32 diff --git a/test/Transforms/ScalarRepl/2006-04-20-PromoteCrash.ll b/test/Transforms/ScalarRepl/2006-04-20-PromoteCrash.ll index 812e021321..a4d39334fa 100644 --- a/test/Transforms/ScalarRepl/2006-04-20-PromoteCrash.ll +++ b/test/Transforms/ScalarRepl/2006-04-20-PromoteCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -scalarrepl -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl -disable-output void %output_toc() { entry: diff --git a/test/Transforms/ScalarRepl/2006-10-23-PointerUnionCrash.ll b/test/Transforms/ScalarRepl/2006-10-23-PointerUnionCrash.ll index 4b4298d56a..9fcf16d4ee 100644 --- a/test/Transforms/ScalarRepl/2006-10-23-PointerUnionCrash.ll +++ b/test/Transforms/ScalarRepl/2006-10-23-PointerUnionCrash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -scalarrepl -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl -disable-output target datalayout = "e-p:32:32" target endian = little diff --git a/test/Transforms/ScalarRepl/2006-11-07-InvalidArrayPromote.ll b/test/Transforms/ScalarRepl/2006-11-07-InvalidArrayPromote.ll index 6bcfebafce..ae795858a8 100644 --- a/test/Transforms/ScalarRepl/2006-11-07-InvalidArrayPromote.ll +++ b/test/Transforms/ScalarRepl/2006-11-07-InvalidArrayPromote.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | opt -scalarrepl | llvm-dis && -; RUN: llvm-as < %s | opt -scalarrepl | llvm-dis | grep -F 'alloca [2 x <4 x int>]' +; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl | llvm-dis && +; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl | llvm-dis | grep -F 'alloca [2 x <4 x int>]' int %func(<4 x float> %v0, <4 x float> %v1) { %vsiidx = alloca [2 x <4 x int>], align 16 ; <[2 x <4 x int>]*> [#uses=3] diff --git a/test/Transforms/ScalarRepl/AggregatePromote.ll b/test/Transforms/ScalarRepl/AggregatePromote.ll index 93011fdd64..ea16b5e5ee 100644 --- a/test/Transforms/ScalarRepl/AggregatePromote.ll +++ b/test/Transforms/ScalarRepl/AggregatePromote.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | opt -scalarrepl | llvm-dis | not grep alloca && -; RUN: llvm-as < %s | opt -scalarrepl -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl | llvm-dis | not grep alloca && +; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl -disable-output target endian = big target pointersize = 32 diff --git a/test/Transforms/ScalarRepl/arraytest.ll b/test/Transforms/ScalarRepl/arraytest.ll index b923e192ab..e6fe1a6379 100644 --- a/test/Transforms/ScalarRepl/arraytest.ll +++ b/test/Transforms/ScalarRepl/arraytest.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -scalarrepl -mem2reg | llvm-dis | not grep alloca +; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl -mem2reg | llvm-dis | not grep alloca int %test() { %X = alloca [ 4 x int ] diff --git a/test/Transforms/ScalarRepl/badarray.ll b/test/Transforms/ScalarRepl/badarray.ll index fa3156b883..f525255b41 100644 --- a/test/Transforms/ScalarRepl/badarray.ll +++ b/test/Transforms/ScalarRepl/badarray.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -scalarrepl -mem2reg | llvm-dis | grep alloca +; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl -mem2reg | llvm-dis | grep alloca int %test() { %X = alloca [ 4 x int ] diff --git a/test/Transforms/ScalarRepl/basictest.ll b/test/Transforms/ScalarRepl/basictest.ll index 53d60c99ae..b7e0a295e3 100644 --- a/test/Transforms/ScalarRepl/basictest.ll +++ b/test/Transforms/ScalarRepl/basictest.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -scalarrepl -mem2reg | llvm-dis | not grep alloca +; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl -mem2reg | llvm-dis | not grep alloca int %test() { %X = alloca { int, float } diff --git a/test/Transforms/ScalarRepl/phinodepromote.ll b/test/Transforms/ScalarRepl/phinodepromote.ll index 573cab2b43..4dc70233e0 100644 --- a/test/Transforms/ScalarRepl/phinodepromote.ll +++ b/test/Transforms/ScalarRepl/phinodepromote.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -simplifycfg -instcombine -mem2reg | llvm-dis | not grep alloca +; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg -instcombine -mem2reg | llvm-dis | not grep alloca ; ; This tests to see if mem2reg can promote alloca instructions whose addresses ; are used by PHI nodes that are immediately loaded. The LLVM C++ front-end diff --git a/test/Transforms/ScalarRepl/select_promote.ll b/test/Transforms/ScalarRepl/select_promote.ll index 11902cfd33..a7a325cdd9 100644 --- a/test/Transforms/ScalarRepl/select_promote.ll +++ b/test/Transforms/ScalarRepl/select_promote.ll @@ -1,7 +1,7 @@ ; Test promotion of loads that use the result of a select instruction. This ; should be simplified by the instcombine pass. -; RUN: llvm-as < %s | opt -instcombine -mem2reg | llvm-dis | not grep alloca +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -mem2reg | llvm-dis | not grep alloca int %main() { %mem_tmp.0 = alloca int ; <int*> [#uses=3] diff --git a/test/Transforms/ScalarRepl/sroa_two.ll b/test/Transforms/ScalarRepl/sroa_two.ll index 2d8e7c6db7..fa044922e8 100644 --- a/test/Transforms/ScalarRepl/sroa_two.ll +++ b/test/Transforms/ScalarRepl/sroa_two.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -scalarrepl | llvm-dis +; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl | llvm-dis implementation diff --git a/test/Transforms/ScalarRepl/union-pointer.ll b/test/Transforms/ScalarRepl/union-pointer.ll index f54704cd49..0207ab976d 100644 --- a/test/Transforms/ScalarRepl/union-pointer.ll +++ b/test/Transforms/ScalarRepl/union-pointer.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | opt -scalarrepl | llvm-dis | not grep alloca && -; RUN: llvm-as < %s | opt -scalarrepl | llvm-dis | grep 'ret sbyte' +; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl | llvm-dis | not grep alloca && +; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl | llvm-dis | grep 'ret sbyte' ; PR892 diff --git a/test/Transforms/ScalarRepl/vector_promote.ll b/test/Transforms/ScalarRepl/vector_promote.ll index 1387183dec..2e9bce7740 100644 --- a/test/Transforms/ScalarRepl/vector_promote.ll +++ b/test/Transforms/ScalarRepl/vector_promote.ll @@ -1,6 +1,6 @@ -; RUN: llvm-as < %s | opt -scalarrepl -disable-output && -; RUN: llvm-as < %s | opt -scalarrepl | llvm-dis | not grep alloca +; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl -disable-output && +; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl | llvm-dis | not grep alloca void %test(<4 x float>* %F, float %f) { entry: diff --git a/test/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll b/test/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll index 054135355c..9d2fe54cba 100644 --- a/test/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll +++ b/test/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/test/Transforms/SimplifyCFG/2002-05-21-PHIElimination.ll b/test/Transforms/SimplifyCFG/2002-05-21-PHIElimination.ll index 7baea2e48d..1ef659384c 100644 --- a/test/Transforms/SimplifyCFG/2002-05-21-PHIElimination.ll +++ b/test/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/test/Transforms/SimplifyCFG/2002-06-24-PHINode.ll b/test/Transforms/SimplifyCFG/2002-06-24-PHINode.ll index 4c0cbbc980..a669a3ffc7 100644 --- a/test/Transforms/SimplifyCFG/2002-06-24-PHINode.ll +++ b/test/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/test/Transforms/SimplifyCFG/2002-09-24-PHIAssertion.ll b/test/Transforms/SimplifyCFG/2002-09-24-PHIAssertion.ll index b3c94859ef..f1674b7ffb 100644 --- a/test/Transforms/SimplifyCFG/2002-09-24-PHIAssertion.ll +++ b/test/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/test/Transforms/SimplifyCFG/2003-03-07-DominateProblem.ll b/test/Transforms/SimplifyCFG/2003-03-07-DominateProblem.ll index 6b75c5fa27..312e514cf2 100644 --- a/test/Transforms/SimplifyCFG/2003-03-07-DominateProblem.ll +++ b/test/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/test/Transforms/SimplifyCFG/2003-08-05-InvokeCrash.ll b/test/Transforms/SimplifyCFG/2003-08-05-InvokeCrash.ll index b6638ee519..6c791d2e85 100644 --- a/test/Transforms/SimplifyCFG/2003-08-05-InvokeCrash.ll +++ b/test/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/test/Transforms/SimplifyCFG/2003-08-05-MishandleInvoke.ll b/test/Transforms/SimplifyCFG/2003-08-05-MishandleInvoke.ll index 179ef72d6c..ff549adbae 100644 --- a/test/Transforms/SimplifyCFG/2003-08-05-MishandleInvoke.ll +++ b/test/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/test/Transforms/SimplifyCFG/2003-08-17-BranchFold.ll b/test/Transforms/SimplifyCFG/2003-08-17-BranchFold.ll index 55199ab2a1..523205b8b9 100644 --- a/test/Transforms/SimplifyCFG/2003-08-17-BranchFold.ll +++ b/test/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/test/Transforms/SimplifyCFG/2003-08-17-BranchFoldOrdering.ll b/test/Transforms/SimplifyCFG/2003-08-17-BranchFoldOrdering.ll index b96a4a6bb1..1fafe77ed2 100644 --- a/test/Transforms/SimplifyCFG/2003-08-17-BranchFoldOrdering.ll +++ b/test/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/test/Transforms/SimplifyCFG/2003-08-17-FoldSwitch.ll b/test/Transforms/SimplifyCFG/2003-08-17-FoldSwitch.ll index c5b0058925..91cb68b77e 100644 --- a/test/Transforms/SimplifyCFG/2003-08-17-FoldSwitch.ll +++ b/test/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/test/Transforms/SimplifyCFG/2004-12-10-SimplifyCFGCrash.ll b/test/Transforms/SimplifyCFG/2004-12-10-SimplifyCFGCrash.ll index 7b44996549..44c89d67b3 100644 --- a/test/Transforms/SimplifyCFG/2004-12-10-SimplifyCFGCrash.ll +++ b/test/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/test/Transforms/SimplifyCFG/2005-06-16-PHICrash.ll b/test/Transforms/SimplifyCFG/2005-06-16-PHICrash.ll index 33457d8d47..6c53029ea6 100644 --- a/test/Transforms/SimplifyCFG/2005-06-16-PHICrash.ll +++ b/test/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/test/Transforms/SimplifyCFG/2005-08-01-PHIUpdateFail.ll b/test/Transforms/SimplifyCFG/2005-08-01-PHIUpdateFail.ll index 71c0149f5b..9271ac209e 100644 --- a/test/Transforms/SimplifyCFG/2005-08-01-PHIUpdateFail.ll +++ b/test/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/test/Transforms/SimplifyCFG/2005-08-03-PHIFactorCrash.ll b/test/Transforms/SimplifyCFG/2005-08-03-PHIFactorCrash.ll index e844c08af1..3f3951ac7c 100644 --- a/test/Transforms/SimplifyCFG/2005-08-03-PHIFactorCrash.ll +++ b/test/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/test/Transforms/SimplifyCFG/2005-10-02-InvokeSimplify.ll b/test/Transforms/SimplifyCFG/2005-10-02-InvokeSimplify.ll index 3a29cb8318..c3b4194e1e 100644 --- a/test/Transforms/SimplifyCFG/2005-10-02-InvokeSimplify.ll +++ b/test/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/test/Transforms/SimplifyCFG/2005-12-03-IncorrectPHIFold.ll b/test/Transforms/SimplifyCFG/2005-12-03-IncorrectPHIFold.ll index 18cbc17652..eabedf9793 100644 --- a/test/Transforms/SimplifyCFG/2005-12-03-IncorrectPHIFold.ll +++ b/test/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/test/Transforms/SimplifyCFG/2006-02-17-InfiniteUnroll.ll b/test/Transforms/SimplifyCFG/2006-02-17-InfiniteUnroll.ll index 16af017c4d..8b443da1c8 100644 --- a/test/Transforms/SimplifyCFG/2006-02-17-InfiniteUnroll.ll +++ b/test/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/test/Transforms/SimplifyCFG/2006-06-12-InfLoop.ll b/test/Transforms/SimplifyCFG/2006-06-12-InfLoop.ll index d6e2551637..c9b1858bd4 100644 --- a/test/Transforms/SimplifyCFG/2006-06-12-InfLoop.ll +++ b/test/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/test/Transforms/SimplifyCFG/2006-08-03-Crash.ll b/test/Transforms/SimplifyCFG/2006-08-03-Crash.ll index 6280453d4d..b796dee803 100644 --- a/test/Transforms/SimplifyCFG/2006-08-03-Crash.ll +++ b/test/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/test/Transforms/SimplifyCFG/2006-10-19-UncondDiv.ll b/test/Transforms/SimplifyCFG/2006-10-19-UncondDiv.ll index b8946dcf98..8e583e880d 100644 --- a/test/Transforms/SimplifyCFG/2006-10-19-UncondDiv.ll +++ b/test/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/test/Transforms/SimplifyCFG/2006-10-29-InvokeCrash.ll b/test/Transforms/SimplifyCFG/2006-10-29-InvokeCrash.ll index 200419acc9..ca48041f67 100644 --- a/test/Transforms/SimplifyCFG/2006-10-29-InvokeCrash.ll +++ b/test/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/test/Transforms/SimplifyCFG/BrUnwind.ll b/test/Transforms/SimplifyCFG/BrUnwind.ll index 64264175ae..94008b0d0f 100644 --- a/test/Transforms/SimplifyCFG/BrUnwind.ll +++ b/test/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/test/Transforms/SimplifyCFG/DeadSetCC.ll b/test/Transforms/SimplifyCFG/DeadSetCC.ll index 70ccfc8c13..b180700d4f 100644 --- a/test/Transforms/SimplifyCFG/DeadSetCC.ll +++ b/test/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/test/Transforms/SimplifyCFG/EqualPHIEdgeBlockMerge.ll b/test/Transforms/SimplifyCFG/EqualPHIEdgeBlockMerge.ll index 09e7024474..4b643c6a17 100644 --- a/test/Transforms/SimplifyCFG/EqualPHIEdgeBlockMerge.ll +++ b/test/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/test/Transforms/SimplifyCFG/HoistCode.ll b/test/Transforms/SimplifyCFG/HoistCode.ll index db397a7e64..b817477161 100644 --- a/test/Transforms/SimplifyCFG/HoistCode.ll +++ b/test/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/test/Transforms/SimplifyCFG/InvokeEliminate.ll b/test/Transforms/SimplifyCFG/InvokeEliminate.ll index 73dc3cfb15..cbce416d66 100644 --- a/test/Transforms/SimplifyCFG/InvokeEliminate.ll +++ b/test/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/test/Transforms/SimplifyCFG/PhiBlockMerge.ll b/test/Transforms/SimplifyCFG/PhiBlockMerge.ll index 0537722ad9..881944fd9d 100644 --- a/test/Transforms/SimplifyCFG/PhiBlockMerge.ll +++ b/test/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/test/Transforms/SimplifyCFG/PhiBlockMerge2.ll b/test/Transforms/SimplifyCFG/PhiBlockMerge2.ll index 083e45e016..7e80677bc7 100644 --- a/test/Transforms/SimplifyCFG/PhiBlockMerge2.ll +++ b/test/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/test/Transforms/SimplifyCFG/PhiEliminate.ll b/test/Transforms/SimplifyCFG/PhiEliminate.ll index 0ca60e3364..9411b33f7b 100644 --- a/test/Transforms/SimplifyCFG/PhiEliminate.ll +++ b/test/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/test/Transforms/SimplifyCFG/PhiEliminate2.ll b/test/Transforms/SimplifyCFG/PhiEliminate2.ll index e93d2939d8..fb00a1342b 100644 --- a/test/Transforms/SimplifyCFG/PhiEliminate2.ll +++ b/test/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/test/Transforms/SimplifyCFG/PhiNoEliminate.ll b/test/Transforms/SimplifyCFG/PhiNoEliminate.ll index 6e7c9f5e78..1eb07b32f1 100644 --- a/test/Transforms/SimplifyCFG/PhiNoEliminate.ll +++ b/test/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/test/Transforms/SimplifyCFG/UncondBranchToReturn.ll b/test/Transforms/SimplifyCFG/UncondBranchToReturn.ll index 6e943f35fb..a3ed678c1b 100644 --- a/test/Transforms/SimplifyCFG/UncondBranchToReturn.ll +++ b/test/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/test/Transforms/SimplifyCFG/UnreachableEliminate.ll b/test/Transforms/SimplifyCFG/UnreachableEliminate.ll index 09c41a90dc..22cd3d4685 100644 --- a/test/Transforms/SimplifyCFG/UnreachableEliminate.ll +++ b/test/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/test/Transforms/SimplifyCFG/basictest.ll b/test/Transforms/SimplifyCFG/basictest.ll index 9dac7c05ab..18fa8978ca 100644 --- a/test/Transforms/SimplifyCFG/basictest.ll +++ b/test/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/test/Transforms/SimplifyCFG/branch-cond-merge.ll b/test/Transforms/SimplifyCFG/branch-cond-merge.ll index 55cf4b8cc2..ca5f3e4ab4 100644 --- a/test/Transforms/SimplifyCFG/branch-cond-merge.ll +++ b/test/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/test/Transforms/SimplifyCFG/branch-cond-prop.ll b/test/Transforms/SimplifyCFG/branch-cond-prop.ll index 6ea548c3be..10270c29fc 100644 --- a/test/Transforms/SimplifyCFG/branch-cond-prop.ll +++ b/test/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/test/Transforms/SimplifyCFG/branch-fold-test.ll b/test/Transforms/SimplifyCFG/branch-fold-test.ll index bb6c5fed3b..3bbb101ef4 100644 --- a/test/Transforms/SimplifyCFG/branch-fold-test.ll +++ b/test/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/test/Transforms/SimplifyCFG/branch-fold.ll b/test/Transforms/SimplifyCFG/branch-fold.ll index 8bd137cc66..bf35c2a4ea 100644 --- a/test/Transforms/SimplifyCFG/branch-fold.ll +++ b/test/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/test/Transforms/SimplifyCFG/branch-phi-thread.ll b/test/Transforms/SimplifyCFG/branch-phi-thread.ll index 491bb0eefa..3b8d188544 100644 --- a/test/Transforms/SimplifyCFG/branch-phi-thread.ll +++ b/test/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/test/Transforms/SimplifyCFG/hoist-common-code.ll b/test/Transforms/SimplifyCFG/hoist-common-code.ll index 80a5446e6d..b19eac98d6 100644 --- a/test/Transforms/SimplifyCFG/hoist-common-code.ll +++ b/test/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/test/Transforms/SimplifyCFG/return-merge.ll b/test/Transforms/SimplifyCFG/return-merge.ll index 51144f0be2..cbcfddbd94 100644 --- a/test/Transforms/SimplifyCFG/return-merge.ll +++ b/test/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/test/Transforms/SimplifyCFG/switch-simplify-crash.ll b/test/Transforms/SimplifyCFG/switch-simplify-crash.ll index 0f94104827..096f2aeb81 100644 --- a/test/Transforms/SimplifyCFG/switch-simplify-crash.ll +++ b/test/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/test/Transforms/SimplifyCFG/switch_create.ll b/test/Transforms/SimplifyCFG/switch_create.ll index ba1b7d65dc..2d722918b9 100644 --- a/test/Transforms/SimplifyCFG/switch_create.ll +++ b/test/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/test/Transforms/SimplifyCFG/switch_formation.ll b/test/Transforms/SimplifyCFG/switch_formation.ll index 60169fe92d..e13f2399e8 100644 --- a/test/Transforms/SimplifyCFG/switch_formation.ll +++ b/test/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/test/Transforms/SimplifyCFG/switch_switch_fold.ll b/test/Transforms/SimplifyCFG/switch_switch_fold.ll index cafd7d7e08..8bc5b8d2e6 100644 --- a/test/Transforms/SimplifyCFG/switch_switch_fold.ll +++ b/test/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/test/Transforms/SimplifyCFG/switch_thread.ll b/test/Transforms/SimplifyCFG/switch_thread.ll index 5eee2c7a7a..60b045ff89 100644 --- a/test/Transforms/SimplifyCFG/switch_thread.ll +++ b/test/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. diff --git a/test/Transforms/SimplifyLibCalls/2005-05-20-sprintf-crash.ll b/test/Transforms/SimplifyLibCalls/2005-05-20-sprintf-crash.ll index 3c00c74ff3..5b4fde870d 100644 --- a/test/Transforms/SimplifyLibCalls/2005-05-20-sprintf-crash.ll +++ b/test/Transforms/SimplifyLibCalls/2005-05-20-sprintf-crash.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -simplify-libcalls -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls -disable-output %G = constant [3 x sbyte] c"%s\00" diff --git a/test/Transforms/SimplifyLibCalls/ExitInMain.ll b/test/Transforms/SimplifyLibCalls/ExitInMain.ll index 29f69d198a..944e39d2e5 100644 --- a/test/Transforms/SimplifyLibCalls/ExitInMain.ll +++ b/test/Transforms/SimplifyLibCalls/ExitInMain.ll @@ -1,5 +1,5 @@ ; Test that the ExitInMainOptimization pass works correctly -; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | grep -c 'ret int 3' | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | grep -c 'ret int 3' | grep 1 declare void %exit(int) declare void %exitonly(int) diff --git a/test/Transforms/SimplifyLibCalls/FFS.ll b/test/Transforms/SimplifyLibCalls/FFS.ll index ccaaf3d350..335274ac45 100644 --- a/test/Transforms/SimplifyLibCalls/FFS.ll +++ b/test/Transforms/SimplifyLibCalls/FFS.ll @@ -1,5 +1,5 @@ ; Test that the ToAsciiOptimizer works correctly -; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | not grep 'call.*%ffs' +; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | not grep 'call.*%ffs' declare int %ffs(int) declare int %ffsl(int) diff --git a/test/Transforms/SimplifyLibCalls/FPrintF.ll b/test/Transforms/SimplifyLibCalls/FPrintF.ll index 760eb7f5ff..040052708e 100644 --- a/test/Transforms/SimplifyLibCalls/FPrintF.ll +++ b/test/Transforms/SimplifyLibCalls/FPrintF.ll @@ -1,5 +1,5 @@ ; Test that the FPrintFOptimizer works correctly -; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | not grep 'call.*fprintf' +; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | not grep 'call.*fprintf' ; %struct._IO_FILE = type { int, sbyte*, sbyte*, sbyte*, sbyte*, sbyte*, sbyte*, sbyte*, sbyte*, sbyte*, sbyte*, sbyte*, %struct._IO_marker*, %struct._IO_FILE*, int, int, int, ushort, sbyte, [1 x sbyte], sbyte*, long, sbyte*, sbyte*, int, [52 x sbyte] } diff --git a/test/Transforms/SimplifyLibCalls/IsDigit.ll b/test/Transforms/SimplifyLibCalls/IsDigit.ll index 9837fa08f0..1386c14ead 100644 --- a/test/Transforms/SimplifyLibCalls/IsDigit.ll +++ b/test/Transforms/SimplifyLibCalls/IsDigit.ll @@ -1,5 +1,5 @@ ; Test that the IsDigitOptimizer works correctly -; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | not grep 'call' +; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | not grep 'call' declare int %isdigit(int) declare int %isascii(int) diff --git a/test/Transforms/SimplifyLibCalls/MemCpy.ll b/test/Transforms/SimplifyLibCalls/MemCpy.ll index 265be73c0e..a127fd329f 100644 --- a/test/Transforms/SimplifyLibCalls/MemCpy.ll +++ b/test/Transforms/SimplifyLibCalls/MemCpy.ll @@ -1,6 +1,6 @@ ; Test that the StrCatOptimizer works correctly -; RUN: llvm-as < %s | opt -constprop -simplify-libcalls -disable-output && -; RUN: llvm-as < %s | opt -constprop -simplify-libcalls | llvm-dis | not grep 'call.*llvm.memcpy' +; RUN: llvm-upgrade < %s | llvm-as | opt -constprop -simplify-libcalls -disable-output && +; RUN: llvm-upgrade < %s | llvm-as | opt -constprop -simplify-libcalls | llvm-dis | not grep 'call.*llvm.memcpy' declare sbyte* %llvm.memcpy(sbyte*,sbyte*,int,int) %h = constant [2 x sbyte] c"h\00" diff --git a/test/Transforms/SimplifyLibCalls/MemMove.ll b/test/Transforms/SimplifyLibCalls/MemMove.ll index 47ed43242c..a114438921 100644 --- a/test/Transforms/SimplifyLibCalls/MemMove.ll +++ b/test/Transforms/SimplifyLibCalls/MemMove.ll @@ -1,6 +1,6 @@ ; Test that the StrCatOptimizer works correctly -; RUN: llvm-as < %s | opt -constprop -simplify-libcalls -disable-output && -; RUN: llvm-as < %s | opt -constprop -simplify-libcalls | llvm-dis | not grep 'call.*llvm.memmove' +; RUN: llvm-upgrade < %s | llvm-as | opt -constprop -simplify-libcalls -disable-output && +; RUN: llvm-upgrade < %s | llvm-as | opt -constprop -simplify-libcalls | llvm-dis | not grep 'call.*llvm.memmove' declare sbyte* %llvm.memmove(sbyte*,sbyte*,int,int) %h = constant [2 x sbyte] c"h\00" diff --git a/test/Transforms/SimplifyLibCalls/MemSet.ll b/test/Transforms/SimplifyLibCalls/MemSet.ll index 4bd358df89..d31a36ae3c 100644 --- a/test/Transforms/SimplifyLibCalls/MemSet.ll +++ b/test/Transforms/SimplifyLibCalls/MemSet.ll @@ -1,5 +1,5 @@ ; Test that the LLVMMemSetOptimizer works correctly -; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | not grep 'call.*llvm.memset' +; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | not grep 'call.*llvm.memset' declare void %llvm.memset(sbyte*,ubyte,uint,uint) diff --git a/test/Transforms/SimplifyLibCalls/Pow.ll b/test/Transforms/SimplifyLibCalls/Pow.ll index 3b9e48c68e..df7d46004a 100644 --- a/test/Transforms/SimplifyLibCalls/Pow.ll +++ b/test/Transforms/SimplifyLibCalls/Pow.ll @@ -1,8 +1,8 @@ ; Testcase for calls to the standard C "pow" function ; ; Equivalent to: http://gcc.gnu.org/ml/gcc-patches/2003-02/msg01786.html -; RUN: llvm-as < %s | opt -simplify-libcalls -disable-output && -; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | not grep 'call double .pow' +; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls -disable-output && +; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | not grep 'call double .pow' declare double %pow(double, double) diff --git a/test/Transforms/SimplifyLibCalls/Puts.ll b/test/Transforms/SimplifyLibCalls/Puts.ll index b3b5434ddf..4011a82fa9 100644 --- a/test/Transforms/SimplifyLibCalls/Puts.ll +++ b/test/Transforms/SimplifyLibCalls/Puts.ll @@ -1,5 +1,5 @@ ; Test that the PutsCatOptimizer works correctly -; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | not grep 'call.*fputs' +; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | not grep 'call.*fputs' ; %struct._IO_FILE = type { int, sbyte*, sbyte*, sbyte*, sbyte*, sbyte*, sbyte*, sbyte*, sbyte*, sbyte*, sbyte*, sbyte*, %struct._IO_marker*, %struct._IO_FILE*, int, int, int, ushort, sbyte, [1 x sbyte], sbyte*, long, sbyte*, sbyte*, int, [52 x sbyte] } %struct._IO_marker = type { %struct._IO_marker*, %struct._IO_FILE*, int } diff --git a/test/Transforms/SimplifyLibCalls/SPrintF.ll b/test/Transforms/SimplifyLibCalls/SPrintF.ll index 8b3ca29246..48b76b194e 100644 --- a/test/Transforms/SimplifyLibCalls/SPrintF.ll +++ b/test/Transforms/SimplifyLibCalls/SPrintF.ll @@ -1,6 +1,6 @@ ; Test that the SPrintFOptimizer works correctly -; RUN: llvm-as < %s | opt -simplify-libcalls -disable-output && -; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | not grep 'call.*sprintf' +; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls -disable-output && +; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | not grep 'call.*sprintf' declare int %sprintf(sbyte*,sbyte*,...) declare int %puts(sbyte*) diff --git a/test/Transforms/SimplifyLibCalls/StrCat.ll b/test/Transforms/SimplifyLibCalls/StrCat.ll index 992837fc5c..6532a637c1 100644 --- a/test/Transforms/SimplifyLibCalls/StrCat.ll +++ b/test/Transforms/SimplifyLibCalls/StrCat.ll @@ -1,5 +1,5 @@ ; Test that the StrCatOptimizer works correctly -; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | not grep 'call.*strcat' +; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | not grep 'call.*strcat' declare sbyte* %strcat(sbyte*,sbyte*) declare int %puts(sbyte*) diff --git a/test/Transforms/SimplifyLibCalls/StrChr.ll b/test/Transforms/SimplifyLibCalls/StrChr.ll index 2d4f5f2dac..b8e0de2733 100644 --- a/test/Transforms/SimplifyLibCalls/StrChr.ll +++ b/test/Transforms/SimplifyLibCalls/StrChr.ll @@ -1,5 +1,5 @@ ; Test that the StrChrOptimizer works correctly -; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | not grep 'call.*%strchr' +; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | not grep 'call.*%strchr' declare sbyte* %strchr(sbyte*,int) declare int %puts(sbyte*) diff --git a/test/Transforms/SimplifyLibCalls/StrCmp.ll b/test/Transforms/SimplifyLibCalls/StrCmp.ll index 96a5dc895e..1ab075de46 100644 --- a/test/Transforms/SimplifyLibCalls/StrCmp.ll +++ b/test/Transforms/SimplifyLibCalls/StrCmp.ll @@ -1,5 +1,5 @@ ; Test that the StrCmpOptimizer works correctly -; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | not grep 'call.*strcmp' +; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | not grep 'call.*strcmp' declare int %strcmp(sbyte*,sbyte*) declare int %puts(sbyte*) diff --git a/test/Transforms/SimplifyLibCalls/StrCpy.ll b/test/Transforms/SimplifyLibCalls/StrCpy.ll index ea94dc2d97..f75238bad4 100644 --- a/test/Transforms/SimplifyLibCalls/StrCpy.ll +++ b/test/Transforms/SimplifyLibCalls/StrCpy.ll @@ -1,5 +1,5 @@ ; Test that the StrCpyOptimizer works correctly -; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | not grep 'call.*strcpy' +; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | not grep 'call.*strcpy' declare sbyte* %strcpy(sbyte*,sbyte*) declare int %puts(sbyte*) diff --git a/test/Transforms/SimplifyLibCalls/StrLen.ll b/test/Transforms/SimplifyLibCalls/StrLen.ll index 8e5962a10a..20aa7a8dca 100644 --- a/test/Transforms/SimplifyLibCalls/StrLen.ll +++ b/test/Transforms/SimplifyLibCalls/StrLen.ll @@ -1,5 +1,5 @@ ; Test that the StrCatOptimizer works correctly -; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | not grep 'call.*strlen' +; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | not grep 'call.*strlen' declare uint %strlen(sbyte*) %hello = constant [6 x sbyte] c"hello\00" diff --git a/test/Transforms/SimplifyLibCalls/StrNCmp.ll b/test/Transforms/SimplifyLibCalls/StrNCmp.ll index 6fdb8cb6c0..278861a9ac 100644 --- a/test/Transforms/SimplifyLibCalls/StrNCmp.ll +++ b/test/Transforms/SimplifyLibCalls/StrNCmp.ll @@ -1,5 +1,5 @@ ; Test that the StrNCmpOptimizer works correctly -; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | not grep 'call.*strncmp' +; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | not grep 'call.*strncmp' declare int %strncmp(sbyte*,sbyte*,int) declare int %puts(sbyte*) diff --git a/test/Transforms/SimplifyLibCalls/ToAscii.ll b/test/Transforms/SimplifyLibCalls/ToAscii.ll index cb7d06c701..e9580c6254 100644 --- a/test/Transforms/SimplifyLibCalls/ToAscii.ll +++ b/test/Transforms/SimplifyLibCalls/ToAscii.ll @@ -1,5 +1,5 @@ ; Test that the ToAsciiOptimizer works correctly -; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | not grep 'call.*toascii' +; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | not grep 'call.*toascii' declare int %toascii(int) diff --git a/test/Transforms/SimplifyLibCalls/floor.ll b/test/Transforms/SimplifyLibCalls/floor.ll index 8748169be4..d1c6548822 100644 --- a/test/Transforms/SimplifyLibCalls/floor.ll +++ b/test/Transforms/SimplifyLibCalls/floor.ll @@ -1,9 +1,9 @@ -; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | not grep 'call.*floor(' && -; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | grep 'call.*floorf(' -; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | not grep 'call.*ceil(' && -; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | grep 'call.*ceilf(' -; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | not grep 'call.*nearbyint(' && -; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | grep 'call.*nearbyintf(' +; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | not grep 'call.*floor(' && +; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | grep 'call.*floorf(' +; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | not grep 'call.*ceil(' && +; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | grep 'call.*ceilf(' +; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | not grep 'call.*nearbyint(' && +; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | grep 'call.*nearbyintf(' ; XFAIL: sparc declare double %floor(double) diff --git a/test/Transforms/SimplifyLibCalls/memcmp.ll b/test/Transforms/SimplifyLibCalls/memcmp.ll index d2c660a093..3ccf00265a 100644 --- a/test/Transforms/SimplifyLibCalls/memcmp.ll +++ b/test/Transforms/SimplifyLibCalls/memcmp.ll @@ -1,6 +1,6 @@ ; Test that the memcmpOptimizer works correctly -; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | not grep 'call.*memcmp' && -; RUN: llvm-as < %s | opt -simplify-libcalls -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | not grep 'call.*memcmp' && +; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls -disable-output declare int %memcmp(sbyte*,sbyte*,int) %h = constant [2 x sbyte] c"h\00" diff --git a/test/Transforms/TailCallElim/accum_recursion.ll b/test/Transforms/TailCallElim/accum_recursion.ll index ceef503a29..d82d963b9d 100644 --- a/test/Transforms/TailCallElim/accum_recursion.ll +++ b/test/Transforms/TailCallElim/accum_recursion.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -tailcallelim | llvm-dis | not grep call +; RUN: llvm-upgrade < %s | llvm-as | opt -tailcallelim | llvm-dis | not grep call int %factorial(int %x) { entry: diff --git a/test/Transforms/TailCallElim/accum_recursion_constant_arg.ll b/test/Transforms/TailCallElim/accum_recursion_constant_arg.ll index 6bc6469f34..b103d897ea 100644 --- a/test/Transforms/TailCallElim/accum_recursion_constant_arg.ll +++ b/test/Transforms/TailCallElim/accum_recursion_constant_arg.ll @@ -3,7 +3,7 @@ ; go out to the anonymous users of the demo script for "suggesting" ; optimizations that should be done. :) -; RUN: llvm-as < %s | opt -tailcallelim | llvm-dis | not grep call +; RUN: llvm-upgrade < %s | llvm-as | opt -tailcallelim | llvm-dis | not grep call int %mul(int %x, int %y) { entry: diff --git a/test/Transforms/TailCallElim/ackermann.ll b/test/Transforms/TailCallElim/ackermann.ll index fb71e88dd1..eed684b946 100644 --- a/test/Transforms/TailCallElim/ackermann.ll +++ b/test/Transforms/TailCallElim/ackermann.ll @@ -1,5 +1,5 @@ ; This function contains two tail calls, which should be eliminated -; RUN: llvm-as < %s | opt -tailcallelim -stats -disable-output 2>&1 | grep '2 tailcallelim' +; RUN: llvm-upgrade < %s | llvm-as | opt -tailcallelim -stats -disable-output 2>&1 | grep '2 tailcallelim' int %Ack(int %M.1, int %N.1) { entry: diff --git a/test/Transforms/TailCallElim/dont-tce-tail-marked-call.ll b/test/Transforms/TailCallElim/dont-tce-tail-marked-call.ll index d038d82717..198e5aedb7 100644 --- a/test/Transforms/TailCallElim/dont-tce-tail-marked-call.ll +++ b/test/Transforms/TailCallElim/dont-tce-tail-marked-call.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -tailcallelim | llvm-dis | grep 'call int %foo' +; RUN: llvm-upgrade < %s | llvm-as | opt -tailcallelim | llvm-dis | grep 'call int %foo' declare void %bar(int*) int %foo(uint %N) { diff --git a/test/Transforms/TailCallElim/intervening-inst.ll b/test/Transforms/TailCallElim/intervening-inst.ll index 92873b8a2d..a480e3b4db 100644 --- a/test/Transforms/TailCallElim/intervening-inst.ll +++ b/test/Transforms/TailCallElim/intervening-inst.ll @@ -1,5 +1,5 @@ ; This function contains intervening instructions which should be moved out of the way -; RUN: llvm-as < %s | opt -tailcallelim | llvm-dis | not grep call +; RUN: llvm-upgrade < %s | llvm-as | opt -tailcallelim | llvm-dis | not grep call int %Test(int %X) { entry: diff --git a/test/Transforms/TailCallElim/move_alloca_for_tail_call.ll b/test/Transforms/TailCallElim/move_alloca_for_tail_call.ll index 1428e05270..33b02df46e 100644 --- a/test/Transforms/TailCallElim/move_alloca_for_tail_call.ll +++ b/test/Transforms/TailCallElim/move_alloca_for_tail_call.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -tailcallelim | llvm-dis | %prcontext alloca 1 | grep 'int %foo' +; RUN: llvm-upgrade < %s | llvm-as | opt -tailcallelim | llvm-dis | %prcontext alloca 1 | grep 'int %foo' declare void %bar(int*) int %foo() { diff --git a/test/Transforms/TailCallElim/return-undef.ll b/test/Transforms/TailCallElim/return-undef.ll index 116d451c63..e721447e6f 100644 --- a/test/Transforms/TailCallElim/return-undef.ll +++ b/test/Transforms/TailCallElim/return-undef.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | opt -tailcallelim | llvm-dis | grep sub && -; RUN: llvm-as < %s | opt -tailcallelim | llvm-dis | not grep call +; RUN: llvm-upgrade < %s | llvm-as | opt -tailcallelim | llvm-dis | grep sub && +; RUN: llvm-upgrade < %s | llvm-as | opt -tailcallelim | llvm-dis | not grep call int %test(int %X) { %Y = sub int %X, 1 diff --git a/test/Transforms/TailCallElim/return_constant.ll b/test/Transforms/TailCallElim/return_constant.ll index daa7d3a373..58020248cb 100644 --- a/test/Transforms/TailCallElim/return_constant.ll +++ b/test/Transforms/TailCallElim/return_constant.ll @@ -1,7 +1,7 @@ ; Though this case seems to be fairly unlikely to occur in the wild, someone ; plunked it into the demo script, so maybe they care about it. ; -; RUN: llvm-as < %s | opt -tailcallelim | llvm-dis | not grep call +; RUN: llvm-upgrade < %s | llvm-as | opt -tailcallelim | llvm-dis | not grep call int %aaa(int %c) { entry: diff --git a/test/Transforms/TailCallElim/tail_call_with_branch.ll b/test/Transforms/TailCallElim/tail_call_with_branch.ll index 00d771d252..b373455eab 100644 --- a/test/Transforms/TailCallElim/tail_call_with_branch.ll +++ b/test/Transforms/TailCallElim/tail_call_with_branch.ll @@ -2,7 +2,7 @@ ; instruction into the terminating blocks because there was other code ; optimized out of the function after the taildup happened. ; XFAIL: * -; RUN: llvm-as < %s | opt -tailcallelim | llvm-dis | not grep call +; RUN: llvm-upgrade < %s | llvm-as | opt -tailcallelim | llvm-dis | not grep call int %t4(int %a) { entry: diff --git a/test/Transforms/TailCallElim/trivial_codegen_tailcall.ll b/test/Transforms/TailCallElim/trivial_codegen_tailcall.ll index d27b9dcc04..6fb574e561 100644 --- a/test/Transforms/TailCallElim/trivial_codegen_tailcall.ll +++ b/test/Transforms/TailCallElim/trivial_codegen_tailcall.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -tailcallelim | llvm-dis | grep 'tail call void %foo' +; RUN: llvm-upgrade < %s | llvm-as | opt -tailcallelim | llvm-dis | grep 'tail call void %foo' declare void %foo() diff --git a/test/Transforms/TailDup/2003-06-24-Simpleloop.ll b/test/Transforms/TailDup/2003-06-24-Simpleloop.ll index 3047fe6ddc..e2b979cb00 100644 --- a/test/Transforms/TailDup/2003-06-24-Simpleloop.ll +++ b/test/Transforms/TailDup/2003-06-24-Simpleloop.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -tailduplicate -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -tailduplicate -disable-output void %motion_result7() { entry: diff --git a/test/Transforms/TailDup/2003-07-22-InfiniteLoop.ll b/test/Transforms/TailDup/2003-07-22-InfiniteLoop.ll index c7233395bc..4d650696ba 100644 --- a/test/Transforms/TailDup/2003-07-22-InfiniteLoop.ll +++ b/test/Transforms/TailDup/2003-07-22-InfiniteLoop.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -tailduplicate -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -tailduplicate -disable-output implementation diff --git a/test/Transforms/TailDup/2003-08-23-InvalidatedPointers.ll b/test/Transforms/TailDup/2003-08-23-InvalidatedPointers.ll index 4b98675421..72e03e10c5 100644 --- a/test/Transforms/TailDup/2003-08-23-InvalidatedPointers.ll +++ b/test/Transforms/TailDup/2003-08-23-InvalidatedPointers.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -tailduplicate -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -tailduplicate -disable-output implementation diff --git a/test/Transforms/TailDup/2003-08-31-UnreachableBlocks.ll b/test/Transforms/TailDup/2003-08-31-UnreachableBlocks.ll index fc020cc0f8..416a5df808 100644 --- a/test/Transforms/TailDup/2003-08-31-UnreachableBlocks.ll +++ b/test/Transforms/TailDup/2003-08-31-UnreachableBlocks.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -tailduplicate -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -tailduplicate -disable-output int %foo() { entry: diff --git a/test/Transforms/TailDup/2004-04-01-DemoteRegToStack.llx b/test/Transforms/TailDup/2004-04-01-DemoteRegToStack.llx index 21a3ffa0e6..4ea84909e5 100644 --- a/test/Transforms/TailDup/2004-04-01-DemoteRegToStack.llx +++ b/test/Transforms/TailDup/2004-04-01-DemoteRegToStack.llx @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -tailduplicate -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -tailduplicate -disable-output void %interpret() { entry: diff --git a/test/Transforms/TailDup/MergeTest.ll b/test/Transforms/TailDup/MergeTest.ll index ef6fe0729e..c11d735f1d 100644 --- a/test/Transforms/TailDup/MergeTest.ll +++ b/test/Transforms/TailDup/MergeTest.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -tailduplicate | llvm-dis | grep add | not grep uses=1 +; RUN: llvm-upgrade < %s | llvm-as | opt -tailduplicate | llvm-dis | grep add | not grep uses=1 int %test1(bool %C, int %A, int* %P) { entry: diff --git a/test/Transforms/TailDup/PHIUpdateTest.ll b/test/Transforms/TailDup/PHIUpdateTest.ll index 433b078025..ae591a00be 100644 --- a/test/Transforms/TailDup/PHIUpdateTest.ll +++ b/test/Transforms/TailDup/PHIUpdateTest.ll @@ -1,6 +1,6 @@ ; This test checks to make sure phi nodes are updated properly ; -; RUN: llvm-as < %s | opt -tailduplicate -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -tailduplicate -disable-output diff --git a/test/Transforms/TailDup/basictest.ll b/test/Transforms/TailDup/basictest.ll index f20896d68a..085acf5577 100644 --- a/test/Transforms/TailDup/basictest.ll +++ b/test/Transforms/TailDup/basictest.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -tailduplicate -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -tailduplicate -disable-output declare void %__main() diff --git a/test/Transforms/TailDup/basictest2.ll b/test/Transforms/TailDup/basictest2.ll index 06fa071e76..c67b3d53f0 100644 --- a/test/Transforms/TailDup/basictest2.ll +++ b/test/Transforms/TailDup/basictest2.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -tailduplicate -disable-output +; RUN: llvm-upgrade < %s | llvm-as | opt -tailduplicate -disable-output void %ab() { entry: diff --git a/test/Transforms/TailDup/if-tail-dup.ll b/test/Transforms/TailDup/if-tail-dup.ll index 69205ec1d5..6a02ac51a3 100644 --- a/test/Transforms/TailDup/if-tail-dup.ll +++ b/test/Transforms/TailDup/if-tail-dup.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | opt -tailduplicate | llc -march=x86 | grep 'je ' && -; RUN: llvm-as < %s | opt -tailduplicate | llc -march=x86 | not grep jmp +; RUN: llvm-upgrade < %s | llvm-as | opt -tailduplicate | llc -march=x86 | grep 'je ' && +; RUN: llvm-upgrade < %s | llvm-as | opt -tailduplicate | llc -march=x86 | not grep jmp ; This should have no unconditional jumps in it. The C source is: ;void foo(int c, int* P) { @@ -9,6 +9,7 @@ ; if (c & 8) P[3] = 1; ;} +implementation void %foo(int %c, int* %P) { entry: |