Remove the error handling wrapper from log
Introduce new log symbol version that doesn't do SVID compatible error handling. The standard errno and fp exception based error handling is inline in the new code and does not have significant overhead. The wrapper is disabled for sysdeps/ieee754/dbl-64 by using empty w_log.c and enabled for targets with their own log implementation by including math/w_log.c. The compatibility symbol version still uses 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). On targets where previously logl was an alias of log, now it points to the compatibility symbol with the wrapper, because it still need the SVID compatible error handling. This affects NO_LONG_DOUBLE (e.g. arm) and LONG_DOUBLE_COMPAT (e.g. alpha) targets as well. The __log_finite symbol is now an alias of log. Both __log_finite and log set errno and thus not const functions. The ia64 asm is changed so the compat and new symbol versions map to the same address. On x86_64 #include <math.h> was added before macro definitions that may affect that header. Tested with build-many-glibcs.py. * math/Versions (GLIBC_2.29): Add log. * math/w_log_compat.c (__log_compat): Change to versioned compat symbol. * math/w_log.c: New file. * sysdeps/i386/fpu/w_log.c: New file. * sysdeps/ia64/fpu/e_log.S: Update. * sysdeps/ieee754/dbl-64/e_log.c (__ieee754_log): Rename to __log and add necessary aliases. * sysdeps/ieee754/dbl-64/w_log.c: New file. * sysdeps/m68k/m680x0/fpu/w_log.c: New file. * sysdeps/mach/hurd/i386/libm.abilist: Update. * sysdeps/unix/sysv/linux/aarch64/libm.abilist: Update. * sysdeps/unix/sysv/linux/alpha/libm.abilist: Update. * sysdeps/unix/sysv/linux/arm/libm.abilist: Update. * sysdeps/unix/sysv/linux/hppa/libm.abilist: Update. * sysdeps/unix/sysv/linux/i386/libm.abilist: Update. * sysdeps/unix/sysv/linux/ia64/libm.abilist: Update. * sysdeps/unix/sysv/linux/m68k/coldfire/libm.abilist: Update. * sysdeps/unix/sysv/linux/m68k/m680x0/libm.abilist: Update. * sysdeps/unix/sysv/linux/microblaze/libm.abilist: Update. * sysdeps/unix/sysv/linux/mips/mips32/libm.abilist: Update. * sysdeps/unix/sysv/linux/mips/mips64/libm.abilist: Update. * sysdeps/unix/sysv/linux/nios2/libm.abilist: Update. * sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libm.abilist: Update. * sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libm.abilist: Update. * sysdeps/unix/sysv/linux/powerpc/powerpc64/libm-le.abilist: Update. * sysdeps/unix/sysv/linux/powerpc/powerpc64/libm.abilist: Update. * sysdeps/unix/sysv/linux/s390/s390-32/libm.abilist: Update. * sysdeps/unix/sysv/linux/s390/s390-64/libm.abilist: Update. * sysdeps/unix/sysv/linux/sh/libm.abilist: Update. * sysdeps/unix/sysv/linux/sparc/sparc32/libm.abilist: Update. * sysdeps/unix/sysv/linux/sparc/sparc64/libm.abilist: Update. * sysdeps/unix/sysv/linux/x86_64/64/libm.abilist: Update. * sysdeps/unix/sysv/linux/x86_64/x32/libm.abilist: Update. * sysdeps/x86_64/fpu/multiarch/e_log-avx.c (__ieee754_log): Rename to __log. * sysdeps/x86_64/fpu/multiarch/e_log-fma.c (__ieee754_log): Likewise. * sysdeps/x86_64/fpu/multiarch/e_log-fma4.c (__ieee754_log): Likewise. * sysdeps/x86_64/fpu/multiarch/e_log.c (__ieee754_log): Likewise. * sysdeps/x86_64/fpu/multiarch/w_log.c: New file.
This commit is contained in:
Szabolcs Nagy
parent
c20a10561a
commit
f29b7c492d
43
ChangeLog
43
ChangeLog
|
|
@ -1,3 +1,46 @@
|
|||
2018-11-21 Szabolcs Nagy <szabolcs.nagy@arm.com>
|
||||
|
||||
* math/Versions (GLIBC_2.29): Add log.
|
||||
* math/w_log_compat.c (__log_compat): Change to versioned compat
|
||||
symbol.
|
||||
* math/w_log.c: New file.
|
||||
* sysdeps/i386/fpu/w_log.c: New file.
|
||||
* sysdeps/ia64/fpu/e_log.S: Update.
|
||||
* sysdeps/ieee754/dbl-64/e_log.c (__ieee754_log): Rename to __log
|
||||
and add necessary aliases.
|
||||
* sysdeps/ieee754/dbl-64/w_log.c: New file.
|
||||
* sysdeps/m68k/m680x0/fpu/w_log.c: New file.
|
||||
* sysdeps/mach/hurd/i386/libm.abilist: Update.
|
||||
* sysdeps/unix/sysv/linux/aarch64/libm.abilist: Update.
|
||||
* sysdeps/unix/sysv/linux/alpha/libm.abilist: Update.
|
||||
* sysdeps/unix/sysv/linux/arm/libm.abilist: Update.
|
||||
* sysdeps/unix/sysv/linux/hppa/libm.abilist: Update.
|
||||
* sysdeps/unix/sysv/linux/i386/libm.abilist: Update.
|
||||
* sysdeps/unix/sysv/linux/ia64/libm.abilist: Update.
|
||||
* sysdeps/unix/sysv/linux/m68k/coldfire/libm.abilist: Update.
|
||||
* sysdeps/unix/sysv/linux/m68k/m680x0/libm.abilist: Update.
|
||||
* sysdeps/unix/sysv/linux/microblaze/libm.abilist: Update.
|
||||
* sysdeps/unix/sysv/linux/mips/mips32/libm.abilist: Update.
|
||||
* sysdeps/unix/sysv/linux/mips/mips64/libm.abilist: Update.
|
||||
* sysdeps/unix/sysv/linux/nios2/libm.abilist: Update.
|
||||
* sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libm.abilist: Update.
|
||||
* sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libm.abilist: Update.
|
||||
* sysdeps/unix/sysv/linux/powerpc/powerpc64/libm-le.abilist: Update.
|
||||
* sysdeps/unix/sysv/linux/powerpc/powerpc64/libm.abilist: Update.
|
||||
* sysdeps/unix/sysv/linux/s390/s390-32/libm.abilist: Update.
|
||||
* sysdeps/unix/sysv/linux/s390/s390-64/libm.abilist: Update.
|
||||
* sysdeps/unix/sysv/linux/sh/libm.abilist: Update.
|
||||
* sysdeps/unix/sysv/linux/sparc/sparc32/libm.abilist: Update.
|
||||
* sysdeps/unix/sysv/linux/sparc/sparc64/libm.abilist: Update.
|
||||
* sysdeps/unix/sysv/linux/x86_64/64/libm.abilist: Update.
|
||||
* sysdeps/unix/sysv/linux/x86_64/x32/libm.abilist: Update.
|
||||
* sysdeps/x86_64/fpu/multiarch/e_log-avx.c (__ieee754_log): Rename to
|
||||
__log.
|
||||
* sysdeps/x86_64/fpu/multiarch/e_log-fma.c (__ieee754_log): Likewise.
|
||||
* sysdeps/x86_64/fpu/multiarch/e_log-fma4.c (__ieee754_log): Likewise.
|
||||
* sysdeps/x86_64/fpu/multiarch/e_log.c (__ieee754_log): Likewise.
|
||||
* sysdeps/x86_64/fpu/multiarch/w_log.c: New file.
|
||||
|
||||
2018-11-21 Szabolcs Nagy <szabolcs.nagy@arm.com>
|
||||
|
||||
* math/Versions (GLIBC_2.29): Add exp and exp2.
|
||||
|
|
|
|||
|
|
@ -577,6 +577,6 @@ libm {
|
|||
}
|
||||
GLIBC_2.29 {
|
||||
# No SVID compatible error handling.
|
||||
exp; exp2;
|
||||
exp; exp2; log;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,8 @@
|
|||
#include <math-type-macros-double.h>
|
||||
#undef __USE_WRAPPER_TEMPLATE
|
||||
#define __USE_WRAPPER_TEMPLATE 1
|
||||
#undef declare_mgen_alias
|
||||
#define declare_mgen_alias(a, b)
|
||||
#include <w_log_template.c>
|
||||
versioned_symbol (libm, __log, log, GLIBC_2_29);
|
||||
libm_alias_double_other (__log, log)
|
||||
|
|
@ -23,10 +23,12 @@
|
|||
#include <libm-alias-double.h>
|
||||
|
||||
|
||||
#if LIBM_SVID_COMPAT
|
||||
#if LIBM_SVID_COMPAT && (SHLIB_COMPAT (libm, GLIBC_2_0, GLIBC_2_29) \
|
||||
|| defined NO_LONG_DOUBLE \
|
||||
|| defined LONG_DOUBLE_COMPAT)
|
||||
/* wrapper log(x) */
|
||||
double
|
||||
__log (double x)
|
||||
__log_compat (double x)
|
||||
{
|
||||
if (__builtin_expect (islessequal (x, 0.0), 0) && _LIB_VERSION != _IEEE_)
|
||||
{
|
||||
|
|
@ -44,5 +46,17 @@ __log (double x)
|
|||
|
||||
return __ieee754_log (x);
|
||||
}
|
||||
libm_alias_double (__log, log)
|
||||
# if SHLIB_COMPAT (libm, GLIBC_2_0, GLIBC_2_29)
|
||||
compat_symbol (libm, __log_compat, log, GLIBC_2_0);
|
||||
# endif
|
||||
# ifdef NO_LONG_DOUBLE
|
||||
weak_alias (__log_compat, logl)
|
||||
# endif
|
||||
# ifdef LONG_DOUBLE_COMPAT
|
||||
/* Work around gas bug "multiple versions for symbol". */
|
||||
weak_alias (__log_compat, __log_compat_alias)
|
||||
|
||||
LONG_DOUBLE_COMPAT_CHOOSE_libm_logl (
|
||||
compat_symbol (libm, __log_compat_alias, logl, FIRST_VERSION_libm_logl), );
|
||||
# endif
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
#include <sysdeps/../math/w_log.c>
|
||||
|
|
@ -1670,6 +1670,12 @@ log_libm_err:
|
|||
};;
|
||||
GLOBAL_IEEE754_END(log)
|
||||
libm_alias_double_other (__log, log)
|
||||
#ifdef SHARED
|
||||
.symver log,log@@GLIBC_2.29
|
||||
.weak __log_compat
|
||||
.set __log_compat,__log
|
||||
.symver __log_compat,log@GLIBC_2.2
|
||||
#endif
|
||||
|
||||
|
||||
LOCAL_LIBM_ENTRY(__libm_error_region)
|
||||
|
|
|
|||
|
|
@ -18,6 +18,9 @@
|
|||
|
||||
#include <math.h>
|
||||
#include <stdint.h>
|
||||
#include <math-svid-compat.h>
|
||||
#include <shlib-compat.h>
|
||||
#include <libm-alias-double.h>
|
||||
#include "math_config.h"
|
||||
|
||||
#define T __log_data.tab
|
||||
|
|
@ -42,7 +45,7 @@ top16 (double x)
|
|||
|
||||
double
|
||||
SECTION
|
||||
__ieee754_log (double x)
|
||||
__log (double x)
|
||||
{
|
||||
/* double_t for better performance on targets with FLT_EVAL_METHOD==2. */
|
||||
double_t w, z, r, r2, r3, y, invc, logc, kd, hi, lo;
|
||||
|
|
@ -127,6 +130,13 @@ __ieee754_log (double x)
|
|||
y = lo + r2 * A[0] + r * r2 * (A[1] + r * A[2] + r2 * (A[3] + r * A[4])) + hi;
|
||||
return y;
|
||||
}
|
||||
#ifndef __ieee754_log
|
||||
strong_alias (__ieee754_log, __log_finite)
|
||||
#ifndef __log
|
||||
strong_alias (__log, __ieee754_log)
|
||||
strong_alias (__log, __log_finite)
|
||||
# if LIBM_SVID_COMPAT
|
||||
versioned_symbol (libm, __log, log, GLIBC_2_29);
|
||||
libm_alias_double_other (__log, log)
|
||||
# else
|
||||
libm_alias_double (__log, log)
|
||||
# endif
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
/* Not needed. */
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <sysdeps/../math/w_log.c>
|
||||
|
|
@ -1070,3 +1070,4 @@ GLIBC_2.28 fsub F
|
|||
GLIBC_2.28 fsubl F
|
||||
GLIBC_2.29 exp F
|
||||
GLIBC_2.29 exp2 F
|
||||
GLIBC_2.29 log F
|
||||
|
|
|
|||
|
|
@ -1034,3 +1034,4 @@ GLIBC_2.28 fsub F
|
|||
GLIBC_2.28 fsubl F
|
||||
GLIBC_2.29 exp F
|
||||
GLIBC_2.29 exp2 F
|
||||
GLIBC_2.29 log F
|
||||
|
|
|
|||
|
|
@ -1045,6 +1045,7 @@ GLIBC_2.28 fsub F
|
|||
GLIBC_2.28 fsubl F
|
||||
GLIBC_2.29 exp F
|
||||
GLIBC_2.29 exp2 F
|
||||
GLIBC_2.29 log F
|
||||
GLIBC_2.3.4 __c1_cabsf F
|
||||
GLIBC_2.3.4 __c1_cacosf F
|
||||
GLIBC_2.3.4 __c1_cacoshf F
|
||||
|
|
|
|||
|
|
@ -455,6 +455,7 @@ GLIBC_2.28 fsub F
|
|||
GLIBC_2.28 fsubl F
|
||||
GLIBC_2.29 exp F
|
||||
GLIBC_2.29 exp2 F
|
||||
GLIBC_2.29 log F
|
||||
GLIBC_2.4 _LIB_VERSION D 0x4
|
||||
GLIBC_2.4 __clog10 F
|
||||
GLIBC_2.4 __clog10f F
|
||||
|
|
|
|||
|
|
@ -766,4 +766,5 @@ GLIBC_2.28 fsub F
|
|||
GLIBC_2.28 fsubl F
|
||||
GLIBC_2.29 exp F
|
||||
GLIBC_2.29 exp2 F
|
||||
GLIBC_2.29 log F
|
||||
GLIBC_2.4 exp2l F
|
||||
|
|
|
|||
|
|
@ -1077,3 +1077,4 @@ GLIBC_2.28 fsub F
|
|||
GLIBC_2.28 fsubl F
|
||||
GLIBC_2.29 exp F
|
||||
GLIBC_2.29 exp2 F
|
||||
GLIBC_2.29 log F
|
||||
|
|
|
|||
|
|
@ -1007,3 +1007,4 @@ GLIBC_2.28 fsub F
|
|||
GLIBC_2.28 fsubl F
|
||||
GLIBC_2.29 exp F
|
||||
GLIBC_2.29 exp2 F
|
||||
GLIBC_2.29 log F
|
||||
|
|
|
|||
|
|
@ -455,6 +455,7 @@ GLIBC_2.28 fsub F
|
|||
GLIBC_2.28 fsubl F
|
||||
GLIBC_2.29 exp F
|
||||
GLIBC_2.29 exp2 F
|
||||
GLIBC_2.29 log F
|
||||
GLIBC_2.4 _LIB_VERSION D 0x4
|
||||
GLIBC_2.4 __clog10 F
|
||||
GLIBC_2.4 __clog10f F
|
||||
|
|
|
|||
|
|
@ -806,3 +806,4 @@ GLIBC_2.28 fsub F
|
|||
GLIBC_2.28 fsubl F
|
||||
GLIBC_2.29 exp F
|
||||
GLIBC_2.29 exp2 F
|
||||
GLIBC_2.29 log F
|
||||
|
|
|
|||
|
|
@ -767,3 +767,4 @@ GLIBC_2.28 fsub F
|
|||
GLIBC_2.28 fsubl F
|
||||
GLIBC_2.29 exp F
|
||||
GLIBC_2.29 exp2 F
|
||||
GLIBC_2.29 log F
|
||||
|
|
|
|||
|
|
@ -766,4 +766,5 @@ GLIBC_2.28 fsub F
|
|||
GLIBC_2.28 fsubl F
|
||||
GLIBC_2.29 exp F
|
||||
GLIBC_2.29 exp2 F
|
||||
GLIBC_2.29 log F
|
||||
GLIBC_2.4 exp2l F
|
||||
|
|
|
|||
|
|
@ -1034,3 +1034,4 @@ GLIBC_2.28 fsub F
|
|||
GLIBC_2.28 fsubl F
|
||||
GLIBC_2.29 exp F
|
||||
GLIBC_2.29 exp2 F
|
||||
GLIBC_2.29 log F
|
||||
|
|
|
|||
|
|
@ -767,3 +767,4 @@ GLIBC_2.28 fsub F
|
|||
GLIBC_2.28 fsubl F
|
||||
GLIBC_2.29 exp F
|
||||
GLIBC_2.29 exp2 F
|
||||
GLIBC_2.29 log F
|
||||
|
|
|
|||
|
|
@ -812,6 +812,7 @@ GLIBC_2.28 fsub F
|
|||
GLIBC_2.28 fsubl F
|
||||
GLIBC_2.29 exp F
|
||||
GLIBC_2.29 exp2 F
|
||||
GLIBC_2.29 log F
|
||||
GLIBC_2.4 __clog10l F
|
||||
GLIBC_2.4 __finitel F
|
||||
GLIBC_2.4 __fpclassifyl F
|
||||
|
|
|
|||
|
|
@ -811,6 +811,7 @@ GLIBC_2.28 fsub F
|
|||
GLIBC_2.28 fsubl F
|
||||
GLIBC_2.29 exp F
|
||||
GLIBC_2.29 exp2 F
|
||||
GLIBC_2.29 log F
|
||||
GLIBC_2.4 __clog10l F
|
||||
GLIBC_2.4 __finitel F
|
||||
GLIBC_2.4 __fpclassifyl F
|
||||
|
|
|
|||
|
|
@ -1078,3 +1078,4 @@ GLIBC_2.28 fsub F
|
|||
GLIBC_2.28 fsubl F
|
||||
GLIBC_2.29 exp F
|
||||
GLIBC_2.29 exp2 F
|
||||
GLIBC_2.29 log F
|
||||
|
|
|
|||
|
|
@ -490,6 +490,7 @@ GLIBC_2.28 fsub F
|
|||
GLIBC_2.28 fsubl F
|
||||
GLIBC_2.29 exp F
|
||||
GLIBC_2.29 exp2 F
|
||||
GLIBC_2.29 log F
|
||||
GLIBC_2.3 _LIB_VERSION D 0x4
|
||||
GLIBC_2.3 __clog10 F
|
||||
GLIBC_2.3 __clog10f F
|
||||
|
|
|
|||
|
|
@ -1035,6 +1035,7 @@ GLIBC_2.28 fsub F
|
|||
GLIBC_2.28 fsubl F
|
||||
GLIBC_2.29 exp F
|
||||
GLIBC_2.29 exp2 F
|
||||
GLIBC_2.29 log F
|
||||
GLIBC_2.4 __clog10l F
|
||||
GLIBC_2.4 __finitel F
|
||||
GLIBC_2.4 __fpclassifyl F
|
||||
|
|
|
|||
|
|
@ -1035,6 +1035,7 @@ GLIBC_2.28 fsub F
|
|||
GLIBC_2.28 fsubl F
|
||||
GLIBC_2.29 exp F
|
||||
GLIBC_2.29 exp2 F
|
||||
GLIBC_2.29 log F
|
||||
GLIBC_2.4 __clog10l F
|
||||
GLIBC_2.4 __finitel F
|
||||
GLIBC_2.4 __fpclassifyl F
|
||||
|
|
|
|||
|
|
@ -766,4 +766,5 @@ GLIBC_2.28 fsub F
|
|||
GLIBC_2.28 fsubl F
|
||||
GLIBC_2.29 exp F
|
||||
GLIBC_2.29 exp2 F
|
||||
GLIBC_2.29 log F
|
||||
GLIBC_2.4 exp2l F
|
||||
|
|
|
|||
|
|
@ -1042,6 +1042,7 @@ GLIBC_2.28 fsub F
|
|||
GLIBC_2.28 fsubl F
|
||||
GLIBC_2.29 exp F
|
||||
GLIBC_2.29 exp2 F
|
||||
GLIBC_2.29 log F
|
||||
GLIBC_2.4 __clog10l F
|
||||
GLIBC_2.4 __finitel F
|
||||
GLIBC_2.4 __fpclassifyl F
|
||||
|
|
|
|||
|
|
@ -1034,3 +1034,4 @@ GLIBC_2.28 fsub F
|
|||
GLIBC_2.28 fsubl F
|
||||
GLIBC_2.29 exp F
|
||||
GLIBC_2.29 exp2 F
|
||||
GLIBC_2.29 log F
|
||||
|
|
|
|||
|
|
@ -1068,3 +1068,4 @@ GLIBC_2.28 fsub F
|
|||
GLIBC_2.28 fsubl F
|
||||
GLIBC_2.29 exp F
|
||||
GLIBC_2.29 exp2 F
|
||||
GLIBC_2.29 log F
|
||||
|
|
|
|||
|
|
@ -1068,3 +1068,4 @@ GLIBC_2.28 fsub F
|
|||
GLIBC_2.28 fsubl F
|
||||
GLIBC_2.29 exp F
|
||||
GLIBC_2.29 exp2 F
|
||||
GLIBC_2.29 log F
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
#define __ieee754_log __ieee754_log_avx
|
||||
#include <math.h>
|
||||
#define __log __ieee754_log_avx
|
||||
#define SECTION __attribute__ ((section (".text.avx")))
|
||||
|
||||
#include <sysdeps/ieee754/dbl-64/e_log.c>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
#define __ieee754_log __ieee754_log_fma
|
||||
#include <math.h>
|
||||
#define __log __ieee754_log_fma
|
||||
#define SECTION __attribute__ ((section (".text.fma")))
|
||||
|
||||
#include <sysdeps/ieee754/dbl-64/e_log.c>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
#define __ieee754_log __ieee754_log_fma4
|
||||
#include <math.h>
|
||||
#define __log __ieee754_log_fma4
|
||||
#define SECTION __attribute__ ((section (".text.fma4")))
|
||||
|
||||
#include <sysdeps/ieee754/dbl-64/e_log.c>
|
||||
|
|
|
|||
|
|
@ -16,6 +16,8 @@
|
|||
License along with the GNU C Library; if not, see
|
||||
<http://www.gnu.org/licenses/>. */
|
||||
|
||||
#include <math.h>
|
||||
|
||||
extern double __redirect_ieee754_log (double);
|
||||
|
||||
#define SYMBOL_NAME ieee754_log
|
||||
|
|
@ -25,5 +27,5 @@ libc_ifunc_redirected (__redirect_ieee754_log, __ieee754_log,
|
|||
IFUNC_SELECTOR ());
|
||||
strong_alias (__ieee754_log, __log_finite)
|
||||
|
||||
#define __ieee754_log __ieee754_log_sse2
|
||||
#define __log __ieee754_log_sse2
|
||||
#include <sysdeps/ieee754/dbl-64/e_log.c>
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
#include <sysdeps/../math/w_log.c>
|
||||
Loading…
Reference in New Issue