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/bsr.ll b/test/CodeGen/Alpha/bsr.ll
index 32ea0cb..d461857 100644
--- a/test/CodeGen/Alpha/bsr.ll
+++ b/test/CodeGen/Alpha/bsr.ll
@@ -1,13 +1,12 @@
 ; Make sure this testcase codegens the bsr instruction
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep bsr
+; RUN: llvm-as < %s | llc -march=alpha | grep bsr
 
-implementation
-
-internal long %abc(int %x) {
-	%tmp.2 = add int %x, -1		; <int> [#uses=1]
-	%tmp.0 = call long %abc( int %tmp.2 )		; <long> [#uses=1]
-	%tmp.5 = add int %x, -2		; <int> [#uses=1]
-	%tmp.3 = call long %abc( int %tmp.5 )		; <long> [#uses=1]
-	%tmp.6 = add long %tmp.0, %tmp.3		; <long> [#uses=1]
-	ret long %tmp.6
+define internal i64 @abc(i32 %x) {
+        %tmp.2 = add i32 %x, -1         ; <i32> [#uses=1]
+        %tmp.0 = call i64 @abc( i32 %tmp.2 )            ; <i64> [#uses=1]
+        %tmp.5 = add i32 %x, -2         ; <i32> [#uses=1]
+        %tmp.3 = call i64 @abc( i32 %tmp.5 )            ; <i64> [#uses=1]
+        %tmp.6 = add i64 %tmp.0, %tmp.3         ; <i64> [#uses=1]
+        ret i64 %tmp.6
 }
+