Skip to content

Commit 757c5b3

Browse files
arsenmarsenm
authored
Revert "InstCombine: Fold ldexp with constant exponent to fmul" (#171895)
Reverts #171731 Fails on a libc test
1 parent 2f9b8b7 commit 757c5b3

File tree

3 files changed

+34
-51
lines changed

3 files changed

+34
-51
lines changed

‎llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3089,19 +3089,6 @@ Instruction *InstCombinerImpl::visitCallInst(CallInst &CI) {
30893089
// exponent. Also could broaden sign check to cover == 0 case.
30903090
Value *Src = II->getArgOperand(0);
30913091
Value *Exp = II->getArgOperand(1);
3092-
3093-
uint64_t ConstExp;
3094-
if (match(Exp, m_ConstantInt(ConstExp))) {
3095-
// ldexp(x, K) -> fmul x, 2^K
3096-
const fltSemantics &FPTy =
3097-
Src->getType()->getScalarType()->getFltSemantics();
3098-
Constant *FPConst =
3099-
ConstantFP::get(Src->getType(), scalbn(APFloat::getOne(FPTy),
3100-
static_cast<int>(ConstExp),
3101-
APFloat::rmNearestTiesToEven));
3102-
return BinaryOperator::CreateFMulFMF(Src, FPConst, II);
3103-
}
3104-
31053092
Value *InnerSrc;
31063093
Value *InnerExp;
31073094
if (match(Src, m_OneUse(m_Intrinsic<Intrinsic::ldexp>(

‎llvm/test/Transforms/InstCombine/fold-select-fmul-if-zero.ll‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,10 @@ define float @fmul_by_32_if_0_oeq_zero_f32(float %x) {
4949

5050
define float @ldexp_by_5_if_0_oeq_zero_f32(float %x) {
5151
; CHECK-LABEL: @ldexp_by_5_if_0_oeq_zero_f32(
52-
; CHECK-NEXT: ret float [[X:%.*]]
52+
; CHECK-NEXT: [[X_IS_ZERO:%.*]] = fcmp oeq float [[X:%.*]], 0.000000e+00
53+
; CHECK-NEXT: [[SCALED_X:%.*]] = call float @llvm.ldexp.f32.i32(float [[X]], i32 5)
54+
; CHECK-NEXT: [[SCALED_IF_DENORMAL:%.*]] = select i1 [[X_IS_ZERO]], float [[SCALED_X]], float [[X]]
55+
; CHECK-NEXT: ret float [[SCALED_IF_DENORMAL]]
5356
;
5457
%x.is.zero = fcmp oeq float %x, 0.0
5558
%scaled.x = call float @llvm.ldexp.f32.i32(float %x, i32 5)
@@ -59,7 +62,10 @@ define float @ldexp_by_5_if_0_oeq_zero_f32(float %x) {
5962

6063
define <2 x float> @ldexp_by_5_if_0_oeq_zero_v2f32(<2 x float> %x) {
6164
; CHECK-LABEL: @ldexp_by_5_if_0_oeq_zero_v2f32(
62-
; CHECK-NEXT: ret <2 x float> [[SCALED_IF_DENORMAL:%.*]]
65+
; CHECK-NEXT: [[X_IS_ZERO:%.*]] = fcmp oeq <2 x float> [[X:%.*]], zeroinitializer
66+
; CHECK-NEXT: [[SCALED_X:%.*]] = call <2 x float> @llvm.ldexp.v2f32.v2i32(<2 x float> [[X]], <2 x i32> splat (i32 5))
67+
; CHECK-NEXT: [[SCALED_IF_DENORMAL:%.*]] = select <2 x i1> [[X_IS_ZERO]], <2 x float> [[SCALED_X]], <2 x float> [[X]]
68+
; CHECK-NEXT: ret <2 x float> [[SCALED_IF_DENORMAL]]
6369
;
6470
%x.is.zero = fcmp oeq <2 x float> %x, zeroinitializer
6571
%scaled.x = call <2 x float> @llvm.ldexp.v2f32.v2i32(<2 x float> %x, <2 x i32> <i32 5, i32 5>)

‎llvm/test/Transforms/InstCombine/ldexp.ll‎

Lines changed: 26 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ define float @ldexp_ldexp_different_exp_type(float %x, i32 %a, i64 %b) {
444444
define float @ldexp_ldexp_constants(float %x) {
445445
; CHECK-LABEL: define float @ldexp_ldexp_constants
446446
; CHECK-SAME: (float [[X:%.*]]) {
447-
; CHECK-NEXT: [[LDEXP1:%.*]] = fmul reassoc float [[X]], 0x41F0000000000000
447+
; CHECK-NEXT: [[LDEXP1:%.*]] = call reassoc float @llvm.ldexp.f32.i32(float [[X]], i32 32)
448448
; CHECK-NEXT: ret float [[LDEXP1]]
449449
;
450450
%ldexp0 = call reassoc float @llvm.ldexp.f32.i32(float %x, i32 8)
@@ -455,7 +455,7 @@ define float @ldexp_ldexp_constants(float %x) {
455455
define float @ldexp_ldexp_constants_nsz(float %x) {
456456
; CHECK-LABEL: define float @ldexp_ldexp_constants_nsz
457457
; CHECK-SAME: (float [[X:%.*]]) {
458-
; CHECK-NEXT: [[LDEXP1:%.*]] = fmul reassoc nsz float [[X]], 0x41F0000000000000
458+
; CHECK-NEXT: [[LDEXP1:%.*]] = call reassoc nsz float @llvm.ldexp.f32.i32(float [[X]], i32 32)
459459
; CHECK-NEXT: ret float [[LDEXP1]]
460460
;
461461
%ldexp0 = call reassoc nsz float @llvm.ldexp.f32.i32(float %x, i32 8)
@@ -466,7 +466,7 @@ define float @ldexp_ldexp_constants_nsz(float %x) {
466466
define float @ldexp_ldexp_constants_nsz0(float %x) {
467467
; CHECK-LABEL: define float @ldexp_ldexp_constants_nsz0
468468
; CHECK-SAME: (float [[X:%.*]]) {
469-
; CHECK-NEXT: [[LDEXP1:%.*]] = fmul reassoc float [[X]], 0x41F0000000000000
469+
; CHECK-NEXT: [[LDEXP1:%.*]] = call reassoc nsz float @llvm.ldexp.f32.i32(float [[X]], i32 32)
470470
; CHECK-NEXT: ret float [[LDEXP1]]
471471
;
472472
%ldexp0 = call reassoc nsz float @llvm.ldexp.f32.i32(float %x, i32 8)
@@ -477,7 +477,7 @@ define float @ldexp_ldexp_constants_nsz0(float %x) {
477477
define float @ldexp_ldexp_constants_nsz1(float %x) {
478478
; CHECK-LABEL: define float @ldexp_ldexp_constants_nsz1
479479
; CHECK-SAME: (float [[X:%.*]]) {
480-
; CHECK-NEXT: [[LDEXP1:%.*]] = fmul reassoc nsz float [[X]], 0x41F0000000000000
480+
; CHECK-NEXT: [[LDEXP1:%.*]] = call reassoc nsz float @llvm.ldexp.f32.i32(float [[X]], i32 32)
481481
; CHECK-NEXT: ret float [[LDEXP1]]
482482
;
483483
%ldexp0 = call reassoc float @llvm.ldexp.f32.i32(float %x, i32 8)
@@ -641,7 +641,7 @@ define float @ldexp_ldexp_0(float %x, i32 %y) {
641641
define float @ldexp_neg150(float %x) {
642642
; CHECK-LABEL: define float @ldexp_neg150
643643
; CHECK-SAME: (float [[X:%.*]]) {
644-
; CHECK-NEXT: [[LDEXP:%.*]] = fmul float [[X]], 0.000000e+00
644+
; CHECK-NEXT: [[LDEXP:%.*]] = call float @llvm.ldexp.f32.i32(float [[X]], i32 -150)
645645
; CHECK-NEXT: ret float [[LDEXP]]
646646
;
647647
%ldexp = call float @llvm.ldexp.f32.i32(float %x, i32 -150)
@@ -651,7 +651,7 @@ define float @ldexp_neg150(float %x) {
651651
define float @ldexp_neg149(float %x) {
652652
; CHECK-LABEL: define float @ldexp_neg149
653653
; CHECK-SAME: (float [[X:%.*]]) {
654-
; CHECK-NEXT: [[LDEXP:%.*]] = fmul float [[X]], 0x36A0000000000000
654+
; CHECK-NEXT: [[LDEXP:%.*]] = call float @llvm.ldexp.f32.i32(float [[X]], i32 -149)
655655
; CHECK-NEXT: ret float [[LDEXP]]
656656
;
657657
%ldexp = call float @llvm.ldexp.f32.i32(float %x, i32 -149)
@@ -661,7 +661,7 @@ define float @ldexp_neg149(float %x) {
661661
define float @ldexp_neg148(float %x) {
662662
; CHECK-LABEL: define float @ldexp_neg148
663663
; CHECK-SAME: (float [[X:%.*]]) {
664-
; CHECK-NEXT: [[LDEXP:%.*]] = fmul float [[X]], 0x36B0000000000000
664+
; CHECK-NEXT: [[LDEXP:%.*]] = call float @llvm.ldexp.f32.i32(float [[X]], i32 -148)
665665
; CHECK-NEXT: ret float [[LDEXP]]
666666
;
667667
%ldexp = call float @llvm.ldexp.f32.i32(float %x, i32 -148)
@@ -671,7 +671,7 @@ define float @ldexp_neg148(float %x) {
671671
define float @ldexp_neg127(float %x) {
672672
; CHECK-LABEL: define float @ldexp_neg127
673673
; CHECK-SAME: (float [[X:%.*]]) {
674-
; CHECK-NEXT: [[LDEXP:%.*]] = fmul float [[X]], 0x3800000000000000
674+
; CHECK-NEXT: [[LDEXP:%.*]] = call float @llvm.ldexp.f32.i32(float [[X]], i32 -127)
675675
; CHECK-NEXT: ret float [[LDEXP]]
676676
;
677677
%ldexp = call float @llvm.ldexp.f32.i32(float %x, i32 -127)
@@ -681,7 +681,7 @@ define float @ldexp_neg127(float %x) {
681681
define float @ldexp_neg126(float %x) {
682682
; CHECK-LABEL: define float @ldexp_neg126
683683
; CHECK-SAME: (float [[X:%.*]]) {
684-
; CHECK-NEXT: [[LDEXP:%.*]] = fmul float [[X]], 0x3810000000000000
684+
; CHECK-NEXT: [[LDEXP:%.*]] = call float @llvm.ldexp.f32.i32(float [[X]], i32 -126)
685685
; CHECK-NEXT: ret float [[LDEXP]]
686686
;
687687
%ldexp = call float @llvm.ldexp.f32.i32(float %x, i32 -126)
@@ -691,7 +691,7 @@ define float @ldexp_neg126(float %x) {
691691
define float @ldexp_neg125(float %x) {
692692
; CHECK-LABEL: define float @ldexp_neg125
693693
; CHECK-SAME: (float [[X:%.*]]) {
694-
; CHECK-NEXT: [[LDEXP:%.*]] = fmul float [[X]], 0x3820000000000000
694+
; CHECK-NEXT: [[LDEXP:%.*]] = call float @llvm.ldexp.f32.i32(float [[X]], i32 -125)
695695
; CHECK-NEXT: ret float [[LDEXP]]
696696
;
697697
%ldexp = call float @llvm.ldexp.f32.i32(float %x, i32 -125)
@@ -701,7 +701,7 @@ define float @ldexp_neg125(float %x) {
701701
define float @ldexp_neg16(float %x) {
702702
; CHECK-LABEL: define float @ldexp_neg16
703703
; CHECK-SAME: (float [[X:%.*]]) {
704-
; CHECK-NEXT: [[LDEXP:%.*]] = fmul float [[X]], 0x3EF0000000000000
704+
; CHECK-NEXT: [[LDEXP:%.*]] = call float @llvm.ldexp.f32.i32(float [[X]], i32 -16)
705705
; CHECK-NEXT: ret float [[LDEXP]]
706706
;
707707
%ldexp = call float @llvm.ldexp.f32.i32(float %x, i32 -16)
@@ -711,7 +711,7 @@ define float @ldexp_neg16(float %x) {
711711
define float @ldexp_neg8(float %x) {
712712
; CHECK-LABEL: define float @ldexp_neg8
713713
; CHECK-SAME: (float [[X:%.*]]) {
714-
; CHECK-NEXT: [[LDEXP:%.*]] = fmul float [[X]], 3.906250e-03
714+
; CHECK-NEXT: [[LDEXP:%.*]] = call float @llvm.ldexp.f32.i32(float [[X]], i32 -8)
715715
; CHECK-NEXT: ret float [[LDEXP]]
716716
;
717717
%ldexp = call float @llvm.ldexp.f32.i32(float %x, i32 -8)
@@ -721,7 +721,7 @@ define float @ldexp_neg8(float %x) {
721721
define float @ldexp_neg4(float %x) {
722722
; CHECK-LABEL: define float @ldexp_neg4
723723
; CHECK-SAME: (float [[X:%.*]]) {
724-
; CHECK-NEXT: [[LDEXP:%.*]] = fmul float [[X]], 6.250000e-02
724+
; CHECK-NEXT: [[LDEXP:%.*]] = call float @llvm.ldexp.f32.i32(float [[X]], i32 -4)
725725
; CHECK-NEXT: ret float [[LDEXP]]
726726
;
727727
%ldexp = call float @llvm.ldexp.f32.i32(float %x, i32 -4)
@@ -731,7 +731,7 @@ define float @ldexp_neg4(float %x) {
731731
define float @ldexp_neg2(float %x) {
732732
; CHECK-LABEL: define float @ldexp_neg2
733733
; CHECK-SAME: (float [[X:%.*]]) {
734-
; CHECK-NEXT: [[LDEXP:%.*]] = fmul float [[X]], 2.500000e-01
734+
; CHECK-NEXT: [[LDEXP:%.*]] = call float @llvm.ldexp.f32.i32(float [[X]], i32 -2)
735735
; CHECK-NEXT: ret float [[LDEXP]]
736736
;
737737
%ldexp = call float @llvm.ldexp.f32.i32(float %x, i32 -2)
@@ -741,7 +741,7 @@ define float @ldexp_neg2(float %x) {
741741
define float @ldexp_neg1(float %x) {
742742
; CHECK-LABEL: define float @ldexp_neg1
743743
; CHECK-SAME: (float [[X:%.*]]) {
744-
; CHECK-NEXT: [[LDEXP:%.*]] = fmul float [[X]], 5.000000e-01
744+
; CHECK-NEXT: [[LDEXP:%.*]] = call float @llvm.ldexp.f32.i32(float [[X]], i32 -1)
745745
; CHECK-NEXT: ret float [[LDEXP]]
746746
;
747747
%ldexp = call float @llvm.ldexp.f32.i32(float %x, i32 -1)
@@ -760,7 +760,7 @@ define float @ldexp_0(float %x) {
760760
define float @ldexp_1(float %x) {
761761
; CHECK-LABEL: define float @ldexp_1
762762
; CHECK-SAME: (float [[X:%.*]]) {
763-
; CHECK-NEXT: [[LDEXP:%.*]] = fmul float [[X]], 2.000000e+00
763+
; CHECK-NEXT: [[LDEXP:%.*]] = call float @llvm.ldexp.f32.i32(float [[X]], i32 1)
764764
; CHECK-NEXT: ret float [[LDEXP]]
765765
;
766766
%ldexp = call float @llvm.ldexp.f32.i32(float %x, i32 1)
@@ -770,7 +770,7 @@ define float @ldexp_1(float %x) {
770770
define float @ldexp_2(float %x) {
771771
; CHECK-LABEL: define float @ldexp_2
772772
; CHECK-SAME: (float [[X:%.*]]) {
773-
; CHECK-NEXT: [[LDEXP:%.*]] = fmul float [[X]], 4.000000e+00
773+
; CHECK-NEXT: [[LDEXP:%.*]] = call float @llvm.ldexp.f32.i32(float [[X]], i32 2)
774774
; CHECK-NEXT: ret float [[LDEXP]]
775775
;
776776
%ldexp = call float @llvm.ldexp.f32.i32(float %x, i32 2)
@@ -780,7 +780,7 @@ define float @ldexp_2(float %x) {
780780
define float @ldexp_3(float %x) {
781781
; CHECK-LABEL: define float @ldexp_3
782782
; CHECK-SAME: (float [[X:%.*]]) {
783-
; CHECK-NEXT: [[LDEXP:%.*]] = fmul float [[X]], 8.000000e+00
783+
; CHECK-NEXT: [[LDEXP:%.*]] = call float @llvm.ldexp.f32.i32(float [[X]], i32 3)
784784
; CHECK-NEXT: ret float [[LDEXP]]
785785
;
786786
%ldexp = call float @llvm.ldexp.f32.i32(float %x, i32 3)
@@ -790,7 +790,7 @@ define float @ldexp_3(float %x) {
790790
define float @ldexp_10(float %x) {
791791
; CHECK-LABEL: define float @ldexp_10
792792
; CHECK-SAME: (float [[X:%.*]]) {
793-
; CHECK-NEXT: [[LDEXP:%.*]] = fmul float [[X]], 1.024000e+03
793+
; CHECK-NEXT: [[LDEXP:%.*]] = call float @llvm.ldexp.f32.i32(float [[X]], i32 10)
794794
; CHECK-NEXT: ret float [[LDEXP]]
795795
;
796796
%ldexp = call float @llvm.ldexp.f32.i32(float %x, i32 10)
@@ -800,7 +800,7 @@ define float @ldexp_10(float %x) {
800800
define float @ldexp_125(float %x) {
801801
; CHECK-LABEL: define float @ldexp_125
802802
; CHECK-SAME: (float [[X:%.*]]) {
803-
; CHECK-NEXT: [[LDEXP:%.*]] = fmul float [[X]], 0x47C0000000000000
803+
; CHECK-NEXT: [[LDEXP:%.*]] = call float @llvm.ldexp.f32.i32(float [[X]], i32 125)
804804
; CHECK-NEXT: ret float [[LDEXP]]
805805
;
806806
%ldexp = call float @llvm.ldexp.f32.i32(float %x, i32 125)
@@ -810,7 +810,7 @@ define float @ldexp_125(float %x) {
810810
define float @ldexp_126(float %x) {
811811
; CHECK-LABEL: define float @ldexp_126
812812
; CHECK-SAME: (float [[X:%.*]]) {
813-
; CHECK-NEXT: [[LDEXP:%.*]] = fmul float [[X]], 0x47D0000000000000
813+
; CHECK-NEXT: [[LDEXP:%.*]] = call float @llvm.ldexp.f32.i32(float [[X]], i32 126)
814814
; CHECK-NEXT: ret float [[LDEXP]]
815815
;
816816
%ldexp = call float @llvm.ldexp.f32.i32(float %x, i32 126)
@@ -820,27 +820,17 @@ define float @ldexp_126(float %x) {
820820
define float @ldexp_127(float %x) {
821821
; CHECK-LABEL: define float @ldexp_127
822822
; CHECK-SAME: (float [[X:%.*]]) {
823-
; CHECK-NEXT: [[LDEXP:%.*]] = fmul float [[X]], 0x47E0000000000000
823+
; CHECK-NEXT: [[LDEXP:%.*]] = call float @llvm.ldexp.f32.i32(float [[X]], i32 127)
824824
; CHECK-NEXT: ret float [[LDEXP]]
825825
;
826826
%ldexp = call float @llvm.ldexp.f32.i32(float %x, i32 127)
827827
ret float %ldexp
828828
}
829829

830-
define float @ldexp_128(float %x) {
831-
; CHECK-LABEL: define float @ldexp_128
832-
; CHECK-SAME: (float [[X:%.*]]) {
833-
; CHECK-NEXT: [[LDEXP:%.*]] = fmul float [[X]], 0x7FF0000000000000
834-
; CHECK-NEXT: ret float [[LDEXP]]
835-
;
836-
%ldexp = call float @llvm.ldexp.f32.i32(float %x, i32 128)
837-
ret float %ldexp
838-
}
839-
840830
define <2 x float> @ldexp_3_vector(<2 x float> %x) {
841831
; CHECK-LABEL: define <2 x float> @ldexp_3_vector
842832
; CHECK-SAME: (<2 x float> [[X:%.*]]) {
843-
; CHECK-NEXT: [[LDEXP:%.*]] = fmul <2 x float> [[X]], splat (float 8.000000e+00)
833+
; CHECK-NEXT: [[LDEXP:%.*]] = call <2 x float> @llvm.ldexp.v2f32.v2i32(<2 x float> [[X]], <2 x i32> splat (i32 3))
844834
; CHECK-NEXT: ret <2 x float> [[LDEXP]]
845835
;
846836
%ldexp = call <2 x float> @llvm.ldexp.v2f32.v2i32(<2 x float> %x, <2 x i32> <i32 3, i32 3>)
@@ -870,7 +860,7 @@ define <2 x float> @ldexp_3_4_vector(<2 x float> %x) {
870860
define float @ldexp_2_flags(float %x) {
871861
; CHECK-LABEL: define float @ldexp_2_flags
872862
; CHECK-SAME: (float [[X:%.*]]) {
873-
; CHECK-NEXT: [[LDEXP:%.*]] = fmul nsz contract float [[X]], 4.000000e+00
863+
; CHECK-NEXT: [[LDEXP:%.*]] = call nsz contract float @llvm.ldexp.f32.i32(float [[X]], i32 2)
874864
; CHECK-NEXT: ret float [[LDEXP]]
875865
;
876866
%ldexp = call contract nsz float @llvm.ldexp.f32.i32(float %x, i32 2)
@@ -880,7 +870,7 @@ define float @ldexp_2_flags(float %x) {
880870
define float @ldexp_metadata(float %x) {
881871
; CHECK-LABEL: define float @ldexp_metadata
882872
; CHECK-SAME: (float [[X:%.*]]) {
883-
; CHECK-NEXT: [[LDEXP:%.*]] = fmul float [[X]], 4.000000e+00
873+
; CHECK-NEXT: [[LDEXP:%.*]] = call float @llvm.ldexp.f32.i32(float [[X]], i32 2), !foo [[META2:![0-9]+]]
884874
; CHECK-NEXT: ret float [[LDEXP]]
885875
;
886876
%ldexp = call float @llvm.ldexp.f32.i32(float %x, i32 2), !foo !2
@@ -890,7 +880,7 @@ define float @ldexp_metadata(float %x) {
890880
define float @ldexp_8_contractable(float %x, float %y) {
891881
; CHECK-LABEL: define float @ldexp_8_contractable
892882
; CHECK-SAME: (float [[X:%.*]], float [[Y:%.*]]) {
893-
; CHECK-NEXT: [[LDEXP:%.*]] = fmul contract float [[X]], 4.000000e+00
883+
; CHECK-NEXT: [[LDEXP:%.*]] = call contract float @llvm.ldexp.f32.i32(float [[X]], i32 2)
894884
; CHECK-NEXT: [[FADD:%.*]] = fadd contract float [[LDEXP]], [[Y]]
895885
; CHECK-NEXT: ret float [[FADD]]
896886
;

0 commit comments

Comments
 (0)