Skip to content

Commit eefef90

Browse files
committed
Revert "Enable exp10 libcall on linux (#68736)"
This reverts commit 9848fa4. Causes buildbot failures.
1 parent 56e3249 commit eefef90

File tree

4 files changed

+42
-88
lines changed

4 files changed

+42
-88
lines changed

llvm/lib/Analysis/TargetLibraryInfo.cpp

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -560,12 +560,16 @@ static void initialize(TargetLibraryInfoImpl &TLI, const Triple &T,
560560
break;
561561
case Triple::Linux:
562562
// exp10, exp10f, exp10l is available on Linux (GLIBC) but are extremely
563-
// buggy prior to glibc version 2.18. As this version is so old, we
564-
// don't really need to worry about using exp10 on Linux.
565-
TLI.setAvailableWithName(LibFunc_exp10, "__exp10");
566-
TLI.setAvailableWithName(LibFunc_exp10f, "__exp10f");
567-
TLI.setAvailableWithName(LibFunc_exp10l, "__exp10l");
568-
break;
563+
// buggy prior to glibc version 2.18. Until this version is widely deployed
564+
// or we have a reasonable detection strategy, we cannot use exp10 reliably
565+
// on Linux.
566+
//
567+
// Fall through to disable all of them.
568+
[[fallthrough]];
569+
default:
570+
TLI.setUnavailable(LibFunc_exp10);
571+
TLI.setUnavailable(LibFunc_exp10f);
572+
TLI.setUnavailable(LibFunc_exp10l);
569573
}
570574

571575
// ffsl is available on at least Darwin, Mac OS X, iOS, FreeBSD, and
@@ -837,9 +841,6 @@ static void initialize(TargetLibraryInfoImpl &TLI, const Triple &T,
837841
TLI.setUnavailable(LibFunc_strndup);
838842
TLI.setUnavailable(LibFunc_strnlen);
839843
TLI.setUnavailable(LibFunc_toascii);
840-
TLI.setUnavailable(LibFunc_exp10);
841-
TLI.setUnavailable(LibFunc_exp10f);
842-
TLI.setUnavailable(LibFunc_exp10l);
843844
}
844845

845846
// As currently implemented in clang, NVPTX code has no standard library to

llvm/test/Transforms/InstCombine/double-float-shrink-1.ll

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -224,20 +224,11 @@ define double @expm1_test2(float %f) {
224224
; exp10f() doesn't exist for this triple, so it doesn't shrink.
225225

226226
define float @exp10_test1(float %f) {
227-
; LINUX-LABEL: define float @exp10_test1(
228-
; LINUX-SAME: float [[F:%.*]]) {
229-
; LINUX-NEXT: [[EXP10F:%.*]] = call fast float @__exp10f(float [[F]])
230-
; LINUX-NEXT: ret float [[EXP10F]]
231-
;
232-
; MS64-LABEL: define float @exp10_test1(
233-
; MS64-SAME: float [[F:%.*]]) {
234-
; MS64-NEXT: [[EXP10F:%.*]] = call fast float @exp10f(float [[F]])
235-
; MS64-NEXT: ret float [[EXP10F]]
236-
;
237-
; MS32-LABEL: define float @exp10_test1(
238-
; MS32-SAME: float [[F:%.*]]) {
239-
; MS32-NEXT: [[EXP10F:%.*]] = call fast float @exp10f(float [[F]])
240-
; MS32-NEXT: ret float [[EXP10F]]
227+
; CHECK-LABEL: @exp10_test1(
228+
; CHECK-NEXT: [[CONV:%.*]] = fpext float [[F:%.*]] to double
229+
; CHECK-NEXT: [[CALL:%.*]] = call fast double @exp10(double [[CONV]])
230+
; CHECK-NEXT: [[CONV1:%.*]] = fptrunc double [[CALL]] to float
231+
; CHECK-NEXT: ret float [[CONV1]]
241232
;
242233
%conv = fpext float %f to double
243234
%call = call fast double @exp10(double %conv)

llvm/test/Transforms/InstCombine/pow-1.ll

Lines changed: 8 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -870,30 +870,10 @@ define float @test_simplify18(float %x) {
870870
; CHECK-EXP10-NEXT: [[__EXP10F:%.*]] = call float @__exp10f(float [[X]])
871871
; CHECK-EXP10-NEXT: ret float [[__EXP10F]]
872872
;
873-
; VC32-LABEL: define float @test_simplify18(
874-
; VC32-SAME: float [[X:%.*]]) {
875-
; VC32-NEXT: [[RETVAL:%.*]] = call float @powf(float 1.000000e+01, float [[X]])
876-
; VC32-NEXT: ret float [[RETVAL]]
877-
;
878-
; VC51-LABEL: define float @test_simplify18(
879-
; VC51-SAME: float [[X:%.*]]) {
880-
; VC51-NEXT: [[RETVAL:%.*]] = call float @powf(float 1.000000e+01, float [[X]])
881-
; VC51-NEXT: ret float [[RETVAL]]
882-
;
883-
; VC64-LABEL: define float @test_simplify18(
884-
; VC64-SAME: float [[X:%.*]]) {
885-
; VC64-NEXT: [[EXP10F:%.*]] = call float @exp10f(float [[X]])
886-
; VC64-NEXT: ret float [[EXP10F]]
887-
;
888-
; VC83-LABEL: define float @test_simplify18(
889-
; VC83-SAME: float [[X:%.*]]) {
890-
; VC83-NEXT: [[EXP10F:%.*]] = call float @exp10f(float [[X]])
891-
; VC83-NEXT: ret float [[EXP10F]]
892-
;
893-
; NOLIB-LABEL: define float @test_simplify18(
894-
; NOLIB-SAME: float [[X:%.*]]) {
895-
; NOLIB-NEXT: [[RETVAL:%.*]] = call float @powf(float 1.000000e+01, float [[X]])
896-
; NOLIB-NEXT: ret float [[RETVAL]]
873+
; CHECK-NO-EXP10-LABEL: define float @test_simplify18(
874+
; CHECK-NO-EXP10-SAME: float [[X:%.*]]) {
875+
; CHECK-NO-EXP10-NEXT: [[RETVAL:%.*]] = call float @powf(float 1.000000e+01, float [[X]])
876+
; CHECK-NO-EXP10-NEXT: ret float [[RETVAL]]
897877
;
898878
%retval = call float @powf(float 10.0, float %x)
899879
ret float %retval
@@ -905,28 +885,11 @@ define double @test_simplify19(double %x) {
905885
; CHECK-EXP10-NEXT: [[__EXP10:%.*]] = call double @__exp10(double [[X]])
906886
; CHECK-EXP10-NEXT: ret double [[__EXP10]]
907887
;
908-
; VC32-LABEL: define double @test_simplify19(
909-
; VC32-SAME: double [[X:%.*]]) {
910-
; VC32-NEXT: [[EXP10:%.*]] = call double @exp10(double [[X]])
911-
; VC32-NEXT: ret double [[EXP10]]
912-
;
913-
; VC19-LABEL: define double @test_simplify19(
914-
; VC19-SAME: double [[X:%.*]]) {
915-
; VC19-NEXT: [[EXP10:%.*]] = call double @exp10(double [[X]])
916-
; VC19-NEXT: ret double [[EXP10]]
917-
;
918-
; VC64-LABEL: define double @test_simplify19(
919-
; VC64-SAME: double [[X:%.*]]) {
920-
; VC64-NEXT: [[EXP10:%.*]] = call double @exp10(double [[X]])
921-
; VC64-NEXT: ret double [[EXP10]]
922-
;
923-
; NOLIB-LABEL: define double @test_simplify19(
924-
; NOLIB-SAME: double [[X:%.*]]) {
925-
; NOLIB-NEXT: [[RETVAL:%.*]] = call double @pow(double 1.000000e+01, double [[X]])
926-
; NOLIB-NEXT: ret double [[RETVAL]]
888+
; CHECK-NO-EXP10-LABEL: define double @test_simplify19(
889+
; CHECK-NO-EXP10-SAME: double [[X:%.*]]) {
890+
; CHECK-NO-EXP10-NEXT: [[RETVAL:%.*]] = call double @pow(double 1.000000e+01, double [[X]])
891+
; CHECK-NO-EXP10-NEXT: ret double [[RETVAL]]
927892
;
928893
%retval = call double @pow(double 10.0, double %x)
929894
ret double %retval
930895
}
931-
;; NOTE: These prefixes are unused and the list is autogenerated. Do not add tests below this line:
932-
; CHECK-NO-EXP10: {{.*}}

llvm/test/Transforms/InstCombine/pow-exp.ll

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -136,11 +136,12 @@ define fp128 @powl_exp2l_not_fast(fp128 %x, fp128 %y) {
136136
ret fp128 %pow
137137
}
138138

139+
; TODO: exp10() is not widely enabled by many targets yet.
140+
139141
define float @powf_exp10f(float %x, float %y) {
140-
; CHECK-LABEL: define float @powf_exp10f(
141-
; CHECK-SAME: float [[X:%.*]], float [[Y:%.*]]) {
142-
; CHECK-NEXT: [[CALL:%.*]] = call fast float @exp10f(float [[X]]) #[[ATTR1:[0-9]+]]
143-
; CHECK-NEXT: [[POW:%.*]] = call fast float @llvm.pow.f32(float [[CALL]], float [[Y]])
142+
; CHECK-LABEL: @powf_exp10f(
143+
; CHECK-NEXT: [[CALL:%.*]] = call fast float @exp10f(float [[X:%.*]]) #[[ATTR1:[0-9]+]]
144+
; CHECK-NEXT: [[POW:%.*]] = call fast float @llvm.pow.f32(float [[CALL]], float [[Y:%.*]])
144145
; CHECK-NEXT: ret float [[POW]]
145146
;
146147
%call = call fast float @exp10f(float %x) nounwind readnone
@@ -149,10 +150,9 @@ define float @powf_exp10f(float %x, float %y) {
149150
}
150151

151152
define double @pow_exp10(double %x, double %y) {
152-
; CHECK-LABEL: define double @pow_exp10(
153-
; CHECK-SAME: double [[X:%.*]], double [[Y:%.*]]) {
154-
; CHECK-NEXT: [[CALL:%.*]] = call fast double @exp10(double [[X]]) #[[ATTR1]]
155-
; CHECK-NEXT: [[POW:%.*]] = call fast double @llvm.pow.f64(double [[CALL]], double [[Y]])
153+
; CHECK-LABEL: @pow_exp10(
154+
; CHECK-NEXT: [[CALL:%.*]] = call fast double @exp10(double [[X:%.*]]) #[[ATTR1]]
155+
; CHECK-NEXT: [[POW:%.*]] = call fast double @llvm.pow.f64(double [[CALL]], double [[Y:%.*]])
156156
; CHECK-NEXT: ret double [[POW]]
157157
;
158158
%call = call fast double @exp10(double %x) nounwind readnone
@@ -161,10 +161,9 @@ define double @pow_exp10(double %x, double %y) {
161161
}
162162

163163
define fp128 @pow_exp10l(fp128 %x, fp128 %y) {
164-
; CHECK-LABEL: define fp128 @pow_exp10l(
165-
; CHECK-SAME: fp128 [[X:%.*]], fp128 [[Y:%.*]]) {
166-
; CHECK-NEXT: [[CALL:%.*]] = call fast fp128 @exp10l(fp128 [[X]]) #[[ATTR1]]
167-
; CHECK-NEXT: [[POW:%.*]] = call fast fp128 @llvm.pow.f128(fp128 [[CALL]], fp128 [[Y]])
164+
; CHECK-LABEL: @pow_exp10l(
165+
; CHECK-NEXT: [[CALL:%.*]] = call fast fp128 @exp10l(fp128 [[X:%.*]]) #[[ATTR1]]
166+
; CHECK-NEXT: [[POW:%.*]] = call fast fp128 @llvm.pow.f128(fp128 [[CALL]], fp128 [[Y:%.*]])
168167
; CHECK-NEXT: ret fp128 [[POW]]
169168
;
170169
%call = call fast fp128 @exp10l(fp128 %x) nounwind readnone
@@ -256,10 +255,10 @@ define double @pow_ok_base3(double %e) {
256255
}
257256

258257
define double @pow_ok_ten_base(double %e) {
259-
; CHECK-LABEL: define double @pow_ok_ten_base(
260-
; CHECK-SAME: double [[E:%.*]]) {
261-
; CHECK-NEXT: [[EXP10:%.*]] = tail call nnan ninf afn double @exp10(double [[E]])
262-
; CHECK-NEXT: ret double [[EXP10]]
258+
; CHECK-LABEL: @pow_ok_ten_base(
259+
; CHECK-NEXT: [[MUL:%.*]] = fmul nnan ninf afn double [[E:%.*]], 0x400A934F{{.*}}
260+
; CHECK-NEXT: [[EXP2:%.*]] = tail call nnan ninf afn double @exp2(double [[MUL]])
261+
; CHECK-NEXT: ret double [[EXP2]]
263262
;
264263
%call = tail call afn nnan ninf double @pow(double 1.000000e+01, double %e)
265264
ret double %call
@@ -306,10 +305,10 @@ define float @powf_ok_base3(float %e) {
306305
}
307306

308307
define float @powf_ok_ten_base(float %e) {
309-
; CHECK-LABEL: define float @powf_ok_ten_base(
310-
; CHECK-SAME: float [[E:%.*]]) {
311-
; CHECK-NEXT: [[EXP10F:%.*]] = tail call nnan ninf afn float @exp10f(float [[E]])
312-
; CHECK-NEXT: ret float [[EXP10F]]
308+
; CHECK-LABEL: @powf_ok_ten_base(
309+
; CHECK-NEXT: [[MUL:%.*]] = fmul nnan ninf afn float [[E:%.*]], 0x400A934{{.*}}
310+
; CHECK-NEXT: [[EXP2F:%.*]] = tail call nnan ninf afn float @exp2f(float [[MUL]])
311+
; CHECK-NEXT: ret float [[EXP2F]]
313312
;
314313
%call = tail call afn nnan ninf float @powf(float 1.000000e+01, float %e)
315314
ret float %call

0 commit comments

Comments
 (0)