diff --git a/lib/libc/musl/src/math/exp2.c b/lib/libc/musl/src/math/exp2.c deleted file mode 100644 index e0ff54bd85bb4a8372a13d26516aa859e6adaf42..0000000000000000000000000000000000000000 --- a/lib/libc/musl/src/math/exp2.c +++ /dev/null @@ -1,121 +0,0 @@ -/* - * Double-precision 2^x function. - * - * Copyright (c) 2018, Arm Limited. - * SPDX-License-Identifier: MIT - */ - -#include -#include -#include "libm.h" -#include "exp_data.h" - -#define N (1 << EXP_TABLE_BITS) -#define Shift __exp_data.exp2_shift -#define T __exp_data.tab -#define C1 __exp_data.exp2_poly[0] -#define C2 __exp_data.exp2_poly[1] -#define C3 __exp_data.exp2_poly[2] -#define C4 __exp_data.exp2_poly[3] -#define C5 __exp_data.exp2_poly[4] - -/* Handle cases that may overflow or underflow when computing the result that - is scale*(1+TMP) without intermediate rounding. The bit representation of - scale is in SBITS, however it has a computed exponent that may have - overflown into the sign bit so that needs to be adjusted before using it as - a double. (int32_t)KI is the k used in the argument reduction and exponent - adjustment of scale, positive k here means the result may overflow and - negative k means the result may underflow. */ -static inline double specialcase(double_t tmp, uint64_t sbits, uint64_t ki) -{ - double_t scale, y; - - if ((ki & 0x80000000) == 0) { - /* k > 0, the exponent of scale might have overflowed by 1. */ - sbits -= 1ull << 52; - scale = asdouble(sbits); - y = 2 * (scale + scale * tmp); - return eval_as_double(y); - } - /* k < 0, need special care in the subnormal range. */ - sbits += 1022ull << 52; - scale = asdouble(sbits); - y = scale + scale * tmp; - if (y < 1.0) { - /* Round y to the right precision before scaling it into the subnormal - range to avoid double rounding that can cause 0.5+E/2 ulp error where - E is the worst-case ulp error outside the subnormal range. So this - is only useful if the goal is better than 1 ulp worst-case error. */ - double_t hi, lo; - lo = scale - y + scale * tmp; - hi = 1.0 + y; - lo = 1.0 - hi + y + lo; - y = eval_as_double(hi + lo) - 1.0; - /* Avoid -0.0 with downward rounding. */ - if (WANT_ROUNDING && y == 0.0) - y = 0.0; - /* The underflow exception needs to be signaled explicitly. */ - fp_force_eval(fp_barrier(0x1p-1022) * 0x1p-1022); - } - y = 0x1p-1022 * y; - return eval_as_double(y); -} - -/* Top 12 bits of a double (sign and exponent bits). */ -static inline uint32_t top12(double x) -{ - return asuint64(x) >> 52; -} - -double exp2(double x) -{ - uint32_t abstop; - uint64_t ki, idx, top, sbits; - double_t kd, r, r2, scale, tail, tmp; - - abstop = top12(x) & 0x7ff; - if (predict_false(abstop - top12(0x1p-54) >= top12(512.0) - top12(0x1p-54))) { - if (abstop - top12(0x1p-54) >= 0x80000000) - /* Avoid spurious underflow for tiny x. */ - /* Note: 0 is common input. */ - return WANT_ROUNDING ? 1.0 + x : 1.0; - if (abstop >= top12(1024.0)) { - if (asuint64(x) == asuint64(-INFINITY)) - return 0.0; - if (abstop >= top12(INFINITY)) - return 1.0 + x; - if (!(asuint64(x) >> 63)) - return __math_oflow(0); - else if (asuint64(x) >= asuint64(-1075.0)) - return __math_uflow(0); - } - if (2 * asuint64(x) > 2 * asuint64(928.0)) - /* Large x is special cased below. */ - abstop = 0; - } - - /* exp2(x) = 2^(k/N) * 2^r, with 2^r in [2^(-1/2N),2^(1/2N)]. */ - /* x = k/N + r, with int k and r in [-1/2N, 1/2N]. */ - kd = eval_as_double(x + Shift); - ki = asuint64(kd); /* k. */ - kd -= Shift; /* k/N for int k. */ - r = x - kd; - /* 2^(k/N) ~= scale * (1 + tail). */ - idx = 2 * (ki % N); - top = ki << (52 - EXP_TABLE_BITS); - tail = asdouble(T[idx]); - /* This is only a valid scale when -1023*N < k < 1024*N. */ - sbits = T[idx + 1] + top; - /* exp2(x) = 2^(k/N) * 2^r ~= scale + scale * (tail + 2^r - 1). */ - /* Evaluation is optimized assuming superscalar pipelined execution. */ - r2 = r * r; - /* Without fma the worst case error is 0.5/N ulp larger. */ - /* Worst case error is less than 0.5+0.86/N+(abs poly error * 2^53) ulp. */ - tmp = tail + r * C1 + r2 * (C2 + r * C3) + r2 * r2 * (C4 + r * C5); - if (predict_false(abstop == 0)) - return specialcase(tmp, sbits, ki); - scale = asdouble(sbits); - /* Note: tmp == 0 or |tmp| > 2^-65 and scale > 2^-928, so there - is no spurious underflow here even without fma. */ - return eval_as_double(scale + scale * tmp); -} diff --git a/lib/libc/musl/src/math/exp2f.c b/lib/libc/musl/src/math/exp2f.c deleted file mode 100644 index 0360482cae0a371d43a0b8f9faf5569eea87a18c..0000000000000000000000000000000000000000 --- a/lib/libc/musl/src/math/exp2f.c +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Single-precision 2^x function. - * - * Copyright (c) 2017-2018, Arm Limited. - * SPDX-License-Identifier: MIT - */ - -#include -#include -#include "libm.h" -#include "exp2f_data.h" - -/* -EXP2F_TABLE_BITS = 5 -EXP2F_POLY_ORDER = 3 - -ULP error: 0.502 (nearest rounding.) -Relative error: 1.69 * 2^-34 in [-1/64, 1/64] (before rounding.) -Wrong count: 168353 (all nearest rounding wrong results with fma.) -Non-nearest ULP error: 1 (rounded ULP error) -*/ - -#define N (1 << EXP2F_TABLE_BITS) -#define T __exp2f_data.tab -#define C __exp2f_data.poly -#define SHIFT __exp2f_data.shift_scaled - -static inline uint32_t top12(float x) -{ - return asuint(x) >> 20; -} - -float exp2f(float x) -{ - uint32_t abstop; - uint64_t ki, t; - double_t kd, xd, z, r, r2, y, s; - - xd = (double_t)x; - abstop = top12(x) & 0x7ff; - if (predict_false(abstop >= top12(128.0f))) { - /* |x| >= 128 or x is nan. */ - if (asuint(x) == asuint(-INFINITY)) - return 0.0f; - if (abstop >= top12(INFINITY)) - return x + x; - if (x > 0.0f) - return __math_oflowf(0); - if (x <= -150.0f) - return __math_uflowf(0); - } - - /* x = k/N + r with r in [-1/(2N), 1/(2N)] and int k. */ - kd = eval_as_double(xd + SHIFT); - ki = asuint64(kd); - kd -= SHIFT; /* k/N for int k. */ - r = xd - kd; - - /* exp2(x) = 2^(k/N) * 2^r ~= s * (C0*r^3 + C1*r^2 + C2*r + 1) */ - t = T[ki % N]; - t += ki << (52 - EXP2F_TABLE_BITS); - s = asdouble(t); - z = C[0] * r + C[1]; - r2 = r * r; - y = C[2] * r + 1; - y = z * r2 + y; - y = y * s; - return eval_as_float(y); -} diff --git a/src/libs/musl.zig b/src/libs/musl.zig index bd817c58c92a1466d5bc36bdc9bfe39c292c4df7..05a3cf3d69fc5d6c003862d51f27548833ca0446 100644 --- a/src/libs/musl.zig +++ b/src/libs/musl.zig @@ -899,8 +899,6 @@ const src_files = [_][]const u8{ "musl/src/math/exp10.c", "musl/src/math/exp10f.c", "musl/src/math/exp10l.c", - "musl/src/math/exp2.c", - "musl/src/math/exp2f.c", "musl/src/math/exp2f_data.c", "musl/src/math/exp2l.c", "musl/src/math/exp_data.c", diff --git a/src/libs/wasi_libc.zig b/src/libs/wasi_libc.zig index b4272e32024b5aabe2d700d1811275c3e2129b19..cc950e89cd1bb0e8ff15c0c6fb8a65d3fb93e150 100644 --- a/src/libs/wasi_libc.zig +++ b/src/libs/wasi_libc.zig @@ -739,8 +739,6 @@ const libc_top_half_src_files = [_][]const u8{ "musl/src/math/exp10.c", "musl/src/math/exp10f.c", "musl/src/math/exp10l.c", - "musl/src/math/exp2.c", - "musl/src/math/exp2f.c", "musl/src/math/exp2f_data.c", "musl/src/math/exp2l.c", "musl/src/math/exp_data.c",