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, 81 insertions, 99 deletions

diff --git a/test/CodeGen/Generic/print-arith-int.ll b/test/CodeGen/Generic/print-arith-int.ll
index 708abec5f2..cf27515157 100644
--- a/test/CodeGen/Generic/print-arith-int.ll
+++ b/test/CodeGen/Generic/print-arith-int.ll
@@ -1,102 +1,84 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc
+; RUN: llvm-as < %s | llc
+@a_str = internal constant [8 x i8] c"a = %d\0A\00"		; <[8 x i8]*> [#uses=1]
+@b_str = internal constant [8 x i8] c"b = %d\0A\00"		; <[8 x i8]*> [#uses=1]
+@add_str = internal constant [12 x i8] c"a + b = %d\0A\00"		; <[12 x i8]*> [#uses=1]
+@sub_str = internal constant [12 x i8] c"a - b = %d\0A\00"		; <[12 x i8]*> [#uses=1]
+@mul_str = internal constant [12 x i8] c"a * b = %d\0A\00"		; <[12 x i8]*> [#uses=1]
+@div_str = internal constant [12 x i8] c"b / a = %d\0A\00"		; <[12 x i8]*> [#uses=1]
+@rem_str = internal constant [13 x i8] c"b \5C% a = %d\0A\00"		; <[13 x i8]*> [#uses=1]
+@lt_str = internal constant [12 x i8] c"a < b = %d\0A\00"		; <[12 x i8]*> [#uses=1]
+@le_str = internal constant [13 x i8] c"a <= b = %d\0A\00"		; <[13 x i8]*> [#uses=1]
+@gt_str = internal constant [12 x i8] c"a > b = %d\0A\00"		; <[12 x i8]*> [#uses=1]
+@ge_str = internal constant [13 x i8] c"a >= b = %d\0A\00"		; <[13 x i8]*> [#uses=1]
+@eq_str = internal constant [13 x i8] c"a == b = %d\0A\00"		; <[13 x i8]*> [#uses=1]
+@ne_str = internal constant [13 x i8] c"a != b = %d\0A\00"		; <[13 x i8]*> [#uses=1]
+@and_str = internal constant [12 x i8] c"a & b = %d\0A\00"		; <[12 x i8]*> [#uses=1]
+@or_str = internal constant [12 x i8] c"a | b = %d\0A\00"		; <[12 x i8]*> [#uses=1]
+@xor_str = internal constant [12 x i8] c"a ^ b = %d\0A\00"		; <[12 x i8]*> [#uses=1]
+@shl_str = internal constant [13 x i8] c"b << a = %d\0A\00"		; <[13 x i8]*> [#uses=1]
+@shr_str = internal constant [13 x i8] c"b >> a = %d\0A\00"		; <[13 x i8]*> [#uses=1]
+@A = global i32 2		; <i32*> [#uses=1]
+@B = global i32 5		; <i32*> [#uses=1]
 
-%a_str = internal constant [8 x sbyte] c"a = %d\0A\00"
-%b_str = internal constant [8 x sbyte] c"b = %d\0A\00"
-;; binary ops: arith
-%add_str = internal constant [12 x sbyte] c"a + b = %d\0A\00"
-%sub_str = internal constant [12 x sbyte] c"a - b = %d\0A\00"
-%mul_str = internal constant [12 x sbyte] c"a * b = %d\0A\00"
-%div_str = internal constant [12 x sbyte] c"b / a = %d\0A\00"
-%rem_str = internal constant [13 x sbyte] c"b \% a = %d\0A\00"
-;; binary ops: setcc
-%lt_str  = internal constant [12 x sbyte] c"a < b = %d\0A\00"
-%le_str  = internal constant [13 x sbyte] c"a <= b = %d\0A\00"
-%gt_str  = internal constant [12 x sbyte] c"a > b = %d\0A\00"
-%ge_str  = internal constant [13 x sbyte] c"a >= b = %d\0A\00"
-%eq_str  = internal constant [13 x sbyte] c"a == b = %d\0A\00"
-%ne_str  = internal constant [13 x sbyte] c"a != b = %d\0A\00"
-;; logical
-%and_str = internal constant [12 x sbyte] c"a & b = %d\0A\00"
-%or_str  = internal constant [12 x sbyte] c"a | b = %d\0A\00"
-%xor_str = internal constant [12 x sbyte] c"a ^ b = %d\0A\00"
-%shl_str = internal constant [13 x sbyte] c"b << a = %d\0A\00"
-%shr_str = internal constant [13 x sbyte] c"b >> a = %d\0A\00"
+declare i32 @printf(i8*, ...)
 
-declare int %printf(sbyte*, ...)
-%A = global int 2
-%B = global int 5
-
-int %main() {  
-  ;; main vars
-  %a = load int* %A
-  %b = load int* %B
-
-  %a_s = getelementptr [8 x sbyte]* %a_str, long 0, long 0
-  %b_s = getelementptr [8 x sbyte]* %b_str, long 0, long 0
-  
-  call int (sbyte*, ...)* %printf(sbyte* %a_s, int %a)
-  call int (sbyte*, ...)* %printf(sbyte* %b_s, int %b)
-
-  ;; arithmetic
-  %add_r  = add int %a, %b
-  %sub_r  = sub int %a, %b
-  %mul_r  = mul int %a, %b
-  %div_r  = div int %b, %a
-  %rem_r  = rem int %b, %a
-
-  %add_s = getelementptr [12 x sbyte]* %add_str, long 0, long 0
-  %sub_s = getelementptr [12 x sbyte]* %sub_str, long 0, long 0
-  %mul_s = getelementptr [12 x sbyte]* %mul_str, long 0, long 0
-  %div_s = getelementptr [12 x sbyte]* %div_str, long 0, long 0
-  %rem_s = getelementptr [13 x sbyte]* %rem_str, long 0, long 0
-
-  call int (sbyte*, ...)* %printf(sbyte* %add_s, int %add_r)
-  call int (sbyte*, ...)* %printf(sbyte* %sub_s, int %sub_r)
-  call int (sbyte*, ...)* %printf(sbyte* %mul_s, int %mul_r)
-  call int (sbyte*, ...)* %printf(sbyte* %div_s, int %div_r)
-  call int (sbyte*, ...)* %printf(sbyte* %rem_s, int %rem_r)
-
-  ;; setcc
-  %lt_r = setlt int %a, %b
-  %le_r = setle int %a, %b
-  %gt_r = setgt int %a, %b 
-  %ge_r = setge int %a, %b
-  %eq_r = seteq int %a, %b
-  %ne_r = setne int %a, %b
-  
-  %lt_s = getelementptr [12 x sbyte]* %lt_str, long 0, long 0
-  %le_s = getelementptr [13 x sbyte]* %le_str, long 0, long 0
-  %gt_s = getelementptr [12 x sbyte]* %gt_str, long 0, long 0
-  %ge_s = getelementptr [13 x sbyte]* %ge_str, long 0, long 0
-  %eq_s = getelementptr [13 x sbyte]* %eq_str, long 0, long 0
-  %ne_s = getelementptr [13 x sbyte]* %ne_str, long 0, long 0
-
-  call int (sbyte*, ...)* %printf(sbyte* %lt_s, bool %lt_r)
-  call int (sbyte*, ...)* %printf(sbyte* %le_s, bool %le_r)
-  call int (sbyte*, ...)* %printf(sbyte* %gt_s, bool %gt_r)
-  call int (sbyte*, ...)* %printf(sbyte* %ge_s, bool %ge_r)
-  call int (sbyte*, ...)* %printf(sbyte* %eq_s, bool %eq_r)
-  call int (sbyte*, ...)* %printf(sbyte* %ne_s, bool %ne_r)
-
-  ;; logical
-  %and_r = and int %a, %b
-  %or_r  = or  int %a, %b
-  %xor_r = xor int %a, %b
-  %u = cast int %a to ubyte
-  %shl_r = shl int %b, ubyte %u
-  %shr_r = shr int %b, ubyte %u
-  
-  %and_s = getelementptr [12 x sbyte]* %and_str, long 0, long 0
-  %or_s  = getelementptr [12 x sbyte]* %or_str,  long 0, long 0
-  %xor_s = getelementptr [12 x sbyte]* %xor_str, long 0, long 0
-  %shl_s = getelementptr [13 x sbyte]* %shl_str, long 0, long 0
-  %shr_s = getelementptr [13 x sbyte]* %shr_str, long 0, long 0
-
-  call int (sbyte*, ...)* %printf(sbyte* %and_s, int %and_r)
-  call int (sbyte*, ...)* %printf(sbyte* %or_s,  int %or_r)
-  call int (sbyte*, ...)* %printf(sbyte* %xor_s, int %xor_r)
-  call int (sbyte*, ...)* %printf(sbyte* %shl_s, int %shl_r)
-  call int (sbyte*, ...)* %printf(sbyte* %shr_s, int %shr_r)
-
-  ret int 0
+define i32 @main() {
+	%a = load i32* @A		; <i32> [#uses=16]
+	%b = load i32* @B		; <i32> [#uses=17]
+	%a_s = getelementptr [8 x i8]* @a_str, i64 0, i64 0		; <i8*> [#uses=1]
+	%b_s = getelementptr [8 x i8]* @b_str, i64 0, i64 0		; <i8*> [#uses=1]
+	call i32 (i8*, ...)* @printf( i8* %a_s, i32 %a )		; <i32>:1 [#uses=0]
+	call i32 (i8*, ...)* @printf( i8* %b_s, i32 %b )		; <i32>:2 [#uses=0]
+	%add_r = add i32 %a, %b		; <i32> [#uses=1]
+	%sub_r = sub i32 %a, %b		; <i32> [#uses=1]
+	%mul_r = mul i32 %a, %b		; <i32> [#uses=1]
+	%div_r = sdiv i32 %b, %a		; <i32> [#uses=1]
+	%rem_r = srem i32 %b, %a		; <i32> [#uses=1]
+	%add_s = getelementptr [12 x i8]* @add_str, i64 0, i64 0		; <i8*> [#uses=1]
+	%sub_s = getelementptr [12 x i8]* @sub_str, i64 0, i64 0		; <i8*> [#uses=1]
+	%mul_s = getelementptr [12 x i8]* @mul_str, i64 0, i64 0		; <i8*> [#uses=1]
+	%div_s = getelementptr [12 x i8]* @div_str, i64 0, i64 0		; <i8*> [#uses=1]
+	%rem_s = getelementptr [13 x i8]* @rem_str, i64 0, i64 0		; <i8*> [#uses=1]
+	call i32 (i8*, ...)* @printf( i8* %add_s, i32 %add_r )		; <i32>:3 [#uses=0]
+	call i32 (i8*, ...)* @printf( i8* %sub_s, i32 %sub_r )		; <i32>:4 [#uses=0]
+	call i32 (i8*, ...)* @printf( i8* %mul_s, i32 %mul_r )		; <i32>:5 [#uses=0]
+	call i32 (i8*, ...)* @printf( i8* %div_s, i32 %div_r )		; <i32>:6 [#uses=0]
+	call i32 (i8*, ...)* @printf( i8* %rem_s, i32 %rem_r )		; <i32>:7 [#uses=0]
+	%lt_r = icmp slt i32 %a, %b		; <i1> [#uses=1]
+	%le_r = icmp sle i32 %a, %b		; <i1> [#uses=1]
+	%gt_r = icmp sgt i32 %a, %b		; <i1> [#uses=1]
+	%ge_r = icmp sge i32 %a, %b		; <i1> [#uses=1]
+	%eq_r = icmp eq i32 %a, %b		; <i1> [#uses=1]
+	%ne_r = icmp ne i32 %a, %b		; <i1> [#uses=1]
+	%lt_s = getelementptr [12 x i8]* @lt_str, i64 0, i64 0		; <i8*> [#uses=1]
+	%le_s = getelementptr [13 x i8]* @le_str, i64 0, i64 0		; <i8*> [#uses=1]
+	%gt_s = getelementptr [12 x i8]* @gt_str, i64 0, i64 0		; <i8*> [#uses=1]
+	%ge_s = getelementptr [13 x i8]* @ge_str, i64 0, i64 0		; <i8*> [#uses=1]
+	%eq_s = getelementptr [13 x i8]* @eq_str, i64 0, i64 0		; <i8*> [#uses=1]
+	%ne_s = getelementptr [13 x i8]* @ne_str, i64 0, i64 0		; <i8*> [#uses=1]
+	call i32 (i8*, ...)* @printf( i8* %lt_s, i1 %lt_r )		; <i32>:8 [#uses=0]
+	call i32 (i8*, ...)* @printf( i8* %le_s, i1 %le_r )		; <i32>:9 [#uses=0]
+	call i32 (i8*, ...)* @printf( i8* %gt_s, i1 %gt_r )		; <i32>:10 [#uses=0]
+	call i32 (i8*, ...)* @printf( i8* %ge_s, i1 %ge_r )		; <i32>:11 [#uses=0]
+	call i32 (i8*, ...)* @printf( i8* %eq_s, i1 %eq_r )		; <i32>:12 [#uses=0]
+	call i32 (i8*, ...)* @printf( i8* %ne_s, i1 %ne_r )		; <i32>:13 [#uses=0]
+	%and_r = and i32 %a, %b		; <i32> [#uses=1]
+	%or_r = or i32 %a, %b		; <i32> [#uses=1]
+	%xor_r = xor i32 %a, %b		; <i32> [#uses=1]
+	%u = trunc i32 %a to i8		; <i8> [#uses=2]
+	%shift.upgrd.1 = zext i8 %u to i32		; <i32> [#uses=1]
+	%shl_r = shl i32 %b, %shift.upgrd.1		; <i32> [#uses=1]
+	%shift.upgrd.2 = zext i8 %u to i32		; <i32> [#uses=1]
+	%shr_r = ashr i32 %b, %shift.upgrd.2		; <i32> [#uses=1]
+	%and_s = getelementptr [12 x i8]* @and_str, i64 0, i64 0		; <i8*> [#uses=1]
+	%or_s = getelementptr [12 x i8]* @or_str, i64 0, i64 0		; <i8*> [#uses=1]
+	%xor_s = getelementptr [12 x i8]* @xor_str, i64 0, i64 0		; <i8*> [#uses=1]
+	%shl_s = getelementptr [13 x i8]* @shl_str, i64 0, i64 0		; <i8*> [#uses=1]
+	%shr_s = getelementptr [13 x i8]* @shr_str, i64 0, i64 0		; <i8*> [#uses=1]
+	call i32 (i8*, ...)* @printf( i8* %and_s, i32 %and_r )		; <i32>:14 [#uses=0]
+	call i32 (i8*, ...)* @printf( i8* %or_s, i32 %or_r )		; <i32>:15 [#uses=0]
+	call i32 (i8*, ...)* @printf( i8* %xor_s, i32 %xor_r )		; <i32>:16 [#uses=0]
+	call i32 (i8*, ...)* @printf( i8* %shl_s, i32 %shl_r )		; <i32>:17 [#uses=0]
+	call i32 (i8*, ...)* @printf( i8* %shr_s, i32 %shr_r )		; <i32>:18 [#uses=0]
+	ret i32 0
 }