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/Generic/2005-01-18-SetUO-InfLoop.ll b/test/CodeGen/Generic/2005-01-18-SetUO-InfLoop.ll
index e47aa18..ed8b2a2 100644
--- a/test/CodeGen/Generic/2005-01-18-SetUO-InfLoop.ll
+++ b/test/CodeGen/Generic/2005-01-18-SetUO-InfLoop.ll
@@ -1,19 +1,20 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc
+; RUN: llvm-as < %s | llc
 
-void %intersect_pixel() {
+define void @intersect_pixel() {
 entry:
-	%tmp125 = call bool %llvm.isunordered.f64( double 0.000000e+00, double 0.000000e+00 )		; <bool> [#uses=1]
-	%tmp126 = or bool %tmp125, false		; <bool> [#uses=1]
-	%tmp126.not = xor bool %tmp126, true		; <bool> [#uses=1]
-	%brmerge1 = or bool %tmp126.not, false		; <bool> [#uses=1]
-	br bool %brmerge1, label %bb154, label %cond_false133
+        %tmp125 = fcmp uno double 0.000000e+00, 0.000000e+00            ; <i1> [#uses=1]
+        %tmp126 = or i1 %tmp125, false          ; <i1> [#uses=1]
+        %tmp126.not = xor i1 %tmp126, true              ; <i1> [#uses=1]
+        %brmerge1 = or i1 %tmp126.not, false            ; <i1> [#uses=1]
+        br i1 %brmerge1, label %bb154, label %cond_false133
 
-cond_false133:		; preds = %entry
-	ret void
+cond_false133:          ; preds = %entry
+        ret void
 
-bb154:		; preds = %entry
-	%tmp164 = seteq uint 0, 0		; <bool> [#uses=0]
-	ret void
+bb154:          ; preds = %entry
+        %tmp164 = icmp eq i32 0, 0              ; <i1> [#uses=0]
+        ret void
 }
 
-declare bool %llvm.isunordered.f64(double, double)
+declare i1 @llvm.isunordered.f64(double, double)
+