1 files changed, 60 insertions, 75 deletions
diff --git a/test/CodeGen/Generic/print-arith-fp.ll b/test/CodeGen/Generic/print-arith-fp.ll
index cfa7583..87aa1a0 100644
--- a/test/CodeGen/Generic/print-arith-fp.ll
+++ b/test/CodeGen/Generic/print-arith-fp.ll
@@ -1,76 +1,61 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc
-
-%a_str = internal constant [8 x sbyte] c"a = %f\0A\00"
-%b_str = internal constant [8 x sbyte] c"b = %f\0A\00"
-;; binary ops: arith
-%add_str = internal constant [12 x sbyte] c"a + b = %f\0A\00"
-%sub_str = internal constant [12 x sbyte] c"a - b = %f\0A\00"
-%mul_str = internal constant [12 x sbyte] c"a * b = %f\0A\00"
-%div_str = internal constant [12 x sbyte] c"b / a = %f\0A\00"
-%rem_str = internal constant [13 x sbyte] c"b %% a = %f\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"
-
-declare int %printf(sbyte*, ...)
-%A = global double 2.0
-%B = global double 5.0
-
-int %main() {  
-  ;; main vars
-  %a = load double* %A
-  %b = load double* %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, double %a)
-  call int (sbyte*, ...)* %printf(sbyte* %b_s, double %b)
-
-  ;; arithmetic
-  %add_r  = add double %a, %b
-  %sub_r  = sub double %a, %b
-  %mul_r  = mul double %a, %b
-  %div_r  = div double %b, %a
-  %rem_r  = rem double %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, double %add_r)
-  call int (sbyte*, ...)* %printf(sbyte* %sub_s, double %sub_r)
-  call int (sbyte*, ...)* %printf(sbyte* %mul_s, double %mul_r)
-  call int (sbyte*, ...)* %printf(sbyte* %div_s, double %div_r)
-  call int (sbyte*, ...)* %printf(sbyte* %rem_s, double %rem_r)
-
-  ;; setcc
-  %lt_r = setlt double %a, %b
-  %le_r = setle double %a, %b
-  %gt_r = setgt double %a, %b 
-  %ge_r = setge double %a, %b
-  %eq_r = seteq double %a, %b
-  %ne_r = setne double %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)
-
-  ret int 0
+; RUN: llvm-as < %s | llc
+@a_str = internal constant [8 x i8] c"a = %f\0A\00"		; <[8 x i8]*> [#uses=1]
+@b_str = internal constant [8 x i8] c"b = %f\0A\00"		; <[8 x i8]*> [#uses=1]
+@add_str = internal constant [12 x i8] c"a + b = %f\0A\00"		; <[12 x i8]*> [#uses=1]
+@sub_str = internal constant [12 x i8] c"a - b = %f\0A\00"		; <[12 x i8]*> [#uses=1]
+@mul_str = internal constant [12 x i8] c"a * b = %f\0A\00"		; <[12 x i8]*> [#uses=1]
+@div_str = internal constant [12 x i8] c"b / a = %f\0A\00"		; <[12 x i8]*> [#uses=1]
+@rem_str = internal constant [13 x i8] c"b %% a = %f\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]
+@A = global double 2.000000e+00		; <double*> [#uses=1]
+@B = global double 5.000000e+00		; <double*> [#uses=1]
+
+declare i32 @printf(i8*, ...)
+
+define i32 @main() {
+	%a = load double* @A		; <double> [#uses=12]
+	%b = load double* @B		; <double> [#uses=12]
+	%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, double %a )		; <i32>:1 [#uses=0]
+	call i32 (i8*, ...)* @printf( i8* %b_s, double %b )		; <i32>:2 [#uses=0]
+	%add_r = add double %a, %b		; <double> [#uses=1]
+	%sub_r = sub double %a, %b		; <double> [#uses=1]
+	%mul_r = mul double %a, %b		; <double> [#uses=1]
+	%div_r = fdiv double %b, %a		; <double> [#uses=1]
+	%rem_r = frem double %b, %a		; <double> [#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, double %add_r )		; <i32>:3 [#uses=0]
+	call i32 (i8*, ...)* @printf( i8* %sub_s, double %sub_r )		; <i32>:4 [#uses=0]
+	call i32 (i8*, ...)* @printf( i8* %mul_s, double %mul_r )		; <i32>:5 [#uses=0]
+	call i32 (i8*, ...)* @printf( i8* %div_s, double %div_r )		; <i32>:6 [#uses=0]
+	call i32 (i8*, ...)* @printf( i8* %rem_s, double %rem_r )		; <i32>:7 [#uses=0]
+	%lt_r = fcmp olt double %a, %b		; <i1> [#uses=1]
+	%le_r = fcmp ole double %a, %b		; <i1> [#uses=1]
+	%gt_r = fcmp ogt double %a, %b		; <i1> [#uses=1]
+	%ge_r = fcmp oge double %a, %b		; <i1> [#uses=1]
+	%eq_r = fcmp oeq double %a, %b		; <i1> [#uses=1]
+	%ne_r = fcmp une double %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]
+	ret i32 0
 }