Skip to content

[SDAG] Don't handle non-canonical libcalls in SDAG lowering #171114

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
nikic merged 1 commit into from
Dec 9, 2025
Merged

[SDAG] Don't handle non-canonical libcalls in SDAG lowering #171114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 12 additions & 6 deletions llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9559,6 +9559,8 @@ void SelectionDAGBuilder::visitCall(const CallInst &I) {
// Check for well-known libc/libm calls. If the function is internal, it
// can't be a library call. Don't do the check if marked as nobuiltin for
// some reason.
// This code should not handle libcalls that are already canonicalized to
// intrinsics by the middle-end.
LibFunc Func;
if (!I.isNoBuiltin() && !F->hasLocalLinkage() && F->hasName() &&
LibInfo->getLibFunc(*F, Func) && LibInfo->hasOptimizedCodeGen(Func)) {
Expand All @@ -9584,30 +9586,35 @@ void SelectionDAGBuilder::visitCall(const CallInst &I) {
case LibFunc_fabs:
case LibFunc_fabsf:
case LibFunc_fabsl:
// TODO: Remove this, already canonicalized by the middle-end.
if (visitUnaryFloatCall(I, ISD::FABS))
return;
break;
case LibFunc_fmin:
case LibFunc_fminf:
case LibFunc_fminl:
// TODO: Remove this, already canonicalized by the middle-end.
if (visitBinaryFloatCall(I, ISD::FMINNUM))
return;
break;
case LibFunc_fmax:
case LibFunc_fmaxf:
case LibFunc_fmaxl:
// TODO: Remove this, already canonicalized by the middle-end.
if (visitBinaryFloatCall(I, ISD::FMAXNUM))
return;
break;
case LibFunc_fminimum_num:
case LibFunc_fminimum_numf:
case LibFunc_fminimum_numl:
// TODO: Remove this, already canonicalized by the middle-end.
if (visitBinaryFloatCall(I, ISD::FMINIMUMNUM))
return;
break;
case LibFunc_fmaximum_num:
case LibFunc_fmaximum_numf:
case LibFunc_fmaximum_numl:
// TODO: Remove this, already canonicalized by the middle-end.
if (visitBinaryFloatCall(I, ISD::FMAXIMUMNUM))
return;
break;
Expand Down Expand Up @@ -9683,36 +9690,35 @@ void SelectionDAGBuilder::visitCall(const CallInst &I) {
case LibFunc_floor:
case LibFunc_floorf:
case LibFunc_floorl:
// TODO: Remove this, already canonicalized by the middle-end.
if (visitUnaryFloatCall(I, ISD::FFLOOR))
return;
break;
case LibFunc_nearbyint:
case LibFunc_nearbyintf:
case LibFunc_nearbyintl:
if (visitUnaryFloatCall(I, ISD::FNEARBYINT))
return;
break;
case LibFunc_ceil:
case LibFunc_ceilf:
case LibFunc_ceill:
// TODO: Remove this, already canonicalized by the middle-end.
if (visitUnaryFloatCall(I, ISD::FCEIL))
return;
break;
case LibFunc_rint:
case LibFunc_rintf:
case LibFunc_rintl:
// TODO: Remove this, already canonicalized by the middle-end.
if (visitUnaryFloatCall(I, ISD::FRINT))
return;
break;
case LibFunc_round:
case LibFunc_roundf:
case LibFunc_roundl:
// TODO: Remove this, already canonicalized by the middle-end.
if (visitUnaryFloatCall(I, ISD::FROUND))
return;
break;
case LibFunc_trunc:
case LibFunc_truncf:
case LibFunc_truncl:
// TODO: Remove this, already canonicalized by the middle-end.
if (visitUnaryFloatCall(I, ISD::FTRUNC))
return;
break;
Expand Down
8 changes: 2 additions & 6 deletions llvm/test/CodeGen/AArch64/arm64-rounding.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,22 +26,18 @@ declare double @floor(double) nounwind readnone
; CHECK: frinti
define float @test3(float %a) #0 {
entry:
%call = tail call float @nearbyintf(float %a) nounwind readnone
%call = tail call float @llvm.nearbyint.f32(float %a) nounwind readnone
ret float %call
}

declare float @nearbyintf(float) nounwind readnone

; CHECK-LABEL: test4:
; CHECK: frinti
define double @test4(double %a) #0 {
entry:
%call = tail call double @nearbyint(double %a) nounwind readnone
%call = tail call double @llvm.nearbyint.f64(double %a) nounwind readnone
ret double %call
}

declare double @nearbyint(double) nounwind readnone

; CHECK-LABEL: test5:
; CHECK: frintp
; CHECK-NOT: frintx
Expand Down
7 changes: 2 additions & 5 deletions llvm/test/CodeGen/AArch64/floatdp_1source.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ declare double @trunc(double) readonly
declare float @rintf(float) readonly
declare double @rint(double) readonly

declare float @nearbyintf(float) readonly
declare double @nearbyint(double) readonly

define float @fabs_f(float %v) {
; CHECK-LABEL: fabs_f:
; CHECK: ; %bb.0:
Expand Down Expand Up @@ -90,7 +87,7 @@ define float @nearbyint_f(float %v) {
; CHECK: ; %bb.0:
; CHECK-NEXT: frinti s0, s0
; CHECK-NEXT: ret
%r = call float @nearbyintf(float %v)
%r = call float @llvm.nearbyint.f32(float %v)
ret float %r
}

Expand Down Expand Up @@ -162,7 +159,7 @@ define double @nearbyint_d(double %v) {
; CHECK: ; %bb.0:
; CHECK-NEXT: frinti d0, d0
; CHECK-NEXT: ret
%r = call double @nearbyint(double %v)
%r = call double @llvm.nearbyint.f64(double %v)
ret double %r
}

Expand Down
6 changes: 2 additions & 4 deletions llvm/test/CodeGen/ARM/arm32-rounding.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ entry:
; CHECK: vrintr.f32
define float @test9(float %a) {
entry:
%call = call float @nearbyintf(float %a) nounwind readnone
%call = call float @llvm.nearbyint.f32(float %a) nounwind readnone
ret float %call
}

Expand All @@ -83,7 +83,7 @@ entry:
; DP: vrintr.f64
define double @test10(double %a) {
entry:
%call = call double @nearbyint(double %a) nounwind readnone
%call = call double @llvm.nearbyint.f64(double %a) nounwind readnone
ret double %call
}

Expand Down Expand Up @@ -128,8 +128,6 @@ declare float @roundf(float) nounwind readnone
declare double @round(double) nounwind readnone
declare float @truncf(float) nounwind readnone
declare double @trunc(double) nounwind readnone
declare float @nearbyintf(float) nounwind readnone
declare double @nearbyint(double) nounwind readnone
declare float @rintf(float) nounwind readnone
declare double @rint(double) nounwind readnone
declare float @llvm.roundeven.f32(float)
Expand Down
4 changes: 1 addition & 3 deletions llvm/test/CodeGen/Mips/mips64-f128.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1736,12 +1736,10 @@ define fp128 @libcall1_nearbyintl() {
; CMP_CC_FMT-NEXT: jrc $ra
entry:
%0 = load fp128, ptr @gld0, align 16
%call = tail call fp128 @nearbyintl(fp128 %0) nounwind readnone
%call = tail call fp128 @llvm.nearbyint.f128(fp128 %0) nounwind readnone
ret fp128 %call
}

declare fp128 @nearbyintl(fp128) #1

define fp128 @libcall1_floorl() {
; C_CC_FMT-LABEL: libcall1_floorl:
; C_CC_FMT: # %bb.0: # %entry
Expand Down
4 changes: 1 addition & 3 deletions llvm/test/CodeGen/RISCV/double-zfa.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,12 +250,10 @@ define double @fround_d_5(double %a) nounwind {
; CHECK: # %bb.0:
; CHECK-NEXT: fround.d fa0, fa0
; CHECK-NEXT: ret
%call = tail call double @nearbyint(double %a) nounwind readnone
%call = tail call double @llvm.nearbyint.f64(double %a) nounwind readnone
ret double %call
}

declare double @nearbyint(double) nounwind readnone

define double @fround_d_6(double %a) nounwind {
; CHECK-LABEL: fround_d_6:
; CHECK: # %bb.0:
Expand Down
4 changes: 1 addition & 3 deletions llvm/test/CodeGen/RISCV/float-zfa.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,12 +183,10 @@ define float @fround_s_5(float %a) nounwind {
; CHECK: # %bb.0:
; CHECK-NEXT: fround.s fa0, fa0
; CHECK-NEXT: ret
%call = tail call float @nearbyintf(float %a) nounwind readnone
%call = tail call float @llvm.nearbyint.f32(float %a) nounwind readnone
ret float %call
}

declare float @nearbyintf(float) nounwind readnone

define float @fround_s_6(float %a) nounwind {
; CHECK-LABEL: fround_s_6:
; CHECK: # %bb.0:
Expand Down
8 changes: 2 additions & 6 deletions llvm/test/CodeGen/X86/rounding-ops.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,10 @@ define float @test3(float %x) nounwind {
; CHECK-AVX512: ## %bb.0:
; CHECK-AVX512-NEXT: vroundss $12, %xmm0, %xmm0, %xmm0
; CHECK-AVX512-NEXT: retq
%call = tail call float @nearbyintf(float %x) nounwind readnone
%call = tail call float @llvm.nearbyint.f32(float %x) nounwind readnone
ret float %call
}

declare float @nearbyintf(float) nounwind readnone

define double @test4(double %x) nounwind {
; CHECK-SSE-LABEL: test4:
; CHECK-SSE: ## %bb.0:
Expand All @@ -81,12 +79,10 @@ define double @test4(double %x) nounwind {
; CHECK-AVX512: ## %bb.0:
; CHECK-AVX512-NEXT: vroundsd $12, %xmm0, %xmm0, %xmm0
; CHECK-AVX512-NEXT: retq
%call = tail call double @nearbyint(double %x) nounwind readnone
%call = tail call double @llvm.nearbyint.f64(double %x) nounwind readnone
ret double %call
}

declare double @nearbyint(double) nounwind readnone

define float @test5(float %x) nounwind {
; CHECK-SSE-LABEL: test5:
; CHECK-SSE: ## %bb.0:
Expand Down
Loading