[11/13] Use GCC builtins for trunc functions if desired.

Message ID 1575297977-2589-12-git-send-email-stli@linux.ibm.com
State Superseded
Headers show
Series
  • Use GCC builtins for some math functions if desired.
Related show

Commit Message

Stefan Liebler Dec. 2, 2019, 2:46 p.m.
This patch is using the corresponding GCC builtin for truncf, trunc,
truncl and truncf128 if the USE_FUNCTION_BUILTIN macros are defined to one
in math-use-builtins.h.

This is the case for s390 if build with at least --march=z196 --mzarch.
Otherwise the generic implementation is used.
---
 sysdeps/generic/math-use-builtins.h         | 5 +++++
 sysdeps/ieee754/dbl-64/s_trunc.c            | 6 +++++-
 sysdeps/ieee754/float128/float128_private.h | 3 +++
 sysdeps/ieee754/flt-32/s_truncf.c           | 6 +++++-
 sysdeps/ieee754/ldbl-128/s_truncl.c         | 6 +++++-
 sysdeps/s390/fpu/math-use-builtins.h        | 6 ++++++
 6 files changed, 29 insertions(+), 3 deletions(-)

-- 
2.19.1

Comments

Adhemerval Zanella Dec. 5, 2019, 8:40 p.m. | #1
On 02/12/2019 11:46, Stefan Liebler wrote:
> This patch is using the corresponding GCC builtin for truncf, trunc,

> truncl and truncf128 if the USE_FUNCTION_BUILTIN macros are defined to one

> in math-use-builtins.h.

> 

> This is the case for s390 if build with at least --march=z196 --mzarch.

> Otherwise the generic implementation is used.


LGTM, thanks.

Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>


> ---

>  sysdeps/generic/math-use-builtins.h         | 5 +++++

>  sysdeps/ieee754/dbl-64/s_trunc.c            | 6 +++++-

>  sysdeps/ieee754/float128/float128_private.h | 3 +++

>  sysdeps/ieee754/flt-32/s_truncf.c           | 6 +++++-

>  sysdeps/ieee754/ldbl-128/s_truncl.c         | 6 +++++-

>  sysdeps/s390/fpu/math-use-builtins.h        | 6 ++++++

>  6 files changed, 29 insertions(+), 3 deletions(-)

> 

> diff --git a/sysdeps/generic/math-use-builtins.h b/sysdeps/generic/math-use-builtins.h

> index 076ec661b0..ab379f45ba 100644

> --- a/sysdeps/generic/math-use-builtins.h

> +++ b/sysdeps/generic/math-use-builtins.h

> @@ -41,4 +41,9 @@

>  #define USE_CEILL_BUILTIN 0

>  #define USE_CEILF128_BUILTIN 0

>  

> +#define USE_TRUNC_BUILTIN 0

> +#define USE_TRUNCF_BUILTIN 0

> +#define USE_TRUNCL_BUILTIN 0

> +#define USE_TRUNCF128_BUILTIN 0

> +

>  #endif /* math-use-builtins.h */


Ok.

> diff --git a/sysdeps/ieee754/dbl-64/s_trunc.c b/sysdeps/ieee754/dbl-64/s_trunc.c

> index 0de68ce298..6189ba4a31 100644

> --- a/sysdeps/ieee754/dbl-64/s_trunc.c

> +++ b/sysdeps/ieee754/dbl-64/s_trunc.c

> @@ -22,11 +22,14 @@

>  

>  #include <math_private.h>

>  #include <libm-alias-double.h>

> -

> +#include <math-use-builtins.h>

>  

>  double

>  __trunc (double x)

>  {

> +#if USE_TRUNC_BUILTIN

> +  return __builtin_trunc (x);

> +#else

>    int64_t i0, j0;

>    int64_t sx;

>  

> @@ -49,6 +52,7 @@ __trunc (double x)

>      }

>  

>    return x;

> +#endif /* USE_TRUNC_BUILTIN  */

>  }

>  #ifndef __trunc

>  libm_alias_double (__trunc, trunc)


Ok.

> diff --git a/sysdeps/ieee754/float128/float128_private.h b/sysdeps/ieee754/float128/float128_private.h

> index 01881b574a..9cd3a63f11 100644

> --- a/sysdeps/ieee754/float128/float128_private.h

> +++ b/sysdeps/ieee754/float128/float128_private.h

> @@ -148,6 +148,8 @@

>  #define USE_FLOORL_BUILTIN USE_FLOORF128_BUILTIN

>  #undef USE_CEILL_BUILTIN

>  #define USE_CEILL_BUILTIN USE_CEILF128_BUILTIN

> +#undef USE_TRUNCL_BUILTIN

> +#define USE_TRUNCL_BUILTIN USE_TRUNCF128_BUILTIN

>  

>  /* IEEE function renames.  */

>  #define __ieee754_acoshl __ieee754_acoshf128

> @@ -355,6 +357,7 @@

>  #define __builtin_rintl __builtin_rintf128

>  #define __builtin_floorl __builtin_floorf128

>  #define __builtin_ceill __builtin_ceilf128

> +#define __builtin_truncl __builtin_truncf128

>  

>  /* Get the constant suffix from bits/floatn-compat.h.  */

>  #define L(x) __f128 (x)


Ok.

> diff --git a/sysdeps/ieee754/flt-32/s_truncf.c b/sysdeps/ieee754/flt-32/s_truncf.c

> index e587706b5b..de6dc24a3f 100644

> --- a/sysdeps/ieee754/flt-32/s_truncf.c

> +++ b/sysdeps/ieee754/flt-32/s_truncf.c

> @@ -22,11 +22,14 @@

>  

>  #include <math_private.h>

>  #include <libm-alias-float.h>

> -

> +#include <math-use-builtins.h>

>  

>  float

>  __truncf (float x)

>  {

> +#if USE_TRUNCF_BUILTIN

> +  return __builtin_truncf (x);

> +#else

>    int32_t i0, j0;

>    int sx;

>  

> @@ -49,6 +52,7 @@ __truncf (float x)

>      }

>  

>    return x;

> +#endif /* USE_TRUNCF_BUILTIN  */

>  }

>  #ifndef __truncf

>  libm_alias_float (__trunc, trunc)


Ok.

> diff --git a/sysdeps/ieee754/ldbl-128/s_truncl.c b/sysdeps/ieee754/ldbl-128/s_truncl.c

> index de4dd34d59..ca62e2f970 100644

> --- a/sysdeps/ieee754/ldbl-128/s_truncl.c

> +++ b/sysdeps/ieee754/ldbl-128/s_truncl.c

> @@ -23,11 +23,14 @@

>  

>  #include <math_private.h>

>  #include <libm-alias-ldouble.h>

> -

> +#include <math-use-builtins.h>

>  

>  _Float128

>  __truncl (_Float128 x)

>  {

> +#if USE_TRUNCL_BUILTIN

> +  return __builtin_truncl (x);

> +#else

>    int32_t j0;

>    uint64_t i0, i1, sx;

>  

> @@ -54,5 +57,6 @@ __truncl (_Float128 x)

>      }

>  

>    return x;

> +#endif /* USE_TRUNCL_BUILTIN  */

>  }

>  libm_alias_ldouble (__trunc, trunc)


Ok.

> diff --git a/sysdeps/s390/fpu/math-use-builtins.h b/sysdeps/s390/fpu/math-use-builtins.h

> index dc364edaa8..1d88a2c40f 100644

> --- a/sysdeps/s390/fpu/math-use-builtins.h

> +++ b/sysdeps/s390/fpu/math-use-builtins.h

> @@ -42,16 +42,22 @@

>  # define USE_CEILF_BUILTIN 1

>  # define USE_CEILL_BUILTIN 1

>  

> +# define USE_TRUNC_BUILTIN 1

> +# define USE_TRUNCF_BUILTIN 1

> +# define USE_TRUNCL_BUILTIN 1

> +

>  # if __GNUC_PREREQ (8, 1)

>  #  define USE_NEARBYINTF128_BUILTIN 1

>  #  define USE_RINTF128_BUILTIN 1

>  #  define USE_FLOORF128_BUILTIN 1

>  #  define USE_CEILF128_BUILTIN 1

> +#  define USE_TRUNCF128_BUILTIN 1

>  # else

>  #  define USE_NEARBYINTF128_BUILTIN 0

>  #  define USE_RINTF128_BUILTIN 0

>  #  define USE_FLOORF128_BUILTIN 0

>  #  define USE_CEILF128_BUILTIN 0

> +#  define USE_TRUNCF128_BUILTIN 0

>  # endif

>  

>  #else

> 


Ok.

Patch

diff --git a/sysdeps/generic/math-use-builtins.h b/sysdeps/generic/math-use-builtins.h
index 076ec661b0..ab379f45ba 100644
--- a/sysdeps/generic/math-use-builtins.h
+++ b/sysdeps/generic/math-use-builtins.h
@@ -41,4 +41,9 @@ 
 #define USE_CEILL_BUILTIN 0
 #define USE_CEILF128_BUILTIN 0
 
+#define USE_TRUNC_BUILTIN 0
+#define USE_TRUNCF_BUILTIN 0
+#define USE_TRUNCL_BUILTIN 0
+#define USE_TRUNCF128_BUILTIN 0
+
 #endif /* math-use-builtins.h */
diff --git a/sysdeps/ieee754/dbl-64/s_trunc.c b/sysdeps/ieee754/dbl-64/s_trunc.c
index 0de68ce298..6189ba4a31 100644
--- a/sysdeps/ieee754/dbl-64/s_trunc.c
+++ b/sysdeps/ieee754/dbl-64/s_trunc.c
@@ -22,11 +22,14 @@ 
 
 #include <math_private.h>
 #include <libm-alias-double.h>
-
+#include <math-use-builtins.h>
 
 double
 __trunc (double x)
 {
+#if USE_TRUNC_BUILTIN
+  return __builtin_trunc (x);
+#else
   int64_t i0, j0;
   int64_t sx;
 
@@ -49,6 +52,7 @@  __trunc (double x)
     }
 
   return x;
+#endif /* USE_TRUNC_BUILTIN  */
 }
 #ifndef __trunc
 libm_alias_double (__trunc, trunc)
diff --git a/sysdeps/ieee754/float128/float128_private.h b/sysdeps/ieee754/float128/float128_private.h
index 01881b574a..9cd3a63f11 100644
--- a/sysdeps/ieee754/float128/float128_private.h
+++ b/sysdeps/ieee754/float128/float128_private.h
@@ -148,6 +148,8 @@ 
 #define USE_FLOORL_BUILTIN USE_FLOORF128_BUILTIN
 #undef USE_CEILL_BUILTIN
 #define USE_CEILL_BUILTIN USE_CEILF128_BUILTIN
+#undef USE_TRUNCL_BUILTIN
+#define USE_TRUNCL_BUILTIN USE_TRUNCF128_BUILTIN
 
 /* IEEE function renames.  */
 #define __ieee754_acoshl __ieee754_acoshf128
@@ -355,6 +357,7 @@ 
 #define __builtin_rintl __builtin_rintf128
 #define __builtin_floorl __builtin_floorf128
 #define __builtin_ceill __builtin_ceilf128
+#define __builtin_truncl __builtin_truncf128
 
 /* Get the constant suffix from bits/floatn-compat.h.  */
 #define L(x) __f128 (x)
diff --git a/sysdeps/ieee754/flt-32/s_truncf.c b/sysdeps/ieee754/flt-32/s_truncf.c
index e587706b5b..de6dc24a3f 100644
--- a/sysdeps/ieee754/flt-32/s_truncf.c
+++ b/sysdeps/ieee754/flt-32/s_truncf.c
@@ -22,11 +22,14 @@ 
 
 #include <math_private.h>
 #include <libm-alias-float.h>
-
+#include <math-use-builtins.h>
 
 float
 __truncf (float x)
 {
+#if USE_TRUNCF_BUILTIN
+  return __builtin_truncf (x);
+#else
   int32_t i0, j0;
   int sx;
 
@@ -49,6 +52,7 @@  __truncf (float x)
     }
 
   return x;
+#endif /* USE_TRUNCF_BUILTIN  */
 }
 #ifndef __truncf
 libm_alias_float (__trunc, trunc)
diff --git a/sysdeps/ieee754/ldbl-128/s_truncl.c b/sysdeps/ieee754/ldbl-128/s_truncl.c
index de4dd34d59..ca62e2f970 100644
--- a/sysdeps/ieee754/ldbl-128/s_truncl.c
+++ b/sysdeps/ieee754/ldbl-128/s_truncl.c
@@ -23,11 +23,14 @@ 
 
 #include <math_private.h>
 #include <libm-alias-ldouble.h>
-
+#include <math-use-builtins.h>
 
 _Float128
 __truncl (_Float128 x)
 {
+#if USE_TRUNCL_BUILTIN
+  return __builtin_truncl (x);
+#else
   int32_t j0;
   uint64_t i0, i1, sx;
 
@@ -54,5 +57,6 @@  __truncl (_Float128 x)
     }
 
   return x;
+#endif /* USE_TRUNCL_BUILTIN  */
 }
 libm_alias_ldouble (__trunc, trunc)
diff --git a/sysdeps/s390/fpu/math-use-builtins.h b/sysdeps/s390/fpu/math-use-builtins.h
index dc364edaa8..1d88a2c40f 100644
--- a/sysdeps/s390/fpu/math-use-builtins.h
+++ b/sysdeps/s390/fpu/math-use-builtins.h
@@ -42,16 +42,22 @@ 
 # define USE_CEILF_BUILTIN 1
 # define USE_CEILL_BUILTIN 1
 
+# define USE_TRUNC_BUILTIN 1
+# define USE_TRUNCF_BUILTIN 1
+# define USE_TRUNCL_BUILTIN 1
+
 # if __GNUC_PREREQ (8, 1)
 #  define USE_NEARBYINTF128_BUILTIN 1
 #  define USE_RINTF128_BUILTIN 1
 #  define USE_FLOORF128_BUILTIN 1
 #  define USE_CEILF128_BUILTIN 1
+#  define USE_TRUNCF128_BUILTIN 1
 # else
 #  define USE_NEARBYINTF128_BUILTIN 0
 #  define USE_RINTF128_BUILTIN 0
 #  define USE_FLOORF128_BUILTIN 0
 #  define USE_CEILF128_BUILTIN 0
+#  define USE_TRUNCF128_BUILTIN 0
 # endif
 
 #else