Remove llvm-upgrade and update test cases.

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

1 files changed, 50 insertions, 53 deletions

diff --git a/test/Transforms/InstCombine/rem.ll b/test/Transforms/InstCombine/rem.ll
index 987d3c3db6..c0e0fa4dc3 100644
--- a/test/Transforms/InstCombine/rem.ll
+++ b/test/Transforms/InstCombine/rem.ll
@@ -1,79 +1,76 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep rem
-; END.
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep rem
 
-implementation
-
-int %test1(int %A) {
-	%B = rem int %A, 1    ; ISA constant 0
-	ret int %B
+define i32 @test1(i32 %A) {
+	%B = srem i32 %A, 1		; <i32> [#uses=1]
+	ret i32 %B
 }
 
-int %test2(int %A) {          ; 0 % X = 0, we don't need to preserve traps
-	%B = rem int 0, %A
-	ret int %B
+define i32 @test2(i32 %A) {
+	%B = srem i32 0, %A		; <i32> [#uses=1]
+	ret i32 %B
 }
 
-uint %test3(uint %A) {
-	%B = rem uint %A, 8   ; & 7
-	ret uint %B
+define i32 @test3(i32 %A) {
+	%B = urem i32 %A, 8		; <i32> [#uses=1]
+	ret i32 %B
 }
 
-bool %test3a(int %A) {
-	%B = rem int %A, -8   ; & 7
-	%C = setne int %B, 0
-	ret bool %C
+define i1 @test3a(i32 %A) {
+	%B = srem i32 %A, -8		; <i32> [#uses=1]
+	%C = icmp ne i32 %B, 0		; <i1> [#uses=1]
+	ret i1 %C
 }
 
-uint %test4(uint %X, bool %C) {
-	%V = select bool %C, uint 1, uint 8
-	%R = rem uint %X, %V
-	ret uint %R
+define i32 @test4(i32 %X, i1 %C) {
+	%V = select i1 %C, i32 1, i32 8		; <i32> [#uses=1]
+	%R = urem i32 %X, %V		; <i32> [#uses=1]
+	ret i32 %R
 }
 
-uint %test5(uint %X, ubyte %B) {
-        %Amt = shl uint 32, ubyte %B
-        %V = rem uint %X, %Amt
-        ret uint %V
+define i32 @test5(i32 %X, i8 %B) {
+	%shift.upgrd.1 = zext i8 %B to i32		; <i32> [#uses=1]
+	%Amt = shl i32 32, %shift.upgrd.1		; <i32> [#uses=1]
+	%V = urem i32 %X, %Amt		; <i32> [#uses=1]
+	ret i32 %V
 }
 
-int %test6(int %A) {
-	%B = rem int %A, 0   ;; undef
-	ret int %B
+define i32 @test6(i32 %A) {
+	%B = srem i32 %A, 0		; <i32> [#uses=1]
+	ret i32 %B
 }
 
-int %test7(int %A) {
-	%B = mul int %A, 26
-	%C = rem int %B, 13
-	ret int %C
+define i32 @test7(i32 %A) {
+	%B = mul i32 %A, 26		; <i32> [#uses=1]
+	%C = srem i32 %B, 13		; <i32> [#uses=1]
+	ret i32 %C
 }
 
-int %test8(int %A) {
-	%B = shl int %A, ubyte 4
-	%C = rem int %B, 8 
-	ret int %C
+define i32 @test8(i32 %A) {
+	%B = shl i32 %A, 4		; <i32> [#uses=1]
+	%C = srem i32 %B, 8		; <i32> [#uses=1]
+	ret i32 %C
 }
 
-uint %test9(uint %A) {
-	%B = mul uint %A, 124
-	%C = rem uint %B, 62 
-	ret uint %C
+define i32 @test9(i32 %A) {
+	%B = mul i32 %A, 124		; <i32> [#uses=1]
+	%C = urem i32 %B, 62		; <i32> [#uses=1]
+	ret i32 %C
 }
 
-int %test10(ubyte %c) {
-        %tmp.1 = cast ubyte %c to int
-        %tmp.2 = mul int %tmp.1, 3
-        %tmp.3 = cast int %tmp.2 to ulong
-        %tmp.5 = rem ulong %tmp.3, 3
-        %tmp.6 = cast ulong %tmp.5 to int
-        ret int %tmp.6
+define i32 @test10(i8 %c) {
+	%tmp.1 = zext i8 %c to i32		; <i32> [#uses=1]
+	%tmp.2 = mul i32 %tmp.1, 3		; <i32> [#uses=1]
+	%tmp.3 = sext i32 %tmp.2 to i64		; <i64> [#uses=1]
+	%tmp.5 = urem i64 %tmp.3, 3		; <i64> [#uses=1]
+	%tmp.6 = trunc i64 %tmp.5 to i32		; <i32> [#uses=1]
+	ret i32 %tmp.6
 }
 
-int %test11(int %i) {
-        %tmp.1 = and int %i, -2
-        %tmp.3 = mul int %tmp.1, 3
-        %tmp.5 = rem int %tmp.3, 6
-        ret int %tmp.5
+define i32 @test11(i32 %i) {
+	%tmp.1 = and i32 %i, -2		; <i32> [#uses=1]
+	%tmp.3 = mul i32 %tmp.1, 3		; <i32> [#uses=1]
+	%tmp.5 = srem i32 %tmp.3, 6		; <i32> [#uses=1]
+	ret i32 %tmp.5
 }
-