14 files changed, 36 insertions, 36 deletions
diff --git a/test/ExecutionEngine/2003-01-04-PhiTest.ll b/test/ExecutionEngine/2003-01-04-PhiTest.ll
index c8c76ee6e1..45af8300a6 100644
--- a/test/ExecutionEngine/2003-01-04-PhiTest.ll
+++ b/test/ExecutionEngine/2003-01-04-PhiTest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as -f %s -o %t.bc
+; RUN: llvm-upgrade < %s | llvm-as -f -o %t.bc
 ; RUN: lli %t.bc > /dev/null
 
 int %main() {
diff --git a/test/ExecutionEngine/2003-05-11-PHIRegAllocBug.ll b/test/ExecutionEngine/2003-05-11-PHIRegAllocBug.ll
index 6b1b0abcba..1d9ba77145 100644
--- a/test/ExecutionEngine/2003-05-11-PHIRegAllocBug.ll
+++ b/test/ExecutionEngine/2003-05-11-PHIRegAllocBug.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as -f %s -o %t.bc
+; RUN: llvm-upgrade < %s | llvm-as -f -o %t.bc
 ; RUN: lli %t.bc > /dev/null
 
 target endian = little
diff --git a/test/ExecutionEngine/2003-06-05-PHIBug.ll b/test/ExecutionEngine/2003-06-05-PHIBug.ll
index 6e4e5e1bac..8c1aaba27d 100644
--- a/test/ExecutionEngine/2003-06-05-PHIBug.ll
+++ b/test/ExecutionEngine/2003-06-05-PHIBug.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as -f %s -o %t.bc
+; RUN: llvm-upgrade < %s | llvm-as -f -o %t.bc
 ; RUN: lli %t.bc > /dev/null
 
 ; Testcase distilled from 256.bzip2.
diff --git a/test/ExecutionEngine/2003-08-15-AllocaAssertion.ll b/test/ExecutionEngine/2003-08-15-AllocaAssertion.ll
index 80b51532d8..adc82206b2 100644
--- a/test/ExecutionEngine/2003-08-15-AllocaAssertion.ll
+++ b/test/ExecutionEngine/2003-08-15-AllocaAssertion.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as -f %s -o %t.bc
+; RUN: llvm-upgrade < %s | llvm-as -f -o %t.bc
 ; RUN: lli %t.bc > /dev/null
 
 ; This testcase failed to work because two variable sized allocas confused the
diff --git a/test/ExecutionEngine/2003-08-23-RegisterAllocatePhysReg.ll b/test/ExecutionEngine/2003-08-23-RegisterAllocatePhysReg.ll
index 1a7e05e213..4d1d0452db 100644
--- a/test/ExecutionEngine/2003-08-23-RegisterAllocatePhysReg.ll
+++ b/test/ExecutionEngine/2003-08-23-RegisterAllocatePhysReg.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as -f %s -o %t.bc
+; RUN: llvm-upgrade < %s | llvm-as -f -o %t.bc
 ; RUN: lli %t.bc > /dev/null
 
 ; This testcase exposes a bug in the local register allocator where it runs out
diff --git a/test/ExecutionEngine/hello.ll b/test/ExecutionEngine/hello.ll
index 0f62dcbb48..ea2f9a4cce 100644
--- a/test/ExecutionEngine/hello.ll
+++ b/test/ExecutionEngine/hello.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as -f %s -o %t.bc
+; RUN: llvm-upgrade < %s | llvm-as -f -o %t.bc
 ; RUN: lli %t.bc > /dev/null
 
 %.LC0 = internal global [12 x sbyte] c"Hello World\00"
diff --git a/test/ExecutionEngine/hello2.ll b/test/ExecutionEngine/hello2.ll
index 92aa5f1918..b186c52e2b 100644
--- a/test/ExecutionEngine/hello2.ll
+++ b/test/ExecutionEngine/hello2.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as -f %s -o %t.bc
+; RUN: llvm-upgrade < %s | llvm-as -f -o %t.bc
 ; RUN: lli %t.bc > /dev/null
 
 
diff --git a/test/ExecutionEngine/simplesttest.ll b/test/ExecutionEngine/simplesttest.ll
index 207229f599..1f578d29f2 100644
--- a/test/ExecutionEngine/simplesttest.ll
+++ b/test/ExecutionEngine/simplesttest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as -f %s -o %t.bc
+; RUN: llvm-upgrade < %s | llvm-as -f -o %t.bc
 ; RUN: lli %t.bc > /dev/null
 
 
diff --git a/test/ExecutionEngine/simpletest.ll b/test/ExecutionEngine/simpletest.ll
index 47a5c64038..68b7044627 100644
--- a/test/ExecutionEngine/simpletest.ll
+++ b/test/ExecutionEngine/simpletest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as -f %s -o %t.bc
+; RUN: llvm-upgrade < %s | llvm-as -f -o %t.bc
 ; RUN: lli %t.bc > /dev/null
 
 implementation
diff --git a/test/ExecutionEngine/test-loadstore.ll b/test/ExecutionEngine/test-loadstore.ll
index ac558b0185..8a4b7933d1 100644
--- a/test/ExecutionEngine/test-loadstore.ll
+++ b/test/ExecutionEngine/test-loadstore.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as -f %s -o %t.bc
+; RUN: llvm-upgrade < %s | llvm-as -f -o %t.bc
 ; RUN: lli %t.bc > /dev/null
 
 
diff --git a/test/ExecutionEngine/test-logical.ll b/test/ExecutionEngine/test-logical.ll
index bad6a9ab85..86af2e224f 100644
--- a/test/ExecutionEngine/test-logical.ll
+++ b/test/ExecutionEngine/test-logical.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as -f %s -o %t.bc
+; RUN: llvm-upgrade < %s | llvm-as -f -o %t.bc
 ; RUN: lli %t.bc > /dev/null
 
 
diff --git a/test/ExecutionEngine/test-malloc.ll b/test/ExecutionEngine/test-malloc.ll
index 69c412abdc..7a7f245bf5 100644
--- a/test/ExecutionEngine/test-malloc.ll
+++ b/test/ExecutionEngine/test-malloc.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as -f %s -o %t.bc
+; RUN: llvm-upgrade < %s | llvm-as -f -o %t.bc
 ; RUN: lli %t.bc > /dev/null
 
 
diff --git a/test/ExecutionEngine/test-ret.ll b/test/ExecutionEngine/test-ret.ll
index 6fbaf717d7..e20691277f 100644
--- a/test/ExecutionEngine/test-ret.ll
+++ b/test/ExecutionEngine/test-ret.ll
@@ -1,16 +1,16 @@
-; RUN: llvm-as -f %s -o %t.bc
+; RUN: llvm-upgrade < %s | llvm-as -f -o %t.bc
 ; RUN: lli %t.bc > /dev/null
 
 ; test return instructions
 
-void %test() { ret void }
-sbyte %test() { ret sbyte 1 }
-ubyte %test() { ret ubyte 1 }
-short %test() { ret short -1 }
-ushort %test() { ret ushort 65535 }
+void %test1() { ret void }
+sbyte %test2() { ret sbyte 1 }
+ubyte %test3() { ret ubyte 1 }
+short %test4() { ret short -1 }
+ushort %test5() { ret ushort 65535 }
 int  %main() { ret int 0 }
-uint %test() { ret uint 4 }
-long %test() { ret long 0 }
-ulong %test() { ret ulong 0 }
-float %test() { ret float 1.0 }
-double %test() { ret double 2.0 }
+uint %test6() { ret uint 4 }
+long %test7() { ret long 0 }
+ulong %test8() { ret ulong 0 }
+float %test9() { ret float 1.0 }
+double %test10() { ret double 2.0 }
diff --git a/test/ExecutionEngine/test-shift.ll b/test/ExecutionEngine/test-shift.ll
index 22e4678879..2549f346f2 100644
--- a/test/ExecutionEngine/test-shift.ll
+++ b/test/ExecutionEngine/test-shift.ll
@@ -6,35 +6,35 @@ int %main() {
     %shamt = add ubyte 0, 1
 
     ; Left shifts...
-    %t1 = shl int 1, ubyte %shamt
-    %t2 = shl int 1, ubyte 4
+    %t1.s = shl int 1, ubyte %shamt
+    %t2.s = shl int 1, ubyte 4
 
     %t1 = shl uint 1, ubyte %shamt
     %t2 = shl uint 1, ubyte 5
 
     ;%t1 = shl long 1, ubyte %shamt
-    %t2 = shl long 1, ubyte 4
+    %t2.s = shl long 1, ubyte 4
 
     ;%t1 = shl ulong 1, ubyte %shamt
     %t2 = shl ulong 1, ubyte 5
 
     ; Right shifts...
-    %tr1 = shr int 1, ubyte %shamt
-    %tr2 = shr int 1, ubyte 4
+    %tr1.s = shr int 1, ubyte %shamt
+    %tr2.s = shr int 1, ubyte 4
 
     %tr1 = shr uint 1, ubyte %shamt
     %tr2 = shr uint 1, ubyte 5
 
     ;%tr1 = shr long 1, ubyte %shamt
-    %tr1 = shr long 1, ubyte 4
-    %tr2 = shr long 1, ubyte %shamt
-    %tr3 = shl long 1, ubyte 4
-    %tr4 = shl long 1, ubyte %shamt
+    %tr1.l = shr long 1, ubyte 4
+    %tr2.l = shr long 1, ubyte %shamt
+    %tr3.l = shl long 1, ubyte 4
+    %tr4.l = shl long 1, ubyte %shamt
 
     ;%t1 = shr ulong 1, ubyte %shamt
-    %tr1 = shr ulong 1, ubyte 5
-    %tr2 = shr ulong 1, ubyte %shamt
-    %tr3 = shl ulong 1, ubyte 5
-    %tr4 = shl ulong 1, ubyte %shamt
+    %tr1.u = shr ulong 1, ubyte 5
+    %tr2.u = shr ulong 1, ubyte %shamt
+    %tr3.u = shl ulong 1, ubyte 5
+    %tr4.u = shl ulong 1, ubyte %shamt
     ret int 0
 }