Remove llvm-upgrade.

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

4 files changed, 73 insertions, 79 deletions

diff --git a/test/Analysis/Dominators/2006-09-26-PostDominanceFrontier.ll b/test/Analysis/Dominators/2006-09-26-PostDominanceFrontier.ll
index 719150dd31d..b272f92499e 100644
--- a/test/Analysis/Dominators/2006-09-26-PostDominanceFrontier.ll
+++ b/test/Analysis/Dominators/2006-09-26-PostDominanceFrontier.ll
@@ -1,102 +1,97 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -postdomfrontier \
+; RUN: llvm-as < %s | opt -analyze -postdomfrontier \
 ; RUN:   -disable-verify
-; END.
-;
 ; ModuleID = '2006-09-26-PostDominanceFrontier.bc'
-target endian = little
-target pointersize = 64
+target datalayout = "e-p:64:64"
 target triple = "alphaev67-unknown-linux-gnu"
-	%struct.FILE = type { int, sbyte*, sbyte*, sbyte*, sbyte*, sbyte*, sbyte*, sbyte*, sbyte*, sbyte*, sbyte*, sbyte*, %struct._IO_marker*, %struct.FILE*, int, int, long, ushort, sbyte, [1 x sbyte], sbyte*, long, sbyte*, sbyte*, int, [44 x sbyte] }
-	%struct._IO_marker = type { %struct._IO_marker*, %struct.FILE*, int }
-%TOP = external global ulong*		; <ulong**> [#uses=1]
-%BOT = external global ulong*		; <ulong**> [#uses=1]
-%str = external global [2 x sbyte]		; <[2 x sbyte]*> [#uses=0]
+	%struct.FILE = type { i32, i8*, i8*, i8*, i8*, i8*, i8*, i8*, i8*, i8*, i8*, i8*, %struct._IO_marker*, %struct.FILE*, i32, i32, i64, i16, i8, [1 x i8], i8*, i64, i8*, i8*, i32, [44 x i8] }
+	%struct._IO_marker = type { %struct._IO_marker*, %struct.FILE*, i32 }
+@TOP = external global i64*		; <i64**> [#uses=1]
+@BOT = external global i64*		; <i64**> [#uses=1]
+@str = external global [2 x i8]		; <[2 x i8]*> [#uses=0]
 
-implementation   ; Functions:
+declare void @fopen()
 
-declare void %fopen()
-
-void %main(sbyte** %argv) {
+define void @main(i8** %argv) {
 entry:
-	%netSelect.i507 = alloca ulong, align 8		; <ulong*> [#uses=0]
-	%topStart.i = alloca ulong, align 8		; <ulong*> [#uses=0]
-	%topEnd.i = alloca ulong, align 8		; <ulong*> [#uses=0]
-	%botStart.i = alloca ulong, align 8		; <ulong*> [#uses=0]
-	%botEnd.i = alloca ulong, align 8		; <ulong*> [#uses=0]
-	%c1.i154 = alloca uint, align 4		; <uint*> [#uses=0]
-	%b1.i155 = alloca uint, align 4		; <uint*> [#uses=0]
-	%t1.i156 = alloca uint, align 4		; <uint*> [#uses=0]
-	%c1.i = alloca uint, align 4		; <uint*> [#uses=0]
-	%b1.i = alloca uint, align 4		; <uint*> [#uses=0]
-	%t1.i = alloca uint, align 4		; <uint*> [#uses=0]
-	%netSelect.i5 = alloca ulong, align 8		; <ulong*> [#uses=0]
-	%netSelect.i = alloca ulong, align 8		; <ulong*> [#uses=0]
-	%tmp2.i = getelementptr sbyte** %argv, int 1		; <sbyte**> [#uses=1]
-	%tmp3.i4 = load sbyte** %tmp2.i		; <sbyte*> [#uses=0]
-	call void %fopen( )
-	br bool false, label %DimensionChannel.exit, label %bb.backedge.i
+	%netSelect.i507 = alloca i64, align 8		; <i64*> [#uses=0]
+	%topStart.i = alloca i64, align 8		; <i64*> [#uses=0]
+	%topEnd.i = alloca i64, align 8		; <i64*> [#uses=0]
+	%botStart.i = alloca i64, align 8		; <i64*> [#uses=0]
+	%botEnd.i = alloca i64, align 8		; <i64*> [#uses=0]
+	%c1.i154 = alloca i32, align 4		; <i32*> [#uses=0]
+	%b1.i155 = alloca i32, align 4		; <i32*> [#uses=0]
+	%t1.i156 = alloca i32, align 4		; <i32*> [#uses=0]
+	%c1.i = alloca i32, align 4		; <i32*> [#uses=0]
+	%b1.i = alloca i32, align 4		; <i32*> [#uses=0]
+	%t1.i = alloca i32, align 4		; <i32*> [#uses=0]
+	%netSelect.i5 = alloca i64, align 8		; <i64*> [#uses=0]
+	%netSelect.i = alloca i64, align 8		; <i64*> [#uses=0]
+	%tmp2.i = getelementptr i8** %argv, i32 1		; <i8**> [#uses=1]
+	%tmp3.i4 = load i8** %tmp2.i		; <i8*> [#uses=0]
+	call void @fopen( )
+	br i1 false, label %DimensionChannel.exit, label %bb.backedge.i
 
 bb.backedge.i:		; preds = %entry
 	ret void
 
 DimensionChannel.exit:		; preds = %entry
-	%tmp13.i137 = malloc ulong, uint 0		; <ulong*> [#uses=1]
-	%tmp610.i = malloc ulong, uint 0		; <ulong*> [#uses=1]
+	%tmp13.i137 = malloc i64, i32 0		; <i64*> [#uses=1]
+	%tmp610.i = malloc i64, i32 0		; <i64*> [#uses=1]
 	br label %cond_true.i143
 
 cond_true.i143:		; preds = %cond_true.i143, %DimensionChannel.exit
-	%tmp9.i140 = getelementptr ulong* %tmp13.i137, ulong 0		; <ulong*> [#uses=0]
-	%tmp12.i = getelementptr ulong* %tmp610.i, ulong 0		; <ulong*> [#uses=0]
-	br bool false, label %bb18.i144, label %cond_true.i143
+	%tmp9.i140 = getelementptr i64* %tmp13.i137, i64 0		; <i64*> [#uses=0]
+	%tmp12.i = getelementptr i64* %tmp610.i, i64 0		; <i64*> [#uses=0]
+	br i1 false, label %bb18.i144, label %cond_true.i143
 
 bb18.i144:		; preds = %cond_true.i143
-	call void %fopen( )
-	%tmp76.i105 = malloc ulong, uint 0		; <ulong*> [#uses=3]
-	%tmp674.i = malloc ulong, uint 0		; <ulong*> [#uses=2]
-	%tmp1072.i = malloc ulong, uint 0		; <ulong*> [#uses=2]
-	%tmp1470.i = malloc ulong, uint 0		; <ulong*> [#uses=1]
+	call void @fopen( )
+	%tmp76.i105 = malloc i64, i32 0		; <i64*> [#uses=3]
+	%tmp674.i = malloc i64, i32 0		; <i64*> [#uses=2]
+	%tmp1072.i = malloc i64, i32 0		; <i64*> [#uses=2]
+	%tmp1470.i = malloc i64, i32 0		; <i64*> [#uses=1]
 	br label %cond_true.i114
 
 cond_true.i114:		; preds = %cond_true.i114, %bb18.i144
-	%tmp17.i108 = getelementptr ulong* %tmp76.i105, ulong 0		; <ulong*> [#uses=0]
-	%tmp20.i = getelementptr ulong* %tmp674.i, ulong 0		; <ulong*> [#uses=0]
-	%tmp23.i111 = getelementptr ulong* %tmp1470.i, ulong 0		; <ulong*> [#uses=0]
-	br bool false, label %cond_true40.i, label %cond_true.i114
+	%tmp17.i108 = getelementptr i64* %tmp76.i105, i64 0		; <i64*> [#uses=0]
+	%tmp20.i = getelementptr i64* %tmp674.i, i64 0		; <i64*> [#uses=0]
+	%tmp23.i111 = getelementptr i64* %tmp1470.i, i64 0		; <i64*> [#uses=0]
+	br i1 false, label %cond_true40.i, label %cond_true.i114
 
 cond_true40.i:		; preds = %cond_true40.i, %cond_true.i114
-	%tmp33.i115 = getelementptr ulong* %tmp1072.i, ulong 0		; <ulong*> [#uses=0]
-	br bool false, label %bb142.i, label %cond_true40.i
+	%tmp33.i115 = getelementptr i64* %tmp1072.i, i64 0		; <i64*> [#uses=0]
+	br i1 false, label %bb142.i, label %cond_true40.i
 
 cond_next54.i:		; preds = %cond_true76.i
-	%tmp57.i = getelementptr ulong* %tmp55.i, ulong 0		; <ulong*> [#uses=0]
-	br bool false, label %bb64.i, label %bb69.i
+	%tmp57.i = getelementptr i64* %tmp55.i, i64 0		; <i64*> [#uses=0]
+	br i1 false, label %bb64.i, label %bb69.i
 
 bb64.i:		; preds = %cond_true76.i, %cond_next54.i
-	%tmp67.i117 = getelementptr ulong* %tmp76.i105, ulong 0		; <ulong*> [#uses=0]
-	br bool false, label %bb114.i, label %cond_true111.i
+	%tmp67.i117 = getelementptr i64* %tmp76.i105, i64 0		; <i64*> [#uses=0]
+	br i1 false, label %bb114.i, label %cond_true111.i
 
 bb69.i:		; preds = %cond_next54.i
-	br bool false, label %bb79.i, label %cond_true76.i
+	br i1 false, label %bb79.i, label %cond_true76.i
 
 cond_true76.i:		; preds = %bb142.i, %bb69.i
-	%tmp48.i = getelementptr ulong* %tmp46.i, ulong 0		; <ulong*> [#uses=0]
-	br bool false, label %bb64.i, label %cond_next54.i
+	%tmp48.i = getelementptr i64* %tmp46.i, i64 0		; <i64*> [#uses=0]
+	br i1 false, label %bb64.i, label %cond_next54.i
 
 bb79.i:		; preds = %bb69.i
-	br bool false, label %bb114.i, label %cond_true111.i
+	br i1 false, label %bb114.i, label %cond_true111.i
 
 cond_true111.i:		; preds = %bb79.i, %bb64.i
-	%tmp84.i127 = getelementptr ulong* %tmp46.i, ulong 0		; <ulong*> [#uses=0]
+	%tmp84.i127 = getelementptr i64* %tmp46.i, i64 0		; <i64*> [#uses=0]
 	ret void
 
 bb114.i:		; preds = %bb142.i, %bb79.i, %bb64.i
-	%tmp117.i = getelementptr ulong* %tmp76.i105, ulong 0		; <ulong*> [#uses=0]
-	%tmp132.i131 = getelementptr ulong* %tmp674.i, ulong 0		; <ulong*> [#uses=0]
-	%tmp122.i = getelementptr ulong* %tmp1072.i, ulong 0		; <ulong*> [#uses=0]
+	%tmp117.i = getelementptr i64* %tmp76.i105, i64 0		; <i64*> [#uses=0]
+	%tmp132.i131 = getelementptr i64* %tmp674.i, i64 0		; <i64*> [#uses=0]
+	%tmp122.i = getelementptr i64* %tmp1072.i, i64 0		; <i64*> [#uses=0]
 	ret void
 
 bb142.i:		; preds = %cond_true40.i
-	%tmp46.i = load ulong** %BOT		; <ulong*> [#uses=2]
-	%tmp55.i = load ulong** %TOP		; <ulong*> [#uses=1]
-	br bool false, label %bb114.i, label %cond_true76.i
+	%tmp46.i = load i64** @BOT		; <i64*> [#uses=2]
+	%tmp55.i = load i64** @TOP		; <i64*> [#uses=1]
+	br i1 false, label %bb114.i, label %cond_true76.i
 }
diff --git a/test/Analysis/Dominators/2006-10-02-BreakCritEdges.ll b/test/Analysis/Dominators/2006-10-02-BreakCritEdges.ll
index cce61f68401..997ee2a8a0a 100644
--- a/test/Analysis/Dominators/2006-10-02-BreakCritEdges.ll
+++ b/test/Analysis/Dominators/2006-10-02-BreakCritEdges.ll
@@ -1,21 +1,20 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -domtree -break-crit-edges -analyze \
+; RUN: llvm-as < %s | opt -domtree -break-crit-edges -analyze \
 ; RUN:  -domtree | grep {3.*%brtrue }
 ; PR932
-implementation   ; Functions:
 
-declare void %use1(int)
+declare void @use1(i32)
 
-void %f(int %i, bool %c) {
+define void @f(i32 %i, i1 %c) {
 entry:
-	%A = seteq int %i, 0		; <bool> [#uses=1]
-	br bool %A, label %brtrue, label %brfalse
+	%A = icmp eq i32 %i, 0		; <i1> [#uses=1]
+	br i1 %A, label %brtrue, label %brfalse
 
 brtrue:		; preds = %brtrue, %entry
-	%B = phi bool [ true, %brtrue ], [ false, %entry ]		; <bool> [#uses=1]
-	call void %use1( int %i )
-	br bool %B, label %brtrue, label %brfalse
+	%B = phi i1 [ true, %brtrue ], [ false, %entry ]		; <i1> [#uses=1]
+	call void @use1( i32 %i )
+	br i1 %B, label %brtrue, label %brfalse
 
 brfalse:		; preds = %brtrue, %entry
-	call void %use1( int %i )
+	call void @use1( i32 %i )
 	ret void
 }
diff --git a/test/Analysis/Dominators/2007-04-17-PostDominanceFrontier.ll b/test/Analysis/Dominators/2007-04-17-PostDominanceFrontier.ll
index 1699b901f0c..51e4c2aeb55 100644
--- a/test/Analysis/Dominators/2007-04-17-PostDominanceFrontier.ll
+++ b/test/Analysis/Dominators/2007-04-17-PostDominanceFrontier.ll
@@ -1,6 +1,6 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -postdomfrontier -disable-output
+; RUN: llvm-as < %s | opt -postdomfrontier -disable-output
 
-void @SManager() {
+define void @SManager() {
 entry:
 	br label %bb.outer
 
@@ -590,7 +590,7 @@ bb442:		; preds = %bb442.outer, %bb442.backedge
 	br i1 false, label %bb420, label %bb.loopexit
 }
 
-void @Invalidate() {
+define void @Invalidate() {
 entry:
 	br i1 false, label %cond_false, label %cond_true
 
diff --git a/test/Analysis/Dominators/2007-04-20-PostDom-Reset.ll b/test/Analysis/Dominators/2007-04-20-PostDom-Reset.ll
index 06bc2898117..4deec98a9ee 100644
--- a/test/Analysis/Dominators/2007-04-20-PostDom-Reset.ll
+++ b/test/Analysis/Dominators/2007-04-20-PostDom-Reset.ll
@@ -1,6 +1,6 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -postdomfrontier -disable-output
+; RUN: llvm-as < %s | opt -postdomfrontier -disable-output
 
-void @args_out_of_range() {
+define void @args_out_of_range() {
 entry:
 	br label %bb
 
@@ -8,7 +8,7 @@ bb:		; preds = %bb, %entry
 	br label %bb
 }
 
-void @args_out_of_range_3() {
+define void @args_out_of_range_3() {
 entry:
 	br label %bb
 
@@ -16,7 +16,7 @@ bb:		; preds = %bb, %entry
 	br label %bb
 }
 
-void @Feq() {
+define void @Feq() {
 entry:
 	br i1 false, label %cond_true, label %cond_next