Skip to content

expandFMINIMUMNUM_FMAXIMUMNUM: Quiet is not needed for NaN vs NaN #139237

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.

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 3 commits into from
Jun 4, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 2 additions & 5 deletions llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8692,11 +8692,8 @@ SDValue TargetLowering::expandFMINIMUMNUM_FMAXIMUMNUM(SDNode *Node,

SDValue MinMax =
DAG.getSelectCC(DL, LHS, RHS, LHS, RHS, IsMax ? ISD::SETGT : ISD::SETLT);
// If MinMax is NaN, let's quiet it.
if (!Flags.hasNoNaNs() && !DAG.isKnownNeverNaN(LHS) &&
!DAG.isKnownNeverNaN(RHS)) {
MinMax = DAG.getNode(ISD::FCANONICALIZE, DL, VT, MinMax, Flags);
}

// TODO: We need quiet sNaN if strictfp.

// Fixup signed zero behavior.
if (Options.NoSignedZerosFPMath || Flags.hasNoSignedZeros() ||
Expand Down
1,122 changes: 365 additions & 757 deletions llvm/test/CodeGen/AMDGPU/fmax3-maximumnum.ll

Large diffs are not rendered by default.

1,171 changes: 389 additions & 782 deletions llvm/test/CodeGen/AMDGPU/fmin3-minimumnum.ll

Large diffs are not rendered by default.

19,369 changes: 7,096 additions & 12,273 deletions llvm/test/CodeGen/AMDGPU/maximumnum.bf16.ll

Large diffs are not rendered by default.

19,570 changes: 7,204 additions & 12,366 deletions llvm/test/CodeGen/AMDGPU/minimumnum.bf16.ll

Large diffs are not rendered by default.

36 changes: 6 additions & 30 deletions llvm/test/CodeGen/Mips/fp-maximumnum-minimumnum.ll
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,12 @@ define float @maximumnum_float(float %x, float %y) {
; MIPS64R2-NEXT: c.ule.s $f12, $f13
; MIPS64R2-NEXT: mov.s $f0, $f13
; MIPS64R2-NEXT: movf.s $f0, $f12, $fcc0
; MIPS64R2-NEXT: add.s $f1, $f0, $f0
; MIPS64R2-NEXT: c.un.s $f0, $f0
; MIPS64R2-NEXT: movt.s $f0, $f1, $fcc0
; MIPS64R2-NEXT: mfc1 $1, $f12
; MIPS64R2-NEXT: mov.s $f1, $f0
; MIPS64R2-NEXT: movz.s $f1, $f12, $1
; MIPS64R2-NEXT: mfc1 $1, $f13
; MIPS64R2-NEXT: mtc1 $zero, $f2
; MIPS64R2-NEXT: movz.s $f1, $f13, $1
; MIPS64R2-NEXT: mtc1 $zero, $f2
; MIPS64R2-NEXT: c.eq.s $f0, $f2
; MIPS64R2-NEXT: jr $ra
; MIPS64R2-NEXT: movt.s $f0, $f1, $fcc0
Expand All @@ -56,11 +53,8 @@ define float @maximumnum_float_nsz(float %x, float %y) {
; MIPS64R2-NEXT: c.un.s $f13, $f13
; MIPS64R2-NEXT: movt.s $f0, $f12, $fcc0
; MIPS64R2-NEXT: c.ule.s $f12, $f0
; MIPS64R2-NEXT: movf.s $f0, $f12, $fcc0
; MIPS64R2-NEXT: add.s $f1, $f0, $f0
; MIPS64R2-NEXT: c.un.s $f0, $f0
; MIPS64R2-NEXT: jr $ra
; MIPS64R2-NEXT: movt.s $f0, $f1, $fcc0
; MIPS64R2-NEXT: movf.s $f0, $f12, $fcc0
%z = call nsz float @llvm.maximumnum.f32(float %x, float %y)
ret float %z
}
Expand Down Expand Up @@ -107,9 +101,6 @@ define double @maximumnum_double(double %x, double %y) {
; MIPS64R2-NEXT: c.ule.d $f12, $f13
; MIPS64R2-NEXT: mov.d $f0, $f13
; MIPS64R2-NEXT: movf.d $f0, $f12, $fcc0
; MIPS64R2-NEXT: add.d $f1, $f0, $f0
; MIPS64R2-NEXT: c.un.d $f0, $f0
; MIPS64R2-NEXT: movt.d $f0, $f1, $fcc0
; MIPS64R2-NEXT: dmfc1 $1, $f12
; MIPS64R2-NEXT: mov.d $f1, $f0
; MIPS64R2-NEXT: movz.d $f1, $f12, $1
Expand Down Expand Up @@ -139,11 +130,8 @@ define double @maximumnum_double_nsz(double %x, double %y) {
; MIPS64R2-NEXT: c.un.d $f13, $f13
; MIPS64R2-NEXT: movt.d $f0, $f12, $fcc0
; MIPS64R2-NEXT: c.ule.d $f12, $f0
; MIPS64R2-NEXT: movf.d $f0, $f12, $fcc0
; MIPS64R2-NEXT: add.d $f1, $f0, $f0
; MIPS64R2-NEXT: c.un.d $f0, $f0
; MIPS64R2-NEXT: jr $ra
; MIPS64R2-NEXT: movt.d $f0, $f1, $fcc0
; MIPS64R2-NEXT: movf.d $f0, $f12, $fcc0
%z = call nsz double @llvm.maximumnum.f64(double %x, double %y)
ret double %z
}
Expand Down Expand Up @@ -189,18 +177,15 @@ define float @minimumnum_float(float %x, float %y) {
; MIPS64R2-NEXT: c.olt.s $f12, $f13
; MIPS64R2-NEXT: mov.s $f0, $f13
; MIPS64R2-NEXT: movt.s $f0, $f12, $fcc0
; MIPS64R2-NEXT: add.s $f1, $f0, $f0
; MIPS64R2-NEXT: c.un.s $f0, $f0
; MIPS64R2-NEXT: movt.s $f0, $f1, $fcc0
; MIPS64R2-NEXT: mfc1 $1, $f12
; MIPS64R2-NEXT: lui $2, 32768
; MIPS64R2-NEXT: xor $1, $1, $2
; MIPS64R2-NEXT: mov.s $f1, $f0
; MIPS64R2-NEXT: movz.s $f1, $f12, $1
; MIPS64R2-NEXT: mfc1 $1, $f13
; MIPS64R2-NEXT: xor $1, $1, $2
; MIPS64R2-NEXT: mtc1 $zero, $f2
; MIPS64R2-NEXT: movz.s $f1, $f13, $1
; MIPS64R2-NEXT: mtc1 $zero, $f2
; MIPS64R2-NEXT: c.eq.s $f0, $f2
; MIPS64R2-NEXT: jr $ra
; MIPS64R2-NEXT: movt.s $f0, $f1, $fcc0
Expand All @@ -224,11 +209,8 @@ define float @minimumnum_float_nsz(float %x, float %y) {
; MIPS64R2-NEXT: c.un.s $f13, $f13
; MIPS64R2-NEXT: movt.s $f0, $f12, $fcc0
; MIPS64R2-NEXT: c.olt.s $f12, $f0
; MIPS64R2-NEXT: movt.s $f0, $f12, $fcc0
; MIPS64R2-NEXT: add.s $f1, $f0, $f0
; MIPS64R2-NEXT: c.un.s $f0, $f0
; MIPS64R2-NEXT: jr $ra
; MIPS64R2-NEXT: movt.s $f0, $f1, $fcc0
; MIPS64R2-NEXT: movt.s $f0, $f12, $fcc0
%z = call nsz float @llvm.minimumnum.f32(float %x, float %y)
ret float %z
}
Expand Down Expand Up @@ -277,9 +259,6 @@ define double @minimumnum_double(double %x, double %y) {
; MIPS64R2-NEXT: c.olt.d $f12, $f13
; MIPS64R2-NEXT: mov.d $f0, $f13
; MIPS64R2-NEXT: movt.d $f0, $f12, $fcc0
; MIPS64R2-NEXT: add.d $f1, $f0, $f0
; MIPS64R2-NEXT: c.un.d $f0, $f0
; MIPS64R2-NEXT: movt.d $f0, $f1, $fcc0
; MIPS64R2-NEXT: dmfc1 $1, $f12
; MIPS64R2-NEXT: daddiu $2, $zero, 1
; MIPS64R2-NEXT: dsll $2, $2, 63
Expand Down Expand Up @@ -313,11 +292,8 @@ define double @minimumnum_double_nsz(double %x, double %y) {
; MIPS64R2-NEXT: c.un.d $f13, $f13
; MIPS64R2-NEXT: movt.d $f0, $f12, $fcc0
; MIPS64R2-NEXT: c.olt.d $f12, $f0
; MIPS64R2-NEXT: movt.d $f0, $f12, $fcc0
; MIPS64R2-NEXT: add.d $f1, $f0, $f0
; MIPS64R2-NEXT: c.un.d $f0, $f0
; MIPS64R2-NEXT: jr $ra
; MIPS64R2-NEXT: movt.d $f0, $f1, $fcc0
; MIPS64R2-NEXT: movt.d $f0, $f12, $fcc0
%z = call nsz double @llvm.minimumnum.f64(double %x, double %y)
ret double %z
}
Expand Down
Loading
Loading