Remove llvm-upgrade.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@47238 91177308-0d34-0410-b5e6-96231b3b80d8

50 files changed, 906 insertions, 906 deletions

diff --git a/test/CodeGen/ARM/2006-11-10-CycleInDAG.ll b/test/CodeGen/ARM/2006-11-10-CycleInDAG.ll
index 49ebead110..caa9a981fc 100644
--- a/test/CodeGen/ARM/2006-11-10-CycleInDAG.ll
+++ b/test/CodeGen/ARM/2006-11-10-CycleInDAG.ll
@@ -1,20 +1,20 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+v6
+; RUN: llvm-as < %s | llc -march=arm -mattr=+v6
 
-	%struct.layer_data = type { int, [2048 x ubyte], ubyte*, [16 x ubyte], uint, ubyte*, int, int, [64 x int], [64 x int], [64 x int], [64 x int], int, int, int, int, int, int, int, int, int, int, int, int, [12 x [64 x short]] }
-%ld = external global %struct.layer_data*
+%struct.layer_data = type { i32, [2048 x i8], i8*, [16 x i8], i32, i8*, i32, i32, [64 x i32], [64 x i32], [64 x i32], [64 x i32], i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, [12 x [64 x i16]] }
+@ld = external global %struct.layer_data*               ; <%struct.layer_data**> [#uses=1]
 
-void %main() {
+define void @main() {
 entry:
-	br bool false, label %bb169.i, label %cond_true11
+        br i1 false, label %bb169.i, label %cond_true11
 
-bb169.i:
+bb169.i:                ; preds = %entry
         ret void
 
-cond_true11:
-	%tmp.i32 = load %struct.layer_data** %ld
-	%tmp3.i35 = getelementptr %struct.layer_data* %tmp.i32, int 0, uint 1, int 2048
-	%tmp.i36 = getelementptr %struct.layer_data* %tmp.i32, int 0, uint 2
-	store ubyte* %tmp3.i35, ubyte** %tmp.i36
-	store ubyte* %tmp3.i35, ubyte** null
-	ret void
+cond_true11:            ; preds = %entry
+        %tmp.i32 = load %struct.layer_data** @ld                ; <%struct.layer_data*> [#uses=2]
+        %tmp3.i35 = getelementptr %struct.layer_data* %tmp.i32, i32 0, i32 1, i32 2048; <i8*> [#uses=2]
+        %tmp.i36 = getelementptr %struct.layer_data* %tmp.i32, i32 0, i32 2          ; <i8**> [#uses=1]
+        store i8* %tmp3.i35, i8** %tmp.i36
+        store i8* %tmp3.i35, i8** null
+        ret void
 }
diff --git a/test/CodeGen/ARM/align.ll b/test/CodeGen/ARM/align.ll
index 263f6ab89d..bb336ceebb 100644
--- a/test/CodeGen/ARM/align.ll
+++ b/test/CodeGen/ARM/align.ll
@@ -1,16 +1,15 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
-; RUN:   grep align.*1 | count 1
-; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=arm-linux-gnueabi | \
+; RUN: llvm-as < %s | llc -march=arm | grep align.*1 | count 1
+; RUN: llvm-as < %s | llc -mtriple=arm-linux-gnueabi | \
 ; RUN:   grep align.*2 | count 2
-; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=arm-linux-gnueabi | \
+; RUN: llvm-as < %s | llc -mtriple=arm-linux-gnueabi | \
 ; RUN:   grep align.*3 | count 2
-; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=arm-apple-darwin | \
+; RUN: llvm-as < %s | llc -mtriple=arm-apple-darwin | \
 ; RUN:   grep align.*2 | count 4
 
-%a = global bool true
-%b = global sbyte 1
-%c = global short 2
-%d = global int 3
-%e = global long 4
-%f = global float 5.0
-%g = global double 6.0
+@a = global i1 true
+@b = global i8 1
+@c = global i16 2
+@d = global i32 3
+@e = global i64 4
+@f = global float 5.0
+@g = global double 6.0
diff --git a/test/CodeGen/ARM/alloca.ll b/test/CodeGen/ARM/alloca.ll
index b98a674ce2..f7e450f593 100644
--- a/test/CodeGen/ARM/alloca.ll
+++ b/test/CodeGen/ARM/alloca.ll
@@ -1,13 +1,13 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mtriple=arm-linux-gnu | \
+; RUN: llvm-as < %s | llc -march=arm -mtriple=arm-linux-gnu | \
 ; RUN:   grep {mov r11, sp}
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mtriple=arm-linux-gnu | \
+; RUN: llvm-as < %s | llc -march=arm -mtriple=arm-linux-gnu | \
 ; RUN:   grep {mov sp, r11}
 
-void %f(uint %a) {
+define void @f(i32 %a) {
 entry:
-	%tmp = alloca sbyte, uint %a
-	call void %g( sbyte* %tmp, uint %a, uint 1, uint 2, uint 3 )
-	ret void
+        %tmp = alloca i8, i32 %a                ; <i8*> [#uses=1]
+        call void @g( i8* %tmp, i32 %a, i32 1, i32 2, i32 3 )
+        ret void
 }
 
-declare void %g(sbyte*, uint, uint, uint, uint)
+declare void @g(i8*, i32, i32, i32, i32)
diff --git a/test/CodeGen/ARM/argaddr.ll b/test/CodeGen/ARM/argaddr.ll
index a1317213fc..080827d7f4 100644
--- a/test/CodeGen/ARM/argaddr.ll
+++ b/test/CodeGen/ARM/argaddr.ll
@@ -1,18 +1,19 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm
-void %f(int %a, int %b, int %c, int %d, int %e) {
+; RUN: llvm-as < %s | llc -march=arm
+
+define void @f(i32 %a, i32 %b, i32 %c, i32 %d, i32 %e) {
 entry:
-	%a_addr = alloca int		; <int*> [#uses=2]
-	%b_addr = alloca int		; <int*> [#uses=2]
-	%c_addr = alloca int		; <int*> [#uses=2]
-	%d_addr = alloca int		; <int*> [#uses=2]
-	%e_addr = alloca int		; <int*> [#uses=2]
-	store int %a, int* %a_addr
-	store int %b, int* %b_addr
-	store int %c, int* %c_addr
-	store int %d, int* %d_addr
-	store int %e, int* %e_addr
-	call void %g( int* %a_addr, int* %b_addr, int* %c_addr, int* %d_addr, int* %e_addr )
-	ret void
+        %a_addr = alloca i32            ; <i32*> [#uses=2]
+        %b_addr = alloca i32            ; <i32*> [#uses=2]
+        %c_addr = alloca i32            ; <i32*> [#uses=2]
+        %d_addr = alloca i32            ; <i32*> [#uses=2]
+        %e_addr = alloca i32            ; <i32*> [#uses=2]
+        store i32 %a, i32* %a_addr
+        store i32 %b, i32* %b_addr
+        store i32 %c, i32* %c_addr
+        store i32 %d, i32* %d_addr
+        store i32 %e, i32* %e_addr
+        call void @g( i32* %a_addr, i32* %b_addr, i32* %c_addr, i32* %d_addr, i32* %e_addr )
+        ret void
 }
 
-declare void %g(int*, int*, int*, int*, int*)
+declare void @g(i32*, i32*, i32*, i32*, i32*)
diff --git a/test/CodeGen/ARM/arm-asm.ll b/test/CodeGen/ARM/arm-asm.ll
index 6b8ce9a9fa..b260b1312d 100644
--- a/test/CodeGen/ARM/arm-asm.ll
+++ b/test/CodeGen/ARM/arm-asm.ll
@@ -1,7 +1,7 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm
+; RUN: llvm-as < %s | llc -march=arm
 
-void %frame_dummy() {
+define void @frame_dummy() {
 entry:
-	%tmp1 = tail call void (sbyte*)* (void (sbyte*)*)* asm "", "=r,0,~{dirflag},~{fpsr},~{flags}"( void (sbyte*)* null )
-	ret void
+        %tmp1 = tail call void (i8*)* (void (i8*)*)* asm "", "=r,0,~{dirflag},~{fpsr},~{flags}"( void (i8*)* null )           ; <void (i8*)*> [#uses=0]
+        ret void
 }
diff --git a/test/CodeGen/ARM/branch.ll b/test/CodeGen/ARM/branch.ll
index 591beb2e30..7f6b18333b 100644
--- a/test/CodeGen/ARM/branch.ll
+++ b/test/CodeGen/ARM/branch.ll
@@ -1,57 +1,57 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -disable-arm-if-conversion > %t 
+; RUN: llvm-as < %s | llc -march=arm -disable-arm-if-conversion > %t 
 ; RUN: grep bne %t
 ; RUN: grep bge %t
 ; RUN: grep bhs %t
 ; RUN: grep blo %t
 
-void %f1(int %a, int %b, int* %v) {
+define void @f1(i32 %a, i32 %b, i32* %v) {
 entry:
-	%tmp = seteq int %a, %b		; <bool> [#uses=1]
-	br bool %tmp, label %cond_true, label %return
+        %tmp = icmp eq i32 %a, %b               ; <i1> [#uses=1]
+        br i1 %tmp, label %cond_true, label %return
 
-cond_true:		; preds = %entry
-	store int 0, int* %v
-	ret void
+cond_true:              ; preds = %entry
+        store i32 0, i32* %v
+        ret void
 
-return:		; preds = %entry
-	ret void
+return:         ; preds = %entry
+        ret void
 }
 
-void %f2(int %a, int %b, int* %v) {
+define void @f2(i32 %a, i32 %b, i32* %v) {
 entry:
-	%tmp = setlt int %a, %b		; <bool> [#uses=1]
-	br bool %tmp, label %cond_true, label %return
+        %tmp = icmp slt i32 %a, %b              ; <i1> [#uses=1]
+        br i1 %tmp, label %cond_true, label %return
 
-cond_true:		; preds = %entry
-	store int 0, int* %v
-	ret void
+cond_true:              ; preds = %entry
+        store i32 0, i32* %v
+        ret void
 
-return:		; preds = %entry
-	ret void
+return:         ; preds = %entry
+        ret void
 }
 
-void %f3(uint %a, uint %b, int* %v) {
+define void @f3(i32 %a, i32 %b, i32* %v) {
 entry:
-	%tmp = setlt uint %a, %b		; <bool> [#uses=1]
-	br bool %tmp, label %cond_true, label %return
+        %tmp = icmp ult i32 %a, %b              ; <i1> [#uses=1]
+        br i1 %tmp, label %cond_true, label %return
 
-cond_true:		; preds = %entry
-	store int 0, int* %v
-	ret void
+cond_true:              ; preds = %entry
+        store i32 0, i32* %v
+        ret void
 
-return:		; preds = %entry
-	ret void
+return:         ; preds = %entry
+        ret void
 }
 
-void %f4(uint %a, uint %b, int* %v) {
+define void @f4(i32 %a, i32 %b, i32* %v) {
 entry:
-	%tmp = setlt uint %a, %b		; <bool> [#uses=1]
-	br bool %tmp, label %return, label %cond_true
+        %tmp = icmp ult i32 %a, %b              ; <i1> [#uses=1]
+        br i1 %tmp, label %return, label %cond_true
 
-cond_true:		; preds = %entry
-	store int 0, int* %v
-	ret void
+cond_true:              ; preds = %entry
+        store i32 0, i32* %v
+        ret void
 
-return:		; preds = %entry
-	ret void
+return:         ; preds = %entry
+        ret void
 }
diff --git a/test/CodeGen/ARM/call.ll b/test/CodeGen/ARM/call.ll
index c7e10b13e8..6b196653e0 100644
--- a/test/CodeGen/ARM/call.ll
+++ b/test/CodeGen/ARM/call.ll
@@ -1,18 +1,19 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep {mov lr, pc}
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+v5t | grep blx
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mtriple=arm-linux-gnueabi\
+; RUN: llvm-as < %s | llc -march=arm | grep {mov lr, pc}
+; RUN: llvm-as < %s | llc -march=arm -mattr=+v5t | grep blx
+; RUN: llvm-as < %s | llc -march=arm -mtriple=arm-linux-gnueabi\
 ; RUN:   -relocation-model=pic | grep {PLT}
 
-%t = weak global int ()* null
-declare void %g(int, int, int, int)
+@t = weak global i32 ()* null           ; <i32 ()**> [#uses=1]
 
-void %f() {
-	call void %g( int 1, int 2, int 3, int 4 )
-	ret void
+declare void @g(i32, i32, i32, i32)
+
+define void @f() {
+        call void @g( i32 1, i32 2, i32 3, i32 4 )
+        ret void
 }
 
-void %g() {
-	%tmp = load int ()** %t
-	%tmp = tail call int %tmp( )
-	ret void
+define void @g.upgrd.1() {
+        %tmp = load i32 ()** @t         ; <i32 ()*> [#uses=1]
+        %tmp.upgrd.2 = tail call i32 %tmp( )            ; <i32> [#uses=0]
+        ret void
 }
diff --git a/test/CodeGen/ARM/clz.ll b/test/CodeGen/ARM/clz.ll
index cdde95a687..389fb2ce1e 100644
--- a/test/CodeGen/ARM/clz.ll
+++ b/test/CodeGen/ARM/clz.ll
@@ -1,8 +1,8 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+v5t | grep clz
+; RUN: llvm-as < %s | llc -march=arm -mattr=+v5t | grep clz
 
-declare uint %llvm.ctlz.i32(uint)
+declare i32 @llvm.ctlz.i32(i32)
 
-uint %test(uint %x) {
-	%tmp.1 = call uint %llvm.ctlz.i32( uint %x ) 
-	ret uint %tmp.1
+define i32 @test(i32 %x) {
+        %tmp.1 = call i32 @llvm.ctlz.i32( i32 %x )              ; <i32> [#uses=1]
+        ret i32 %tmp.1
 }
diff --git a/test/CodeGen/ARM/compare-call.ll b/test/CodeGen/ARM/compare-call.ll
index 3fcded8431..fcb8b179c8 100644
--- a/test/CodeGen/ARM/compare-call.ll
+++ b/test/CodeGen/ARM/compare-call.ll
@@ -1,20 +1,20 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+v6,+vfp2 | \
+; RUN: llvm-as < %s | llc -march=arm -mattr=+v6,+vfp2 | \
 ; RUN:   grep fcmpes
 
-void %test3(float* %glob, int %X) {
+define void @test3(float* %glob, i32 %X) {
 entry:
-	%tmp = load float* %glob		; <float> [#uses=1]
-	%tmp2 = getelementptr float* %glob, int 2		; <float*> [#uses=1]
-	%tmp3 = load float* %tmp2		; <float> [#uses=1]
-	%tmp = setgt float %tmp, %tmp3		; <bool> [#uses=1]
-	br bool %tmp, label %cond_true, label %UnifiedReturnBlock
+        %tmp = load float* %glob                ; <float> [#uses=1]
+        %tmp2 = getelementptr float* %glob, i32 2               ; <float*> [#uses=1]
+        %tmp3 = load float* %tmp2               ; <float> [#uses=1]
+        %tmp.upgrd.1 = fcmp ogt float %tmp, %tmp3               ; <i1> [#uses=1]
+        br i1 %tmp.upgrd.1, label %cond_true, label %UnifiedReturnBlock
 
-cond_true:		; preds = %entry
-	%tmp = tail call int (...)* %bar( )		; <int> [#uses=0]
-	ret void
+cond_true:              ; preds = %entry
+        %tmp.upgrd.2 = tail call i32 (...)* @bar( )             ; <i32> [#uses=0]
+        ret void
 
-UnifiedReturnBlock:		; preds = %entry
-	ret void
+UnifiedReturnBlock:             ; preds = %entry
+        ret void
 }
 
-declare int %bar(...)
+declare i32 @bar(...)
diff --git a/test/CodeGen/ARM/constants.ll b/test/CodeGen/ARM/constants.ll
index 63cca2484d..2d863128a8 100644
--- a/test/CodeGen/ARM/constants.ll
+++ b/test/CodeGen/ARM/constants.ll
@@ -1,46 +1,42 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
+; RUN: llvm-as < %s | llc -march=arm | \
 ; RUN:   grep {mov r0, #0} | count 1
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
+; RUN: llvm-as < %s | llc -march=arm | \
 ; RUN:   grep {mov r0, #255$} | count 1
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
+; RUN: llvm-as < %s | llc -march=arm | \
 ; RUN:   grep {mov r0.*256} | count 1
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
-; RUN:   grep {orr.*256} | count 1
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
-; RUN:   grep {mov r0, .*-1073741761} | count 1
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
-; RUN:   grep {mov r0, .*1008} | count 1
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
-; RUN:   grep {cmp r0, #1, 16} | count 1
-
-uint %f1() {
-  ret uint 0
+; RUN: llvm-as < %s | llc -march=arm | grep {orr.*256} | count 1
+; RUN: llvm-as < %s | llc -march=arm | grep {mov r0, .*-1073741761} | count 1
+; RUN: llvm-as < %s | llc -march=arm | grep {mov r0, .*1008} | count 1
+; RUN: llvm-as < %s | llc -march=arm | grep {cmp r0, #1, 16} | count 1
+
+define i32 @f1() {
+        ret i32 0
 }
 
-uint %f2() {
-  ret uint 255
+define i32 @f2() {
+        ret i32 255
 }
 
-uint %f3() {
-  ret uint 256
+define i32 @f3() {
+        ret i32 256
 }
 
-uint %f4() {
-  ret uint 257
+define i32 @f4() {
+        ret i32 257
 }
 
-uint %f5() {
-  ret uint 3221225535
+define i32 @f5() {
+        ret i32 -1073741761
 }
 
-uint %f6() {
-  ret uint 1008
+define i32 @f6() {
+        ret i32 1008
 }
 
-void %f7(uint %a) {
-	%b = setgt uint %a, 65536
-	br bool %b, label %r, label %r
+define void @f7(i32 %a) {
+        %b = icmp ugt i32 %a, 65536             ; <i1> [#uses=1]
+        br i1 %b, label %r, label %r
 
-r:
-	ret void
+r:              ; preds = %0, %0
+        ret void
 }
diff --git a/test/CodeGen/ARM/ctors_dtors.ll b/test/CodeGen/ARM/ctors_dtors.ll
index cf58ca467f..5caa5b1266 100644
--- a/test/CodeGen/ARM/ctors_dtors.ll
+++ b/test/CodeGen/ARM/ctors_dtors.ll
@@ -1,25 +1,25 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=arm-apple-darwin | \
+; RUN: llvm-as <  %s | llc -mtriple=arm-apple-darwin | \
 ; RUN:   grep {\\.mod_init_func}
-; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=arm-apple-darwin | \
+; RUN: llvm-as < %s | llc -mtriple=arm-apple-darwin | \
 ; RUN:   grep {\\.mod_term_func} 
-; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=arm-linux-gnu | \
+; RUN: llvm-as  < %s | llc -mtriple=arm-linux-gnu | \
 ; RUN:   grep {\\.section \\.ctors,"aw",.progbits}
-; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=arm-linux-gnu | \
+; RUN: llvm-as < %s | llc -mtriple=arm-linux-gnu | \
 ; RUN:   grep {\\.section \\.dtors,"aw",.progbits}
-; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=arm-linux-gnueabi | \
+; RUN: llvm-as < %s | llc -mtriple=arm-linux-gnueabi | \
 ; RUN:   grep {\\.section \\.init_array,"aw",.init_array}
-; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=arm-linux-gnueabi | \
+; RUN: llvm-as < %s | llc -mtriple=arm-linux-gnueabi | \
 ; RUN:   grep {\\.section \\.fini_array,"aw",.fini_array}
 
-%llvm.global_ctors = appending global [1 x { int, void ()* }] [ { int, void ()* } { int 65535, void ()* %__mf_init } ]		; <[1 x { int, void ()* }]*> [#uses=0]
-%llvm.global_dtors = appending global [1 x { int, void ()* }] [ { int, void ()* } { int 65535, void ()* %__mf_fini } ]		; <[1 x { int, void ()* }]*> [#uses=0]
+@llvm.global_ctors = appending global [1 x { i32, void ()* }] [ { i32, void ()* } { i32 65535, void ()* @__mf_init } ]                ; <[1 x { i32, void ()* }]*> [#uses=0]
+@llvm.global_dtors = appending global [1 x { i32, void ()* }] [ { i32, void ()* } { i32 65535, void ()* @__mf_fini } ]                ; <[1 x { i32, void ()* }]*> [#uses=0]
 
-void %__mf_init() {
+define void @__mf_init() {
 entry:
-	ret void
+        ret void
 }
 
-void %__mf_fini() {
+define void @__mf_fini() {
 entry:
-	ret void
+        ret void
 }
diff --git a/test/CodeGen/ARM/div.ll b/test/CodeGen/ARM/div.ll
index 3f8a752b39..1085ec7fa6 100644
--- a/test/CodeGen/ARM/div.ll
+++ b/test/CodeGen/ARM/div.ll
@@ -1,29 +1,30 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm > %t
+; RUN: llvm-as < %s | llc -march=arm > %t
 ; RUN: grep __divsi3  %t
 ; RUN: grep __udivsi3 %t
 ; RUN: grep __modsi3  %t
 ; RUN: grep __umodsi3 %t
 
-int %f1(int %a, int %b) {
+define i32 @f1(i32 %a, i32 %b) {
 entry:
-	%tmp1 = div int %a, %b
-	ret int %tmp1
+        %tmp1 = sdiv i32 %a, %b         ; <i32> [#uses=1]
+        ret i32 %tmp1
 }
 
-uint %f2(uint %a, uint %b) {
+define i32 @f2(i32 %a, i32 %b) {
 entry:
-	%tmp1 = div uint %a, %b
-	ret uint %tmp1
+        %tmp1 = udiv i32 %a, %b         ; <i32> [#uses=1]
+        ret i32 %tmp1
 }
 
-int %f3(int %a, int %b) {
+define i32 @f3(i32 %a, i32 %b) {
 entry:
-	%tmp1 = rem int %a, %b
-	ret int %tmp1
+        %tmp1 = srem i32 %a, %b         ; <i32> [#uses=1]
+        ret i32 %tmp1
 }
 
-uint %f4(uint %a, uint %b) {
+define i32 @f4(i32 %a, i32 %b) {
 entry:
-	%tmp1 = rem uint %a, %b
-	ret uint %tmp1
+        %tmp1 = urem i32 %a, %b         ; <i32> [#uses=1]
+        ret i32 %tmp1
 }
+
diff --git a/test/CodeGen/ARM/extloadi1.ll b/test/CodeGen/ARM/extloadi1.ll
index b4dcd7f75d..2e9041c6ec 100644
--- a/test/CodeGen/ARM/extloadi1.ll
+++ b/test/CodeGen/ARM/extloadi1.ll
@@ -1,22 +1,20 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm
+; RUN: llvm-as < %s | llc -march=arm
+@handler_installed.6144.b = external global i1          ; <i1*> [#uses=1]
 
-%handler_installed.6144.b = external global bool                ; <bool*> [#uses=1]
-
-
-void %__mf_sigusr1_respond() {
+define void @__mf_sigusr1_respond() {
 entry:
-	%tmp8.b = load bool* %handler_installed.6144.b		; <bool> [#uses=1]
-	br bool false, label %cond_true7, label %cond_next
+        %tmp8.b = load i1* @handler_installed.6144.b            ; <i1> [#uses=1]
+        br i1 false, label %cond_true7, label %cond_next
 
-cond_next:		; preds = %entry
-	br bool %tmp8.b, label %bb, label %cond_next3
+cond_next:              ; preds = %entry
+        br i1 %tmp8.b, label %bb, label %cond_next3
 
-cond_next3:		; preds = %cond_next
-	ret void
+cond_next3:             ; preds = %cond_next
+        ret void
 
-bb:		; preds = %cond_next
-	ret void
+bb:             ; preds = %cond_next
+        ret void
 
-cond_true7:		; preds = %entry
-	ret void
+cond_true7:             ; preds = %entry
+        ret void
 }
diff --git a/test/CodeGen/ARM/fp.ll b/test/CodeGen/ARM/fp.ll
index ec4890ff82..ba199dbf56 100644
--- a/test/CodeGen/ARM/fp.ll
+++ b/test/CodeGen/ARM/fp.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 > %t
+; RUN: llvm-as < %s | llc -march=arm -mattr=+vfp2 > %t
 ; RUN: grep fmsr %t | count 4
 ; RUN: grep fsitos %t
 ; RUN: grep fmrs %t | count 2
@@ -10,52 +10,53 @@
 ; RUN: grep fuitos %t
 ; RUN: grep 1065353216 %t
 
-float %f(int %a) {
+define float @f(i32 %a) {
 entry:
-	%tmp = cast int %a to float		; <float> [#uses=1]
-	ret float %tmp
+        %tmp = sitofp i32 %a to float           ; <float> [#uses=1]
+        ret float %tmp
 }
 
-double %g(int %a) {
+define double @g(i32 %a) {
 entry:
-        %tmp = cast int %a to double            ; <double> [#uses=1]
+        %tmp = sitofp i32 %a to double          ; <double> [#uses=1]
         ret double %tmp
 }
 
-double %uint_to_double(uint %a) {
+define double @uint_to_double(i32 %a) {
 entry:
-	%tmp = cast uint %a to double
-	ret double %tmp
+        %tmp = uitofp i32 %a to double          ; <double> [#uses=1]
+        ret double %tmp
 }
 
-float %uint_to_float(uint %a) {
+define float @uint_to_float(i32 %a) {
 entry:
-	%tmp = cast uint %a to float
-	ret float %tmp
+        %tmp = uitofp i32 %a to float           ; <float> [#uses=1]
+        ret float %tmp
 }
 
-
-double %h(double* %v) {
+define double @h(double* %v) {
 entry:
-	%tmp = load double* %v		; <double> [#uses=1]
-	ret double %tmp
+        %tmp = load double* %v          ; <double> [#uses=1]
+        ret double %tmp
 }
 
-float %h2() {
+define float @h2() {
 entry:
         ret float 1.000000e+00
 }
 
-double %f2(double %a) {
+define double @f2(double %a) {
         ret double %a
 }
 
-void %f3() {
+define void @f3() {
 entry:
-	%tmp = call double %f5()		; <double> [#uses=1]
-	call void %f4(double %tmp )
-	ret void
+        %tmp = call double @f5( )               ; <double> [#uses=1]
+        call void @f4( double %tmp )
+        ret void
 }
 
-declare void %f4(double)
-declare double %f5()
+declare void @f4(double)
+
+declare double @f5()
+
diff --git a/test/CodeGen/ARM/fparith.ll b/test/CodeGen/ARM/fparith.ll
index 6dfe86015c..11933d5f70 100644
--- a/test/CodeGen/ARM/fparith.ll
+++ b/test/CodeGen/ARM/fparith.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 > %t
+; RUN: llvm-as < %s | llc -march=arm -mattr=+vfp2 > %t
 ; RUN: grep fadds %t
 ; RUN: grep faddd %t
 ; RUN: grep fmuls %t
@@ -8,79 +8,78 @@
 ; RU