Skip to content

[DAGCombiner] Add hasOneUse checks for folding (not (add X, -1)) to (neg X) #126667

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 12, 2025
Merged

[DAGCombiner] Add hasOneUse checks for folding (not (add X, -1)) to (neg X) #126667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de15dca
[DAGCombiner] Add hasOneUse checks for folding (not (add X, -1)) to (…
tclin914 Feb 11, 2025
c94af5d
Address arsenm's comment
tclin914 Feb 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9702,7 +9702,7 @@ SDValue DAGCombiner::visitXOR(SDNode *N) {
}

// fold (not (add X, -1)) -> (neg X)
if (isAllOnesConstant(N1) && N0.getOpcode() == ISD::ADD &&
if (N0.getOpcode() == ISD::ADD && N0.hasOneUse() && isAllOnesConstant(N1) &&
isAllOnesOrAllOnesSplat(N0.getOperand(1))) {
return DAG.getNegative(N0.getOperand(0), DL, VT);
}
Expand Down
7 changes: 3 additions & 4 deletions llvm/test/CodeGen/AArch64/align-down.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,9 @@ define i32 @t2_commutative(i32 %ptr, i32 %alignment) nounwind {
define i32 @t3_extrause0(i32 %ptr, i32 %alignment, ptr %mask_storage) nounwind {
; CHECK-LABEL: t3_extrause0:
; CHECK: // %bb.0:
; CHECK-NEXT: neg w8, w1
; CHECK-NEXT: sub w9, w1, #1
; CHECK-NEXT: and w0, w0, w8
; CHECK-NEXT: str w9, [x2]
; CHECK-NEXT: sub w8, w1, #1
; CHECK-NEXT: bic w0, w0, w8
; CHECK-NEXT: str w8, [x2]
; CHECK-NEXT: ret
%mask = add i32 %alignment, -1
store i32 %mask, ptr %mask_storage
Expand Down
51 changes: 33 additions & 18 deletions llvm/test/CodeGen/X86/align-down.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,25 +82,40 @@ define i32 @t2_commutative(i32 %ptr, i32 %alignment) nounwind {
; Extra use tests

define i32 @t3_extrause0(i32 %ptr, i32 %alignment, ptr %mask_storage) nounwind {
; X86-LABEL: t3_extrause0:
; X86: # %bb.0:
; X86-NEXT: movl {{[0-9]+}}(%esp), %ecx
; X86-NEXT: movl {{[0-9]+}}(%esp), %eax
; X86-NEXT: leal -1(%eax), %edx
; X86-NEXT: movl %edx, (%ecx)
; X86-NEXT: negl %eax
; X86-NEXT: andl {{[0-9]+}}(%esp), %eax
; X86-NEXT: retl
; NOBMI-X86-LABEL: t3_extrause0:
; NOBMI-X86: # %bb.0:
; NOBMI-X86-NEXT: movl {{[0-9]+}}(%esp), %ecx
; NOBMI-X86-NEXT: movl {{[0-9]+}}(%esp), %eax
; NOBMI-X86-NEXT: decl %eax
; NOBMI-X86-NEXT: movl %eax, (%ecx)
; NOBMI-X86-NEXT: notl %eax
; NOBMI-X86-NEXT: andl {{[0-9]+}}(%esp), %eax
; NOBMI-X86-NEXT: retl
;
; X64-LABEL: t3_extrause0:
; X64: # %bb.0:
; X64-NEXT: movl %esi, %eax
; X64-NEXT: leal -1(%rax), %ecx
; X64-NEXT: movl %ecx, (%rdx)
; X64-NEXT: negl %eax
; X64-NEXT: andl %edi, %eax
; X64-NEXT: # kill: def $eax killed $eax killed $rax
; X64-NEXT: retq
; BMI-X86-LABEL: t3_extrause0:
; BMI-X86: # %bb.0:
; BMI-X86-NEXT: movl {{[0-9]+}}(%esp), %eax
; BMI-X86-NEXT: movl {{[0-9]+}}(%esp), %ecx
; BMI-X86-NEXT: decl %ecx
; BMI-X86-NEXT: movl %ecx, (%eax)
; BMI-X86-NEXT: andnl {{[0-9]+}}(%esp), %ecx, %eax
; BMI-X86-NEXT: retl
;
; NOBMI-X64-LABEL: t3_extrause0:
; NOBMI-X64: # %bb.0:
; NOBMI-X64-NEXT: # kill: def $esi killed $esi def $rsi
; NOBMI-X64-NEXT: leal -1(%rsi), %eax
; NOBMI-X64-NEXT: movl %eax, (%rdx)
; NOBMI-X64-NEXT: notl %eax
; NOBMI-X64-NEXT: andl %edi, %eax
; NOBMI-X64-NEXT: retq
;
; BMI-X64-LABEL: t3_extrause0:
; BMI-X64: # %bb.0:
; BMI-X64-NEXT: decl %esi
; BMI-X64-NEXT: movl %esi, (%rdx)
; BMI-X64-NEXT: andnl %edi, %esi, %eax
; BMI-X64-NEXT: retq
%mask = add i32 %alignment, -1
store i32 %mask, ptr %mask_storage
%bias = and i32 %ptr, %mask
Expand Down
15 changes: 7 additions & 8 deletions llvm/test/CodeGen/X86/not-of-dec.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,18 +57,17 @@ define i32 @t2_extrause(i32 %alignment, ptr %mask_storage) nounwind {
; X86: # %bb.0:
; X86-NEXT: movl {{[0-9]+}}(%esp), %ecx
; X86-NEXT: movl {{[0-9]+}}(%esp), %eax
; X86-NEXT: leal -1(%eax), %edx
; X86-NEXT: movl %edx, (%ecx)
; X86-NEXT: negl %eax
; X86-NEXT: decl %eax
; X86-NEXT: movl %eax, (%ecx)
; X86-NEXT: notl %eax
; X86-NEXT: retl
;
; X64-LABEL: t2_extrause:
; X64: # %bb.0:
; X64-NEXT: movl %edi, %eax
; X64-NEXT: leal -1(%rax), %ecx
; X64-NEXT: movl %ecx, (%rsi)
; X64-NEXT: negl %eax
; X64-NEXT: # kill: def $eax killed $eax killed $rax
; X64-NEXT: # kill: def $edi killed $edi def $rdi
; X64-NEXT: leal -1(%rdi), %eax
; X64-NEXT: movl %eax, (%rsi)
; X64-NEXT: notl %eax
; X64-NEXT: retq
%mask = add i32 %alignment, -1
store i32 %mask, ptr %mask_storage
Expand Down