From: Vlad Tsyrklevich <vlad@tsyrklevich.net>
Date: Fri, 1 Mar 2019 18:58:22 +0000 (+0000)
Subject: Revert "[MIPS GlobalISel] Fix mul operands"
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=31ec6de6cab9344450d0178007b2a0db49d2bd51;p=llvm

Revert "[MIPS GlobalISel] Fix mul operands"

This reverts commit r355178, it is causing ASan failures on the
sanitizer bots.

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

diff --git a/lib/Target/Mips/MipsInstructionSelector.cpp b/lib/Target/Mips/MipsInstructionSelector.cpp
index fb43231bc96..92a62b5186b 100644
--- a/lib/Target/Mips/MipsInstructionSelector.cpp
+++ b/lib/Target/Mips/MipsInstructionSelector.cpp
@@ -132,10 +132,6 @@ bool MipsInstructionSelector::select(MachineInstr &I,
   }
 
   if (selectImpl(I, CoverageInfo)) {
-    if (I.getOpcode() == Mips::MUL) {
-      I.getOperand(3).setIsDead(true);
-      I.getOperand(4).setIsDead(true);
-    }
     return true;
   }
 
diff --git a/test/CodeGen/Mips/GlobalISel/instruction-select/mul.mir b/test/CodeGen/Mips/GlobalISel/instruction-select/mul.mir
index 205ecf38705..0b173e1c741 100644
--- a/test/CodeGen/Mips/GlobalISel/instruction-select/mul.mir
+++ b/test/CodeGen/Mips/GlobalISel/instruction-select/mul.mir
@@ -3,7 +3,7 @@
 --- |
 
   define void @mul_i32(i32 %x, i32 %y) {entry: ret void}
-  define void @umul_with_overflow(i32 %lhs, i32 %rhs, i32* %pmul, i1* %pcarry_flag) { ret void }
+  define void @umul_with_overflow(i32 %lhs, i32 %rhs, i1* %pcarry_flag) { ret void }
 
 ...
 ---
@@ -20,7 +20,7 @@ body:             |
     ; MIPS32: liveins: $a0, $a1
     ; MIPS32: [[COPY:%[0-9]+]]:gpr32 = COPY $a0
     ; MIPS32: [[COPY1:%[0-9]+]]:gpr32 = COPY $a1
-    ; MIPS32: [[MUL:%[0-9]+]]:gpr32 = MUL [[COPY]], [[COPY1]], implicit-def dead $hi0, implicit-def dead $lo0
+    ; MIPS32: [[MUL:%[0-9]+]]:gpr32 = MUL [[COPY]], [[COPY1]], implicit-def $hi0, implicit-def $lo0
     ; MIPS32: $v0 = COPY [[MUL]]
     ; MIPS32: RetRA implicit $v0
     %0:gprb(s32) = COPY $a0
@@ -38,15 +38,13 @@ regBankSelected: true
 tracksRegLiveness: true
 body:             |
   bb.1 (%ir-block.0):
-    liveins: $a0, $a1, $a2, $a3
+    liveins: $a0, $a1, $a2
 
     ; MIPS32-LABEL: name: umul_with_overflow
-    ; MIPS32: liveins: $a0, $a1, $a2, $a3
+    ; MIPS32: liveins: $a0, $a1, $a2
     ; MIPS32: [[COPY:%[0-9]+]]:gpr32 = COPY $a0
     ; MIPS32: [[COPY1:%[0-9]+]]:gpr32 = COPY $a1
     ; MIPS32: [[COPY2:%[0-9]+]]:gpr32 = COPY $a2
-    ; MIPS32: [[COPY3:%[0-9]+]]:gpr32 = COPY $a3
-    ; MIPS32: [[MUL:%[0-9]+]]:gpr32 = MUL [[COPY]], [[COPY1]], implicit-def dead $hi0, implicit-def dead $lo0
     ; MIPS32: [[PseudoMULTu:%[0-9]+]]:acc64 = PseudoMULTu [[COPY]], [[COPY1]]
     ; MIPS32: [[PseudoMFHI:%[0-9]+]]:gpr32 = PseudoMFHI [[PseudoMULTu]]
     ; MIPS32: [[LUi:%[0-9]+]]:gpr32 = LUi 0
@@ -56,22 +54,18 @@ body:             |
     ; MIPS32: [[LUi1:%[0-9]+]]:gpr32 = LUi 0
     ; MIPS32: [[ORi1:%[0-9]+]]:gpr32 = ORi [[LUi1]], 1
     ; MIPS32: [[AND:%[0-9]+]]:gpr32 = AND [[SLTu]], [[ORi1]]
-    ; MIPS32: SB [[AND]], [[COPY3]], 0 :: (store 1 into %ir.pcarry_flag)
-    ; MIPS32: SW [[MUL]], [[COPY2]], 0 :: (store 4 into %ir.pmul)
+    ; MIPS32: SB [[AND]], [[COPY2]], 0 :: (store 1 into %ir.pcarry_flag)
     ; MIPS32: RetRA
     %0:gprb(s32) = COPY $a0
     %1:gprb(s32) = COPY $a1
     %2:gprb(p0) = COPY $a2
-    %3:gprb(p0) = COPY $a3
-    %4:gprb(s32) = G_MUL %0, %1
-    %7:gprb(s32) = G_UMULH %0, %1
-    %8:gprb(s32) = G_CONSTANT i32 0
-    %9:gprb(s32) = G_ICMP intpred(ne), %7(s32), %8
-    %10:gprb(s32) = G_CONSTANT i32 1
-    %11:gprb(s32) = COPY %9(s32)
-    %6:gprb(s32) = G_AND %11, %10
-    G_STORE %6(s32), %3(p0) :: (store 1 into %ir.pcarry_flag)
-    G_STORE %4(s32), %2(p0) :: (store 4 into %ir.pmul)
+    %6:gprb(s32) = G_UMULH %0, %1
+    %7:gprb(s32) = G_CONSTANT i32 0
+    %8:gprb(s32) = G_ICMP intpred(ne), %6(s32), %7
+    %9:gprb(s32) = G_CONSTANT i32 1
+    %10:gprb(s32) = COPY %8(s32)
+    %5:gprb(s32) = G_AND %10, %9
+    G_STORE %5(s32), %2(p0) :: (store 1 into %ir.pcarry_flag)
     RetRA
 
 ...
diff --git a/test/CodeGen/Mips/GlobalISel/legalizer/mul.mir b/test/CodeGen/Mips/GlobalISel/legalizer/mul.mir
index d26a71061ec..24b8341f8ec 100644
--- a/test/CodeGen/Mips/GlobalISel/legalizer/mul.mir
+++ b/test/CodeGen/Mips/GlobalISel/legalizer/mul.mir
@@ -9,7 +9,7 @@
   define void @mul_i16_sext() {entry: ret void}
   define void @mul_i16_zext() {entry: ret void}
   define void @mul_i16_aext() {entry: ret void}
-  define void @umul_with_overflow(i32 %lhs, i32 %rhs, i32* %pmul, i1* %pcarry_flag) { ret void }
+  define void @umul_with_overflow(i32 %lhs, i32 %rhs, i1* %pcarry_flag) { ret void }
 
 ...
 ---
@@ -218,31 +218,26 @@ alignment:       2
 tracksRegLiveness: true
 body:             |
   bb.1 (%ir-block.0):
-    liveins: $a0, $a1, $a2, $a3
+    liveins: $a0, $a1, $a2
 
     ; MIPS32-LABEL: name: umul_with_overflow
-    ; MIPS32: liveins: $a0, $a1, $a2, $a3
+    ; MIPS32: liveins: $a0, $a1, $a2
     ; MIPS32: [[COPY:%[0-9]+]]:_(s32) = COPY $a0
     ; MIPS32: [[COPY1:%[0-9]+]]:_(s32) = COPY $a1
     ; MIPS32: [[COPY2:%[0-9]+]]:_(p0) = COPY $a2
-    ; MIPS32: [[COPY3:%[0-9]+]]:_(p0) = COPY $a3
-    ; MIPS32: [[MUL:%[0-9]+]]:_(s32) = G_MUL [[COPY]], [[COPY1]]
     ; MIPS32: [[UMULH:%[0-9]+]]:_(s32) = G_UMULH [[COPY]], [[COPY1]]
     ; MIPS32: [[C:%[0-9]+]]:_(s32) = G_CONSTANT i32 0
     ; MIPS32: [[ICMP:%[0-9]+]]:_(s32) = G_ICMP intpred(ne), [[UMULH]](s32), [[C]]
     ; MIPS32: [[C1:%[0-9]+]]:_(s32) = G_CONSTANT i32 1
-    ; MIPS32: [[COPY4:%[0-9]+]]:_(s32) = COPY [[ICMP]](s32)
-    ; MIPS32: [[AND:%[0-9]+]]:_(s32) = G_AND [[COPY4]], [[C1]]
-    ; MIPS32: G_STORE [[AND]](s32), [[COPY3]](p0) :: (store 1 into %ir.pcarry_flag)
-    ; MIPS32: G_STORE [[MUL]](s32), [[COPY2]](p0) :: (store 4 into %ir.pmul)
+    ; MIPS32: [[COPY3:%[0-9]+]]:_(s32) = COPY [[ICMP]](s32)
+    ; MIPS32: [[AND:%[0-9]+]]:_(s32) = G_AND [[COPY3]], [[C1]]
+    ; MIPS32: G_STORE [[AND]](s32), [[COPY2]](p0) :: (store 1 into %ir.pcarry_flag)
     ; MIPS32: RetRA
     %0:_(s32) = COPY $a0
     %1:_(s32) = COPY $a1
     %2:_(p0) = COPY $a2
-    %3:_(p0) = COPY $a3
-    %4:_(s32), %5:_(s1) = G_UMULO %0, %1
-    G_STORE %5(s1), %3(p0) :: (store 1 into %ir.pcarry_flag)
-    G_STORE %4(s32), %2(p0) :: (store 4 into %ir.pmul)
+    %3:_(s32), %4:_(s1) = G_UMULO %0, %1
+    G_STORE %4(s1), %2(p0) :: (store 1 into %ir.pcarry_flag)
     RetRA
 
 ...
diff --git a/test/CodeGen/Mips/GlobalISel/llvm-ir/mul.ll b/test/CodeGen/Mips/GlobalISel/llvm-ir/mul.ll
index 87cbb15e330..8475d78f6e5 100644
--- a/test/CodeGen/Mips/GlobalISel/llvm-ir/mul.ll
+++ b/test/CodeGen/Mips/GlobalISel/llvm-ir/mul.ll
@@ -88,10 +88,9 @@ entry:
 }
 
 declare { i32, i1 } @llvm.umul.with.overflow.i32(i32, i32)
-define void @umul_with_overflow(i32 %lhs, i32 %rhs, i32* %pmul, i1* %pcarry_flag) {
+define void @umul_with_overflow(i32 %lhs, i32 %rhs, i1* %pcarry_flag) {
 ; MIPS32-LABEL: umul_with_overflow:
 ; MIPS32:       # %bb.0:
-; MIPS32-NEXT:    mul $1, $4, $5
 ; MIPS32-NEXT:    multu $4, $5
 ; MIPS32-NEXT:    mfhi $4
 ; MIPS32-NEXT:    lui $5, 0
@@ -101,14 +100,11 @@ define void @umul_with_overflow(i32 %lhs, i32 %rhs, i32* %pmul, i1* %pcarry_flag
 ; MIPS32-NEXT:    lui $5, 0
 ; MIPS32-NEXT:    ori $5, $5, 1
 ; MIPS32-NEXT:    and $4, $4, $5
-; MIPS32-NEXT:    sb $4, 0($7)
-; MIPS32-NEXT:    sw $1, 0($6)
+; MIPS32-NEXT:    sb $4, 0($6)
 ; MIPS32-NEXT:    jr $ra
 ; MIPS32-NEXT:    nop
   %res = call { i32, i1 } @llvm.umul.with.overflow.i32(i32 %lhs, i32 %rhs)
   %carry_flag = extractvalue { i32, i1 } %res, 1
-  %mul = extractvalue { i32, i1 } %res, 0
   store i1 %carry_flag, i1* %pcarry_flag
-  store i32 %mul, i32* %pmul
   ret void
 }
diff --git a/test/CodeGen/Mips/GlobalISel/regbankselect/mul.mir b/test/CodeGen/Mips/GlobalISel/regbankselect/mul.mir
index dd347142b01..f02bdd67114 100644
--- a/test/CodeGen/Mips/GlobalISel/regbankselect/mul.mir
+++ b/test/CodeGen/Mips/GlobalISel/regbankselect/mul.mir
@@ -3,7 +3,7 @@
 --- |
 
   define void @mul_i32(i32 %x, i32 %y) {entry: ret void}
-  define void @umul_with_overflow(i32 %lhs, i32 %rhs, i32* %pmul, i1* %pcarry_flag) { ret void }
+  define void @umul_with_overflow(i32 %lhs, i32 %rhs, i1* %pcarry_flag) { ret void }
 
 ...
 ---
@@ -36,37 +36,31 @@ legalized:       true
 tracksRegLiveness: true
 body:             |
   bb.1 (%ir-block.0):
-    liveins: $a0, $a1, $a2, $a3
+    liveins: $a0, $a1, $a2
 
     ; MIPS32-LABEL: name: umul_with_overflow
-    ; MIPS32: liveins: $a0, $a1, $a2, $a3
+    ; MIPS32: liveins: $a0, $a1, $a2
     ; MIPS32: [[COPY:%[0-9]+]]:gprb(s32) = COPY $a0
     ; MIPS32: [[COPY1:%[0-9]+]]:gprb(s32) = COPY $a1
     ; MIPS32: [[COPY2:%[0-9]+]]:gprb(p0) = COPY $a2
-    ; MIPS32: [[COPY3:%[0-9]+]]:gprb(p0) = COPY $a3
-    ; MIPS32: [[MUL:%[0-9]+]]:gprb(s32) = G_MUL [[COPY]], [[COPY1]]
     ; MIPS32: [[UMULH:%[0-9]+]]:gprb(s32) = G_UMULH [[COPY]], [[COPY1]]
     ; MIPS32: [[C:%[0-9]+]]:gprb(s32) = G_CONSTANT i32 0
     ; MIPS32: [[ICMP:%[0-9]+]]:gprb(s32) = G_ICMP intpred(ne), [[UMULH]](s32), [[C]]
     ; MIPS32: [[C1:%[0-9]+]]:gprb(s32) = G_CONSTANT i32 1
-    ; MIPS32: [[COPY4:%[0-9]+]]:gprb(s32) = COPY [[ICMP]](s32)
-    ; MIPS32: [[AND:%[0-9]+]]:gprb(s32) = G_AND [[COPY4]], [[C1]]
-    ; MIPS32: G_STORE [[AND]](s32), [[COPY3]](p0) :: (store 1 into %ir.pcarry_flag)
-    ; MIPS32: G_STORE [[MUL]](s32), [[COPY2]](p0) :: (store 4 into %ir.pmul)
+    ; MIPS32: [[COPY3:%[0-9]+]]:gprb(s32) = COPY [[ICMP]](s32)
+    ; MIPS32: [[AND:%[0-9]+]]:gprb(s32) = G_AND [[COPY3]], [[C1]]
+    ; MIPS32: G_STORE [[AND]](s32), [[COPY2]](p0) :: (store 1 into %ir.pcarry_flag)
     ; MIPS32: RetRA
     %0:_(s32) = COPY $a0
     %1:_(s32) = COPY $a1
     %2:_(p0) = COPY $a2
-    %3:_(p0) = COPY $a3
-    %4:_(s32) = G_MUL %0, %1
-    %7:_(s32) = G_UMULH %0, %1
-    %8:_(s32) = G_CONSTANT i32 0
-    %9:_(s32) = G_ICMP intpred(ne), %7(s32), %8
-    %10:_(s32) = G_CONSTANT i32 1
-    %11:_(s32) = COPY %9(s32)
-    %6:_(s32) = G_AND %11, %10
-    G_STORE %6(s32), %3(p0) :: (store 1 into %ir.pcarry_flag)
-    G_STORE %4(s32), %2(p0) :: (store 4 into %ir.pmul)
+    %6:_(s32) = G_UMULH %0, %1
+    %7:_(s32) = G_CONSTANT i32 0
+    %8:_(s32) = G_ICMP intpred(ne), %6(s32), %7
+    %9:_(s32) = G_CONSTANT i32 1
+    %10:_(s32) = COPY %8(s32)
+    %5:_(s32) = G_AND %10, %9
+    G_STORE %5(s32), %2(p0) :: (store 1 into %ir.pcarry_flag)
     RetRA
 
 ...