Upgrade tests.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@48538 91177308-0d34-0410-b5e6-96231b3b80d8

4 files changed, 33 insertions, 44 deletions

diff --git a/test/Transforms/LoopUnroll/2004-05-13-DontUnrollTooMuch.ll b/test/Transforms/LoopUnroll/2004-05-13-DontUnrollTooMuch.ll
index 8c3e697c89..13a26a2533 100644
--- a/test/Transforms/LoopUnroll/2004-05-13-DontUnrollTooMuch.ll
+++ b/test/Transforms/LoopUnroll/2004-05-13-DontUnrollTooMuch.ll
@@ -1,15 +1,14 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -loop-unroll -disable-output
+; RUN: llvm-as < %s | opt -loop-unroll -disable-output
 
-int %main() {
+define i32 @main() {
 entry:
-        br label %no_exit
-
-no_exit:                ; preds = %entry, %no_exit
-        %indvar = phi uint [ 0, %entry ], [ %indvar.next, %no_exit ]            ; <uint> [#uses=1]
-        %indvar.next = add uint %indvar, 1              ; <uint> [#uses=2]
-        %exitcond = setne uint %indvar.next, 2147483648         ; <bool> [#uses=1]
-        br bool %exitcond, label %no_exit, label %loopexit
-
-loopexit:               ; preds = %no_exit
-        ret int 0
+	br label %no_exit
+no_exit:		; preds = %no_exit, %entry
+	%indvar = phi i32 [ 0, %entry ], [ %indvar.next, %no_exit ]		; <i32> [#uses=1]
+	%indvar.next = add i32 %indvar, 1		; <i32> [#uses=2]
+	%exitcond = icmp ne i32 %indvar.next, -2147483648		; <i1> [#uses=1]
+	br i1 %exitcond, label %no_exit, label %loopexit
+loopexit:		; preds = %no_exit
+	ret i32 0
 }
+
diff --git a/test/Transforms/LoopUnroll/2005-03-06-BadLoopInfoUpdate.ll b/test/Transforms/LoopUnroll/2005-03-06-BadLoopInfoUpdate.ll
index 1681506acb..db107fdd4b 100644
--- a/test/Transforms/LoopUnroll/2005-03-06-BadLoopInfoUpdate.ll
+++ b/test/Transforms/LoopUnroll/2005-03-06-BadLoopInfoUpdate.ll
@@ -1,29 +1,22 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -loop-unroll -loopsimplify -disable-output
+; RUN: llvm-as < %s | opt -loop-unroll -loopsimplify -disable-output
 
-implementation   ; Functions:
-
-void %print_board() {
+define void @print_board() {
 entry:
 	br label %no_exit.1
-
 no_exit.1:		; preds = %cond_false.2, %entry
 	br label %no_exit.2
-
 no_exit.2:		; preds = %no_exit.2, %no_exit.1
-	%indvar1 = phi uint [ 0, %no_exit.1 ], [ %indvar.next2, %no_exit.2 ]		; <uint> [#uses=1]
-	%indvar.next2 = add uint %indvar1, 1		; <uint> [#uses=2]
-	%exitcond3 = setne uint %indvar.next2, 7		; <bool> [#uses=1]
-	br bool %exitcond3, label %no_exit.2, label %loopexit.2
-
+	%indvar1 = phi i32 [ 0, %no_exit.1 ], [ %indvar.next2, %no_exit.2 ]		; <i32> [#uses=1]
+	%indvar.next2 = add i32 %indvar1, 1		; <i32> [#uses=2]
+	%exitcond3 = icmp ne i32 %indvar.next2, 7		; <i1> [#uses=1]
+	br i1 %exitcond3, label %no_exit.2, label %loopexit.2
 loopexit.2:		; preds = %no_exit.2
-	br bool false, label %cond_true.2, label %cond_false.2
-
+	br i1 false, label %cond_true.2, label %cond_false.2
 cond_true.2:		; preds = %loopexit.2
 	ret void
-
 cond_false.2:		; preds = %loopexit.2
-	br bool false, label %no_exit.1, label %loopexit.1
-
+	br i1 false, label %no_exit.1, label %loopexit.1
 loopexit.1:		; preds = %cond_false.2
 	ret void
 }
+
diff --git a/test/Transforms/LoopUnroll/2006-08-24-MultiBlockLoop.ll b/test/Transforms/LoopUnroll/2006-08-24-MultiBlockLoop.ll
index 42ff3fafe7..16419cab1a 100644
--- a/test/Transforms/LoopUnroll/2006-08-24-MultiBlockLoop.ll
+++ b/test/Transforms/LoopUnroll/2006-08-24-MultiBlockLoop.ll
@@ -1,18 +1,16 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -loop-unroll | llvm-dis | grep bb72.2
+; RUN: llvm-as < %s | opt -loop-unroll | llvm-dis | grep bb72.2
 
-void %vorbis_encode_noisebias_setup() {
+define void @vorbis_encode_noisebias_setup() {
 entry:
 	br label %cond_true.outer
-
-cond_true.outer:
-	%indvar1.ph = phi uint [ 0, %entry ], [ %indvar.next2, %bb72 ]
+cond_true.outer:		; preds = %bb72, %entry
+	%indvar1.ph = phi i32 [ 0, %entry ], [ %indvar.next2, %bb72 ]		; <i32> [#uses=1]
 	br label %bb72
-
-bb72:
-	%indvar.next2 = add uint %indvar1.ph, 1
-	%exitcond3 = seteq uint %indvar.next2, 3
-	br bool %exitcond3, label %cond_true138, label %cond_true.outer
-
-cond_true138:
+bb72:		; preds = %cond_true.outer
+	%indvar.next2 = add i32 %indvar1.ph, 1		; <i32> [#uses=2]
+	%exitcond3 = icmp eq i32 %indvar.next2, 3		; <i1> [#uses=1]
+	br i1 %exitcond3, label %cond_true138, label %cond_true.outer
+cond_true138:		; preds = %bb72
 	ret void
 }
+
diff --git a/test/Transforms/LoopUnroll/2007-04-16-PhiUpdate.ll b/test/Transforms/LoopUnroll/2007-04-16-PhiUpdate.ll
index c30d8380ee..26fa60a821 100644
--- a/test/Transforms/LoopUnroll/2007-04-16-PhiUpdate.ll
+++ b/test/Transforms/LoopUnroll/2007-04-16-PhiUpdate.ll
@@ -1,18 +1,17 @@
 ; PR 1334
-; RUN: llvm-upgrade < %s | llvm-as | opt -loop-unroll -disable-output
+; RUN: llvm-as < %s | opt -loop-unroll -disable-output
 
-void @sal__math_float_manipulator_7__math__joint_array_dcv_ops__Omultiply__3([6 x float]* %agg.result) {
+define void @sal__math_float_manipulator_7__math__joint_array_dcv_ops__Omultiply__3([6 x float]* %agg.result) {
 entry:
 	%tmp282911 = zext i8 0 to i32		; <i32> [#uses=1]
 	br label %cond_next
-
 cond_next:		; preds = %cond_next, %entry
 	%indvar = phi i8 [ 0, %entry ], [ %indvar.next, %cond_next ]		; <i8> [#uses=1]
 	%indvar.next = add i8 %indvar, 1		; <i8> [#uses=2]
 	%exitcond = icmp eq i8 %indvar.next, 7		; <i1> [#uses=1]
 	br i1 %exitcond, label %bb27, label %cond_next
-
 bb27:		; preds = %cond_next
 	%tmp282911.lcssa = phi i32 [ %tmp282911, %cond_next ]		; <i32> [#uses=0]
 	ret void
 }
+