Remove llvm-upgrade and update tests.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@47296 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/CodeGen/Alpha/cmpbge.ll b/test/CodeGen/Alpha/cmpbge.ll
index e99a6b1..9b83215 100644
--- a/test/CodeGen/Alpha/cmpbge.ll
+++ b/test/CodeGen/Alpha/cmpbge.ll
@@ -1,16 +1,16 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep cmpbge | count 2
+; RUN: llvm-as < %s | llc -march=alpha | grep cmpbge | count 2
 
-bool %test1(ulong %A, ulong %B) {
-	%C = and ulong %A, 255
-	%D = and ulong %B, 255
-	%E = setge ulong %C, %D
-	ret bool %E
+define i1 @test1(i64 %A, i64 %B) {
+        %C = and i64 %A, 255            ; <i64> [#uses=1]
+        %D = and i64 %B, 255            ; <i64> [#uses=1]
+        %E = icmp uge i64 %C, %D                ; <i1> [#uses=1]
+        ret i1 %E
 }
 
-bool %test2(ulong %a, ulong %B) {
-	%A = shl ulong %a, ubyte 1
-	%C = and ulong %A, 254
-	%D = and ulong %B, 255
-	%E = setge ulong %C, %D
-	ret bool %E
+define i1 @test2(i64 %a, i64 %B) {
+        %A = shl i64 %a, 1              ; <i64> [#uses=1]
+        %C = and i64 %A, 254            ; <i64> [#uses=1]
+        %D = and i64 %B, 255            ; <i64> [#uses=1]
+        %E = icmp uge i64 %C, %D                ; <i1> [#uses=1]
+        ret i1 %E
 }