[llvm] bf80546 - [DAGCombiner] Don't expand (neg (abs x)) if the abs has an additional user.
Craig Topper via llvm-commits
llvm-commits at lists.llvm.org
Tue Mar 1 07:32:15 PST 2022
Author: Craig Topper
Date: 2022-03-01T07:32:07-08:00
New Revision: bf8054644de952179ffc54f430ecf221ef260282
URL: https://github.com/llvm/llvm-project/commit/bf8054644de952179ffc54f430ecf221ef260282
DIFF: https://github.com/llvm/llvm-project/commit/bf8054644de952179ffc54f430ecf221ef260282.diff
LOG: [DAGCombiner] Don't expand (neg (abs x)) if the abs has an additional user.
If the types aren't legal, the expansions may get type legalized in a
different way preventing code sharing. If the type is legal, we will
share some instructions between the two expansions, but we will need an
extra register.
Since we don't appear to fold (neg (sub A, B)) if the sub has an
additional user, I think it makes sense not to expand NABS.
Reviewed By: RKSimon
Differential Revision: https://reviews.llvm.org/D120513
Added:
Modified:
llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
llvm/test/CodeGen/RISCV/neg-abs.ll
Removed:
################################################################################
diff --git a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
index 8f0df16807b50..3d643ce0665f3 100644
--- a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
@@ -3401,7 +3401,7 @@ SDValue DAGCombiner::visitSUB(SDNode *N) {
}
// Convert 0 - abs(x).
- if (N1->getOpcode() == ISD::ABS &&
+ if (N1.getOpcode() == ISD::ABS && N1.hasOneUse() &&
!TLI.isOperationLegalOrCustom(ISD::ABS, VT))
if (SDValue Result = TLI.expandABS(N1.getNode(), DAG, true))
return Result;
diff --git a/llvm/test/CodeGen/RISCV/neg-abs.ll b/llvm/test/CodeGen/RISCV/neg-abs.ll
index 9dfa533ebcadc..7e2ed7a8bc321 100644
--- a/llvm/test/CodeGen/RISCV/neg-abs.ll
+++ b/llvm/test/CodeGen/RISCV/neg-abs.ll
@@ -229,56 +229,53 @@ define i32 @neg_abs32_multiuse(i32 %x, i32* %y) {
; RV32I-LABEL: neg_abs32_multiuse:
; RV32I: # %bb.0:
; RV32I-NEXT: srai a2, a0, 31
-; RV32I-NEXT: xor a3, a0, a2
-; RV32I-NEXT: sub a0, a2, a3
-; RV32I-NEXT: sub a2, a3, a2
+; RV32I-NEXT: xor a0, a0, a2
+; RV32I-NEXT: sub a2, a0, a2
+; RV32I-NEXT: neg a0, a2
; RV32I-NEXT: sw a2, 0(a1)
; RV32I-NEXT: ret
;
; RV32ZBB-LABEL: neg_abs32_multiuse:
; RV32ZBB: # %bb.0:
-; RV32ZBB-NEXT: neg a3, a0
-; RV32ZBB-NEXT: min a2, a0, a3
-; RV32ZBB-NEXT: max a0, a0, a3
-; RV32ZBB-NEXT: sw a0, 0(a1)
-; RV32ZBB-NEXT: mv a0, a2
+; RV32ZBB-NEXT: neg a2, a0
+; RV32ZBB-NEXT: max a2, a0, a2
+; RV32ZBB-NEXT: neg a0, a2
+; RV32ZBB-NEXT: sw a2, 0(a1)
; RV32ZBB-NEXT: ret
;
; RV32IBT-LABEL: neg_abs32_multiuse:
; RV32IBT: # %bb.0:
; RV32IBT-NEXT: srai a2, a0, 31
-; RV32IBT-NEXT: xor a3, a0, a2
-; RV32IBT-NEXT: sub a0, a2, a3
-; RV32IBT-NEXT: sub a2, a3, a2
+; RV32IBT-NEXT: xor a0, a0, a2
+; RV32IBT-NEXT: sub a2, a0, a2
+; RV32IBT-NEXT: neg a0, a2
; RV32IBT-NEXT: sw a2, 0(a1)
; RV32IBT-NEXT: ret
;
; RV64I-LABEL: neg_abs32_multiuse:
; RV64I: # %bb.0:
; RV64I-NEXT: sraiw a2, a0, 31
-; RV64I-NEXT: xor a3, a0, a2
-; RV64I-NEXT: subw a0, a2, a3
-; RV64I-NEXT: subw a2, a3, a2
+; RV64I-NEXT: xor a0, a0, a2
+; RV64I-NEXT: subw a2, a0, a2
+; RV64I-NEXT: negw a0, a2
; RV64I-NEXT: sw a2, 0(a1)
; RV64I-NEXT: ret
;
; RV64ZBB-LABEL: neg_abs32_multiuse:
; RV64ZBB: # %bb.0:
-; RV64ZBB-NEXT: sext.w a2, a0
-; RV64ZBB-NEXT: sraiw a3, a0, 31
-; RV64ZBB-NEXT: xor a0, a0, a3
-; RV64ZBB-NEXT: subw a0, a3, a0
-; RV64ZBB-NEXT: neg a3, a2
-; RV64ZBB-NEXT: max a2, a2, a3
+; RV64ZBB-NEXT: sext.w a0, a0
+; RV64ZBB-NEXT: neg a2, a0
+; RV64ZBB-NEXT: max a2, a0, a2
+; RV64ZBB-NEXT: negw a0, a2
; RV64ZBB-NEXT: sw a2, 0(a1)
; RV64ZBB-NEXT: ret
;
; RV64IBT-LABEL: neg_abs32_multiuse:
; RV64IBT: # %bb.0:
; RV64IBT-NEXT: sraiw a2, a0, 31
-; RV64IBT-NEXT: xor a3, a0, a2
-; RV64IBT-NEXT: subw a0, a2, a3
-; RV64IBT-NEXT: subw a2, a3, a2
+; RV64IBT-NEXT: xor a0, a0, a2
+; RV64IBT-NEXT: subw a2, a0, a2
+; RV64IBT-NEXT: negw a0, a2
; RV64IBT-NEXT: sw a2, 0(a1)
; RV64IBT-NEXT: ret
%abs = tail call i32 @llvm.abs.i32(i32 %x, i1 true)
@@ -290,94 +287,80 @@ define i32 @neg_abs32_multiuse(i32 %x, i32* %y) {
define i64 @neg_abs64_multiuse(i64 %x, i64* %y) {
; RV32I-LABEL: neg_abs64_multiuse:
; RV32I: # %bb.0:
-; RV32I-NEXT: srai a4, a1, 31
-; RV32I-NEXT: xor a5, a0, a4
-; RV32I-NEXT: sltu a3, a4, a5
-; RV32I-NEXT: xor a6, a1, a4
-; RV32I-NEXT: sub a6, a4, a6
-; RV32I-NEXT: sub a3, a6, a3
-; RV32I-NEXT: sub a4, a4, a5
; RV32I-NEXT: bgez a1, .LBB5_2
; RV32I-NEXT: # %bb.1:
-; RV32I-NEXT: snez a5, a0
-; RV32I-NEXT: add a1, a1, a5
+; RV32I-NEXT: snez a3, a0
+; RV32I-NEXT: add a1, a1, a3
; RV32I-NEXT: neg a1, a1
; RV32I-NEXT: neg a0, a0
; RV32I-NEXT: .LBB5_2:
; RV32I-NEXT: sw a0, 0(a2)
+; RV32I-NEXT: snez a3, a0
+; RV32I-NEXT: add a3, a1, a3
+; RV32I-NEXT: neg a3, a3
+; RV32I-NEXT: neg a0, a0
; RV32I-NEXT: sw a1, 4(a2)
-; RV32I-NEXT: mv a0, a4
; RV32I-NEXT: mv a1, a3
; RV32I-NEXT: ret
;
; RV32ZBB-LABEL: neg_abs64_multiuse:
; RV32ZBB: # %bb.0:
-; RV32ZBB-NEXT: srai a4, a1, 31
-; RV32ZBB-NEXT: xor a5, a0, a4
-; RV32ZBB-NEXT: sltu a3, a4, a5
-; RV32ZBB-NEXT: xor a6, a1, a4
-; RV32ZBB-NEXT: sub a6, a4, a6
-; RV32ZBB-NEXT: sub a3, a6, a3
-; RV32ZBB-NEXT: sub a4, a4, a5
; RV32ZBB-NEXT: bgez a1, .LBB5_2
; RV32ZBB-NEXT: # %bb.1:
-; RV32ZBB-NEXT: snez a5, a0
-; RV32ZBB-NEXT: add a1, a1, a5
+; RV32ZBB-NEXT: snez a3, a0
+; RV32ZBB-NEXT: add a1, a1, a3
; RV32ZBB-NEXT: neg a1, a1
; RV32ZBB-NEXT: neg a0, a0
; RV32ZBB-NEXT: .LBB5_2:
; RV32ZBB-NEXT: sw a0, 0(a2)
+; RV32ZBB-NEXT: snez a3, a0
+; RV32ZBB-NEXT: add a3, a1, a3
+; RV32ZBB-NEXT: neg a3, a3
+; RV32ZBB-NEXT: neg a0, a0
; RV32ZBB-NEXT: sw a1, 4(a2)
-; RV32ZBB-NEXT: mv a0, a4
; RV32ZBB-NEXT: mv a1, a3
; RV32ZBB-NEXT: ret
;
; RV32IBT-LABEL: neg_abs64_multiuse:
; RV32IBT: # %bb.0:
-; RV32IBT-NEXT: srai a4, a1, 31
-; RV32IBT-NEXT: xor a5, a0, a4
-; RV32IBT-NEXT: sltu a3, a4, a5
-; RV32IBT-NEXT: xor a6, a1, a4
-; RV32IBT-NEXT: sub a6, a4, a6
-; RV32IBT-NEXT: sub a3, a6, a3
-; RV32IBT-NEXT: sub a4, a4, a5
-; RV32IBT-NEXT: snez a5, a0
-; RV32IBT-NEXT: add a5, a1, a5
-; RV32IBT-NEXT: neg a5, a5
-; RV32IBT-NEXT: slti a6, a1, 0
-; RV32IBT-NEXT: cmov a1, a6, a5, a1
-; RV32IBT-NEXT: neg a5, a0
-; RV32IBT-NEXT: cmov a0, a6, a5, a0
+; RV32IBT-NEXT: snez a3, a0
+; RV32IBT-NEXT: add a3, a1, a3
+; RV32IBT-NEXT: neg a3, a3
+; RV32IBT-NEXT: slti a4, a1, 0
+; RV32IBT-NEXT: cmov a3, a4, a3, a1
+; RV32IBT-NEXT: neg a1, a0
+; RV32IBT-NEXT: cmov a0, a4, a1, a0
; RV32IBT-NEXT: sw a0, 0(a2)
-; RV32IBT-NEXT: sw a1, 4(a2)
-; RV32IBT-NEXT: mv a0, a4
-; RV32IBT-NEXT: mv a1, a3
+; RV32IBT-NEXT: snez a1, a0
+; RV32IBT-NEXT: add a1, a3, a1
+; RV32IBT-NEXT: neg a1, a1
+; RV32IBT-NEXT: neg a0, a0
+; RV32IBT-NEXT: sw a3, 4(a2)
; RV32IBT-NEXT: ret
;
; RV64I-LABEL: neg_abs64_multiuse:
; RV64I: # %bb.0:
; RV64I-NEXT: srai a2, a0, 63
-; RV64I-NEXT: xor a3, a0, a2
-; RV64I-NEXT: sub a0, a2, a3
-; RV64I-NEXT: sub a2, a3, a2
+; RV64I-NEXT: xor a0, a0, a2
+; RV64I-NEXT: sub a2, a0, a2
+; RV64I-NEXT: neg a0, a2
; RV64I-NEXT: sd a2, 0(a1)
; RV64I-NEXT: ret
;
; RV64ZBB-LABEL: neg_abs64_multiuse:
; RV64ZBB: # %bb.0:
-; RV64ZBB-NEXT: neg a3, a0
-; RV64ZBB-NEXT: min a2, a0, a3
-; RV64ZBB-NEXT: max a0, a0, a3
-; RV64ZBB-NEXT: sd a0, 0(a1)
-; RV64ZBB-NEXT: mv a0, a2
+; RV64ZBB-NEXT: neg a2, a0
+; RV64ZBB-NEXT: max a2, a0, a2
+; RV64ZBB-NEXT: neg a0, a2
+; RV64ZBB-NEXT: sd a2, 0(a1)
; RV64ZBB-NEXT: ret
;
; RV64IBT-LABEL: neg_abs64_multiuse:
; RV64IBT: # %bb.0:
; RV64IBT-NEXT: srai a2, a0, 63
-; RV64IBT-NEXT: xor a3, a0, a2
-; RV64IBT-NEXT: sub a0, a2, a3
-; RV64IBT-NEXT: sub a2, a3, a2
+; RV64IBT-NEXT: xor a0, a0, a2
+; RV64IBT-NEXT: sub a2, a0, a2
+; RV64IBT-NEXT: neg a0, a2
; RV64IBT-NEXT: sd a2, 0(a1)
; RV64IBT-NEXT: ret
%abs = tail call i64 @llvm.abs.i64(i64 %x, i1 true)
More information about the llvm-commits
mailing list