Revert "[DAGCombiner] Fold (mul (sra X, BW-1), Y) -> (neg (and (sra X, BW-1), Y))"

This reverts commit e8b3ffa.

The AMDGPU/mad_64_32.ll seems to fail on some of the build bots but
passes locally. I'm really confused.

Author: topperc

llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp

@@ -3957,30 +3957,6 @@ SDValue DAGCombiner::visitMULFIX(SDNode *N) {
   return SDValue();
 }
 
-// Fold (mul (sra X, BW-1), Y) -> (neg (and (sra X, BW-1), Y))
-static SDValue foldSraMulToAndNeg(SDNode *N, SDValue N0, SDValue N1,
-                                  SelectionDAG &DAG) {
-  if (N0.getOpcode() != ISD::SRA)
-    return SDValue();
-
-  EVT VT = N->getValueType(0);
-
-  // TODO: Use computeNumSignBits() == BitWidth?
-  unsigned BitWidth = VT.getScalarSizeInBits();
-  ConstantSDNode *ShiftAmt = isConstOrConstSplat(N0.getOperand(1));
-  if (!ShiftAmt || ShiftAmt->getAPIntValue() != (BitWidth - 1))
-    return SDValue();
-
-  // If optimizing for minsize, we don't want to increase the number of
-  // instructions.
-  if (DAG.getMachineFunction().getFunction().hasMinSize())
-    return SDValue();
-
-  SDLoc dl(N);
-  SDValue And = DAG.getNode(ISD::AND, dl, VT, N0, N1);
-  return DAG.getNode(ISD::SUB, dl, VT, DAG.getConstant(0, dl, VT), And);
-}
-
 SDValue DAGCombiner::visitMUL(SDNode *N) {
   SDValue N0 = N->getOperand(0);
   SDValue N1 = N->getOperand(1);
@@ -4191,11 +4167,6 @@ SDValue DAGCombiner::visitMUL(SDNode *N) {
     }
   }
 
-  if (SDValue V = foldSraMulToAndNeg(N, N0, N1, DAG))
-    return V;
-  if (SDValue V = foldSraMulToAndNeg(N, N1, N0, DAG))
-    return V;
-
   // reassociate mul
   if (SDValue RMUL = reassociateOps(ISD::MUL, DL, N0, N1, N->getFlags()))
     return RMUL;

llvm/test/CodeGen/AArch64/umulo-128-legalisation-lowering.ll

@@ -39,24 +39,21 @@ define i128 @__muloti4(i128 %0, i128 %1, i32* nocapture nonnull writeonly align
 ; AARCH:       // %bb.0: // %Entry
 ; AARCH-NEXT:    asr x9, x1, #63
 ; AARCH-NEXT:    asr x10, x3, #63
-; AARCH-NEXT:    and x11, x9, x2
-; AARCH-NEXT:    and x14, x10, x1
-; AARCH-NEXT:    umulh x12, x2, x9
-; AARCH-NEXT:    and x9, x9, x3
-; AARCH-NEXT:    umulh x13, x10, x0
-; AARCH-NEXT:    and x10, x10, x0
-; AARCH-NEXT:    sub x12, x12, x11
-; AARCH-NEXT:    neg x11, x11
-; AARCH-NEXT:    sub x13, x13, x14
-; AARCH-NEXT:    sub x9, x12, x9
-; AARCH-NEXT:    sub x12, x13, x10
-; AARCH-NEXT:    neg x10, x10
 ; AARCH-NEXT:    umulh x14, x0, x2
+; AARCH-NEXT:    mov x8, x1
+; AARCH-NEXT:    mul x11, x2, x9
+; AARCH-NEXT:    str wzr, [x4]
+; AARCH-NEXT:    umulh x12, x10, x0
+; AARCH-NEXT:    umulh x13, x2, x9
+; AARCH-NEXT:    madd x12, x10, x1, x12
+; AARCH-NEXT:    add x13, x13, x11
+; AARCH-NEXT:    mul x10, x10, x0
+; AARCH-NEXT:    madd x9, x3, x9, x13
+; AARCH-NEXT:    add x12, x12, x10
 ; AARCH-NEXT:    adds x10, x10, x11
 ; AARCH-NEXT:    mul x11, x1, x2
 ; AARCH-NEXT:    adc x9, x12, x9
 ; AARCH-NEXT:    umulh x13, x1, x2
-; AARCH-NEXT:    mov x8, x1
 ; AARCH-NEXT:    mul x12, x0, x3
 ; AARCH-NEXT:    adds x11, x11, x14
 ; AARCH-NEXT:    umulh x14, x0, x3
@@ -76,7 +73,6 @@ define i128 @__muloti4(i128 %0, i128 %1, i32* nocapture nonnull writeonly align
 ; AARCH-NEXT:    eor x9, x9, x11
 ; AARCH-NEXT:    eor x10, x10, x11
 ; AARCH-NEXT:    orr x9, x10, x9
-; AARCH-NEXT:    str wzr, [x4]
 ; AARCH-NEXT:    cmp x9, #0
 ; AARCH-NEXT:    cset w9, ne
 ; AARCH-NEXT:    tbz x8, #63, .LBB1_2

llvm/test/CodeGen/AMDGPU/mad_64_32.ll

@@ -159,93 +159,85 @@ define i128 @mad_i64_i32_sextops_i32_i128(i32 %arg0, i32 %arg1, i128 %arg2) #0 {
 ; CI:       ; %bb.0:
 ; CI-NEXT:    s_waitcnt vmcnt(0) expcnt(0) lgkmcnt(0)
 ; CI-NEXT:    v_mad_u64_u32 v[6:7], s[4:5], v0, v1, 0
-; CI-NEXT:    v_ashrrev_i32_e32 v11, 31, v0
+; CI-NEXT:    v_ashrrev_i32_e32 v13, 31, v0
 ; CI-NEXT:    v_mov_b32_e32 v8, 0
-; CI-NEXT:    v_mad_u64_u32 v[9:10], s[4:5], v11, v1, v[7:8]
-; CI-NEXT:    v_ashrrev_i32_e32 v12, 31, v1
-; CI-NEXT:    v_and_b32_e32 v14, v11, v1
-; CI-NEXT:    v_mov_b32_e32 v1, v10
+; CI-NEXT:    v_mad_u64_u32 v[9:10], s[4:5], v13, v1, v[7:8]
+; CI-NEXT:    v_ashrrev_i32_e32 v14, 31, v1
+; CI-NEXT:    v_mad_i64_i32 v[11:12], s[4:5], v1, v13, 0
+; CI-NEXT:    v_mov_b32_e32 v7, v10
 ; CI-NEXT:    v_mov_b32_e32 v10, v8
-; CI-NEXT:    v_mad_u64_u32 v[7:8], s[4:5], v0, v12, v[9:10]
-; CI-NEXT:    v_and_b32_e32 v13, v11, v12
-; CI-NEXT:    v_sub_i32_e32 v9, vcc, 0, v14
-; CI-NEXT:    v_subb_u32_e32 v10, vcc, 0, v13, vcc
-; CI-NEXT:    v_mad_i64_i32 v[9:10], s[4:5], v12, v0, v[9:10]
-; CI-NEXT:    v_mov_b32_e32 v0, v8
-; CI-NEXT:    v_add_i32_e32 v0, vcc, v1, v0
-; CI-NEXT:    v_addc_u32_e64 v1, s[4:5], 0, 0, vcc
-; CI-NEXT:    v_mad_u64_u32 v[0:1], s[4:5], v11, v12, v[0:1]
-; CI-NEXT:    v_add_i32_e32 v8, vcc, v0, v9
-; CI-NEXT:    v_addc_u32_e32 v9, vcc, v1, v10, vcc
-; CI-NEXT:    v_mov_b32_e32 v1, v7
+; CI-NEXT:    v_mad_u64_u32 v[8:9], s[4:5], v0, v14, v[9:10]
+; CI-NEXT:    v_mad_i64_i32 v[0:1], s[4:5], v14, v0, v[11:12]
+; CI-NEXT:    v_add_i32_e32 v9, vcc, v7, v9
+; CI-NEXT:    v_addc_u32_e64 v10, s[4:5], 0, 0, vcc
+; CI-NEXT:    v_mad_u64_u32 v[9:10], s[4:5], v13, v14, v[9:10]
+; CI-NEXT:    v_add_i32_e32 v7, vcc, v9, v0
+; CI-NEXT:    v_addc_u32_e32 v9, vcc, v10, v1, vcc
+; CI-NEXT:    v_mov_b32_e32 v1, v8
 ; CI-NEXT:    v_add_i32_e32 v0, vcc, v6, v2
 ; CI-NEXT:    v_addc_u32_e32 v1, vcc, v1, v3, vcc
-; CI-NEXT:    v_addc_u32_e32 v2, vcc, v8, v4, vcc
+; CI-NEXT:    v_addc_u32_e32 v2, vcc, v7, v4, vcc
 ; CI-NEXT:    v_addc_u32_e32 v3, vcc, v9, v5, vcc
 ; CI-NEXT:    s_setpc_b64 s[30:31]
 ;
 ; SI-LABEL: mad_i64_i32_sextops_i32_i128:
 ; SI:       ; %bb.0:
 ; SI-NEXT:    s_waitcnt vmcnt(0) expcnt(0) lgkmcnt(0)
 ; SI-NEXT:    v_ashrrev_i32_e32 v6, 31, v0
+; SI-NEXT:    v_mul_lo_u32 v11, v6, v1
+; SI-NEXT:    v_mul_hi_u32 v12, v0, v1
 ; SI-NEXT:    v_ashrrev_i32_e32 v7, 31, v1
-; SI-NEXT:    v_and_b32_e32 v9, v6, v1
-; SI-NEXT:    v_and_b32_e32 v10, v7, v0
-; SI-NEXT:    v_mul_lo_u32 v13, v6, v1
-; SI-NEXT:    v_mul_hi_u32 v14, v0, v1
-; SI-NEXT:    v_and_b32_e32 v8, v6, v7
-; SI-NEXT:    v_add_i32_e32 v9, vcc, v10, v9
-; SI-NEXT:    v_mul_hi_u32 v10, v6, v7
-; SI-NEXT:    v_mul_i32_i24_e32 v11, v6, v7
-; SI-NEXT:    v_mul_hi_u32 v6, v6, v1
-; SI-NEXT:    v_mul_hi_u32 v12, v0, v7
-; SI-NEXT:    v_mul_lo_u32 v7, v0, v7
-; SI-NEXT:    v_addc_u32_e32 v8, vcc, v8, v8, vcc
-; SI-NEXT:    v_add_i32_e32 v13, vcc, v13, v14
-; SI-NEXT:    v_addc_u32_e32 v6, vcc, 0, v6, vcc
-; SI-NEXT:    v_add_i32_e32 v7, vcc, v7, v13
-; SI-NEXT:    v_addc_u32_e32 v12, vcc, 0, v12, vcc
-; SI-NEXT:    v_add_i32_e32 v6, vcc, v6, v12
-; SI-NEXT:    v_addc_u32_e64 v12, s[4:5], 0, 0, vcc
-; SI-NEXT:    v_add_i32_e32 v6, vcc, v11, v6
+; SI-NEXT:    v_mul_hi_u32 v14, v6, v1
+; SI-NEXT:    v_mul_lo_u32 v13, v0, v7
+; SI-NEXT:    v_mul_hi_u32 v10, v0, v7
+; SI-NEXT:    v_add_i32_e32 v12, vcc, v11, v12
+; SI-NEXT:    v_addc_u32_e32 v14, vcc, 0, v14, vcc
+; SI-NEXT:    v_mul_hi_u32 v8, v6, v7
+; SI-NEXT:    v_add_i32_e32 v12, vcc, v13, v12
+; SI-NEXT:    v_addc_u32_e32 v10, vcc, 0, v10, vcc
+; SI-NEXT:    v_mul_i32_i24_e32 v9, v6, v7
+; SI-NEXT:    v_add_i32_e32 v10, vcc, v14, v10
+; SI-NEXT:    v_mul_hi_i32 v6, v1, v6
+; SI-NEXT:    v_mul_hi_i32 v7, v7, v0
+; SI-NEXT:    v_addc_u32_e64 v14, s[4:5], 0, 0, vcc
+; SI-NEXT:    v_add_i32_e32 v9, vcc, v9, v10
+; SI-NEXT:    v_addc_u32_e32 v8, vcc, v8, v14, vcc
+; SI-NEXT:    v_add_i32_e32 v10, vcc, v13, v11
 ; SI-NEXT:    v_mul_lo_u32 v0, v0, v1
-; SI-NEXT:    v_addc_u32_e32 v10, vcc, v10, v12, vcc
-; SI-NEXT:    v_sub_i32_e32 v6, vcc, v6, v9
-; SI-NEXT:    v_subb_u32_e32 v8, vcc, v10, v8, vcc
+; SI-NEXT:    v_addc_u32_e32 v6, vcc, v7, v6, vcc
+; SI-NEXT:    v_add_i32_e32 v7, vcc, v9, v10
+; SI-NEXT:    v_addc_u32_e32 v6, vcc, v8, v6, vcc
 ; SI-NEXT:    v_add_i32_e32 v0, vcc, v0, v2
-; SI-NEXT:    v_addc_u32_e32 v1, vcc, v7, v3, vcc
-; SI-NEXT:    v_addc_u32_e32 v2, vcc, v6, v4, vcc
-; SI-NEXT:    v_addc_u32_e32 v3, vcc, v8, v5, vcc
+; SI-NEXT:    v_addc_u32_e32 v1, vcc, v12, v3, vcc
+; SI-NEXT:    v_addc_u32_e32 v2, vcc, v7, v4, vcc
+; SI-NEXT:    v_addc_u32_e32 v3, vcc, v6, v5, vcc
 ; SI-NEXT:    s_setpc_b64 s[30:31]
 ;
 ; GFX9-LABEL: mad_i64_i32_sextops_i32_i128:
 ; GFX9:       ; %bb.0:
 ; GFX9-NEXT:    s_waitcnt vmcnt(0) expcnt(0) lgkmcnt(0)
-; GFX9-NEXT:    v_ashrrev_i32_e32 v14, 31, v0
-; GFX9-NEXT:    v_mad_u64_u32 v[8:9], s[4:5], v0, v1, 0
-; GFX9-NEXT:    v_ashrrev_i32_e32 v15, 31, v1
-; GFX9-NEXT:    v_and_b32_e32 v6, v14, v1
-; GFX9-NEXT:    v_mov_b32_e32 v11, 0
-; GFX9-NEXT:    v_mov_b32_e32 v10, v9
-; GFX9-NEXT:    v_and_b32_e32 v7, v14, v15
-; GFX9-NEXT:    v_sub_co_u32_e32 v6, vcc, 0, v6
-; GFX9-NEXT:    v_mad_u64_u32 v[12:13], s[4:5], v14, v1, v[10:11]
-; GFX9-NEXT:    v_subb_co_u32_e32 v7, vcc, 0, v7, vcc
-; GFX9-NEXT:    v_mov_b32_e32 v10, v13
-; GFX9-NEXT:    v_mov_b32_e32 v13, v11
-; GFX9-NEXT:    v_mad_i64_i32 v[6:7], s[4:5], v15, v0, v[6:7]
-; GFX9-NEXT:    v_mad_u64_u32 v[0:1], s[4:5], v0, v15, v[12:13]
-; GFX9-NEXT:    v_mov_b32_e32 v12, v1
-; GFX9-NEXT:    v_add_co_u32_e32 v10, vcc, v10, v12
-; GFX9-NEXT:    v_addc_co_u32_e64 v11, s[4:5], 0, 0, vcc
-; GFX9-NEXT:    v_mad_u64_u32 v[10:11], s[4:5], v14, v15, v[10:11]
-; GFX9-NEXT:    v_add_co_u32_e32 v6, vcc, v10, v6
-; GFX9-NEXT:    v_addc_co_u32_e32 v7, vcc, v11, v7, vcc
-; GFX9-NEXT:    v_mov_b32_e32 v1, v0
-; GFX9-NEXT:    v_add_co_u32_e32 v0, vcc, v8, v2
+; GFX9-NEXT:    v_mad_u64_u32 v[6:7], s[4:5], v0, v1, 0
+; GFX9-NEXT:    v_ashrrev_i32_e32 v13, 31, v0
+; GFX9-NEXT:    v_mov_b32_e32 v9, 0
+; GFX9-NEXT:    v_mov_b32_e32 v8, v7
+; GFX9-NEXT:    v_mad_u64_u32 v[10:11], s[4:5], v13, v1, v[8:9]
+; GFX9-NEXT:    v_ashrrev_i32_e32 v14, 31, v1
+; GFX9-NEXT:    v_mov_b32_e32 v8, v11
+; GFX9-NEXT:    v_mov_b32_e32 v11, v9
+; GFX9-NEXT:    v_mad_u64_u32 v[10:11], s[4:5], v0, v14, v[10:11]
+; GFX9-NEXT:    v_mov_b32_e32 v12, v11
+; GFX9-NEXT:    v_add_co_u32_e32 v8, vcc, v8, v12
+; GFX9-NEXT:    v_addc_co_u32_e64 v9, s[4:5], 0, 0, vcc
+; GFX9-NEXT:    v_mad_u64_u32 v[8:9], s[4:5], v13, v14, v[8:9]
+; GFX9-NEXT:    v_mad_i64_i32 v[12:13], s[4:5], v1, v13, 0
+; GFX9-NEXT:    v_mad_i64_i32 v[0:1], s[4:5], v14, v0, v[12:13]
+; GFX9-NEXT:    v_add_co_u32_e32 v7, vcc, v8, v0
+; GFX9-NEXT:    v_addc_co_u32_e32 v8, vcc, v9, v1, vcc
+; GFX9-NEXT:    v_mov_b32_e32 v1, v10
+; GFX9-NEXT:    v_add_co_u32_e32 v0, vcc, v6, v2
 ; GFX9-NEXT:    v_addc_co_u32_e32 v1, vcc, v1, v3, vcc
-; GFX9-NEXT:    v_addc_co_u32_e32 v2, vcc, v6, v4, vcc
-; GFX9-NEXT:    v_addc_co_u32_e32 v3, vcc, v7, v5, vcc
+; GFX9-NEXT:    v_addc_co_u32_e32 v2, vcc, v7, v4, vcc
+; GFX9-NEXT:    v_addc_co_u32_e32 v3, vcc, v8, v5, vcc
 ; GFX9-NEXT:    s_setpc_b64 s[30:31]
 ;
 ; GFX11-LABEL: mad_i64_i32_sextops_i32_i128:
@@ -254,30 +246,27 @@ define i128 @mad_i64_i32_sextops_i32_i128(i32 %arg0, i32 %arg1, i128 %arg2) #0 {
 ; GFX11-NEXT:    s_waitcnt_vscnt null, 0x0
 ; GFX11-NEXT:    v_mad_u64_u32 v[6:7], null, v0, v1, 0
 ; GFX11-NEXT:    v_mov_b32_e32 v8, 0
-; GFX11-NEXT:    v_ashrrev_i32_e32 v16, 31, v0
-; GFX11-NEXT:    v_ashrrev_i32_e32 v17, 31, v1
+; GFX11-NEXT:    v_ashrrev_i32_e32 v14, 31, v0
+; GFX11-NEXT:    v_ashrrev_i32_e32 v15, 31, v1
 ; GFX11-NEXT:    s_delay_alu instid0(VALU_DEP_2) | instskip(NEXT) | instid1(VALU_DEP_1)
-; GFX11-NEXT:    v_mad_u64_u32 v[9:10], null, v16, v1, v[7:8]
+; GFX11-NEXT:    v_mad_u64_u32 v[9:10], null, v14, v1, v[7:8]
 ; GFX11-NEXT:    v_dual_mov_b32 v7, v10 :: v_dual_mov_b32 v10, v8
-; GFX11-NEXT:    v_and_b32_e32 v8, v16, v1
-; GFX11-NEXT:    s_delay_alu instid0(VALU_DEP_2) | instskip(SKIP_1) | instid1(VALU_DEP_3)
-; GFX11-NEXT:    v_mad_u64_u32 v[11:12], null, v0, v17, v[9:10]
-; GFX11-NEXT:    v_and_b32_e32 v9, v16, v17
-; GFX11-NEXT:    v_sub_co_u32 v8, vcc_lo, 0, v8
-; GFX11-NEXT:    s_delay_alu instid0(VALU_DEP_2) | instskip(NEXT) | instid1(VALU_DEP_4)
-; GFX11-NEXT:    v_sub_co_ci_u32_e32 v9, vcc_lo, 0, v9, vcc_lo
-; GFX11-NEXT:    v_mov_b32_e32 v1, v12
+; GFX11-NEXT:    s_delay_alu instid0(VALU_DEP_1) | instskip(SKIP_1) | instid1(VALU_DEP_2)
+; GFX11-NEXT:    v_mad_u64_u32 v[11:12], null, v0, v15, v[9:10]
+; GFX11-NEXT:    v_mad_i64_i32 v[9:10], null, v1, v14, 0
+; GFX11-NEXT:    v_mov_b32_e32 v8, v12
 ; GFX11-NEXT:    s_delay_alu instid0(VALU_DEP_2) | instskip(NEXT) | instid1(VALU_DEP_2)
-; GFX11-NEXT:    v_mad_i64_i32 v[14:15], null, v17, v0, v[8:9]
-; GFX11-NEXT:    v_add_co_u32 v12, s0, v7, v1
-; GFX11-NEXT:    v_mov_b32_e32 v7, v11
-; GFX11-NEXT:    v_add_co_ci_u32_e64 v13, null, 0, 0, s0
+; GFX11-NEXT:    v_mad_i64_i32 v[12:13], null, v15, v0, v[9:10]
+; GFX11-NEXT:    v_add_co_u32 v7, s0, v7, v8
 ; GFX11-NEXT:    s_delay_alu instid0(VALU_DEP_1) | instskip(NEXT) | instid1(VALU_DEP_1)
-; GFX11-NEXT:    v_mad_u64_u32 v[0:1], null, v16, v17, v[12:13]
-; GFX11-NEXT:    v_add_co_u32 v8, vcc_lo, v0, v14
-; GFX11-NEXT:    s_delay_alu instid0(VALU_DEP_2) | instskip(SKIP_2) | instid1(VALU_DEP_4)
-; GFX11-NEXT:    v_add_co_ci_u32_e32 v9, vcc_lo, v1, v15, vcc_lo
+; GFX11-NEXT:    v_add_co_ci_u32_e64 v8, null, 0, 0, s0
+; GFX11-NEXT:    v_mad_u64_u32 v[0:1], null, v14, v15, v[7:8]
+; GFX11-NEXT:    v_mov_b32_e32 v7, v11
+; GFX11-NEXT:    s_delay_alu instid0(VALU_DEP_2) | instskip(NEXT) | instid1(VALU_DEP_3)
+; GFX11-NEXT:    v_add_co_u32 v8, vcc_lo, v0, v12
+; GFX11-NEXT:    v_add_co_ci_u32_e32 v9, vcc_lo, v1, v13, vcc_lo
 ; GFX11-NEXT:    v_add_co_u32 v0, vcc_lo, v6, v2
+; GFX11-NEXT:    s_delay_alu instid0(VALU_DEP_4) | instskip(NEXT) | instid1(VALU_DEP_4)
 ; GFX11-NEXT:    v_add_co_ci_u32_e32 v1, vcc_lo, v7, v3, vcc_lo
 ; GFX11-NEXT:    v_add_co_ci_u32_e32 v2, vcc_lo, v8, v4, vcc_lo
 ; GFX11-NEXT:    s_delay_alu instid0(VALU_DEP_4)

llvm/test/CodeGen/PowerPC/pr45448.ll

@@ -25,8 +25,7 @@ define hidden void @julia_tryparse_internal_45896() #0 {
 ; CHECK-NEXT:    rldic r5, r5, 4, 32
 ; CHECK-NEXT:    crnot 4*cr5+lt, eq
 ; CHECK-NEXT:    mulhdu r3, r3, r5
-; CHECK-NEXT:    and r6, r4, r5
-; CHECK-NEXT:    sub r6, r3, r6
+; CHECK-NEXT:    maddld r6, r4, r5, r3
 ; CHECK-NEXT:    cmpld cr1, r6, r3
 ; CHECK-NEXT:    mulhdu. r3, r4, r5
 ; CHECK-NEXT:    bc 4, 4*cr5+lt, .LBB0_10

llvm/test/CodeGen/RISCV/mul.ll

@@ -1480,18 +1480,18 @@ define i64 @mulhsu_i64(i64 %a, i64 %b) nounwind {
 ; RV32IM-NEXT:    add a5, a6, a2
 ; RV32IM-NEXT:    mul a7, a1, a3
 ; RV32IM-NEXT:    add t0, a7, a5
-; RV32IM-NEXT:    and t1, a4, a0
-; RV32IM-NEXT:    sub a2, t0, t1
+; RV32IM-NEXT:    mul t1, a4, a0
+; RV32IM-NEXT:    add a2, t0, t1
 ; RV32IM-NEXT:    sltu t2, a2, t0
 ; RV32IM-NEXT:    sltu a7, t0, a7
 ; RV32IM-NEXT:    sltu a5, a5, a6
 ; RV32IM-NEXT:    mulhu a3, a1, a3
 ; RV32IM-NEXT:    add a3, a3, a5
 ; RV32IM-NEXT:    add a3, a3, a7
-; RV32IM-NEXT:    and a1, a4, a1
+; RV32IM-NEXT:    mul a1, a4, a1
 ; RV32IM-NEXT:    mulhu a0, a4, a0
-; RV32IM-NEXT:    sub a0, a0, a1
-; RV32IM-NEXT:    sub a0, a0, t1
+; RV32IM-NEXT:    add a0, a0, a1
+; RV32IM-NEXT:    add a0, a0, t1
 ; RV32IM-NEXT:    add a0, a3, a0
 ; RV32IM-NEXT:    add a1, a0, t2
 ; RV32IM-NEXT:    mv a0, a2