Remove llvm-upgrade and update tests.

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

1 files changed, 54 insertions, 52 deletions

diff --git a/test/CodeGen/Generic/2006-09-02-LocalAllocCrash.ll b/test/CodeGen/Generic/2006-09-02-LocalAllocCrash.ll
index e2f07e8ae2..c6d0dfee38 100644
--- a/test/CodeGen/Generic/2006-09-02-LocalAllocCrash.ll
+++ b/test/CodeGen/Generic/2006-09-02-LocalAllocCrash.ll
@@ -1,35 +1,33 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -regalloc=local
-
-	%struct.CHESS_POSITION = type { ulong, ulong, ulong, ulong, ulong, ulong, ulong, ulong, ulong, ulong, ulong, ulong, ulong, ulong, ulong, ulong, ulong, ulong, uint, int, sbyte, sbyte, [64 x sbyte], sbyte, sbyte, sbyte, sbyte, sbyte }
-%search = external global %struct.CHESS_POSITION		; <%struct.CHESS_POSITION*> [#uses=2]
-%bishop_shift_rl45 = external global [64 x int]		; <[64 x int]*> [#uses=1]
-%bishop_shift_rr45 = external global [64 x int]		; <[64 x int]*> [#uses=1]
-%black_outpost = external global [64 x sbyte]		; <[64 x sbyte]*> [#uses=1]
-%bishop_mobility_rl45 = external global [64 x [256 x int]]		; <[64 x [256 x int]]*> [#uses=1]
-%bishop_mobility_rr45 = external global [64 x [256 x int]]		; <[64 x [256 x int]]*> [#uses=1]
-
-implementation   ; Functions:
-
-declare fastcc int %FirstOne()
-
-fastcc void %Evaluate() {
+; RUN: llvm-as < %s | llc -regalloc=local
+	
+%struct.CHESS_POSITION = type { i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i32, i32, i8, i8, [64 x i8], i8, i8, i8, i8, i8 }
+@search = external global %struct.CHESS_POSITION		; <%struct.CHESS_POSITION*> [#uses=2]
+@bishop_shift_rl45 = external global [64 x i32]		; <[64 x i32]*> [#uses=1]
+@bishop_shift_rr45 = external global [64 x i32]		; <[64 x i32]*> [#uses=1]
+@black_outpost = external global [64 x i8]		; <[64 x i8]*> [#uses=1]
+@bishop_mobility_rl45 = external global [64 x [256 x i32]]		; <[64 x [256 x i32]]*> [#uses=1]
+@bishop_mobility_rr45 = external global [64 x [256 x i32]]		; <[64 x [256 x i32]]*> [#uses=1]
+
+declare fastcc i32 @FirstOne()
+
+define fastcc void @Evaluate() {
 entry:
-	br bool false, label %cond_false186, label %cond_true
+	br i1 false, label %cond_false186, label %cond_true
 
 cond_true:		; preds = %entry
 	ret void
 
 cond_false186:		; preds = %entry
-	br bool false, label %cond_true293, label %bb203
+	br i1 false, label %cond_true293, label %bb203
 
 bb203:		; preds = %cond_false186
 	ret void
 
 cond_true293:		; preds = %cond_false186
-	br bool false, label %cond_true298, label %cond_next317
+	br i1 false, label %cond_true298, label %cond_next317
 
 cond_true298:		; preds = %cond_true293
-	br bool false, label %cond_next518, label %cond_true397.preheader
+	br i1 false, label %cond_next518, label %cond_true397.preheader
 
 cond_next317:		; preds = %cond_true293
 	ret void
@@ -38,37 +36,37 @@ cond_true397.preheader:		; preds = %cond_true298
 	ret void
 
 cond_next518:		; preds = %cond_true298
-	br bool false, label %bb1069, label %cond_true522
+	br i1 false, label %bb1069, label %cond_true522
 
 cond_true522:		; preds = %cond_next518
 	ret void
 
 bb1069:		; preds = %cond_next518
-	br bool false, label %cond_next1131, label %bb1096
+	br i1 false, label %cond_next1131, label %bb1096
 
 bb1096:		; preds = %bb1069
 	ret void
 
 cond_next1131:		; preds = %bb1069
-	br bool false, label %cond_next1207, label %cond_true1150
+	br i1 false, label %cond_next1207, label %cond_true1150
 
 cond_true1150:		; preds = %cond_next1131
 	ret void
 
 cond_next1207:		; preds = %cond_next1131
-	br bool false, label %cond_next1219, label %cond_true1211
+	br i1 false, label %cond_next1219, label %cond_true1211
 
 cond_true1211:		; preds = %cond_next1207
 	ret void
 
 cond_next1219:		; preds = %cond_next1207
-	br bool false, label %cond_true1223, label %cond_next1283
+	br i1 false, label %cond_true1223, label %cond_next1283
 
 cond_true1223:		; preds = %cond_next1219
-	br bool false, label %cond_true1254, label %cond_true1264
+	br i1 false, label %cond_true1254, label %cond_true1264
 
 cond_true1254:		; preds = %cond_true1223
-	br bool false, label %bb1567, label %cond_true1369.preheader
+	br i1 false, label %bb1567, label %cond_true1369.preheader
 
 cond_true1264:		; preds = %cond_true1223
 	ret void
@@ -80,36 +78,40 @@ cond_true1369.preheader:		; preds = %cond_true1254
 	ret void
 
 bb1567:		; preds = %cond_true1254
-	%tmp1580 = load ulong* getelementptr (%struct.CHESS_POSITION* %search, int 0, uint 3)		; <ulong> [#uses=1]
-	%tmp1591 = load ulong* getelementptr (%struct.CHESS_POSITION* %search, int 0, uint 4)		; <ulong> [#uses=1]
-	%tmp1572 = tail call fastcc int %FirstOne( )		; <int> [#uses=5]
-	%tmp1582 = getelementptr [64 x int]* %bishop_shift_rl45, int 0, int %tmp1572		; <int*> [#uses=1]
-	%tmp1583 = load int* %tmp1582		; <int> [#uses=1]
-	%tmp1583 = cast int %tmp1583 to ubyte		; <ubyte> [#uses=1]
-	%tmp1584 = shr ulong %tmp1580, ubyte %tmp1583		; <ulong> [#uses=1]
-	%tmp1584 = cast ulong %tmp1584 to uint		; <uint> [#uses=1]
-	%tmp1585 = and uint %tmp1584, 255		; <uint> [#uses=1]
-	%tmp1587 = getelementptr [64 x [256 x int]]* %bishop_mobility_rl45, int 0, int %tmp1572, uint %tmp1585		; <int*> [#uses=1]
-	%tmp1588 = load int* %tmp1587		; <int> [#uses=1]
-	%tmp1593 = getelementptr [64 x int]* %bishop_shift_rr45, int 0, int %tmp1572		; <int*> [#uses=1]
-	%tmp1594 = load int* %tmp1593		; <int> [#uses=1]
-	%tmp1594 = cast int %tmp1594 to ubyte		; <ubyte> [#uses=1]
-	%tmp1595 = shr ulong %tmp1591, ubyte %tmp1594		; <ulong> [#uses=1]
-	%tmp1595 = cast ulong %tmp1595 to uint		; <uint> [#uses=1]
-	%tmp1596 = and uint %tmp1595, 255		; <uint> [#uses=1]
-	%tmp1598 = getelementptr [64 x [256 x int]]* %bishop_mobility_rr45, int 0, int %tmp1572, uint %tmp1596		; <int*> [#uses=1]
-	%tmp1599 = load int* %tmp1598		; <int> [#uses=1]
-	%tmp1600.neg = sub int 0, %tmp1588		; <int> [#uses=1]
-	%tmp1602 = sub int %tmp1600.neg, %tmp1599		; <int> [#uses=1]
-	%tmp1604 = getelementptr [64 x sbyte]* %black_outpost, int 0, int %tmp1572		; <sbyte*> [#uses=1]
-	%tmp1605 = load sbyte* %tmp1604		; <sbyte> [#uses=1]
-	%tmp1606 = seteq sbyte %tmp1605, 0		; <bool> [#uses=1]
-	br bool %tmp1606, label %cond_next1637, label %cond_true1607
+	%tmp1580 = load i64* getelementptr (%struct.CHESS_POSITION* @search, i32 0, i32 3)		; <i64> [#uses=1]
+	%tmp1591 = load i64* getelementptr (%struct.CHESS_POSITION* @search, i32 0, i32 4)		; <i64> [#uses=1]
+	%tmp1572 = tail call fastcc i32 @FirstOne( )		; <i32> [#uses=5]
+	%tmp1582 = getelementptr [64 x i32]* @bishop_shift_rl45, i32 0, i32 %tmp1572		; <i32*> [#uses=1]
+	%tmp1583 = load i32* %tmp1582		; <i32> [#uses=1]
+	%tmp1583.upgrd.1 = trunc i32 %tmp1583 to i8		; <i8> [#uses=1]
+	%shift.upgrd.2 = zext i8 %tmp1583.upgrd.1 to i64		; <i64> [#uses=1]
+	%tmp1584 = lshr i64 %tmp1580, %shift.upgrd.2		; <i64> [#uses=1]
+	%tmp1584.upgrd.3 = trunc i64 %tmp1584 to i32		; <i32> [#uses=1]
+	%tmp1585 = and i32 %tmp1584.upgrd.3, 255		; <i32> [#uses=1]
+	%gep.upgrd.4 = zext i32 %tmp1585 to i64		; <i64> [#uses=1]
+	%tmp1587 = getelementptr [64 x [256 x i32]]* @bishop_mobility_rl45, i32 0, i32 %tmp1572, i64 %gep.upgrd.4		; <i32*> [#uses=1]
+	%tmp1588 = load i32* %tmp1587		; <i32> [#uses=1]
+	%tmp1593 = getelementptr [64 x i32]* @bishop_shift_rr45, i32 0, i32 %tmp1572		; <i32*> [#uses=1]
+	%tmp1594 = load i32* %tmp1593		; <i32> [#uses=1]
+	%tmp1594.upgrd.5 = trunc i32 %tmp1594 to i8		; <i8> [#uses=1]
+	%shift.upgrd.6 = zext i8 %tmp1594.upgrd.5 to i64		; <i64> [#uses=1]
+	%tmp1595 = lshr i64 %tmp1591, %shift.upgrd.6		; <i64> [#uses=1]
+	%tmp1595.upgrd.7 = trunc i64 %tmp1595 to i32		; <i32> [#uses=1]
+	%tmp1596 = and i32 %tmp1595.upgrd.7, 255		; <i32> [#uses=1]
+	%gep.upgrd.8 = zext i32 %tmp1596 to i64		; <i64> [#uses=1]
+	%tmp1598 = getelementptr [64 x [256 x i32]]* @bishop_mobility_rr45, i32 0, i32 %tmp1572, i64 %gep.upgrd.8		; <i32*> [#uses=1]
+	%tmp1599 = load i32* %tmp1598		; <i32> [#uses=1]
+	%tmp1600.neg = sub i32 0, %tmp1588		; <i32> [#uses=1]
+	%tmp1602 = sub i32 %tmp1600.neg, %tmp1599		; <i32> [#uses=1]
+	%tmp1604 = getelementptr [64 x i8]* @black_outpost, i32 0, i32 %tmp1572		; <i8*> [#uses=1]
+	%tmp1605 = load i8* %tmp1604		; <i8> [#uses=1]
+	%tmp1606 = icmp eq i8 %tmp1605, 0		; <i1> [#uses=1]
+	br i1 %tmp1606, label %cond_next1637, label %cond_true1607
 
 cond_true1607:		; preds = %bb1567
 	ret void
 
 cond_next1637:		; preds = %bb1567
-	%tmp1662 = sub int %tmp1602, 0		; <int> [#uses=0]
+	%tmp1662 = sub i32 %tmp1602, 0		; <i32> [#uses=0]
 	ret void
 }