|
|
dfa500 |
From e93b17fad37a61f7ae9a663c617926b0f510921a Mon Sep 17 00:00:00 2001
|
|
|
dfa500 |
From: Stefan Liebler <stli@linux.ibm.com>
|
|
|
dfa500 |
Date: Wed, 11 Dec 2019 15:09:24 +0100
|
|
|
dfa500 |
Subject: [PATCH 13/28] Use GCC builtins for copysign functions if desired.
|
|
|
dfa500 |
|
|
|
dfa500 |
This patch is always using the corresponding GCC builtin for copysignf, copysign,
|
|
|
dfa500 |
and is using the builtin for copysignl, copysignf128 if the USE_FUNCTION_BUILTIN
|
|
|
dfa500 |
macros are defined to one in math-use-builtins.h.
|
|
|
dfa500 |
|
|
|
dfa500 |
Altough the long double version is enabled by default we still need
|
|
|
dfa500 |
the macro and the alternative implementation as the _Float128 version
|
|
|
dfa500 |
of the builtin is not available with all supported GCC versions.
|
|
|
dfa500 |
|
|
|
dfa500 |
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
|
|
|
dfa500 |
(cherry picked from commit f818afdd3b29d7eef2010448457c9f5c16e684cd)
|
|
|
dfa500 |
---
|
|
|
dfa500 |
sysdeps/generic/math-use-builtins.h | 9 +++++++++
|
|
|
dfa500 |
sysdeps/ieee754/dbl-64/s_copysign.c | 9 ++-------
|
|
|
dfa500 |
sysdeps/ieee754/float128/float128_private.h | 3 +++
|
|
|
dfa500 |
sysdeps/ieee754/flt-32/s_copysignf.c | 12 ++++--------
|
|
|
dfa500 |
sysdeps/ieee754/ldbl-128/s_copysignl.c | 6 ++++++
|
|
|
dfa500 |
sysdeps/s390/fpu/math-use-builtins.h | 7 +++++++
|
|
|
dfa500 |
6 files changed, 31 insertions(+), 15 deletions(-)
|
|
|
dfa500 |
|
|
|
dfa500 |
diff --git a/sysdeps/generic/math-use-builtins.h b/sysdeps/generic/math-use-builtins.h
|
|
|
dfa500 |
index 34ca438a8c..770b54ce61 100644
|
|
|
dfa500 |
--- a/sysdeps/generic/math-use-builtins.h
|
|
|
dfa500 |
+++ b/sysdeps/generic/math-use-builtins.h
|
|
|
dfa500 |
@@ -19,6 +19,8 @@
|
|
|
dfa500 |
#ifndef MATH_USE_BUILTINS_H
|
|
|
dfa500 |
#define MATH_USE_BUILTINS_H 1
|
|
|
dfa500 |
|
|
|
dfa500 |
+#include <features.h> /* For __GNUC_PREREQ. */
|
|
|
dfa500 |
+
|
|
|
dfa500 |
/* Define these macros to 1 to use __builtin_xyz instead of the
|
|
|
dfa500 |
generic implementation. */
|
|
|
dfa500 |
#define USE_NEARBYINT_BUILTIN 0
|
|
|
dfa500 |
@@ -51,4 +53,11 @@
|
|
|
dfa500 |
#define USE_ROUNDL_BUILTIN 0
|
|
|
dfa500 |
#define USE_ROUNDF128_BUILTIN 0
|
|
|
dfa500 |
|
|
|
dfa500 |
+#define USE_COPYSIGNL_BUILTIN 1
|
|
|
dfa500 |
+#if __GNUC_PREREQ (7, 0)
|
|
|
dfa500 |
+# define USE_COPYSIGNF128_BUILTIN 1
|
|
|
dfa500 |
+#else
|
|
|
dfa500 |
+# define USE_COPYSIGNF128_BUILTIN 0
|
|
|
dfa500 |
+#endif
|
|
|
dfa500 |
+
|
|
|
dfa500 |
#endif /* math-use-builtins.h */
|
|
|
dfa500 |
diff --git a/sysdeps/ieee754/dbl-64/s_copysign.c b/sysdeps/ieee754/dbl-64/s_copysign.c
|
|
|
dfa500 |
index ab81d732ab..b95f1575d9 100644
|
|
|
dfa500 |
--- a/sysdeps/ieee754/dbl-64/s_copysign.c
|
|
|
dfa500 |
+++ b/sysdeps/ieee754/dbl-64/s_copysign.c
|
|
|
dfa500 |
@@ -10,7 +10,7 @@
|
|
|
dfa500 |
* ====================================================
|
|
|
dfa500 |
*/
|
|
|
dfa500 |
|
|
|
dfa500 |
-#if defined(LIBM_SCCS) && !defined(lint)
|
|
|
dfa500 |
+#if defined (LIBM_SCCS) && ! defined (lint)
|
|
|
dfa500 |
static char rcsid[] = "$NetBSD: s_copysign.c,v 1.8 1995/05/10 20:46:57 jtc Exp $";
|
|
|
dfa500 |
#endif
|
|
|
dfa500 |
|
|
|
dfa500 |
@@ -21,16 +21,11 @@ static char rcsid[] = "$NetBSD: s_copysign.c,v 1.8 1995/05/10 20:46:57 jtc Exp $
|
|
|
dfa500 |
*/
|
|
|
dfa500 |
|
|
|
dfa500 |
#include <math.h>
|
|
|
dfa500 |
-#include <math_private.h>
|
|
|
dfa500 |
#include <libm-alias-double.h>
|
|
|
dfa500 |
|
|
|
dfa500 |
double
|
|
|
dfa500 |
__copysign (double x, double y)
|
|
|
dfa500 |
{
|
|
|
dfa500 |
- uint32_t hx, hy;
|
|
|
dfa500 |
- GET_HIGH_WORD (hx, x);
|
|
|
dfa500 |
- GET_HIGH_WORD (hy, y);
|
|
|
dfa500 |
- SET_HIGH_WORD (x, (hx & 0x7fffffff) | (hy & 0x80000000));
|
|
|
dfa500 |
- return x;
|
|
|
dfa500 |
+ return __builtin_copysign (x, y);
|
|
|
dfa500 |
}
|
|
|
dfa500 |
libm_alias_double (__copysign, copysign)
|
|
|
dfa500 |
diff --git a/sysdeps/ieee754/float128/float128_private.h b/sysdeps/ieee754/float128/float128_private.h
|
|
|
dfa500 |
index 3297a71e44..077df0e09f 100644
|
|
|
dfa500 |
--- a/sysdeps/ieee754/float128/float128_private.h
|
|
|
dfa500 |
+++ b/sysdeps/ieee754/float128/float128_private.h
|
|
|
dfa500 |
@@ -151,6 +151,8 @@
|
|
|
dfa500 |
#define USE_TRUNCL_BUILTIN USE_TRUNCF128_BUILTIN
|
|
|
dfa500 |
#undef USE_ROUNDL_BUILTIN
|
|
|
dfa500 |
#define USE_ROUNDL_BUILTIN USE_ROUNDF128_BUILTIN
|
|
|
dfa500 |
+#undef USE_COPYSIGNL_BUILTIN
|
|
|
dfa500 |
+#define USE_COPYSIGNL_BUILTIN USE_COPYSIGNF128_BUILTIN
|
|
|
dfa500 |
|
|
|
dfa500 |
/* IEEE function renames. */
|
|
|
dfa500 |
#define __ieee754_acoshl __ieee754_acoshf128
|
|
|
dfa500 |
@@ -358,6 +360,7 @@
|
|
|
dfa500 |
#define __builtin_ceill __builtin_ceilf128
|
|
|
dfa500 |
#define __builtin_truncl __builtin_truncf128
|
|
|
dfa500 |
#define __builtin_roundl __builtin_roundf128
|
|
|
dfa500 |
+#define __builtin_copysignl __builtin_copysignf128
|
|
|
dfa500 |
|
|
|
dfa500 |
/* Get the constant suffix from bits/floatn-compat.h. */
|
|
|
dfa500 |
#define L(x) __f128 (x)
|
|
|
dfa500 |
diff --git a/sysdeps/ieee754/flt-32/s_copysignf.c b/sysdeps/ieee754/flt-32/s_copysignf.c
|
|
|
dfa500 |
index 3c4ac7ce68..0247abd152 100644
|
|
|
dfa500 |
--- a/sysdeps/ieee754/flt-32/s_copysignf.c
|
|
|
dfa500 |
+++ b/sysdeps/ieee754/flt-32/s_copysignf.c
|
|
|
dfa500 |
@@ -13,7 +13,7 @@
|
|
|
dfa500 |
* ====================================================
|
|
|
dfa500 |
*/
|
|
|
dfa500 |
|
|
|
dfa500 |
-#if defined(LIBM_SCCS) && !defined(lint)
|
|
|
dfa500 |
+#if defined (LIBM_SCCS) && ! defined (lint)
|
|
|
dfa500 |
static char rcsid[] = "$NetBSD: s_copysignf.c,v 1.4 1995/05/10 20:46:59 jtc Exp $";
|
|
|
dfa500 |
#endif
|
|
|
dfa500 |
|
|
|
dfa500 |
@@ -24,15 +24,11 @@ static char rcsid[] = "$NetBSD: s_copysignf.c,v 1.4 1995/05/10 20:46:59 jtc Exp
|
|
|
dfa500 |
*/
|
|
|
dfa500 |
|
|
|
dfa500 |
#include <math.h>
|
|
|
dfa500 |
-#include <math_private.h>
|
|
|
dfa500 |
#include <libm-alias-float.h>
|
|
|
dfa500 |
|
|
|
dfa500 |
-float __copysignf(float x, float y)
|
|
|
dfa500 |
+float
|
|
|
dfa500 |
+__copysignf (float x, float y)
|
|
|
dfa500 |
{
|
|
|
dfa500 |
- uint32_t ix,iy;
|
|
|
dfa500 |
- GET_FLOAT_WORD(ix,x);
|
|
|
dfa500 |
- GET_FLOAT_WORD(iy,y);
|
|
|
dfa500 |
- SET_FLOAT_WORD(x,(ix&0x7fffffff)|(iy&0x80000000));
|
|
|
dfa500 |
- return x;
|
|
|
dfa500 |
+ return __builtin_copysignf (x, y);
|
|
|
dfa500 |
}
|
|
|
dfa500 |
libm_alias_float (__copysign, copysign)
|
|
|
dfa500 |
diff --git a/sysdeps/ieee754/ldbl-128/s_copysignl.c b/sysdeps/ieee754/ldbl-128/s_copysignl.c
|
|
|
dfa500 |
index d23e0f72ea..4cae8612dc 100644
|
|
|
dfa500 |
--- a/sysdeps/ieee754/ldbl-128/s_copysignl.c
|
|
|
dfa500 |
+++ b/sysdeps/ieee754/ldbl-128/s_copysignl.c
|
|
|
dfa500 |
@@ -26,14 +26,20 @@ static char rcsid[] = "$NetBSD: $";
|
|
|
dfa500 |
#include <math.h>
|
|
|
dfa500 |
#include <math_private.h>
|
|
|
dfa500 |
#include <libm-alias-ldouble.h>
|
|
|
dfa500 |
+#include <math-use-builtins.h>
|
|
|
dfa500 |
|
|
|
dfa500 |
_Float128 __copysignl(_Float128 x, _Float128 y)
|
|
|
dfa500 |
{
|
|
|
dfa500 |
+#if USE_COPYSIGNL_BUILTIN
|
|
|
dfa500 |
+ return __builtin_copysignl (x, y);
|
|
|
dfa500 |
+#else
|
|
|
dfa500 |
+ /* Use generic implementation. */
|
|
|
dfa500 |
uint64_t hx,hy;
|
|
|
dfa500 |
GET_LDOUBLE_MSW64(hx,x);
|
|
|
dfa500 |
GET_LDOUBLE_MSW64(hy,y);
|
|
|
dfa500 |
SET_LDOUBLE_MSW64(x,(hx&0x7fffffffffffffffULL)
|
|
|
dfa500 |
|(hy&0x8000000000000000ULL));
|
|
|
dfa500 |
return x;
|
|
|
dfa500 |
+#endif /* ! USE_COPYSIGNL_BUILTIN */
|
|
|
dfa500 |
}
|
|
|
dfa500 |
libm_alias_ldouble (__copysign, copysign)
|
|
|
dfa500 |
diff --git a/sysdeps/s390/fpu/math-use-builtins.h b/sysdeps/s390/fpu/math-use-builtins.h
|
|
|
dfa500 |
index 51cb9f91ab..4c4aad2ab5 100644
|
|
|
dfa500 |
--- a/sysdeps/s390/fpu/math-use-builtins.h
|
|
|
dfa500 |
+++ b/sysdeps/s390/fpu/math-use-builtins.h
|
|
|
dfa500 |
@@ -101,4 +101,11 @@
|
|
|
dfa500 |
|
|
|
dfa500 |
#endif /* ! HAVE_S390_MIN_Z196_ZARCH_ASM_SUPPORT */
|
|
|
dfa500 |
|
|
|
dfa500 |
+#define USE_COPYSIGNL_BUILTIN 1
|
|
|
dfa500 |
+#if __GNUC_PREREQ (7, 0)
|
|
|
dfa500 |
+# define USE_COPYSIGNF128_BUILTIN 1
|
|
|
dfa500 |
+#else
|
|
|
dfa500 |
+# define USE_COPYSIGNF128_BUILTIN 0
|
|
|
dfa500 |
+#endif
|
|
|
dfa500 |
+
|
|
|
dfa500 |
#endif /* math-use-builtins.h */
|
|
|
dfa500 |
--
|
|
|
dfa500 |
2.18.2
|
|
|
dfa500 |
|