Remove llvm-upgrade and update test cases.

llvm-svn: 47793
diff --git a/llvm/test/Transforms/ADCE/2003-06-24-BasicFunctionality.ll b/llvm/test/Transforms/ADCE/2003-06-24-BasicFunctionality.ll
index ac62699..9c6764d 100644
--- a/llvm/test/Transforms/ADCE/2003-06-24-BasicFunctionality.ll
+++ b/llvm/test/Transforms/ADCE/2003-06-24-BasicFunctionality.ll
@@ -1,40 +1,41 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -adce -simplifycfg | llvm-dis | not grep then:
+; RUN: llvm-as < %s | opt -adce -simplifycfg | llvm-dis | not grep then:
 
-void %dead_test8(int* %data.1, int %idx.1) {
-entry:		; No predecessors!
-	%tmp.1 = load int* %data.1		; <int> [#uses=2]
-	%tmp.41 = setgt int %tmp.1, 0		; <bool> [#uses=1]
-	br bool %tmp.41, label %no_exit.preheader, label %return
+define void @dead_test8(i32* %data.1, i32 %idx.1) {
+entry:
+        %tmp.1 = load i32* %data.1              ; <i32> [#uses=2]
+        %tmp.41 = icmp sgt i32 %tmp.1, 0                ; <i1> [#uses=1]
+        br i1 %tmp.41, label %no_exit.preheader, label %return
 
-no_exit.preheader:		; preds = %entry
-	%tmp.11 = getelementptr int* %data.1, long 1		; <int*> [#uses=1]
-	%tmp.22-idxcast = cast int %idx.1 to long		; <long> [#uses=1]
-	%tmp.28 = getelementptr int* %data.1, long %tmp.22-idxcast		; <int*> [#uses=1]
-	br label %no_exit
+no_exit.preheader:              ; preds = %entry
+        %tmp.11 = getelementptr i32* %data.1, i64 1             ; <i32*> [#uses=1]
+        %tmp.22-idxcast = sext i32 %idx.1 to i64                ; <i64> [#uses=1]
+        %tmp.28 = getelementptr i32* %data.1, i64 %tmp.22-idxcast               ; <i32*> [#uses=1]
+        br label %no_exit
 
-no_exit:		; preds = %no_exit.preheader, %endif
-	%k.1 = phi int [ %k.0, %endif ], [ 0, %no_exit.preheader ]		; <int> [#uses=3]
-	%i.0 = phi int [ %inc.1, %endif ], [ 0, %no_exit.preheader ]		; <int> [#uses=1]
-	%tmp.12 = load int* %tmp.11		; <int> [#uses=1]
-	%tmp.14 = sub int 0, %tmp.12		; <int> [#uses=1]
-	%tmp.161 = setne int %k.1, %tmp.14		; <bool> [#uses=1]
-	br bool %tmp.161, label %then, label %else
+no_exit:                ; preds = %endif, %no_exit.preheader
+        %k.1 = phi i32 [ %k.0, %endif ], [ 0, %no_exit.preheader ]              ; <i32> [#uses=3]
+        %i.0 = phi i32 [ %inc.1, %endif ], [ 0, %no_exit.preheader ]            ; <i32> [#uses=1]
+        %tmp.12 = load i32* %tmp.11             ; <i32> [#uses=1]
+        %tmp.14 = sub i32 0, %tmp.12            ; <i32> [#uses=1]
+        %tmp.161 = icmp ne i32 %k.1, %tmp.14            ; <i1> [#uses=1]
+        br i1 %tmp.161, label %then, label %else
 
-then:		; preds = %no_exit
-	%inc.0 = add int %k.1, 1		; <int> [#uses=1]
-	br label %endif
+then:           ; preds = %no_exit
+        %inc.0 = add i32 %k.1, 1                ; <i32> [#uses=1]
+        br label %endif
 
-else:		; preds = %no_exit
-	%dec = add int %k.1, -1		; <int> [#uses=1]
-	br label %endif
+else:           ; preds = %no_exit
+        %dec = add i32 %k.1, -1         ; <i32> [#uses=1]
+        br label %endif
 
-endif:		; preds = %else, %then
-	%k.0 = phi int [ %dec, %else ], [ %inc.0, %then ]		; <int> [#uses=1]
-	store int 2, int* %tmp.28
-	%inc.1 = add int %i.0, 1		; <int> [#uses=2]
-	%tmp.4 = setlt int %inc.1, %tmp.1		; <bool> [#uses=1]
-	br bool %tmp.4, label %no_exit, label %return
+endif:          ; preds = %else, %then
+        %k.0 = phi i32 [ %dec, %else ], [ %inc.0, %then ]               ; <i32> [#uses=1]
+        store i32 2, i32* %tmp.28
+        %inc.1 = add i32 %i.0, 1                ; <i32> [#uses=2]
+        %tmp.4 = icmp slt i32 %inc.1, %tmp.1            ; <i1> [#uses=1]
+        br i1 %tmp.4, label %no_exit, label %return
 
-return:		; preds = %entry, %endif
-	ret void
+return:         ; preds = %endif, %entry
+        ret void
 }
+