[DAG] Fold (and X, (add (not Y), Z)) -> (and X, (not (sub Y, Z))).

[simonzgx]

Fixes #140639

[llvmbot]

@llvm/pr-subscribers-backend-x86
@llvm/pr-subscribers-backend-aarch64
@llvm/pr-subscribers-backend-loongarch

@llvm/pr-subscribers-llvm-selectiondag

Author: Xu Zhang (simonzgx)

Changes

---

Full diff: https://github.com/llvm/llvm-project/pull/141476.diff

1 Files Affected:

• (modified) llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp (+7)

diff --git a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
index efaa8bd4a7950..31fbab23e4fcf 100644
--- a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
@@ -7528,6 +7528,13 @@ SDValue DAGCombiner::visitAND(SDNode *N) {
       return DAG.getNode(ISD::AND, DL, VT, X,
                          DAG.getNOT(DL, DAG.getNode(Opc, DL, VT, Y, Z), VT));
 
+  // a bitwiseop (~b + c) -> a bitwiseop ~(b - c).
+  // Fold (and X, (add (not Y), Z)) -> (and X, (not (sub Y, Z)))
+  if (sd_match(N, m_And(m_Value(X), m_Add(m_Value(NotY), m_Value(Z)))) &&
+      sd_match(NotY, m_Not(m_Value(Y))) &&
+      (TLI.hasAndNot(SDValue(N, 0)) || NotY->hasOneUse())) {
+		return DAG.getNode(ISD::AND, DL, VT, X, DAG.getNOT(DL, DAG.getNode(ISD::SUB, DL, VT, Y, Z), VT));
+  }
   // Fold (and (srl X, C), 1) -> (srl X, BW-1) for signbit extraction
   // If we are shifting down an extended sign bit, see if we can simplify
   // this to shifting the MSB directly to expose further simplifications.

[github-actions]

✅ With the latest revision this PR passed the C/C++ code formatter.

[jayfoad]

As well as ~y+z --> ~(y-z) you can also do ~y-z --> ~(y+z) right?

[arsenm]

Needs tests

[simonzgx]

Needs tests

Yes, there are some failed UT that need fixing and some new ones to add. I'm still working on both and will submit soon.

[simonzgx]

pin

[RKSimon]

The m_OneUse isn't doing anything as the previous pattern is matching all m_Not cases

[RKSimon]

Please can regenerate the failing test files:
LLVM :: CodeGen/LoongArch/ctlz-cttz-ctpop.ll
LLVM :: CodeGen/X86/vector-lzcnt-128.ll

[RKSimon]

LGTM - cheers!