[AArch64] Canonicalize X*(Y+1) or X*(1-Y) to madd/msub

[wwei]

Summary

Performing the rearrangement for add/sub and mul instructions to match the madd/msub pattern

[dmgreen]

llvm/test/CodeGen/AArch64/madd-combiner.ll

0–4

Can you change these check lines to:

; RUN: llc -mtriple=aarch64-apple-darwin            -verify-machineinstrs < %s | FileCheck %s --check-prefixes=CHECK,CHECK-ISEL
; RUN: llc -mtriple=aarch64-apple-darwin -fast-isel -verify-machineinstrs < %s | FileCheck %s --check-prefixes=CHECK,CHECK-FAST

And pre-generate the check lines with update_llc_test_checks.

[sdesmalen]

llvm/lib/Target/AArch64/AArch64ISelLowering.cpp

13026

I'd suggest collapsing all conditions together into a single lambda, so that it makes the code structurally simpler (less control flow) and more readable (you can directly see the exact pattern being matched). It may also help handle the case where the N0 is an ADD/SUB which does not match the conditions that follow, where N1 is just Y + 1. e.g. (X+Z)*(Y+1), isn't yet handled by your code.

auto IsAddSubWith1= [](SDValue V) -> bool {
  unsigned Opc = V->getOpcode();
  if ((Opc == ISD::ADD || Opc == ISD::SUB) ) && V->hasOneUse()) {
    SDValue Opnd = Opc == ISD::ADD ? V->getOperand(1) : V->getOperand(0);
    if (auto C = dyn_cast<ConstantSDNode>(Opnd))
      return C->isOne();
  }
  return false;
}

if (IsAddSubWith1(N->getOperand(0)) {
  // Rewrite
}

if (IsAddSubWith1(N->getOperand(1))) {
  // Rewrite
}

13041

nit: this one can be replaced by N1.

13048

nit: this one can be replaced by N0.

[wwei]

llvm/lib/Target/AArch64/AArch64ISelLowering.cpp

13026

Thank you for your suggestion! I have refactored the code.

13041

done

13048

This one can't be replaced

llvm/test/CodeGen/AArch64/madd-combiner.ll

0–4

updated, thanks

[sdesmalen]

Thanks for the changes!

llvm/lib/Target/AArch64/AArch64ISelLowering.cpp

13016

nit: unnecessary curly braces.

13026

If you change IsAddSubWith1 also return the other operand, the code for rewriting becomes a bit simpler and easier to follow.

auto IsAddSubWith1 = [](SDValue V, SDValue &OtherOpnd) -> bool {
  ...
};

SDValue OtherOpnd;                                                
if (IsAddSubWith1(N0, OtherOpnd)) {
  SDValue MulVal = DAG.getNode(ISD::MUL, DL, VT, N1, OtherOpnd);
  return DAG.getNode(N0->getOpcode(), DL, VT, N1, MulVal);
}

[david-arm]

Hi @wwei, have you done any performance measurements with this change on hardware to see what effect it has on some benchmarks?

[wwei]

llvm/lib/Target/AArch64/AArch64ISelLowering.cpp

13016

Braces removed

13026

Done.

[wwei]

In D111862#3075475, @david-arm wrote:

Hi @wwei, have you done any performance measurements with this change on hardware to see what effect it has on some benchmarks?

We found this optimization opportunity on some HPC workloads, but we haven’t tested the performance gain yet.

[david-arm]

LGTM! Looks like you've addressed all the review comments.

llvm/lib/Target/AArch64/AArch64ISelLowering.cpp

13012

nit: Could you rename this so it's more obvious, i.e. something like AddSubOpc?

[bcl5980]

Should we add ISD::Freeze here? What if X/Y is undef for this pattern?
It looks the transform is not correct unless X/Y is noundef on LLVM IR. I don't know if SDAG have similar limitation or not.
https://alive2.llvm.org/ce/z/ciKKWy

[efriedma]

The pattern isn't undef-safe, but it's poison-safe. We haven't been going after transforms like that very aggressively lately, given https://discourse.llvm.org/t/rfc-load-instruction-uninitialized-memory-semantics/67481 . But yes, it should freeze the operand.

llvm/lib/Target/AArch64/AArch64ISelLowering.cpp

static SDValue performMulCombine(SDNode *N, SelectionDAG &DAG,
                                  const AArch64Subtarget *Subtarget) {
 
   if (SDValue Ext = performMulVectorExtendCombine(N, DAG))
     return Ext;
 
   if (DCI.isBeforeLegalizeOps())
     return SDValue();
 
+  // Canonicalize X*(Y+1) -> X*Y+X and (X+1)*Y -> X*Y+Y,
+  // and in MachineCombiner pass, add+mul will be combined into madd.
+  // Similarly, X*(1-Y) -> X - X*Y and (1-Y)*X -> X - Y*X.
+  SDLoc DL(N);
+  EVT VT = N->getValueType(0);
+  SDValue N0 = N->getOperand(0);
+  SDValue N1 = N->getOperand(1);
+  SDValue MulOper;
+  unsigned Opc;
+
+  auto IsAddSubWith1 = [&](SDValue V) -> bool {
+    Opc = V->getOpcode();
+    if ((Opc == ISD::ADD || Opc == ISD::SUB) && V->hasOneUse()) {
+      SDValue Opnd = V->getOperand(1);
+      MulOper = V->getOperand(0);
+      if (Opc == ISD::SUB)
+        std::swap(Opnd, MulOper);
+      if (auto C = dyn_cast<ConstantSDNode>(Opnd))
+        return C->isOne();
+    }
+    return false;
+  };
+
+  if (IsAddSubWith1(N0)) {
+    SDValue MulVal = DAG.getNode(ISD::MUL, DL, VT, N1, MulOper);
+    return DAG.getNode(Opc, DL, VT, N1, MulVal);
+  }
+
+  if (IsAddSubWith1(N1)) {
+    SDValue MulVal = DAG.getNode(ISD::MUL, DL, VT, N0, MulOper);
+    return DAG.getNode(Opc, DL, VT, N0, MulVal);
+  }
+
   // The below optimizations require a constant RHS.
-  if (!isa<ConstantSDNode>(N->getOperand(1)))
+  if (!isa<ConstantSDNode>(N1))
     return SDValue();
 
-  SDValue N0 = N->getOperand(0);
-  ConstantSDNode *C = cast<ConstantSDNode>(N->getOperand(1));
+  ConstantSDNode *C = cast<ConstantSDNode>(N1);
   const APInt &ConstValue = C->getAPIntValue();
 
   // Allow the scaling to be folded into the `cnt` instruction by preventing
   // the scaling to be obscured here. This makes it easier to pattern match.
   if (IsSVECntIntrinsic(N0) ||
      (N0->getOpcode() == ISD::TRUNCATE &&
       (IsSVECntIntrinsic(N0->getOperand(0)))))
        if (ConstValue.sge(1) && ConstValue.sle(16))
          return SDValue();
 
   // Multiplication of a power of two plus/minus one can be done more
   // cheaply as as shift+add/sub. For now, this is true unilaterally. If
   // future CPUs have a cheaper MADD instruction, this may need to be
   // gated on a subtarget feature. For Cyclone, 32-bit MADD is 4 cycles and
   // 64-bit is 5 cycles, so this is always a win.
if (ConstValue.isNonNegative()) {
     } else if (CVNegMinus1.isPowerOf2()) {
       ShiftAmt = CVNegMinus1.logBase2();
       AddSubOpc = ISD::ADD;
       NegateResult = true;
     } else
       return SDValue();
   }
 
-  SDLoc DL(N);
-  EVT VT = N->getValueType(0);
   SDValue ShiftedVal = DAG.getNode(ISD::SHL, DL, VT, N0,
                                    DAG.getConstant(ShiftAmt, DL, MVT::i64));
 
   SDValue AddSubN0 = ShiftValUseIsN0 ? ShiftedVal : N0;
   SDValue AddSubN1 = ShiftValUseIsN0 ? N0 : ShiftedVal;
   SDValue Res = DAG.getNode(AddSubOpc, DL, VT, AddSubN0, AddSubN1);
   assert(!(NegateResult && TrailingZeroes) &&
          "NegateResult and TrailingZeroes cannot both be true for now.");

llvm/test/CodeGen/AArch64/madd-combiner.ll

-; RUN: llc -mtriple=aarch64-apple-darwin            -verify-machineinstrs < %s | FileCheck %s
-; RUN: llc -mtriple=aarch64-apple-darwin -fast-isel -verify-machineinstrs < %s | FileCheck %s
+; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
+; RUN: llc -mtriple=aarch64-apple-darwin            -verify-machineinstrs < %s | FileCheck %s --check-prefixes=CHECK,CHECK-ISEL
+; RUN: llc -mtriple=aarch64-apple-darwin -fast-isel -verify-machineinstrs < %s | FileCheck %s --check-prefixes=CHECK,CHECK-FAST
 
 ; Test that we use the correct register class.
 define i32 @mul_add_imm(i32 %a, i32 %b) {
-; CHECK-LABEL: mul_add_imm
-; CHECK:       orr [[REG:w[0-9]+]], wzr, #0x4
-; CHECK-NEXT:  madd  {{w[0-9]+}}, w0, w1, [[REG]]
+; CHECK-LABEL: mul_add_imm:
+; CHECK:       ; %bb.0:
+; CHECK-NEXT:    orr w8, wzr, #0x4
+; CHECK-NEXT:    madd w0, w0, w1, w8
+; CHECK-NEXT:    ret
   %1 = mul i32 %a, %b
   %2 = add i32 %1, 4
   ret i32 %2
 }
 
 define i32 @mul_sub_imm1(i32 %a, i32 %b) {
-; CHECK-LABEL: mul_sub_imm1
-; CHECK:       mov [[REG:w[0-9]+]], #4
-; CHECK-NEXT:  msub  {{w[0-9]+}}, w0, w1, [[REG]]
+; CHECK-LABEL: mul_sub_imm1:
+; CHECK:       ; %bb.0:
+; CHECK-NEXT:    mov w8, #4
+; CHECK-NEXT:    msub w0, w0, w1, w8
+; CHECK-NEXT:    ret
   %1 = mul i32 %a, %b
   %2 = sub i32 4, %1
   ret i32 %2
 }
 
 ; bugpoint reduced test case. This only tests that we pass the MI verifier.
 define void @mul_add_imm2() {
+; CHECK-ISEL-LABEL: mul_add_imm2:
+; CHECK-ISEL:       ; %bb.0: ; %entry
+; CHECK-ISEL-NEXT:    mov w8, #1
+; CHECK-ISEL-NEXT:  LBB2_1: ; %for.body8
+; CHECK-ISEL-NEXT:    ; =>This Inner Loop Header: Depth=1
+; CHECK-ISEL-NEXT:    cbnz w8, LBB2_1
+; CHECK-ISEL-NEXT:  ; %bb.2: ; %for.end20
+; CHECK-ISEL-NEXT:    ret
+;
+; CHECK-FAST-LABEL: mul_add_imm2:
+; CHECK-FAST:       ; %bb.0: ; %entry
+; CHECK-FAST-NEXT:    mov x8, #-3
+; CHECK-FAST-NEXT:    orr x9, xzr, #0xfffffffffffffffd
+; CHECK-FAST-NEXT:    madd x8, x8, x8, x9
+; CHECK-FAST-NEXT:    mov x9, #45968
+; CHECK-FAST-NEXT:    movk x9, #48484, lsl #16
+; CHECK-FAST-NEXT:    movk x9, #323, lsl #32
+; CHECK-FAST-NEXT:  LBB2_1: ; %for.body8
+; CHECK-FAST-NEXT:    ; =>This Inner Loop Header: Depth=1
+; CHECK-FAST-NEXT:    cmp x8, x9
+; CHECK-FAST-NEXT:    b.lt LBB2_1
+; CHECK-FAST-NEXT:  ; %bb.2: ; %for.end20
+; CHECK-FAST-NEXT:    ret
 entry:
   br label %for.body
 for.body:
   br i1 undef, label %for.body, label %for.body8
 for.body8:
   %0 = mul i64 undef, -3
   %mul1971 = add i64 %0, -3
   %cmp7 = icmp slt i64 %mul1971, 1390451930000
   br i1 %cmp7, label %for.body8, label %for.end20
 for.end20:
   ret void
 }
 
+define i32 @add1_mul_val1(i32 %a, i32 %b) {
+; CHECK-ISEL-LABEL: add1_mul_val1:
+; CHECK-ISEL:       ; %bb.0:
+; CHECK-ISEL-NEXT:    madd w0, w1, w0, w1
+; CHECK-ISEL-NEXT:    ret
+;
+; CHECK-FAST-LABEL: add1_mul_val1:
+; CHECK-FAST:       ; %bb.0:
+; CHECK-FAST-NEXT:    add w8, w0, #1
+; CHECK-FAST-NEXT:    mul w0, w8, w1
+; CHECK-FAST-NEXT:    ret
+  %1 = add i32 %a, 1
+  %2 = mul i32 %1, %b
+  ret i32 %2
+}
+
+define i32 @add1_mul_val2(i32 %a, i32 %b) {
+; CHECK-ISEL-LABEL: add1_mul_val2:
+; CHECK-ISEL:       ; %bb.0:
+; CHECK-ISEL-NEXT:    madd w0, w0, w1, w0
+; CHECK-ISEL-NEXT:    ret
+;
+; CHECK-FAST-LABEL: add1_mul_val2:
+; CHECK-FAST:       ; %bb.0:
+; CHECK-FAST-NEXT:    add w8, w1, #1
+; CHECK-FAST-NEXT:    mul w0, w0, w8
+; CHECK-FAST-NEXT:    ret
+  %1 = add i32 %b, 1
+  %2 = mul i32 %a, %1
+  ret i32 %2
+}
+
+define i64 @add1_mul_val3(i64 %a, i64 %b) {
+; CHECK-ISEL-LABEL: add1_mul_val3:
+; CHECK-ISEL:       ; %bb.0:
+; CHECK-ISEL-NEXT:    madd x0, x0, x1, x0
+; CHECK-ISEL-NEXT:    ret
+;
+; CHECK-FAST-LABEL: add1_mul_val3:
+; CHECK-FAST:       ; %bb.0:
+; CHECK-FAST-NEXT:    add x8, x1, #1
+; CHECK-FAST-NEXT:    mul x0, x0, x8
+; CHECK-FAST-NEXT:    ret
+  %1 = add i64 %b, 1
+  %2 = mul i64 %a, %1
+  ret i64 %2
+}
+
+define i64 @add1_mul_val4(i64 %a, i64 %b, i64 %c) {
+; CHECK-ISEL-LABEL: add1_mul_val4:
+; CHECK-ISEL:       ; %bb.0:
+; CHECK-ISEL-NEXT:    add x8, x0, x2
+; CHECK-ISEL-NEXT:    madd x0, x8, x1, x8
+; CHECK-ISEL-NEXT:    ret
+;
+; CHECK-FAST-LABEL: add1_mul_val4:
+; CHECK-FAST:       ; %bb.0:
+; CHECK-FAST-NEXT:    add x8, x1, #1
+; CHECK-FAST-NEXT:    add x9, x0, x2
+; CHECK-FAST-NEXT:    mul x0, x9, x8
+; CHECK-FAST-NEXT:    ret
+  %1 = add i64 %a, %c
+  %2 = add i64 %b, 1
+  %3 = mul i64 %1, %2
+  ret i64 %3
+}
+
+define i32 @sub1_mul_val1(i32 %a, i32 %b) {
+; CHECK-ISEL-LABEL: sub1_mul_val1:
+; CHECK-ISEL:       ; %bb.0:
+; CHECK-ISEL-NEXT:    msub w0, w1, w0, w1
+; CHECK-ISEL-NEXT:    ret
+;
+; CHECK-FAST-LABEL: sub1_mul_val1:
+; CHECK-FAST:       ; %bb.0:
+; CHECK-FAST-NEXT:    mov w8, #1
+; CHECK-FAST-NEXT:    sub w8, w8, w0
+; CHECK-FAST-NEXT:    mul w0, w8, w1
+; CHECK-FAST-NEXT:    ret
+  %1 = sub i32 1, %a
+  %2 = mul i32 %1, %b
+  ret i32 %2
+}
+
+define i32 @sub1_mul_val2(i32 %a, i32 %b) {
+; CHECK-ISEL-LABEL: sub1_mul_val2:
+; CHECK-ISEL:       ; %bb.0:
+; CHECK-ISEL-NEXT:    msub w0, w0, w1, w0
+; CHECK-ISEL-NEXT:    ret
+;
+; CHECK-FAST-LABEL: sub1_mul_val2:
+; CHECK-FAST:       ; %bb.0:
+; CHECK-FAST-NEXT:    mov w8, #1
+; CHECK-FAST-NEXT:    sub w8, w8, w1
+; CHECK-FAST-NEXT:    mul w0, w0, w8
+; CHECK-FAST-NEXT:    ret
+  %1 = sub i32 1, %b
+  %2 = mul i32 %a, %1
+  ret i32 %2
+}
+
+define i64 @sub1_mul_val3(i64 %a, i64 %b) {
+; CHECK-ISEL-LABEL: sub1_mul_val3:
+; CHECK-ISEL:       ; %bb.0:
+; CHECK-ISEL-NEXT:    msub x0, x0, x1, x0
+; CHECK-ISEL-NEXT:    ret
+;
+; CHECK-FAST-LABEL: sub1_mul_val3:
+; CHECK-FAST:       ; %bb.0:
+; CHECK-FAST-NEXT:    mov x8, #1
+; CHECK-FAST-NEXT:    sub x8, x8, x1
+; CHECK-FAST-NEXT:    mul x0, x0, x8
+; CHECK-FAST-NEXT:    ret
+  %1 = sub i64 1, %b
+  %2 = mul i64 %a, %1
+  ret i64 %2
+}
+
+define i64 @sub1_mul_val4(i64 %a, i64 %b) {
+; CHECK-ISEL-LABEL: sub1_mul_val4:
+; CHECK-ISEL:       ; %bb.0:
+; CHECK-ISEL-NEXT:    sub x8, x0, #1
+; CHECK-ISEL-NEXT:    msub x0, x8, x1, x8
+; CHECK-ISEL-NEXT:    ret
+;
+; CHECK-FAST-LABEL: sub1_mul_val4:
+; CHECK-FAST:       ; %bb.0:
+; CHECK-FAST-NEXT:    mov x8, #1
+; CHECK-FAST-NEXT:    sub x9, x0, #1
+; CHECK-FAST-NEXT:    sub x8, x8, x1
+; CHECK-FAST-NEXT:    mul x0, x9, x8
+; CHECK-FAST-NEXT:    ret
+  %1 = sub i64 %a, 1
+  %2 = sub i64 1, %b
+  %3 = mul i64 %1, %2
+  ret i64 %3
+}
+