diff options
author | Joseph Myers <joseph@codesourcery.com> | 2018-11-05 23:03:55 +0000 |
---|---|---|
committer | Joseph Myers <jsm28@gcc.gnu.org> | 2018-11-05 23:03:55 +0000 |
commit | 4239f144ce50c94f2c6cc232028f167b6ebfd506 (patch) | |
tree | 9effaf7dacd8e3e4533a6d6baf3f09e88a990825 /libquadmath/quadmath-imp.h | |
parent | 0f31a750311079962cb1082bc1202584da491aba (diff) | |
download | gcc-4239f144ce50c94f2c6cc232028f167b6ebfd506.tar.gz |
Update most of libquadmath/math/ from glibc, automate update (PR libquadmath/68686).
libquadmath sources are mostly based on glibc sources at present, but
derived from them by a manual editing / substitution process and with
subsequent manual merges. The manual effort involved in merges means
they are sometimes incomplete and long-delayed.
Since libquadmath was first created, glibc's support for this format
has undergone significant changes so that it can also be used in glibc
to provide *f128 functions for the _Float128 type from TS 18661-3.
This makes it significantly easier to use it for libquadmath in a more
automated fashion, since glibc has a float128_private.h header that
redefines many identifiers as macros as needed for building *f128
functions.
Simply using float128_private.h directly in libquadmath, with
unmodified glibc sources except for changing function names in that
one header to be *q instead of *f128, would be tricky, given its
dependence on lots of other glibc-internal headers (whereas
libquadmath supports non-glibc systems), and also given how some libm
functions in glibc are built from type-generic templates using a
further set of macros rather than from separate function
implementations for each type.
So instead this patch adds a script update-quadmath.py to convert
glibc sources into libquadmath ones, and the script reads
float128_private.h to identify many of the substitutions it should
make. quadmath-imp.h is updated with various new internal
definitions, taken from glibc as needed; this is the main place
expected to need updating manually when subsequent merges from glibc
are done using the script. No attempt is made to make the script
output match the details of existing formatting, although the
differences are of a size that makes a rough comparison (ignoring
whitespace) possible.
Two new public interfaces are added to libquadmath, exp2q and
issignalingq, at a new QUADMATH_1.2 symbol version, since those
interfaces are used internally by some of the glibc sources being
merged into libquadmath; although there is a new symbol version, no
change however is made to the libtool version in the libtool-version
file. Although there are various other interfaces now in glibc libm
but not in libquadmath, this patch does nothing to add such interfaces
(although adding many of them would in fact be easy to do, given the
script).
One internal file (not providing any public interfaces),
math/isinf_nsq.c, is removed, as no longer used by anything in
libquadmath after the merge.
Conditionals in individual source files on <fenv.h> availability or
features are moved into quadmath-imp.h (providing trivial macro
versions of the functions if real implementations aren't available),
to simplify the substitutions in individual source files. Note
however that I haven't tested for any configurations lacking <fenv.h>,
so further changes could well be needed there.
Two files in libquadmath/math/ are based on glibc sources but not
updated in this patch: fmaq.c and rem_pio2q.c. Both could be updated
after further changes to the script (and quadmath-imp.h as needed); in
the case of rem_pio2q.c, based on two separate glibc source files,
those separate files would naturally be split out into separate
libquadmath source files in the process (as done in this patch with
expq_table.h and tanq_kernel.c, where previously two glibc source
files had been merged into one libquadmath source file). complex.c,
nanq.c and sqrtq.c are not based on glibc sources (though four of the
(trivial) functions in complex.c could readily be replaced by instead
using the four corresponding files from glibc, if desired).
libquadmath also has printf/ and strtod/ sources based on glibc, also
mostly not updated for a long time. Again the script could no doubt
be made to generate those automatically, although that would be a
larger change (effectively some completely separate logic in the
script, not sharing much if anything with the existing code).
Bootstrapped with no regressions on x86_64-pc-linux-gnu.
PR libquadmath/68686
* Makefile.am: (libquadmath_la_SOURCES): Remove math/isinf_nsq.c.
Add math/exp2q.c math/issignalingq.c math/lgammaq_neg.c
math/lgammaq_product.c math/tanq_kernel.c math/tgammaq_product.c
math/casinhq_kernel.c.
* Makefile.in: Regenerate.
* libquadmath.texi (exp2q, issignalingq): Document.
* quadmath-imp.h: Include <errno.h>, <limits.h>, <stdbool.h> and
<fenv.h>.
(HIGH_ORDER_BIT_IS_SET_FOR_SNAN, FIX_FLT128_LONG_CONVERT_OVERFLOW)
(FIX_FLT128_LLONG_CONVERT_OVERFLOW, __quadmath_kernel_tanq)
(__quadmath_gamma_productq, __quadmath_gammaq_r)
(__quadmath_lgamma_negq, __quadmath_lgamma_productq)
(__quadmath_lgammaq_r, __quadmath_kernel_casinhq, mul_splitq)
(math_check_force_underflow_complex, __glibc_likely)
(__glibc_unlikely, struct rm_ctx, SET_RESTORE_ROUNDF128)
(libc_feholdsetround_ctx, libc_feresetround_ctx): New.
(feraiseexcept, fenv_t, feholdexcept, fesetround, feupdateenv)
(fesetenv, fetestexcept, feclearexcept): Define if not supported
through <fenv.h>.
(__quadmath_isinf_nsq): Remove.
* quadmath.h (exp2q, issignalingq): New.
* quadmath.map (QUADMATH_1.2): New.
* quadmath_weak.h (exp2q, issignalingq): New.
* update-quadmath.py: New file.
* math/isinf_nsq.c: Remove file.
* math/casinhq_kernel.c, math/exp2q.c, math/expq_table.h,
math/issignalingq.c, math/lgammaq_neg.c, math/lgammaq_product.c,
math/tanq_kernel.c, math/tgammaq_product.c: New files. Generated
from glibc sources with update-quadmath.py.
* math/acoshq.c, math/acosq.c, math/asinhq.c, math/asinq.c,
math/atan2q.c, math/atanhq.c, math/atanq.c, math/cacoshq.c,
math/cacosq.c, math/casinhq.c, math/casinq.c, math/catanhq.c,
math/catanq.c, math/cbrtq.c, math/ccoshq.c, math/ceilq.c,
math/cexpq.c, math/cimagq.c, math/clog10q.c, math/clogq.c,
math/conjq.c, math/copysignq.c, math/coshq.c, math/cosq.c,
math/cosq_kernel.c, math/cprojq.c, math/crealq.c, math/csinhq.c,
math/csinq.c, math/csqrtq.c, math/ctanhq.c, math/ctanq.c,
math/erfq.c, math/expm1q.c, math/expq.c, math/fabsq.c,
math/fdimq.c, math/finiteq.c, math/floorq.c, math/fmaxq.c,
math/fminq.c, math/fmodq.c, math/frexpq.c, math/hypotq.c,
math/ilogbq.c, math/isinfq.c, math/isnanq.c, math/j0q.c,
math/j1q.c, math/jnq.c, math/ldexpq.c, math/lgammaq.c,
math/llrintq.c, math/llroundq.c, math/log10q.c, math/log1pq.c,
math/log2q.c, math/logbq.c, math/logq.c, math/lrintq.c,
math/lroundq.c, math/modfq.c, math/nearbyintq.c,
math/nextafterq.c, math/powq.c, math/remainderq.c, math/remquoq.c,
math/rintq.c, math/roundq.c, math/scalblnq.c, math/scalbnq.c,
math/signbitq.c, math/sincos_table.c, math/sincosq.c,
math/sincosq_kernel.c, math/sinhq.c, math/sinq.c,
math/sinq_kernel.c, math/tanhq.c, math/tanq.c, math/tgammaq.c,
math/truncq.c, math/x2y2m1q.c: Regenerate from glibc sources with
update-quadmath.py.
From-SVN: r265822
Diffstat (limited to 'libquadmath/quadmath-imp.h')
-rw-r--r-- | libquadmath/quadmath-imp.h | 109 |
1 files changed, 108 insertions, 1 deletions
diff --git a/libquadmath/quadmath-imp.h b/libquadmath/quadmath-imp.h index ed186144e75..8d22248504a 100644 --- a/libquadmath/quadmath-imp.h +++ b/libquadmath/quadmath-imp.h @@ -21,10 +21,16 @@ Boston, MA 02110-1301, USA. */ #ifndef QUADMATH_IMP_H #define QUADMATH_IMP_H +#include <errno.h> +#include <limits.h> +#include <stdbool.h> #include <stdint.h> #include <stdlib.h> #include "quadmath.h" #include "config.h" +#ifdef HAVE_FENV_H +# include <fenv.h> +#endif /* Under IEEE 754, an architecture may determine tininess of @@ -36,6 +42,10 @@ Boston, MA 02110-1301, USA. */ #define TININESS_AFTER_ROUNDING 1 +#define HIGH_ORDER_BIT_IS_SET_FOR_SNAN 0 + +#define FIX_FLT128_LONG_CONVERT_OVERFLOW 0 +#define FIX_FLT128_LLONG_CONVERT_OVERFLOW 0 /* Prototypes for internal functions. */ extern int32_t __quadmath_rem_pio2q (__float128, __float128 *); @@ -43,9 +53,24 @@ extern void __quadmath_kernel_sincosq (__float128, __float128, __float128 *, __float128 *, int); extern __float128 __quadmath_kernel_sinq (__float128, __float128, int); extern __float128 __quadmath_kernel_cosq (__float128, __float128); +extern __float128 __quadmath_kernel_tanq (__float128, __float128, int); +extern __float128 __quadmath_gamma_productq (__float128, __float128, int, + __float128 *); +extern __float128 __quadmath_gammaq_r (__float128, int *); +extern __float128 __quadmath_lgamma_negq (__float128, int *); +extern __float128 __quadmath_lgamma_productq (__float128, __float128, + __float128, int); +extern __float128 __quadmath_lgammaq_r (__float128, int *); extern __float128 __quadmath_x2y2m1q (__float128 x, __float128 y); -extern int __quadmath_isinf_nsq (__float128 x); +extern __complex128 __quadmath_kernel_casinhq (__complex128, int); +static inline void +mul_splitq (__float128 *hi, __float128 *lo, __float128 x, __float128 y) +{ + /* Fast built-in fused multiply-add. */ + *hi = x * y; + *lo = fmaq (x, y, -*hi); +} @@ -227,4 +252,86 @@ do { \ } \ while (0) +/* Likewise, for both real and imaginary parts of a complex + result. */ +#define math_check_force_underflow_complex(x) \ + do \ + { \ + __typeof (x) force_underflow_complex_tmp = (x); \ + math_check_force_underflow (__real__ force_underflow_complex_tmp); \ + math_check_force_underflow (__imag__ force_underflow_complex_tmp); \ + } \ + while (0) + +#ifndef HAVE_FENV_H +# define feraiseexcept(arg) ((void) 0) +typedef int fenv_t; +# define feholdexcept(arg) ((void) 0) +# define fesetround(arg) ((void) 0) +# define feupdateenv(arg) ((void) (arg)) +# define fesetenv(arg) ((void) (arg)) +# define fetestexcept(arg) 0 +# define feclearexcept(arg) ((void) 0) +#else +# ifndef HAVE_FEHOLDEXCEPT +# define feholdexcept(arg) ((void) 0) +# endif +# ifndef HAVE_FESETROUND +# define fesetround(arg) ((void) 0) +# endif +# ifndef HAVE_FEUPDATEENV +# define feupdateenv(arg) ((void) (arg)) +# endif +# ifndef HAVE_FESETENV +# define fesetenv(arg) ((void) (arg)) +# endif +# ifndef HAVE_FETESTEXCEPT +# define fetestexcept(arg) 0 +# endif +#endif + +#ifndef __glibc_likely +# define __glibc_likely(cond) __builtin_expect ((cond), 1) +#endif + +#ifndef __glibc_unlikely +# define __glibc_unlikely(cond) __builtin_expect ((cond), 0) +#endif + +#if defined HAVE_FENV_H && defined HAVE_FESETROUND && defined HAVE_FEUPDATEENV +struct rm_ctx +{ + fenv_t env; + bool updated_status; +}; + +# define SET_RESTORE_ROUNDF128(RM) \ + struct rm_ctx ctx __attribute__((cleanup (libc_feresetround_ctx))); \ + libc_feholdsetround_ctx (&ctx, (RM)) + +static inline __attribute__ ((always_inline)) void +libc_feholdsetround_ctx (struct rm_ctx *ctx, int round) +{ + ctx->updated_status = false; + + /* Update rounding mode only if different. */ + if (__glibc_unlikely (round != fegetround ())) + { + ctx->updated_status = true; + fegetenv (&ctx->env); + fesetround (round); + } +} + +static inline __attribute__ ((always_inline)) void +libc_feresetround_ctx (struct rm_ctx *ctx) +{ + /* Restore the rounding mode if updated. */ + if (__glibc_unlikely (ctx->updated_status)) + feupdateenv (&ctx->env); +} +#else +# define SET_RESTORE_ROUNDF128(RM) ((void) 0) +#endif + #endif |