Remove llvm-upgrade and update tests.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@47296 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/CodeGen/Generic/print-mul.ll b/test/CodeGen/Generic/print-mul.ll
index 911c73e..1d9452a 100644
--- a/test/CodeGen/Generic/print-mul.ll
+++ b/test/CodeGen/Generic/print-mul.ll
@@ -1,35 +1,32 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc
+; RUN: llvm-as < %s | llc
-%a_str = internal constant [8 x sbyte] c"a = %d\0A\00"
-%b_str = internal constant [8 x sbyte] c"b = %d\0A\00"
+@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]
+@a_mul_str = internal constant [13 x i8] c"a * %d = %d\0A\00" ; <[13 x i8]*> [#uses=1]
+@A = global i32 2 ; <i32*> [#uses=1]
+@B = global i32 5 ; <i32*> [#uses=1]
-;; mul
-%a_mul_str = internal constant [13 x sbyte] c"a * %d = %d\0A\00"
+declare i32 @printf(i8*, ...)
-declare int %printf(sbyte*, ...)
-%A = global int 2
-%B = global int 5
-
-int %main() {
+define i32 @main() {
entry:
- %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
- %a_mul_s = getelementptr [13 x sbyte]* %a_mul_str, long 0, long 0
- call int (sbyte*, ...)* %printf(sbyte* %a_s, int %a)
- call int (sbyte*, ...)* %printf(sbyte* %b_s, int %b)
- br label %shl_test
+ %a = load i32* @A ; <i32> [#uses=2]
+ %b = load i32* @B ; <i32> [#uses=1]
+ %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]
+ %a_mul_s = getelementptr [13 x i8]* @a_mul_str, i64 0, i64 0 ; <i8*> [#uses=1]
+ call i32 (i8*, ...)* @printf( i8* %a_s, i32 %a ) ; <i32>:0 [#uses=0]
+ call i32 (i8*, ...)* @printf( i8* %b_s, i32 %b ) ; <i32>:1 [#uses=0]
+ br label %shl_test
-shl_test:
- ;; test mul by 0-255
- %s = phi int [ 0, %entry ], [ %s_inc, %shl_test ]
- %result = mul int %a, %s
- call int (sbyte*, ...)* %printf(sbyte* %a_mul_s, int %s, int %result)
- %s_inc = add int %s, 1
- %done = seteq int %s, 256
- br bool %done, label %fini, label %shl_test
+shl_test: ; preds = %shl_test, %entry
+ %s = phi i32 [ 0, %entry ], [ %s_inc, %shl_test ] ; <i32> [#uses=4]
+ %result = mul i32 %a, %s ; <i32> [#uses=1]
+ call i32 (i8*, ...)* @printf( i8* %a_mul_s, i32 %s, i32 %result ) ; <i32>:2 [#uses=0]
+ %s_inc = add i32 %s, 1 ; <i32> [#uses=1]
+ %done = icmp eq i32 %s, 256 ; <i1> [#uses=1]
+ br i1 %done, label %fini, label %shl_test
-fini:
- ret int 0
+fini: ; preds = %shl_test
+ ret i32 0
}