From 16439f419b270184ec501c531bf20d83b6745fb0 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Netto Date: Mon, 20 Mar 2023 13:01:18 -0300 Subject: math: Remove the error handling wrapper from fmod and fmodf The error handling is moved to sysdeps/ieee754 version with no SVID support. The compatibility symbol versions still use the wrapper with SVID error handling around the new code. There is no new symbol version nor compatibility code on !LIBM_SVID_COMPAT targets (e.g. riscv). The ia64 is unchanged, since it still uses the arch specific __libm_error_region on its implementation. For both i686 and m68k, which provive arch specific implementation, wrappers are added so no new symbol are added (which would require to change the implementations). It shows an small improvement, the results for fmod: Architecture | Input | master | patch -----------------|-----------------|----------|-------- x86_64 (Ryzen 9) | subnormals | 12.5049 | 9.40992 x86_64 (Ryzen 9) | normal | 296.939 | 296.738 x86_64 (Ryzen 9) | close-exponents | 16.0244 | 13.119 aarch64 (N1) | subnormal | 6.81778 | 4.33313 aarch64 (N1) | normal | 155.620 | 152.915 aarch64 (N1) | close-exponents | 8.21306 | 5.76138 armhf (N1) | subnormal | 15.1083 | 14.5746 armhf (N1) | normal | 244.833 | 241.738 armhf (N1) | close-exponents | 21.8182 | 22.457 Checked on x86_64-linux-gnu, i686-linux-gnu, and aarch64-linux-gnu. Reviewed-by: Wilco Dijkstra --- sysdeps/ieee754/flt-32/e_fmodf.c | 20 +++++++++++++++++--- sysdeps/ieee754/flt-32/math_config.h | 1 + sysdeps/ieee754/flt-32/math_errf.c | 6 ++++++ sysdeps/ieee754/flt-32/w_fmodf.c | 1 + 4 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 sysdeps/ieee754/flt-32/w_fmodf.c (limited to 'sysdeps/ieee754/flt-32') diff --git a/sysdeps/ieee754/flt-32/e_fmodf.c b/sysdeps/ieee754/flt-32/e_fmodf.c index 4482b8c..763900e 100644 --- a/sysdeps/ieee754/flt-32/e_fmodf.c +++ b/sysdeps/ieee754/flt-32/e_fmodf.c @@ -17,6 +17,8 @@ . */ #include +#include +#include #include #include "math_config.h" @@ -55,7 +57,7 @@ } */ float -__ieee754_fmodf (float x, float y) +__fmodf (float x, float y) { uint32_t hx = asuint (x); uint32_t hy = asuint (y); @@ -70,8 +72,13 @@ __ieee754_fmodf (float x, float y) - If x is an inifinity, a NaN is returned. - If y is zero, Nan is returned. - If x is +0/-0, and y is not zero, +0/-0 is returned. */ - if (__glibc_unlikely (hy == 0 || hx >= EXPONENT_MASK || hy > EXPONENT_MASK)) - return (x * y) / (x * y); + if (__glibc_unlikely (hy == 0 + || hx >= EXPONENT_MASK || hy > EXPONENT_MASK)) + { + if (is_nan (hx) || is_nan (hy)) + return (x * y) / (x * y); + return __math_edomf ((x * y) / (x * y)); + } if (__glibc_unlikely (hx <= hy)) { @@ -152,4 +159,11 @@ __ieee754_fmodf (float x, float y) return make_float (mx, ey, sx); } +strong_alias (__fmodf, __ieee754_fmodf) +#if LIBM_SVID_COMPAT +versioned_symbol (libm, __fmodf, fmodf, GLIBC_2_38); +libm_alias_float_other (__fmod, fmod) +#else +libm_alias_float (__fmod, fmod) +#endif libm_alias_finite (__ieee754_fmodf, __fmodf) diff --git a/sysdeps/ieee754/flt-32/math_config.h b/sysdeps/ieee754/flt-32/math_config.h index 829430e..a7fb332 100644 --- a/sysdeps/ieee754/flt-32/math_config.h +++ b/sysdeps/ieee754/flt-32/math_config.h @@ -158,6 +158,7 @@ attribute_hidden float __math_uflowf (uint32_t); attribute_hidden float __math_may_uflowf (uint32_t); attribute_hidden float __math_divzerof (uint32_t); attribute_hidden float __math_invalidf (float); +attribute_hidden float __math_edomf (float x); /* Shared between expf, exp2f, exp10f, and powf. */ #define EXP2F_TABLE_BITS 5 diff --git a/sysdeps/ieee754/flt-32/math_errf.c b/sysdeps/ieee754/flt-32/math_errf.c index 0389ce0..7245ab8 100644 --- a/sysdeps/ieee754/flt-32/math_errf.c +++ b/sysdeps/ieee754/flt-32/math_errf.c @@ -31,6 +31,12 @@ with_errnof (float y, int e) # define with_errnof(x, e) (x) #endif +attribute_hidden float +__math_edomf (float y) +{ + return with_errnof (y, EDOM); +} + /* NOINLINE prevents fenv semantics breaking optimizations. */ NOINLINE static float xflowf (uint32_t sign, float y) diff --git a/sysdeps/ieee754/flt-32/w_fmodf.c b/sysdeps/ieee754/flt-32/w_fmodf.c new file mode 100644 index 0000000..1cc8931 --- /dev/null +++ b/sysdeps/ieee754/flt-32/w_fmodf.c @@ -0,0 +1 @@ +/* Not needed. */ -- cgit v1.1