Redirect fma calls to __fma in libm

include/math.h has a mechanism to redirect internal calls to various
libm functions, that can often be inlined by the compiler, to call
non-exported __* names for those functions in the case when the calls
aren't inlined, with the redirection being disabled when
NO_MATH_REDIRECT.  Add fma to the functions to which this mechanism is
applied.

At present, libm-internal fma calls (generally to __builtin_fma*
functions) are only done when it's known the call will be inlined,
with alternative code not relying on an fma operation being used in
the caller otherwise.  This patch is in preparation for adding the TS
18661 / C2X narrowing fma functions to glibc; it will be natural for
the narrowing function implementations to call the underlying fma
functions unconditionally, with this either being inlined or resulting
in an __fma* call.  (Using two levels of round-to-odd computation like
that, in the case where there isn't an fma hardware instruction, isn't
optimal but is certainly a lot simpler for the initial implementation
than writing different narrowing fma implementations for all the
various pairs of formats.)

Tested with build-many-glibcs.py that installed stripped shared
libraries are unchanged by the patch (using
<https://sourceware.org/pipermail/libc-alpha/2021-September/130991.html>
to fix installed library stripping in build-many-glibcs.py).  Also
tested for x86_64.
This commit is contained in:
Joseph Myers 2021-09-15 22:57:35 +00:00
parent 5604830dea
commit 4b6574a6f6
25 changed files with 26 additions and 0 deletions

View File

@ -155,6 +155,7 @@ fabsf128 (_Float128 x)
# endif # endif
# define MATH_REDIRECT_UNARY_ARGS(TYPE) TYPE # define MATH_REDIRECT_UNARY_ARGS(TYPE) TYPE
# define MATH_REDIRECT_BINARY_ARGS(TYPE) TYPE, TYPE # define MATH_REDIRECT_BINARY_ARGS(TYPE) TYPE, TYPE
# define MATH_REDIRECT_TERNARY_ARGS(TYPE) TYPE, TYPE, TYPE
MATH_REDIRECT (sqrt, "__ieee754_", MATH_REDIRECT_UNARY_ARGS) MATH_REDIRECT (sqrt, "__ieee754_", MATH_REDIRECT_UNARY_ARGS)
MATH_REDIRECT (ceil, "__", MATH_REDIRECT_UNARY_ARGS) MATH_REDIRECT (ceil, "__", MATH_REDIRECT_UNARY_ARGS)
MATH_REDIRECT (floor, "__", MATH_REDIRECT_UNARY_ARGS) MATH_REDIRECT (floor, "__", MATH_REDIRECT_UNARY_ARGS)
@ -163,6 +164,7 @@ MATH_REDIRECT (rint, "__", MATH_REDIRECT_UNARY_ARGS)
MATH_REDIRECT (trunc, "__", MATH_REDIRECT_UNARY_ARGS) MATH_REDIRECT (trunc, "__", MATH_REDIRECT_UNARY_ARGS)
MATH_REDIRECT (round, "__", MATH_REDIRECT_UNARY_ARGS) MATH_REDIRECT (round, "__", MATH_REDIRECT_UNARY_ARGS)
MATH_REDIRECT (copysign, "__", MATH_REDIRECT_BINARY_ARGS) MATH_REDIRECT (copysign, "__", MATH_REDIRECT_BINARY_ARGS)
MATH_REDIRECT (fma, "__", MATH_REDIRECT_TERNARY_ARGS)
# endif # endif
# endif # endif

View File

@ -16,6 +16,7 @@
License along with the GNU C Library; if not, see License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */ <https://www.gnu.org/licenses/>. */
#define NO_MATH_REDIRECT
#include <math.h> #include <math.h>
#include <libm-alias-double.h> #include <libm-alias-double.h>

View File

@ -16,6 +16,7 @@
License along with the GNU C Library; if not, see License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */ <https://www.gnu.org/licenses/>. */
#define NO_MATH_REDIRECT
#include <math.h> #include <math.h>
#include <libm-alias-float.h> #include <libm-alias-float.h>

View File

@ -16,6 +16,7 @@
License along with the GNU C Library; if not, see License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */ <https://www.gnu.org/licenses/>. */
#define NO_MATH_REDIRECT
#include <math.h> #include <math.h>
#include <libm-alias-ldouble.h> #include <libm-alias-ldouble.h>

View File

@ -16,6 +16,7 @@
License along with the GNU C Library; if not, see License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */ <https://www.gnu.org/licenses/>. */
#define NO_MATH_REDIRECT
#include <config.h> #include <config.h>
#include <math.h> #include <math.h>

View File

@ -16,6 +16,7 @@
License along with the GNU C Library; if not, see License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */ <https://www.gnu.org/licenses/>. */
#define NO_MATH_REDIRECT
#include <config.h> #include <config.h>
#include <math.h> #include <math.h>

View File

@ -16,6 +16,7 @@
License along with the GNU C Library; if not, see License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */ <https://www.gnu.org/licenses/>. */
#define NO_MATH_REDIRECT
#include <float.h> #include <float.h>
#include <math.h> #include <math.h>
#include <fenv.h> #include <fenv.h>

View File

@ -16,6 +16,7 @@
License along with the GNU C Library; if not, see License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */ <https://www.gnu.org/licenses/>. */
#define NO_MATH_REDIRECT
#include <math.h> #include <math.h>
#include <fenv.h> #include <fenv.h>
#include <ieee754.h> #include <ieee754.h>

View File

@ -1,2 +1,3 @@
#define NO_MATH_REDIRECT
#include <float128_private.h> #include <float128_private.h>
#include "../ldbl-128/s_fmal.c" #include "../ldbl-128/s_fmal.c"

View File

@ -16,6 +16,7 @@
License along with the GNU C Library; if not, see License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */ <https://www.gnu.org/licenses/>. */
#define NO_MATH_REDIRECT
#include <math.h> #include <math.h>
#include <fenv.h> #include <fenv.h>
#include <ieee754.h> #include <ieee754.h>

View File

@ -16,6 +16,7 @@
License along with the GNU C Library; if not, see License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */ <https://www.gnu.org/licenses/>. */
#define NO_MATH_REDIRECT
#include <float.h> #include <float.h>
#include <math.h> #include <math.h>
#include <fenv.h> #include <fenv.h>

View File

@ -16,6 +16,7 @@
License along with the GNU C Library; if not, see License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */ <https://www.gnu.org/licenses/>. */
#define NO_MATH_REDIRECT
#include <fenv.h> #include <fenv.h>
#include <float.h> #include <float.h>
#include <math.h> #include <math.h>

View File

@ -16,6 +16,7 @@
License along with the GNU C Library; if not, see License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */ <https://www.gnu.org/licenses/>. */
#define NO_MATH_REDIRECT
#include <float.h> #include <float.h>
#include <math.h> #include <math.h>
#include <fenv.h> #include <fenv.h>

View File

@ -16,6 +16,7 @@
License along with the GNU C Library; if not, see License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */ <https://www.gnu.org/licenses/>. */
#define NO_MATH_REDIRECT
#include <float.h> #include <float.h>
#include <math.h> #include <math.h>
#include <fenv.h> #include <fenv.h>

View File

@ -25,6 +25,7 @@
License along with the GNU C Library; if not, see License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */ <https://www.gnu.org/licenses/>. */
#define NO_MATH_REDIRECT
#include <math.h> #include <math.h>
#include <libc-diag.h> #include <libc-diag.h>
#include <libm-alias-double.h> #include <libm-alias-double.h>

View File

@ -25,6 +25,7 @@
License along with the GNU C Library; if not, see License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */ <https://www.gnu.org/licenses/>. */
#define NO_MATH_REDIRECT
#include <math.h> #include <math.h>
#include <libc-diag.h> #include <libc-diag.h>
#include <libm-alias-float.h> #include <libm-alias-float.h>

View File

@ -25,6 +25,7 @@
License along with the GNU C Library; if not, see License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */ <https://www.gnu.org/licenses/>. */
#define NO_MATH_REDIRECT
#include <math.h> #include <math.h>
#include <libc-diag.h> #include <libc-diag.h>
#include <libm-alias-ldouble.h> #include <libm-alias-ldouble.h>

View File

@ -16,6 +16,7 @@
License along with the GNU C Library. If not, see License along with the GNU C Library. If not, see
<https://www.gnu.org/licenses/>. */ <https://www.gnu.org/licenses/>. */
#define NO_MATH_REDIRECT
#include <math.h> #include <math.h>
#include <fenv.h> #include <fenv.h>
#include <ieee754.h> #include <ieee754.h>

View File

@ -16,6 +16,7 @@
License along with the GNU C Library. If not, see License along with the GNU C Library. If not, see
<https://www.gnu.org/licenses/>. */ <https://www.gnu.org/licenses/>. */
#define NO_MATH_REDIRECT
#include <math.h> #include <math.h>
#include <fenv.h> #include <fenv.h>
#include <ieee754.h> #include <ieee754.h>

View File

@ -1,3 +1,4 @@
#define NO_MATH_REDIRECT
#include <sparc-ifunc.h> #include <sparc-ifunc.h>
#include <math.h> #include <math.h>
#include <math_ldbl_opt.h> #include <math_ldbl_opt.h>

View File

@ -1,3 +1,4 @@
#define NO_MATH_REDIRECT
#include <sparc-ifunc.h> #include <sparc-ifunc.h>
#include <math.h> #include <math.h>
#include <libm-alias-float.h> #include <libm-alias-float.h>

View File

@ -1,3 +1,4 @@
#define NO_MATH_REDIRECT
#include <sparc-ifunc.h> #include <sparc-ifunc.h>
#include <math.h> #include <math.h>
#include <libm-alias-double.h> #include <libm-alias-double.h>

View File

@ -1,3 +1,4 @@
#define NO_MATH_REDIRECT
#include <sparc-ifunc.h> #include <sparc-ifunc.h>
#include <math.h> #include <math.h>
#include <libm-alias-float.h> #include <libm-alias-float.h>

View File

@ -16,6 +16,7 @@
License along with the GNU C Library; if not, see License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */ <https://www.gnu.org/licenses/>. */
#define NO_MATH_REDIRECT
#include <config.h> #include <config.h>
#include <math.h> #include <math.h>
#include <init-arch.h> #include <init-arch.h>

View File

@ -16,6 +16,7 @@
License along with the GNU C Library; if not, see License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */ <https://www.gnu.org/licenses/>. */
#define NO_MATH_REDIRECT
#include <config.h> #include <config.h>
#include <math.h> #include <math.h>
#include <init-arch.h> #include <init-arch.h>