Remove llvm-upgrade and update tests.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@48137 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/ExecutionEngine/2003-06-04-bzip2-bug.ll b/test/ExecutionEngine/2003-06-04-bzip2-bug.ll
index cd237c3..ff758cf 100644
--- a/test/ExecutionEngine/2003-06-04-bzip2-bug.ll
+++ b/test/ExecutionEngine/2003-06-04-bzip2-bug.ll
@@ -1,22 +1,20 @@
-; RUN: llvm-upgrade < %s | llvm-as -f -o %t.bc
+; RUN: llvm-as < %s -f -o %t.bc
 ; RUN: lli %t.bc > /dev/null
 
 ; Testcase distilled from 256.bzip2.
 
-target endian = little
-target pointersize = 32
+target datalayout = "e-p:32:32"
 
-int %main() {
+define i32 @main() {
 entry:
 	br label %loopentry.0
-
-loopentry.0:
-	%h.0 = phi int [ %tmp.2, %loopentry.0 ], [ -1, %entry ]
-	%tmp.2 = add int %h.0, 1
-	%tmp.4 = setne int %tmp.2, 0
-	br bool %tmp.4, label %loopentry.0, label %loopentry.1
-
-loopentry.1:
-	%h.1 = phi int [ %tmp.2, %loopentry.0 ]
-	ret int %h.1
+loopentry.0:		; preds = %loopentry.0, %entry
+	%h.0 = phi i32 [ %tmp.2, %loopentry.0 ], [ -1, %entry ]		; <i32> [#uses=1]
+	%tmp.2 = add i32 %h.0, 1		; <i32> [#uses=3]
+	%tmp.4 = icmp ne i32 %tmp.2, 0		; <i1> [#uses=1]
+	br i1 %tmp.4, label %loopentry.0, label %loopentry.1
+loopentry.1:		; preds = %loopentry.0
+	%h.1 = phi i32 [ %tmp.2, %loopentry.0 ]		; <i32> [#uses=1]
+	ret i32 %h.1
 }
+