Use the llvm-upgrade program to upgrade llvm assembly.

llvm-svn: 32115

65 files changed, 73 insertions, 73 deletions

diff --git a/llvm/test/Regression/CodeGen/Generic/2004-02-08-UnwindSupport.llx b/llvm/test/Regression/CodeGen/Generic/2004-02-08-UnwindSupport.llx
index 2b952f9fbf3..6e57fbc2095 100644
--- a/llvm/test/Regression/CodeGen/Generic/2004-02-08-UnwindSupport.llx
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/2004-05-09-LiveVarPartialRegister.llx b/llvm/test/Regression/CodeGen/Generic/2004-05-09-LiveVarPartialRegister.llx
index a98ae856e9b..82d33a0db59 100644
--- a/llvm/test/Regression/CodeGen/Generic/2004-05-09-LiveVarPartialRegister.llx
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/2005-01-18-SetUO-InfLoop.ll b/llvm/test/Regression/CodeGen/Generic/2005-01-18-SetUO-InfLoop.ll
index 072841d948f..e47aa18f414 100644
--- a/llvm/test/Regression/CodeGen/Generic/2005-01-18-SetUO-InfLoop.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/2005-04-09-GlobalInPHI.ll b/llvm/test/Regression/CodeGen/Generic/2005-04-09-GlobalInPHI.ll
index ad379dac592..54f9883ae91 100644
--- a/llvm/test/Regression/CodeGen/Generic/2005-04-09-GlobalInPHI.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/2005-07-12-memcpy-i64-length.ll b/llvm/test/Regression/CodeGen/Generic/2005-07-12-memcpy-i64-length.ll
index c6eea6a1bf5..96b9435e7f4 100644
--- a/llvm/test/Regression/CodeGen/Generic/2005-07-12-memcpy-i64-length.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/2005-10-18-ZeroSizeStackObject.ll b/llvm/test/Regression/CodeGen/Generic/2005-10-18-ZeroSizeStackObject.ll
index 59b31d95b14..e7cce1f4ef7 100644
--- a/llvm/test/Regression/CodeGen/Generic/2005-10-18-ZeroSizeStackObject.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/2005-10-21-longlonggtu.ll b/llvm/test/Regression/CodeGen/Generic/2005-10-21-longlonggtu.ll
index 7d12d78cf25..602321398af 100644
--- a/llvm/test/Regression/CodeGen/Generic/2005-10-21-longlonggtu.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/2005-12-01-Crash.ll b/llvm/test/Regression/CodeGen/Generic/2005-12-01-Crash.ll
index a3238da0018..a9d8deb6d67 100644
--- a/llvm/test/Regression/CodeGen/Generic/2005-12-01-Crash.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/2005-12-12-ExpandSextInreg.ll b/llvm/test/Regression/CodeGen/Generic/2005-12-12-ExpandSextInreg.ll
index 20ef2d9f063..ef1359ee7cd 100644
--- a/llvm/test/Regression/CodeGen/Generic/2005-12-12-ExpandSextInreg.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/2006-01-12-BadSetCCFold.ll b/llvm/test/Regression/CodeGen/Generic/2006-01-12-BadSetCCFold.ll
index fb5092a5881..192274a8454 100644
--- a/llvm/test/Regression/CodeGen/Generic/2006-01-12-BadSetCCFold.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/2006-01-18-InvalidBranchOpcodeAssert.ll b/llvm/test/Regression/CodeGen/Generic/2006-01-18-InvalidBranchOpcodeAssert.ll
index 5f5aed43e37..73fd6582a29 100644
--- a/llvm/test/Regression/CodeGen/Generic/2006-01-18-InvalidBranchOpcodeAssert.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/2006-02-12-InsertLibcall.ll b/llvm/test/Regression/CodeGen/Generic/2006-02-12-InsertLibcall.ll
index 5a48570d323..d18ce14c63b 100644
--- a/llvm/test/Regression/CodeGen/Generic/2006-02-12-InsertLibcall.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/2006-03-01-dagcombineinfloop.ll b/llvm/test/Regression/CodeGen/Generic/2006-03-01-dagcombineinfloop.ll
index 27b00d5f9f4..797af74c20b 100644
--- a/llvm/test/Regression/CodeGen/Generic/2006-03-01-dagcombineinfloop.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/2006-03-27-DebugInfoNULLDeclare.ll b/llvm/test/Regression/CodeGen/Generic/2006-03-27-DebugInfoNULLDeclare.ll
index e778a6f1091..4e262f85a3d 100644
--- a/llvm/test/Regression/CodeGen/Generic/2006-03-27-DebugInfoNULLDeclare.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/2006-04-11-vecload.ll b/llvm/test/Regression/CodeGen/Generic/2006-04-11-vecload.ll
index 9df1c0a2905..056edac0080 100644
--- a/llvm/test/Regression/CodeGen/Generic/2006-04-11-vecload.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/2006-04-26-SetCCAnd.ll b/llvm/test/Regression/CodeGen/Generic/2006-04-26-SetCCAnd.ll
index d827a0cc14b..2a424be94ec 100644
--- a/llvm/test/Regression/CodeGen/Generic/2006-04-26-SetCCAnd.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/2006-04-28-Sign-extend-bool.ll b/llvm/test/Regression/CodeGen/Generic/2006-04-28-Sign-extend-bool.ll
index 719c66d552e..068d6807b81 100644
--- a/llvm/test/Regression/CodeGen/Generic/2006-04-28-Sign-extend-bool.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/2006-05-06-GEP-Cast-Sink-Crash.ll b/llvm/test/Regression/CodeGen/Generic/2006-05-06-GEP-Cast-Sink-Crash.ll
index cbe77a2e7cf..ac7e19d381e 100644
--- a/llvm/test/Regression/CodeGen/Generic/2006-05-06-GEP-Cast-Sink-Crash.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/2006-06-12-LowerSwitchCrash.ll b/llvm/test/Regression/CodeGen/Generic/2006-06-12-LowerSwitchCrash.ll
index c7cd33fe7a7..0cf2e9359d1 100644
--- a/llvm/test/Regression/CodeGen/Generic/2006-06-12-LowerSwitchCrash.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/2006-06-13-ComputeMaskedBitsCrash.ll b/llvm/test/Regression/CodeGen/Generic/2006-06-13-ComputeMaskedBitsCrash.ll
index 5c5a1dc4e29..a910b58ac89 100644
--- a/llvm/test/Regression/CodeGen/Generic/2006-06-13-ComputeMaskedBitsCrash.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/2006-06-28-SimplifySetCCCrash.ll b/llvm/test/Regression/CodeGen/Generic/2006-06-28-SimplifySetCCCrash.ll
index 0c2acc86ced..f5d0fb35c47 100644
--- a/llvm/test/Regression/CodeGen/Generic/2006-06-28-SimplifySetCCCrash.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/2006-08-30-CoallescerCrash.ll b/llvm/test/Regression/CodeGen/Generic/2006-08-30-CoallescerCrash.ll
index ea50cec3187..68aadc57104 100644
--- a/llvm/test/Regression/CodeGen/Generic/2006-08-30-CoallescerCrash.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/2006-09-02-LocalAllocCrash.ll b/llvm/test/Regression/CodeGen/Generic/2006-09-02-LocalAllocCrash.ll
index 3231a3cec29..e2f07e8ae2c 100644
--- a/llvm/test/Regression/CodeGen/Generic/2006-09-02-LocalAllocCrash.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/2006-09-06-SwitchLowering.ll b/llvm/test/Regression/CodeGen/Generic/2006-09-06-SwitchLowering.ll
index 29b81bb70a7..2b129261740 100644
--- a/llvm/test/Regression/CodeGen/Generic/2006-09-06-SwitchLowering.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/2006-10-27-CondFolding.ll b/llvm/test/Regression/CodeGen/Generic/2006-10-27-CondFolding.ll
index 6ebe9fbcf5d..8bf3c11e260 100644
--- a/llvm/test/Regression/CodeGen/Generic/2006-10-27-CondFolding.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/2006-10-29-Crash.ll b/llvm/test/Regression/CodeGen/Generic/2006-10-29-Crash.ll
index 0296cb07bdd..8857c930dd3 100644
--- a/llvm/test/Regression/CodeGen/Generic/2006-10-29-Crash.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/2006-11-06-MemIntrinsicExpand.ll b/llvm/test/Regression/CodeGen/Generic/2006-11-06-MemIntrinsicExpand.ll
index b329520614f..d7ef1db6353 100644
--- a/llvm/test/Regression/CodeGen/Generic/2006-11-06-MemIntrinsicExpand.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/2006-11-10-DAGCombineMiscompile.ll b/llvm/test/Regression/CodeGen/Generic/2006-11-10-DAGCombineMiscompile.ll
index 972418c0376..a5476eb3b50 100644
--- a/llvm/test/Regression/CodeGen/Generic/2006-11-10-DAGCombineMiscompile.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/2006-11-20-DAGCombineCrash.ll b/llvm/test/Regression/CodeGen/Generic/2006-11-20-DAGCombineCrash.ll
index 93b58575dc2..6a76079e253 100644
--- a/llvm/test/Regression/CodeGen/Generic/2006-11-20-DAGCombineCrash.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/BasicInstrs.llx b/llvm/test/Regression/CodeGen/Generic/BasicInstrs.llx
index 2d969345fe2..82606094c37 100644
--- a/llvm/test/Regression/CodeGen/Generic/BasicInstrs.llx
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/ConstantExprLowering.llx b/llvm/test/Regression/CodeGen/Generic/ConstantExprLowering.llx
index 20c3ef6f81a..afb6530bab9 100644
--- a/llvm/test/Regression/CodeGen/Generic/ConstantExprLowering.llx
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/DebugStuff.ll b/llvm/test/Regression/CodeGen/Generic/DebugStuff.ll
index 76d354be0c3..fd60d0b6041 100644
--- a/llvm/test/Regression/CodeGen/Generic/DebugStuff.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/GC/alloc_loop.ll b/llvm/test/Regression/CodeGen/Generic/GC/alloc_loop.ll
index 33114701089..11294e1eb2a 100644
--- a/llvm/test/Regression/CodeGen/Generic/GC/alloc_loop.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/SwitchLowering.ll b/llvm/test/Regression/CodeGen/Generic/SwitchLowering.ll
index 136bdb494b6..37bfffaa026 100644
--- a/llvm/test/Regression/CodeGen/Generic/SwitchLowering.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/bool-to-double.ll b/llvm/test/Regression/CodeGen/Generic/bool-to-double.ll
index b2396ea04cd..ad9bc8e86fc 100644
--- a/llvm/test/Regression/CodeGen/Generic/bool-to-double.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/call-ret0.ll b/llvm/test/Regression/CodeGen/Generic/call-ret0.ll
index 79edc1e6459..44c30d3f6fd 100644
--- a/llvm/test/Regression/CodeGen/Generic/call-ret0.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/call-ret42.ll b/llvm/test/Regression/CodeGen/Generic/call-ret42.ll
index 2e8ed381a0c..b0a480f0450 100644
--- a/llvm/test/Regression/CodeGen/Generic/call-ret42.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/call-void.ll b/llvm/test/Regression/CodeGen/Generic/call-void.ll
index 1263b989765..64e6336b16f 100644
--- a/llvm/test/Regression/CodeGen/Generic/call-void.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/call2-ret0.ll b/llvm/test/Regression/CodeGen/Generic/call2-ret0.ll
index a0bde8de2b4..55be5c68b65 100644
--- a/llvm/test/Regression/CodeGen/Generic/call2-ret0.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/cast-fp.ll b/llvm/test/Regression/CodeGen/Generic/cast-fp.ll
index 1b80385cd4d..8359329035c 100644
--- a/llvm/test/Regression/CodeGen/Generic/cast-fp.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/debug-info.ll b/llvm/test/Regression/CodeGen/Generic/debug-info.ll
index 0c69ea0eb6e..cd5c3557f78 100644
--- a/llvm/test/Regression/CodeGen/Generic/debug-info.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/div-neg-power-2.ll b/llvm/test/Regression/CodeGen/Generic/div-neg-power-2.ll
index 76d6182931c..7452c7e3aa0 100644
--- a/llvm/test/Regression/CodeGen/Generic/div-neg-power-2.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/fneg-fabs.ll b/llvm/test/Regression/CodeGen/Generic/fneg-fabs.ll
index a533fe55996..3dc4588eeab 100644
--- a/llvm/test/Regression/CodeGen/Generic/fneg-fabs.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/fp_to_int.ll b/llvm/test/Regression/CodeGen/Generic/fp_to_int.ll
index 7b9c0e985bb..a99c5b5e8dd 100644
--- a/llvm/test/Regression/CodeGen/Generic/fp_to_int.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/global-ret0.ll b/llvm/test/Regression/CodeGen/Generic/global-ret0.ll
index 993049dfb99..dfe6aef67d3 100644
--- a/llvm/test/Regression/CodeGen/Generic/global-ret0.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/hello.ll b/llvm/test/Regression/CodeGen/Generic/hello.ll
index e68d5885190..d9e9d587ce6 100644
--- a/llvm/test/Regression/CodeGen/Generic/hello.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/intrinsics.ll b/llvm/test/Regression/CodeGen/Generic/intrinsics.ll
index f8a64f7cba6..7c1d1a52bc9 100644
--- a/llvm/test/Regression/CodeGen/Generic/intrinsics.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/isunord.ll b/llvm/test/Regression/CodeGen/Generic/isunord.ll
index 21205c181d6..f11ec337366 100644
--- a/llvm/test/Regression/CodeGen/Generic/isunord.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/llvm-ct-intrinsics.ll b/llvm/test/Regression/CodeGen/Generic/llvm-ct-intrinsics.ll
index 2095ca3584f..1897abee570 100644
--- a/llvm/test/Regression/CodeGen/Generic/llvm-ct-intrinsics.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/nested-select.ll b/llvm/test/Regression/CodeGen/Generic/nested-select.ll
index c2dd580a44e..18798d1d276 100644
--- a/llvm/test/Regression/CodeGen/Generic/nested-select.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/print-add.ll b/llvm/test/Regression/CodeGen/Generic/print-add.ll
index 6e5c3c48fa4..ef224a14036 100644
--- a/llvm/test/Regression/CodeGen/Generic/print-add.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/print-arith-fp.ll b/llvm/test/Regression/CodeGen/Generic/print-arith-fp.ll
index 446dbea3fd8..cfa75839817 100644
--- a/llvm/test/Regression/CodeGen/Generic/print-arith-fp.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/print-arith-int.ll b/llvm/test/Regression/CodeGen/Generic/print-arith-int.ll
index b67850388c5..708abec5f2e 100644
--- a/llvm/test/Regression/CodeGen/Generic/print-arith-int.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/print-int.ll b/llvm/test/Regression/CodeGen/Generic/print-int.ll
index cd3e2b276da..27cf637e10b 100644
--- a/llvm/test/Regression/CodeGen/Generic/print-int.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/print-mul-exp.ll b/llvm/test/Regression/CodeGen/Generic/print-mul-exp.ll
index 0a8fd782b75..d5f5f935573 100644
--- a/llvm/test/Regression/CodeGen/Generic/print-mul-exp.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/print-mul.ll b/llvm/test/Regression/CodeGen/Generic/print-mul.ll
index 80d2d5140d5..911c73e9935 100644
--- a/llvm/test/Regression/CodeGen/Generic/print-mul.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/print-shift.ll b/llvm/test/Regression/CodeGen/Generic/print-shift.ll
index 8ce3bac1590..4f699d5c18e 100644
--- a/llvm/test/Regression/CodeGen/Generic/print-shift.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/ret0.ll b/llvm/test/Regression/CodeGen/Generic/ret0.ll
index 439a2f3284b..4d0d10b0e09 100644
--- a/llvm/test/Regression/CodeGen/Generic/ret0.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/ret42.ll b/llvm/test/Regression/CodeGen/Generic/ret42.ll
index ac14231b8b8..88d3c986e27 100644
--- a/llvm/test/Regression/CodeGen/Generic/ret42.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/shift-int64.ll b/llvm/test/Regression/CodeGen/Generic/shift-int64.ll
index 50299af0713..a5ab37d725f 100644
--- a/llvm/test/Regression/CodeGen/Generic/shift-int64.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/stacksave-restore.ll b/llvm/test/Regression/CodeGen/Generic/stacksave-restore.ll
index 8ef0dac46d7..65cf6c1e617 100644
--- a/llvm/test/Regression/CodeGen/Generic/stacksave-restore.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/switch-crit-edge-constant.ll b/llvm/test/Regression/CodeGen/Generic/switch-crit-edge-constant.ll
index 460354e9b93..12c15159af1 100644
--- a/llvm/test/Regression/CodeGen/Generic/switch-crit-edge-constant.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/vector-constantexpr.ll b/llvm/test/Regression/CodeGen/Generic/vector-constantexpr.ll
index eb49dbfbd73..31b60a4d687 100644
--- a/llvm/test/Regression/CodeGen/Generic/vector-constantexpr.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/vector-identity-shuffle.ll b/llvm/test/Regression/CodeGen/Generic/vector-identity-shuffle.ll
index 7ee5fd6d2b0..1cdf580cfb1 100644
--- a/llvm/test/Regression/CodeGen/Generic/vector-identity-shuffle.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/CodeGen/Generic/vector.ll b/llvm/test/Regression/CodeGen/Generic/vector.ll
index 34a3b2444b8..207c51dc431 100644
--- a/llvm/test/Regression/CodeGen/Generic/vector.ll
+++ b/llvm/test/Regression/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>