Remove llvm-upgrade.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@47238 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/CodeGen/ARM/fpcmp.ll b/test/CodeGen/ARM/fpcmp.ll
index f16c9d4..ce0f402 100644
--- a/test/CodeGen/ARM/fpcmp.ll
+++ b/test/CodeGen/ARM/fpcmp.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 movmi %t
 ; RUN: grep moveq %t
 ; RUN: grep movgt %t
@@ -7,51 +7,51 @@
 ; RUN: grep fcmped %t | count 1
 ; RUN: grep fcmpes %t | count 6
 
-int %f1(float %a) {
+define i32 @f1(float %a) {
 entry:
-	%tmp = setlt float %a, 1.000000e+00		; <bool> [#uses=1]
-	%tmp = cast bool %tmp to int		; <int> [#uses=1]
-	ret int %tmp
+        %tmp = fcmp olt float %a, 1.000000e+00          ; <i1> [#uses=1]
+        %tmp1 = zext i1 %tmp to i32              ; <i32> [#uses=1]
+        ret i32 %tmp1
 }
 
-int %f2(float %a) {
+define i32 @f2(float %a) {
 entry:
-	%tmp = seteq float %a, 1.000000e+00		; <bool> [#uses=1]
-	%tmp = cast bool %tmp to int		; <int> [#uses=1]
-	ret int %tmp
+        %tmp = fcmp oeq float %a, 1.000000e+00          ; <i1> [#uses=1]
+        %tmp2 = zext i1 %tmp to i32              ; <i32> [#uses=1]
+        ret i32 %tmp2
 }
 
-int %f3(float %a) {
+define i32 @f3(float %a) {
 entry:
-	%tmp = setgt float %a, 1.000000e+00		; <bool> [#uses=1]
-	%tmp = cast bool %tmp to int		; <int> [#uses=1]
-	ret int %tmp
+        %tmp = fcmp ogt float %a, 1.000000e+00          ; <i1> [#uses=1]
+        %tmp3 = zext i1 %tmp to i32              ; <i32> [#uses=1]
+        ret i32 %tmp3
 }
 
-int %f4(float %a) {
+define i32 @f4(float %a) {
 entry:
-	%tmp = setge float %a, 1.000000e+00		; <bool> [#uses=1]
-	%tmp = cast bool %tmp to int		; <int> [#uses=1]
-	ret int %tmp
+        %tmp = fcmp oge float %a, 1.000000e+00          ; <i1> [#uses=1]
+        %tmp4 = zext i1 %tmp to i32              ; <i32> [#uses=1]
+        ret i32 %tmp4
 }
 
-int %f5(float %a) {
+define i32 @f5(float %a) {
 entry:
-	%tmp = setle float %a, 1.000000e+00		; <bool> [#uses=1]
-	%tmp = cast bool %tmp to int		; <int> [#uses=1]
-	ret int %tmp
+        %tmp = fcmp ole float %a, 1.000000e+00          ; <i1> [#uses=1]
+        %tmp5 = zext i1 %tmp to i32              ; <i32> [#uses=1]
+        ret i32 %tmp5
 }
 
-int %f6(float %a) {
+define i32 @f6(float %a) {
 entry:
-	%tmp = setne float %a, 1.000000e+00		; <bool> [#uses=1]
-	%tmp = cast bool %tmp to int		; <int> [#uses=1]
-	ret int %tmp
+        %tmp = fcmp une float %a, 1.000000e+00          ; <i1> [#uses=1]
+        %tmp6 = zext i1 %tmp to i32              ; <i32> [#uses=1]
+        ret i32 %tmp6
 }
 
-int %g1(double %a) {
+define i32 @g1(double %a) {
 entry:
-	%tmp = setlt double %a, 1.000000e+00		; <bool> [#uses=1]
-	%tmp = cast bool %tmp to int		; <int> [#uses=1]
-	ret int %tmp
+        %tmp = fcmp olt double %a, 1.000000e+00         ; <i1> [#uses=1]
+        %tmp7 = zext i1 %tmp to i32              ; <i32> [#uses=1]
+        ret i32 %tmp7
 }