Remove llvm-upgrade and update tests.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@47784 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/Feature/basictest.ll b/test/Feature/basictest.ll
index cf040ec..2303b59 100644
--- a/test/Feature/basictest.ll
+++ b/test/Feature/basictest.ll
@@ -1,32 +1,31 @@
-; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll
+; RUN: llvm-as < %s | llvm-dis > %t1.ll
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
-implementation
-
 ; Test "stripped" format where nothing is symbolic... this is how the bytecode
 ; format looks anyways (except for negative vs positive offsets)...
 ;
-void "void"(int, int)   ; Def %0, %1
-begin
-	add int 0, 0      ; Def 2
-	sub int 0, 4      ; Def 3
-	br label %1
 
-	add int %0, %1    ; Def 4
-	sub int %4, %3    ; Def 5
-	setle int %5, %2  ; Def 0 - bool plane
-	br bool %0, label %2, label %1
+define void @void(i32, i32) {
+        add i32 0, 0            ; <i32>:3 [#uses=2]
+        sub i32 0, 4            ; <i32>:4 [#uses=2]
+        br label %5
 
-	add int %0, %1    ; Def 6
-	sub int %4, %3    ; Def 7
-	setle int %7, %2  ; Def 1 - bool plane
-	ret void
-end
+; <label>:5             ; preds = %5, %2
+        add i32 %0, %1          ; <i32>:6 [#uses=2]
+        sub i32 %6, %4          ; <i32>:7 [#uses=1]
+        icmp sle i32 %7, %3             ; <i1>:8 [#uses=1]
+        br i1 %8, label %9, label %5
+
+; <label>:9             ; preds = %5
+        add i32 %0, %1          ; <i32>:10 [#uses=0]
+        sub i32 %6, %4          ; <i32>:11 [#uses=1]
+        icmp sle i32 %11, %3            ; <i1>:12 [#uses=0]
+        ret void
+}
 
 ; This function always returns zero
-int "zarro"()
-begin
+define i32 @zarro() {
 Startup:
-	ret int 0
-end
+        ret i32 0
+}