Skip to content

Commit 8063884

Browse files
committed
Revert "power uses Float64 exponents for integers (#53967)"
This reverts commit 237ad1a.
1 parent 8979836 commit 8063884

File tree

4 files changed

+13
-62
lines changed

4 files changed

+13
-62
lines changed

base/math.jl

Lines changed: 11 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1140,10 +1140,6 @@ function modf(x::T) where T<:IEEEFloat
11401140
return (rx, ix)
11411141
end
11421142

1143-
@inline function use_power_by_squaring(n::Integer)
1144-
-2^12 <= n <= 3 * 2^13
1145-
end
1146-
11471143
# @constprop aggressive to help the compiler see the switch between the integer and float
11481144
# variants for callers with constant `y`
11491145
@constprop :aggressive function ^(x::Float64, y::Float64)
@@ -1156,33 +1152,24 @@ end
11561152
y = sign(y)*0x1.8p62
11571153
end
11581154
yint = unsafe_trunc(Int64, y) # This is actually safe since julia freezes the result
1159-
yisint = y == yint
1160-
if yisint
1161-
yint == 0 && return 1.0
1162-
use_power_by_squaring(yint) && return @noinline pow_body(x, yint)
1163-
end
1164-
2*xu==0 && return abs(y)*Inf*(!(y>0)) # if x === +0.0 or -0.0 (Inf * false === 0.0)
1165-
s = 1
1166-
if x < 0
1167-
!yisint && throw_exp_domainerror(x) # y isn't an integer
1168-
s = ifelse(isodd(yint), -1, 1)
1169-
end
1170-
!isfinite(x) && return copysign(x,s)*(y>0 || isnan(x)) # x is inf or NaN
1171-
return copysign(pow_body(abs(x), y), s)
1172-
end
1173-
1174-
@assume_effects :foldable @noinline function pow_body(x::Float64, y::Float64)
1175-
xu = reinterpret(UInt64, x)
1155+
y == yint && return @noinline x^yint
1156+
2*xu==0 && return abs(y)*Inf*(!(y>0)) # if x==0
1157+
x<0 && throw_exp_domainerror(x) # |y| is small enough that y isn't an integer
1158+
!isfinite(x) && return x*(y>0 || isnan(x)) # x is inf or NaN
11761159
if xu < (UInt64(1)<<52) # x is subnormal
11771160
xu = reinterpret(UInt64, x * 0x1p52) # normalize x
11781161
xu &= ~sign_mask(Float64)
11791162
xu -= UInt64(52) << 52 # mess with the exponent
11801163
end
1164+
return pow_body(xu, y)
1165+
end
1166+
1167+
@inline function pow_body(xu::UInt64, y::Float64)
11811168
logxhi,logxlo = _log_ext(xu)
11821169
xyhi, xylo = two_mul(logxhi,y)
11831170
xylo = muladd(logxlo, y, xylo)
11841171
hi = xyhi+xylo
1185-
return @inline Base.Math.exp_impl(hi, xylo-(hi-xyhi), Val(:ℯ))
1172+
return Base.Math.exp_impl(hi, xylo-(hi-xyhi), Val(:ℯ))
11861173
end
11871174

11881175
@constprop :aggressive function ^(x::T, y::T) where T <: Union{Float16, Float32}
@@ -1206,29 +1193,12 @@ end
12061193
return T(exp2(log2(abs(widen(x))) * y))
12071194
end
12081195

1196+
# compensated power by squaring
12091197
@constprop :aggressive @inline function ^(x::Float64, n::Integer)
1210-
x^clamp(n, Int64)
1211-
end
1212-
@constprop :aggressive @inline function ^(x::Float64, n::Int64)
12131198
n == 0 && return one(x)
1214-
if use_power_by_squaring(n)
1215-
return pow_body(x, n)
1216-
else
1217-
s = ifelse(x < 0 && isodd(n), -1.0, 1.0)
1218-
x = abs(x)
1219-
y = float(n)
1220-
if y == n
1221-
return copysign(pow_body(x, y), s)
1222-
else
1223-
n2 = n % 1024
1224-
y = float(n - n2)
1225-
return pow_body(x, y) * copysign(pow_body(x, n2), s)
1226-
end
1227-
end
1199+
return pow_body(x, n)
12281200
end
12291201

1230-
# compensated power by squaring
1231-
# this method is only reliable for -2^20 < n < 2^20 (cf. #53881 #53886)
12321202
@assume_effects :terminates_locally @noinline function pow_body(x::Float64, n::Integer)
12331203
y = 1.0
12341204
xnlo = ynlo = 0.0

base/special/exp.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ end
252252
twopk = (k + UInt64(53)) << 52
253253
return reinterpret(T, twopk + reinterpret(UInt64, small_part))*0x1p-53
254254
end
255-
k == 1024 && return (small_part * 2.0) * 2.0^1023
255+
#k == 1024 && return (small_part * 2.0) * 2.0^1023
256256
end
257257
twopk = Int64(k) << 52
258258
return reinterpret(T, twopk + reinterpret(Int64, small_part))

test/compiler/codegen.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -866,7 +866,7 @@ if Sys.ARCH === :x86_64
866866
foo52079() = Core.Intrinsics.have_fma(Float64)
867867
if foo52079() == true
868868
let io = IOBuffer()
869-
code_native(io,Base.Math.exp_impl,(Float64,Float64,Val{:ℯ}), dump_module=false)
869+
code_native(io,^,(Float64,Float64), dump_module=false)
870870
str = String(take!(io))
871871
@test !occursin("fma_emulated", str)
872872
@test occursin("vfmadd", str)

test/math.jl

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1464,25 +1464,6 @@ end
14641464
# two cases where we have observed > 1 ULP in the past
14651465
@test 0.0013653274095082324^-97.60372292227069 == 4.088393948750035e279
14661466
@test 8.758520413376658e-5^70.55863059215994 == 5.052076767078296e-287
1467-
1468-
# issue #53881
1469-
c53881 = 2.2844135865398217e222 # check correctness within 2 ULPs
1470-
@test prevfloat(1.0) ^ -Int64(2)^62 c53881 atol=2eps(c53881)
1471-
@test 2.0 ^ typemin(Int) == 0.0
1472-
@test (-1.0) ^ typemin(Int) == 1.0
1473-
Z = Int64(2)
1474-
E = prevfloat(1.0)
1475-
@test E ^ (-Z^54) 7.38905609893065
1476-
@test E ^ (-Z^62) 2.2844135865231613e222
1477-
@test E ^ (-Z^63) == Inf
1478-
@test abs(E ^ (Z^62-1) * E ^ (-Z^62+1) - 1) <= eps(1.0)
1479-
n, x = -1065564664, 0.9999997040311492
1480-
@test abs(x^n - Float64(big(x)^n)) / eps(x^n) == 0 # ULPs
1481-
@test E ^ (big(2)^100 + 1) == 0
1482-
@test E ^ 6705320061009595392 == nextfloat(0.0)
1483-
n = Int64(1024 / log2(E))
1484-
@test E^n == Inf
1485-
@test E^float(n) == Inf
14861467
end
14871468

14881469
@testset "special function `::Real` fallback shouldn't recur without bound, issue #57789" begin

0 commit comments

Comments
 (0)