Skip to content

Commit 485c176

Browse files
committed
[DAGCombiner] Relax nsz constraint for more FP optimizations
Some floating-point optimization don't trigger because they can produce incorrect results around signed zeros, and rely on the existence of the nsz flag which commonly appears when fast-math is enabled. However, this flag is not a hard requirement when all of the users of the combined value are either guranteed to overwrite the sign-bit or simply ignore it (comparisons, etc.). The optimizations affected: - fadd x, -0.0 -> x - fsub x, 0.0 -> x - fsub -0.0, x -> fneg x - fdiv x, sqrt(x) -> sqrt(x) - frem lowering with power-of-2 divisors
1 parent 7f65dea commit 485c176

File tree

3 files changed

+86
-9
lines changed

3 files changed

+86
-9
lines changed

llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17781,7 +17781,8 @@ SDValue DAGCombiner::visitFADD(SDNode *N) {
1778117781
// N0 + -0.0 --> N0 (also allowed with +0.0 and fast-math)
1778217782
ConstantFPSDNode *N1C = isConstOrConstSplatFP(N1, true);
1778317783
if (N1C && N1C->isZero())
17784-
if (N1C->isNegative() || Flags.hasNoSignedZeros())
17784+
if (N1C->isNegative() || Flags.hasNoSignedZeros() ||
17785+
DAG.allUsesSignedZeroInsensitive(SDValue(N, 0)))
1778517786
return N0;
1778617787

1778717788
if (SDValue NewSel = foldBinOpIntoSelect(N))
@@ -17993,7 +17994,8 @@ SDValue DAGCombiner::visitFSUB(SDNode *N) {
1799317994

1799417995
// (fsub A, 0) -> A
1799517996
if (N1CFP && N1CFP->isZero()) {
17996-
if (!N1CFP->isNegative() || Flags.hasNoSignedZeros()) {
17997+
if (!N1CFP->isNegative() || Flags.hasNoSignedZeros() ||
17998+
DAG.allUsesSignedZeroInsensitive(SDValue(N, 0))) {
1799717999
return N0;
1799818000
}
1799918001
}
@@ -18006,7 +18008,8 @@ SDValue DAGCombiner::visitFSUB(SDNode *N) {
1800618008

1800718009
// (fsub -0.0, N1) -> -N1
1800818010
if (N0CFP && N0CFP->isZero()) {
18009-
if (N0CFP->isNegative() || Flags.hasNoSignedZeros()) {
18011+
if (N0CFP->isNegative() || Flags.hasNoSignedZeros() ||
18012+
DAG.allUsesSignedZeroInsensitive(SDValue(N, 0))) {
1801018013
// We cannot replace an FSUB(+-0.0,X) with FNEG(X) when denormals are
1801118014
// flushed to zero, unless all users treat denorms as zero (DAZ).
1801218015
// FIXME: This transform will change the sign of a NaN and the behavior
@@ -18654,7 +18657,9 @@ SDValue DAGCombiner::visitFDIV(SDNode *N) {
1865418657
}
1865518658

1865618659
// Fold X/Sqrt(X) -> Sqrt(X)
18657-
if (Flags.hasNoSignedZeros() && Flags.hasAllowReassociation())
18660+
if ((Flags.hasNoSignedZeros() ||
18661+
DAG.allUsesSignedZeroInsensitive(SDValue(N, 0))) &&
18662+
Flags.hasAllowReassociation())
1865818663
if (N1.getOpcode() == ISD::FSQRT && N0 == N1.getOperand(0))
1865918664
return N1;
1866018665

@@ -18705,8 +18710,9 @@ SDValue DAGCombiner::visitFREM(SDNode *N) {
1870518710
TLI.isOperationLegalOrCustom(ISD::FDIV, VT) &&
1870618711
TLI.isOperationLegalOrCustom(ISD::FTRUNC, VT) &&
1870718712
DAG.isKnownToBeAPowerOfTwoFP(N1)) {
18708-
bool NeedsCopySign =
18709-
!Flags.hasNoSignedZeros() && !DAG.cannotBeOrderedNegativeFP(N0);
18713+
bool NeedsCopySign = !Flags.hasNoSignedZeros() &&
18714+
!DAG.cannotBeOrderedNegativeFP(N0) &&
18715+
!DAG.allUsesSignedZeroInsensitive(SDValue(N, 0));
1871018716
SDValue Div = DAG.getNode(ISD::FDIV, DL, VT, N0, N1);
1871118717
SDValue Rnd = DAG.getNode(ISD::FTRUNC, DL, VT, Div);
1871218718
SDValue MLA;
Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
2+
; RUN: llc < %s -mtriple=aarch64 | FileCheck %s
3+
4+
; Test that nsz constraint can be bypassed when all uses are sign-insensitive.
5+
6+
define i1 @test_fadd_neg_zero_fcmp(float %x) {
7+
; CHECK-LABEL: test_fadd_neg_zero_fcmp:
8+
; CHECK: // %bb.0:
9+
; CHECK-NEXT: fmov s1, #1.00000000
10+
; CHECK-NEXT: fcmp s0, s1
11+
; CHECK-NEXT: cset w0, eq
12+
; CHECK-NEXT: ret
13+
%add = fadd float %x, -0.0
14+
%cmp = fcmp oeq float %add, 1.0
15+
ret i1 %cmp
16+
}
17+
18+
define float @test_fsub_zero_fabs(float %x) {
19+
; CHECK-LABEL: test_fsub_zero_fabs:
20+
; CHECK: // %bb.0:
21+
; CHECK-NEXT: fabs s0, s0
22+
; CHECK-NEXT: ret
23+
%sub = fsub float %x, 0.0
24+
%abs = call float @llvm.fabs.f32(float %sub)
25+
ret float %abs
26+
}
27+
28+
define float @test_fsub_neg_zero_copysign(float %x, float %y) {
29+
; CHECK-LABEL: test_fsub_neg_zero_copysign:
30+
; CHECK: // %bb.0:
31+
; CHECK-NEXT: mvni v2.4s, #128, lsl #24
32+
; CHECK-NEXT: // kill: def $s0 killed $s0 def $q0
33+
; CHECK-NEXT: // kill: def $s1 killed $s1 def $q1
34+
; CHECK-NEXT: bif v0.16b, v1.16b, v2.16b
35+
; CHECK-NEXT: // kill: def $s0 killed $s0 killed $q0
36+
; CHECK-NEXT: ret
37+
%sub = fsub float -0.0, %x
38+
%copysign = call float @llvm.copysign.f32(float %sub, float %y)
39+
ret float %copysign
40+
}
41+
42+
define i1 @test_div_sqrt_fcmp(float %x) {
43+
; CHECK-LABEL: test_div_sqrt_fcmp:
44+
; CHECK: // %bb.0:
45+
; CHECK-NEXT: fsqrt s0, s0
46+
; CHECK-NEXT: fcmp s0, #0.0
47+
; CHECK-NEXT: cset w0, gt
48+
; CHECK-NEXT: ret
49+
%sqrt = call float @llvm.sqrt.f32(float %x)
50+
%div = fdiv reassoc float %x, %sqrt
51+
%cmp = fcmp ogt float %div, 0.0
52+
ret i1 %cmp
53+
}
54+
55+
define float @test_frem_fabs(float %x) {
56+
; CHECK-LABEL: test_frem_fabs:
57+
; CHECK: // %bb.0:
58+
; CHECK-NEXT: fmov s1, #0.50000000
59+
; CHECK-NEXT: fmov s2, #-2.00000000
60+
; CHECK-NEXT: fmul s1, s0, s1
61+
; CHECK-NEXT: frintz s1, s1
62+
; CHECK-NEXT: fmadd s0, s1, s2, s0
63+
; CHECK-NEXT: fabs s0, s0
64+
; CHECK-NEXT: ret
65+
%rem = frem float %x, 2.0
66+
%abs = call float @llvm.fabs.f32(float %rem)
67+
ret float %abs
68+
}
69+
70+
declare float @llvm.fabs.f32(float)
71+
declare float @llvm.copysign.f32(float, float)
72+
declare float @llvm.sqrt.f32(float)

llvm/test/CodeGen/AMDGPU/swdev380865.ll

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,13 @@ define amdgpu_kernel void @_Z6kernelILi4000ELi1EEvPd(ptr addrspace(1) %x.coerce)
2828
; CHECK-NEXT: v_mov_b32_e32 v1, s7
2929
; CHECK-NEXT: .LBB0_1: ; %for.cond4.preheader
3030
; CHECK-NEXT: ; =>This Inner Loop Header: Depth=1
31-
; CHECK-NEXT: v_add_f64 v[0:1], v[0:1], 0
3231
; CHECK-NEXT: s_mov_b32 s6, 0
3332
; CHECK-NEXT: s_mov_b32 s7, 0x40140000
34-
; CHECK-NEXT: s_add_i32 s1, s1, s0
35-
; CHECK-NEXT: s_cmpk_lt_i32 s1, 0xa00
3633
; CHECK-NEXT: v_add_f64 v[0:1], v[0:1], s[6:7]
3734
; CHECK-NEXT: s_mov_b32 s6, 0
3835
; CHECK-NEXT: s_mov_b32 s7, 0x40180000
36+
; CHECK-NEXT: s_add_i32 s1, s1, s0
37+
; CHECK-NEXT: s_cmpk_lt_i32 s1, 0xa00
3938
; CHECK-NEXT: v_add_f64 v[0:1], v[0:1], s[6:7]
4039
; CHECK-NEXT: s_mov_b32 s6, 0
4140
; CHECK-NEXT: s_mov_b32 s7, 0x401c0000

0 commit comments

Comments
 (0)