Skip to content

Commit bc36dff

Browse files
arsenmarsenm
committed
RuntimeLibcalls: Stop opting out of exp10
This changes the behavior on old darwin triples for x86_fp80; it now turns into an error instead of emitting exp10l. The comments in TargetLibraryInfo suggest it never existed.
1 parent 779868d commit bc36dff

File tree

6 files changed

+112
-68
lines changed

6 files changed

+112
-68
lines changed

‎llvm/include/llvm/IR/RuntimeLibcalls.td

Lines changed: 28 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ def isNotOSWindowsOrIsCygwinMinGW
2929
def isGNUEnvironment : RuntimeLibcallPredicate<"TT.isGNUEnvironment()">;
3030
def darwinHasSinCosStret : RuntimeLibcallPredicate<"darwinHasSinCosStret(TT)">;
3131
def darwinHasExp10 : RuntimeLibcallPredicate<"darwinHasExp10(TT)">;
32+
33+
def hasExp10 : RuntimeLibcallPredicate<[{!TT.isOSDarwin()}]>;
34+
3235
def hasSinCos : RuntimeLibcallPredicate<"hasSinCos(TT)">;
3336

3437
// FIXME: Way to combine predicates
@@ -786,12 +789,6 @@ def __exp2l_finite_f80 : RuntimeLibcallImpl<EXP2_FINITE_F80, "__exp2l_finite">;
786789
def __exp2l_finite_f128 : RuntimeLibcallImpl<EXP2_FINITE_F128, "__exp2l_finite">;
787790
def __exp2l_finite_ppcf128 : RuntimeLibcallImpl<EXP2_FINITE_PPCF128, "__exp2l_finite">;
788791

789-
def exp10f : RuntimeLibcallImpl<EXP10_F32>;
790-
def exp10 : RuntimeLibcallImpl<EXP10_F64>;
791-
def exp10l_f80 : RuntimeLibcallImpl<EXP10_F80, "exp10l">;
792-
def exp10l_f128 : RuntimeLibcallImpl<EXP10_F128, "exp10l">;
793-
def exp10l_ppcf128 : RuntimeLibcallImpl<EXP10_PPCF128, "exp10l">;
794-
795792
def sinf : RuntimeLibcallImpl<SIN_F32>;
796793
def sin : RuntimeLibcallImpl<SIN_F64>;
797794
defm sin : LibmLongDoubleLibCall;
@@ -952,6 +949,12 @@ def calloc : RuntimeLibcallImpl<CALLOC>;
952949

953950
} // End let IsDefault = true
954951

952+
def exp10f : RuntimeLibcallImpl<EXP10_F32>;
953+
def exp10 : RuntimeLibcallImpl<EXP10_F64>;
954+
def exp10l_f80 : RuntimeLibcallImpl<EXP10_F80, "exp10l">;
955+
def exp10l_f128 : RuntimeLibcallImpl<EXP10_F128, "exp10l">;
956+
def exp10l_ppcf128 : RuntimeLibcallImpl<EXP10_PPCF128, "exp10l">;
957+
955958
//--------------------------------------------------------------------
956959
// compiler-rt/libgcc but 64-bit only, not available by default
957960
//--------------------------------------------------------------------
@@ -1113,6 +1116,12 @@ defvar LibmHasSinCosF80 = LibcallImpls<(add sincos_f80), hasSinCos>;
11131116
defvar LibmHasSinCosF128 = LibcallImpls<(add sincos_f128), hasSinCos>;
11141117
defvar LibmHasSinCosPPCF128 = LibcallImpls<(add sincos_ppcf128), hasSinCos>;
11151118

1119+
defvar LibmHasExp10F32 = LibcallImpls<(add exp10f), hasExp10>;
1120+
defvar LibmHasExp10F64 = LibcallImpls<(add exp10), hasExp10>;
1121+
defvar LibmHasExp10F80 = LibcallImpls<(add exp10l_f80), hasExp10>;
1122+
defvar LibmHasExp10F128 = LibcallImpls<(add exp10l_f128), hasExp10>;
1123+
defvar LibmHasExp10PPCF128 = LibcallImpls<(add exp10l_ppcf128), hasExp10>;
1124+
11161125
defvar WindowsMathRemovals = [
11171126
ldexpf, ldexp_f80, ldexp_f128, ldexp_ppcf128,
11181127
frexpf, frexp_f80, frexp_f128, frexp_ppcf128
@@ -1211,7 +1220,8 @@ def AArch64SystemLibrary : SystemRuntimeLibrary<
12111220
LibcallImpls<(add Int128RTLibcalls), isAArch64_ILP64>,
12121221
LibcallImpls<(add bzero), isOSDarwin>,
12131222
DarwinExp10, DarwinSinCosStret,
1214-
LibmHasSinCosF32, LibmHasSinCosF64, LibmHasSinCosF128)
1223+
LibmHasSinCosF32, LibmHasSinCosF64, LibmHasSinCosF128,
1224+
LibmHasExp10F32, LibmHasExp10F64, LibmHasExp10F128)
12151225
>;
12161226

12171227
// Prepend a # to every name
@@ -1482,6 +1492,7 @@ def ARMSystemLibrary
14821492
AEABIDivRemCalls,
14831493
DarwinSinCosStret, DarwinExp10,
14841494
LibmHasSinCosF32, LibmHasSinCosF64, LibmHasSinCosF128,
1495+
LibmHasExp10F32, LibmHasExp10F64, LibmHasExp10F128,
14851496

14861497
// Use divmod compiler-rt calls for iOS 5.0 and later.
14871498
LibcallImpls<(add __divmodsi4, __udivmodsi4),
@@ -1983,6 +1994,7 @@ def PPCSystemLibrary
19831994
DefaultRuntimeLibcallImpls_f128),
19841995
__extendkftf2, __trunctfkf2,
19851996
DefaultRuntimeLibcallImpls_ppcf128,
1997+
exp10f, exp10, exp10l_ppcf128,
19861998
LibmF128Libcalls, AIX32Calls, AIX64Calls,
19871999
LibmHasSinCosF32, LibmHasSinCosF64, LibmHasSinCosF128,
19882000
LibmHasSinCosPPCF128,
@@ -1998,7 +2010,9 @@ def isRISCV64 : RuntimeLibcallPredicate<"TT.isRISCV64()">;
19982010

19992011
def RISCVSystemLibrary
20002012
: SystemRuntimeLibrary<isRISCV,
2001-
(add DefaultRuntimeLibcallImpls, __riscv_flush_icache,
2013+
(add DefaultRuntimeLibcallImpls,
2014+
exp10f, exp10, exp10l_f128,
2015+
__riscv_flush_icache,
20022016
LibcallImpls<(add Int128RTLibcalls), isRISCV64>)>;
20032017

20042018
//===----------------------------------------------------------------------===//
@@ -2104,7 +2118,7 @@ def isX86 : RuntimeLibcallPredicate<"TT.isX86()">;
21042118
def darwinHas__bzero : RuntimeLibcallPredicate<"TT.isMacOSX() && !TT.isMacOSXVersionLT(10, 6)">;
21052119

21062120
// FIXME: This is has ldexpl/frexpl plus use f128 for long double.
2107-
def hasFrexplLdexplF128
2121+
def hasExpFrexplLdexplF128
21082122
: RuntimeLibcallPredicate<[{(!TT.isOSWindows() || TT.isOSCygMing()) && !TT.isGNUEnvironment()}]>;
21092123

21102124
// Use the f128 variants of math functions on x86
@@ -2120,12 +2134,13 @@ defvar X86CommonLibcalls =
21202134
LibcallImpls<(add __bzero), darwinHas__bzero>,
21212135
LibmHasFrexpF32, LibmHasLdexpF32,
21222136
LibmHasFrexpF80, LibmHasLdexpF80,
2123-
LibcallImpls<(add frexp_f128, ldexp_f128), hasFrexplLdexplF128>,
2137+
LibcallImpls<(add frexp_f128, ldexp_f128, exp10l_f128), hasExpFrexplLdexplF128>,
21242138
DefaultRuntimeLibcallImpls_f80,
2139+
LibmHasExp10F32, LibmHasExp10F64, LibmHasExp10F80,
2140+
LibcallImpls<(add MostPowI), isNotOSMSVCRT>,
21252141
// FIXME: MSVCRT doesn't have powi. The f128 case is added as a
21262142
// hack for one test relying on it.
2127-
__powitf2_f128,
2128-
LibcallImpls<(add MostPowI), isNotOSMSVCRT>
2143+
__powitf2_f128
21292144
);
21302145

21312146
defvar Windows32DivRemMulCalls =
@@ -2265,4 +2280,5 @@ def WasmSystemLibrary
22652280
: SystemRuntimeLibrary<isWasm,
22662281
(add DefaultRuntimeLibcallImpls, Int128RTLibcalls,
22672282
CompilerRTOnlyInt64Libcalls, CompilerRTOnlyInt128Libcalls,
2283+
exp10f, exp10,
22682284
emscripten_return_address)>;

‎llvm/lib/IR/RuntimeLibcalls.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,9 @@ void RuntimeLibcallsInfo::initLibcalls(const Triple &TT,
104104
setLibcallImpl(RTLIB::STACK_SMASH_HANDLER, RTLIB::__stack_smash_handler);
105105
}
106106

107-
// Skip default manual processing for targets that have been fully ported to
107+
// Skip default manual processing for targets that have been mostly ported to
108108
// tablegen for now. Eventually the rest of this should be deleted.
109-
if (TT.isX86() || TT.isAArch64() || TT.isWasm())
109+
if (TT.isX86() || TT.isAArch64() || TT.isWasm() || TT.isPPC())
110110
return;
111111

112112
if (TT.isARM() || TT.isThumb()) {
@@ -120,6 +120,10 @@ void RuntimeLibcallsInfo::initLibcalls(const Triple &TT,
120120
setLibcallImpl(RTLIB::SINCOS_F128, RTLIB::sincos_f128);
121121
}
122122

123+
setLibcallImpl(RTLIB::EXP10_F32, RTLIB::exp10f);
124+
setLibcallImpl(RTLIB::EXP10_F64, RTLIB::exp10);
125+
setLibcallImpl(RTLIB::EXP10_F128, RTLIB::exp10l_f128);
126+
123127
// These libcalls are only available in compiler-rt, not libgcc.
124128
if (TT.isArch64Bit()) {
125129
setLibcallImpl(RTLIB::SHL_I128, RTLIB::__ashlti3);

‎llvm/test/CodeGen/Generic/fp128-exp10-libcall.ll

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
; RUN: %if aarch64-registered-target %{ llc < %s -mtriple=aarch64-unknown-linux-gnu | FileCheck %s --check-prefixes=CHECK-ALL,CHECK-USELD %}
2+
; RUN: %if aarch64-registered-target %{ llc < %s -mtriple=aarch64-unknown-linux-musl | FileCheck %s --check-prefixes=CHECK-ALL,CHECK-USELD %}
3+
; RUN: %if aarch64-registered-target %{ llc < %s -mtriple=aarch64-unknown-none | FileCheck %s --check-prefixes=CHECK-ALL,CHECK-USELD %}
4+
; RUN: %if aarch64-registered-target %{ not llc -mtriple=arm64-apple-macosx -filetype=null %s 2>&1 | FileCheck --check-prefix=ERR %s %}
5+
; RUN: %if arm-registered-target %{ llc < %s -mtriple=arm-none-eabi | FileCheck %s --check-prefixes=CHECK-ALL,CHECK-USELD %}
6+
; RUN: %if arm-registered-target %{ llc < %s -mtriple=arm-unknown-linux-gnueabi | FileCheck %s --check-prefixes=CHECK-ALL,CHECK-USELD %}
7+
; RUN: %if powerpc-registered-target %{ llc < %s -mtriple=powerpc-unknown-linux-gnu | FileCheck %s --check-prefixes=CHECK-ALL,CHECK-F128 %}
8+
; RUN: %if powerpc-registered-target %{ llc < %s -mtriple=powerpc64-unknown-linux-gnu | FileCheck %s --check-prefixes=CHECK-ALL,CHECK-F128 %}
9+
; RUN: %if powerpc-registered-target %{ llc < %s -mtriple=powerpc64-unknown-linux-musl | FileCheck %s --check-prefixes=CHECK-ALL,CHECK-F128 %}
10+
; RUN: %if riscv-registered-target %{ llc < %s -mtriple=riscv32-unknown-linux-gnu | FileCheck %s --check-prefixes=CHECK-ALL,CHECK-USELD %}
11+
; RUN: %if systemz-registered-target %{ llc < %s -mtriple=s390x-unknown-linux-gnu | FileCheck %s --check-prefixes=CHECK-ALL,CHECK-S390X %}
12+
; RUN: %if x86-registered-target %{ llc < %s -mtriple=i686-unknown-linux-gnu | FileCheck %s --check-prefixes=CHECK-ALL,CHECK-F128 %}
13+
; RUN: %if x86-registered-target %{ llc < %s -mtriple=i686-unknown-linux-musl | FileCheck %s --check-prefixes=CHECK-ALL,CHECK-USELD %}
14+
; RUN: %if x86-registered-target %{ llc < %s -mtriple=x86_64-unknown-linux-gnu | FileCheck %s --check-prefixes=CHECK-ALL,CHECK-F128 %}
15+
; RUN: %if x86-registered-target %{ llc < %s -mtriple=x86_64-unknown-linux-musl | FileCheck %s --check-prefixes=CHECK-ALL,CHECK-USELD %}
16+
;
17+
; FIXME(#144006): Windows-MSVC should also be run but has a ldexp selection
18+
; failure.
19+
; %if x86-registered-target %{ llc < %s -mtriple=x86_64-pc-windows-msvc -verify-machineinstrs | FileCheck %s --check-prefixes=CHECK-ALL,CHECK-F128 %}
20+
21+
; ERR: error: no libcall available for fexp10
22+
define fp128 @test_exp10(fp128 %a) {
23+
; CHECK-ALL-LABEL: test_exp10:
24+
; CHECK-F128: exp10f128
25+
; CHECK-USELD: exp10l
26+
; CHECK-S390X: exp10l
27+
start:
28+
%0 = tail call fp128 @llvm.exp10.f128(fp128 %a)
29+
ret fp128 %0
30+
}
31+

‎llvm/test/CodeGen/Generic/fp128-math-libcalls.ll

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -95,16 +95,6 @@ start:
9595
ret fp128 %0
9696
}
9797

98-
define fp128 @test_exp10(fp128 %a) {
99-
; CHECK-ALL-LABEL: test_exp10:
100-
; CHECK-F128: exp10f128
101-
; CHECK-USELD: exp10l
102-
; CHECK-S390X: exp10l
103-
start:
104-
%0 = tail call fp128 @llvm.exp10.f128(fp128 %a)
105-
ret fp128 %0
106-
}
107-
10898
define fp128 @test_exp2(fp128 %a) {
10999
; CHECK-ALL-LABEL: test_exp2:
110100
; CHECK-F128: exp2f128

‎llvm/test/CodeGen/X86/exp10-libcall-names.ll

Lines changed: 1 addition & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@
1313
; RUN: llc < %s -mtriple=i686-linux-gnu -global-isel -global-isel-abort=1 | FileCheck %s --check-prefix=GISEL-X86
1414
; RUN: llc < %s -mtriple=x86_64-linux-gnu -global-isel -global-isel-abort=1 | FileCheck %s --check-prefix=GISEL-X64
1515

16-
; RUN: not llc -mtriple=x86_64-apple-macos10.8 -filetype=null %s 2>&1 | FileCheck -check-prefix=ERR %s
17-
; Check exp10/exp10f is emitted as __exp10/__exp10f on assorted systems.
18-
19-
; ERR: no libcall available for fexp10
16+
; Check exp10/exp10f is emitted as __exp10/__exp10f on assorted darwin systems.
2017

2118
define float @test_exp10_f32(float %x) nounwind {
2219
; LINUX-LABEL: test_exp10_f32:
@@ -78,43 +75,3 @@ define double @test_exp10_f64(double %x) nounwind {
7875
%ret = call double @llvm.exp10.f64(double %x)
7976
ret double %ret
8077
}
81-
82-
define x86_fp80 @test_exp10_f80(x86_fp80 %x) nounwind {
83-
; LINUX-LABEL: test_exp10_f80:
84-
; LINUX: # %bb.0:
85-
; LINUX-NEXT: subq $24, %rsp
86-
; LINUX-NEXT: fldt {{[0-9]+}}(%rsp)
87-
; LINUX-NEXT: fstpt (%rsp)
88-
; LINUX-NEXT: callq exp10l@PLT
89-
; LINUX-NEXT: addq $24, %rsp
90-
; LINUX-NEXT: retq
91-
;
92-
; APPLE-LABEL: test_exp10_f80:
93-
; APPLE: ## %bb.0:
94-
; APPLE-NEXT: subq $24, %rsp
95-
; APPLE-NEXT: fldt {{[0-9]+}}(%rsp)
96-
; APPLE-NEXT: fstpt (%rsp)
97-
; APPLE-NEXT: callq _exp10l
98-
; APPLE-NEXT: addq $24, %rsp
99-
; APPLE-NEXT: retq
100-
;
101-
; GISEL-X86-LABEL: test_exp10_f80:
102-
; GISEL-X86: # %bb.0:
103-
; GISEL-X86-NEXT: subl $12, %esp
104-
; GISEL-X86-NEXT: fldt {{[0-9]+}}(%esp)
105-
; GISEL-X86-NEXT: fstpt (%esp)
106-
; GISEL-X86-NEXT: calll exp10l
107-
; GISEL-X86-NEXT: addl $12, %esp
108-
; GISEL-X86-NEXT: retl
109-
;
110-
; GISEL-X64-LABEL: test_exp10_f80:
111-
; GISEL-X64: # %bb.0:
112-
; GISEL-X64-NEXT: subq $24, %rsp
113-
; GISEL-X64-NEXT: fldt {{[0-9]+}}(%rsp)
114-
; GISEL-X64-NEXT: fstpt (%rsp)
115-
; GISEL-X64-NEXT: callq exp10l
116-
; GISEL-X64-NEXT: addq $24, %rsp
117-
; GISEL-X64-NEXT: retq
118-
%ret = call x86_fp80 @llvm.exp10.f80(x86_fp80 %x)
119-
ret x86_fp80 %ret
120-
}

‎llvm/test/CodeGen/X86/exp10l-libcall-names.ll

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
; RUN: llc -mtriple=x86_64-linux-gnu < %s | FileCheck -check-prefix=LINUX %s
2+
; RUN: not llc -mtriple=x86_64-apple-macos10.9 < %s 2>&1 | FileCheck -check-prefix=ERR %s
3+
; RUN: not llc -mtriple=x86_64-apple-ios9.0 < %s 2>&1 | FileCheck -check-prefix=ERR %s
4+
; RUN: not llc -mtriple=x86_64-apple-tvos9.0 < %s 2>&1 | FileCheck -check-prefix=ERR %s
5+
; RUN: not llc -mtriple=x86_64-apple-watchos9.0 < %s 2>&1 | FileCheck -check-prefix=ERR %s
6+
; RUN: not llc -mtriple=x86_64-apple-xros9.0 < %s 2>&1 | FileCheck -check-prefix=ERR %s
7+
; RUN: not llc -mtriple=x86_64-apple-ios8.0 < %s 2>&1 | FileCheck -check-prefix=ERR %s
8+
; RUN: not llc -mtriple=x86_64-apple-tvos8.0 < %s 2>&1 | FileCheck -check-prefix=ERR %s
9+
; RUN: not llc -mtriple=x86_64-apple-xros8.0 < %s 2>&1 | FileCheck -check-prefix=ERR %s
10+
; RUN: not llc -mtriple=x86_64-apple-driverkit < %s 2>&1 | FileCheck -check-prefix=ERR %s
11+
; RUN: not llc -mtriple=x86_64-apple-driverkit24.0 < %s 2>&1 | FileCheck -check-prefix=ERR %s
12+
; RUN: llc < %s -mtriple=i686-linux-gnu -global-isel -global-isel-abort=1 | FileCheck %s --check-prefix=GISEL-X86
13+
; RUN: llc < %s -mtriple=x86_64-linux-gnu -global-isel -global-isel-abort=1 | FileCheck %s --check-prefix=GISEL-X64
14+
15+
; ERR: no libcall available for fexp10
16+
17+
define x86_fp80 @test_exp10_f80(x86_fp80 %x) nounwind {
18+
; LINUX-LABEL: test_exp10_f80:
19+
; LINUX: # %bb.0:
20+
; LINUX-NEXT: subq $24, %rsp
21+
; LINUX-NEXT: fldt {{[0-9]+}}(%rsp)
22+
; LINUX-NEXT: fstpt (%rsp)
23+
; LINUX-NEXT: callq exp10l@PLT
24+
; LINUX-NEXT: addq $24, %rsp
25+
; LINUX-NEXT: retq
26+
;
27+
; GISEL-X86-LABEL: test_exp10_f80:
28+
; GISEL-X86: # %bb.0:
29+
; GISEL-X86-NEXT: subl $12, %esp
30+
; GISEL-X86-NEXT: fldt {{[0-9]+}}(%esp)
31+
; GISEL-X86-NEXT: fstpt (%esp)
32+
; GISEL-X86-NEXT: calll exp10l
33+
; GISEL-X86-NEXT: addl $12, %esp
34+
; GISEL-X86-NEXT: retl
35+
;
36+
; GISEL-X64-LABEL: test_exp10_f80:
37+
; GISEL-X64: # %bb.0:
38+
; GISEL-X64-NEXT: subq $24, %rsp
39+
; GISEL-X64-NEXT: fldt {{[0-9]+}}(%rsp)
40+
; GISEL-X64-NEXT: fstpt (%rsp)
41+
; GISEL-X64-NEXT: callq exp10l
42+
; GISEL-X64-NEXT: addq $24, %rsp
43+
; GISEL-X64-NEXT: retq
44+
%ret = call x86_fp80 @llvm.exp10.f80(x86_fp80 %x)
45+
ret x86_fp80 %ret
46+
}

0 commit comments

Comments
 (0)