Use ceil functions not __ceil functions in glibc libm.

Continuing the move to use, within libm, public names for libm functions that can be inlined as built-in functions on many architectures, this patch moves calls to __ceil functions to call the corresponding ceil names instead, with asm redirection to __ceil when the calls are not inlined. Tested for x86_64, and with build-many-glibcs.py. * include/math.h [!_ISOMAC && !(__FINITE_MATH_ONLY__ && __FINITE_MATH_ONLY__ > 0) && !NO_MATH_REDIRECT] (ceil): Redirect using MATH_REDIRECT. * sysdeps/aarch64/fpu/s_ceil.c: Define NO_MATH_REDIRECT before header inclusion. * sysdeps/aarch64/fpu/s_ceilf.c: Likewise. * sysdeps/ieee754/dbl-64/s_ceil.c: Likewise. * sysdeps/ieee754/dbl-64/wordsize-64/s_ceil.c: Likewise. * sysdeps/ieee754/float128/s_ceilf128.c: Likewise. * sysdeps/ieee754/flt-32/s_ceilf.c: Likewise. * sysdeps/ieee754/ldbl-128/s_ceill.c: Likewise. * sysdeps/ieee754/ldbl-128ibm/s_ceill.c: Likewise. * sysdeps/m68k/m680x0/fpu/s_ceil_template.c: Likewise. * sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_ceil.c: Likewise. * sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_ceilf.c: Likewise. * sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceil.c: Likewise. * sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceilf.c: Likewise. * sysdeps/riscv/rv64/rvd/s_ceil.c: Likewise. * sysdeps/riscv/rvf/s_ceilf.c: Likewise. * sysdeps/sparc/sparc64/fpu/multiarch/s_ceil.c: Likewise. * sysdeps/sparc/sparc64/fpu/multiarch/s_ceilf.c: Likewise. * sysdeps/x86_64/fpu/multiarch/s_ceil.c: Likewise. * sysdeps/x86_64/fpu/multiarch/s_ceilf.c: Likewise. * sysdeps/powerpc/fpu/math_private.h [_ARCH_PWR5X] (__ceil): Remove macro. * sysdeps/ieee754/dbl-64/e_gamma_r.c (gamma_positive): Use ceil functions instead of __ceil variants. * sysdeps/ieee754/flt-32/e_gammaf_r.c (gammaf_positive): Likewise. * sysdeps/ieee754/ldbl-128/e_gammal_r.c (gammal_positive): Likewise. * sysdeps/ieee754/ldbl-128ibm/e_gammal_r.c (gammal_positive): Likewise. * sysdeps/ieee754/ldbl-128ibm/s_truncl.c (__truncl): Likewise. * sysdeps/ieee754/ldbl-96/e_gammal_r.c (gammal_positive): Likewise. * sysdeps/powerpc/power5+/fpu/s_modf.c (__modf): Likewise. * sysdeps/powerpc/power5+/fpu/s_modff.c (__modff): Likewise.
2018-09-17 20:42:06 +00:00 · 2018-09-17 20:42:06 +00:00 · 71223ef909
parent 89983cb37c
commit 71223ef909
30 changed files with 70 additions and 32 deletions
--- a/38
+++ b/38
@ -1,5 +1,43 @@
 2018-09-17  Joseph Myers  <joseph@codesourcery.com>

+	* include/math.h [!_ISOMAC && !(__FINITE_MATH_ONLY__ &&
+	__FINITE_MATH_ONLY__ > 0) && !NO_MATH_REDIRECT] (ceil): Redirect
+	using MATH_REDIRECT.
+	* sysdeps/aarch64/fpu/s_ceil.c: Define NO_MATH_REDIRECT before
+	header inclusion.
+	* sysdeps/aarch64/fpu/s_ceilf.c: Likewise.
+	* sysdeps/ieee754/dbl-64/s_ceil.c: Likewise.
+	* sysdeps/ieee754/dbl-64/wordsize-64/s_ceil.c: Likewise.
+	* sysdeps/ieee754/float128/s_ceilf128.c: Likewise.
+	* sysdeps/ieee754/flt-32/s_ceilf.c: Likewise.
+	* sysdeps/ieee754/ldbl-128/s_ceill.c: Likewise.
+	* sysdeps/ieee754/ldbl-128ibm/s_ceill.c: Likewise.
+	* sysdeps/m68k/m680x0/fpu/s_ceil_template.c: Likewise.
+	* sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_ceil.c: Likewise.
+	* sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_ceilf.c: Likewise.
+	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceil.c: Likewise.
+	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceilf.c: Likewise.
+	* sysdeps/riscv/rv64/rvd/s_ceil.c: Likewise.
+	* sysdeps/riscv/rvf/s_ceilf.c: Likewise.
+	* sysdeps/sparc/sparc64/fpu/multiarch/s_ceil.c: Likewise.
+	* sysdeps/sparc/sparc64/fpu/multiarch/s_ceilf.c: Likewise.
+	* sysdeps/x86_64/fpu/multiarch/s_ceil.c: Likewise.
+	* sysdeps/x86_64/fpu/multiarch/s_ceilf.c: Likewise.
+	* sysdeps/powerpc/fpu/math_private.h [_ARCH_PWR5X] (__ceil):
+	Remove macro.
+	* sysdeps/ieee754/dbl-64/e_gamma_r.c (gamma_positive): Use ceil
+	functions instead of __ceil variants.
+	* sysdeps/ieee754/flt-32/e_gammaf_r.c (gammaf_positive): Likewise.
+	* sysdeps/ieee754/ldbl-128/e_gammal_r.c (gammal_positive):
+	Likewise.
+	* sysdeps/ieee754/ldbl-128ibm/e_gammal_r.c (gammal_positive):
+	Likewise.
+	* sysdeps/ieee754/ldbl-128ibm/s_truncl.c (__truncl): Likewise.
+	* sysdeps/ieee754/ldbl-96/e_gammal_r.c (gammal_positive):
+	Likewise.
+	* sysdeps/powerpc/power5+/fpu/s_modf.c (__modf): Likewise.
+	* sysdeps/powerpc/power5+/fpu/s_modff.c (__modff): Likewise.
+
 	[BZ #21286]
 	* sysdeps/unix/sysv/linux/bits/siginfo-consts.h (SI_DETHREAD): New
 	constant.
--- a/include/math.h
+++ b/include/math.h
@ -101,6 +101,7 @@ fabsf128 (_Float128 x)
 #   endif
 #   define MATH_REDIRECT_UNARY_ARGS(TYPE) TYPE
 MATH_REDIRECT (sqrt, "__ieee754_", MATH_REDIRECT_UNARY_ARGS)
+MATH_REDIRECT (ceil, "__", MATH_REDIRECT_UNARY_ARGS)
 MATH_REDIRECT (floor, "__", MATH_REDIRECT_UNARY_ARGS)
 MATH_REDIRECT (rint, "__", MATH_REDIRECT_UNARY_ARGS)
 #  endif
--- a/sysdeps/aarch64/fpu/s_ceil.c
+++ b/sysdeps/aarch64/fpu/s_ceil.c
@ -16,6 +16,7 @@
   License along with the GNU C Library; if not, see
   <http://www.gnu.org/licenses/>.  */

+#define NO_MATH_REDIRECT
 #include <math.h>
 #include <libm-alias-double.h>

--- a/sysdeps/aarch64/fpu/s_ceilf.c
+++ b/sysdeps/aarch64/fpu/s_ceilf.c
@ -16,6 +16,7 @@
   License along with the GNU C Library; if not, see
   <http://www.gnu.org/licenses/>.  */

+#define NO_MATH_REDIRECT
 #include <math.h>
 #include <libm-alias-float.h>

--- a/sysdeps/ieee754/dbl-64/e_gamma_r.c
+++ b/sysdeps/ieee754/dbl-64/e_gamma_r.c
@ -61,7 +61,7 @@ gamma_positive (double x, int *exp2_adj)
    {
      /* Adjust into the range for using exp (lgamma).  */
      *exp2_adj = 0;
-      double n = __ceil (x - 1.5);
+      double n = ceil (x - 1.5);
      double x_adj = x - n;
      double eps;
      double prod = __gamma_product (x_adj, 0, n, &eps);
@ -78,7 +78,7 @@ gamma_positive (double x, int *exp2_adj)
 	{
 	  /* Adjust into the range for applying Stirling's
 	     approximation.  */
-	  double n = __ceil (12.0 - x);
+	  double n = ceil (12.0 - x);
 	  x_adj = math_narrow_eval (x + n);
 	  x_eps = (x - (x_adj - n));
 	  prod = __gamma_product (x_adj - n, x_eps, n, &eps);
--- a/sysdeps/ieee754/dbl-64/s_ceil.c
+++ b/sysdeps/ieee754/dbl-64/s_ceil.c
@ -17,6 +17,7 @@
 *	Bit twiddling.
 */

+#define NO_MATH_REDIRECT
 #include <math.h>
 #include <math_private.h>
 #include <libm-alias-double.h>
--- a/sysdeps/ieee754/dbl-64/wordsize-64/s_ceil.c
+++ b/sysdeps/ieee754/dbl-64/wordsize-64/s_ceil.c
@ -17,6 +17,7 @@
 *	Bit twiddling.
 */

+#define NO_MATH_REDIRECT
 #include <math.h>
 #include <math_private.h>
 #include <libm-alias-double.h>
--- a/sysdeps/ieee754/float128/s_ceilf128.c
+++ b/sysdeps/ieee754/float128/s_ceilf128.c
@ -1,2 +1,3 @@
+#define NO_MATH_REDIRECT
 #include <float128_private.h>
 #include "../ldbl-128/s_ceill.c"
--- a/sysdeps/ieee754/flt-32/e_gammaf_r.c
+++ b/sysdeps/ieee754/flt-32/e_gammaf_r.c
@ -71,7 +71,7 @@ gammaf_positive (float x, int *exp2_adj)
 	{
 	  /* Adjust into the range for applying Stirling's
 	     approximation.  */
-	  float n = __ceilf (4.0f - x);
+	  float n = ceilf (4.0f - x);
 	  x_adj = math_narrow_eval (x + n);
 	  x_eps = (x - (x_adj - n));
 	  prod = __gamma_productf (x_adj - n, x_eps, n, &eps);
--- a/sysdeps/ieee754/flt-32/s_ceilf.c
+++ b/sysdeps/ieee754/flt-32/s_ceilf.c
@ -13,6 +13,7 @@
 * ====================================================
 */

+#define NO_MATH_REDIRECT
 #include <math.h>
 #include <math_private.h>
 #include <libm-alias-float.h>
--- a/sysdeps/ieee754/ldbl-128/e_gammal_r.c
+++ b/sysdeps/ieee754/ldbl-128/e_gammal_r.c
@ -69,7 +69,7 @@ gammal_positive (_Float128 x, int *exp2_adj)
    {
      /* Adjust into the range for using exp (lgamma).  */
      *exp2_adj = 0;
-      _Float128 n = __ceill (x - L(1.5));
+      _Float128 n = ceill (x - L(1.5));
      _Float128 x_adj = x - n;
      _Float128 eps;
      _Float128 prod = __gamma_productl (x_adj, 0, n, &eps);
@ -86,7 +86,7 @@ gammal_positive (_Float128 x, int *exp2_adj)
 	{
 	  /* Adjust into the range for applying Stirling's
 	     approximation.  */
-	  _Float128 n = __ceill (24 - x);
+	  _Float128 n = ceill (24 - x);
 	  x_adj = x + n;
 	  x_eps = (x - (x_adj - n));
 	  prod = __gamma_productl (x_adj - n, x_eps, n, &eps);
--- a/sysdeps/ieee754/ldbl-128/s_ceill.c
+++ b/sysdeps/ieee754/ldbl-128/s_ceill.c
@ -24,6 +24,7 @@ static char rcsid[] = "$NetBSD: $";
 *	Bit twiddling.
 */

+#define NO_MATH_REDIRECT
 #include <math.h>
 #include <math_private.h>
 #include <libm-alias-ldouble.h>
--- a/sysdeps/ieee754/ldbl-128ibm/e_gammal_r.c
+++ b/sysdeps/ieee754/ldbl-128ibm/e_gammal_r.c
@ -68,7 +68,7 @@ gammal_positive (long double x, int *exp2_adj)
    {
      /* Adjust into the range for using exp (lgamma).  */
      *exp2_adj = 0;
-      long double n = __ceill (x - 1.5L);
+      long double n = ceill (x - 1.5L);
      long double x_adj = x - n;
      long double eps;
      long double prod = __gamma_productl (x_adj, 0, n, &eps);
@ -85,7 +85,7 @@ gammal_positive (long double x, int *exp2_adj)
 	{
 	  /* Adjust into the range for applying Stirling's
 	     approximation.  */
-	  long double n = __ceill (23.0L - x);
+	  long double n = ceill (23.0L - x);
 	  x_adj = x + n;
 	  x_eps = (x - (x_adj - n));
 	  prod = __gamma_productl (x_adj - n, x_eps, n, &eps);
--- a/sysdeps/ieee754/ldbl-128ibm/s_ceill.c
+++ b/sysdeps/ieee754/ldbl-128ibm/s_ceill.c
@ -17,6 +17,7 @@
   License along with the GNU C Library; if not, see
   <http://www.gnu.org/licenses/>.  */

+#define NO_MATH_REDIRECT
 #include <math.h>
 #include <math_private.h>
 #include <math_ldbl_opt.h>
--- a/sysdeps/ieee754/ldbl-128ibm/s_truncl.c
+++ b/sysdeps/ieee754/ldbl-128ibm/s_truncl.c
@ -47,7 +47,7 @@ __truncl (long double x)
      else
 	{
 	  /* The high part is a nonzero integer.  */
-	  lo = xh > 0 ? floor (xl) : __ceil (xl);
+	  lo = xh > 0 ? floor (xl) : ceil (xl);
 	  xh = hi;
 	  xl = lo;
 	  ldbl_canonicalize_int (&xh, &xl);
--- a/sysdeps/ieee754/ldbl-96/e_gammal_r.c
+++ b/sysdeps/ieee754/ldbl-96/e_gammal_r.c
@ -62,7 +62,7 @@ gammal_positive (long double x, int *exp2_adj)
    {
      /* Adjust into the range for using exp (lgamma).  */
      *exp2_adj = 0;
-      long double n = __ceill (x - 1.5L);
+      long double n = ceill (x - 1.5L);
      long double x_adj = x - n;
      long double eps;
      long double prod = __gamma_productl (x_adj, 0, n, &eps);
@ -79,7 +79,7 @@ gammal_positive (long double x, int *exp2_adj)
 	{
 	  /* Adjust into the range for applying Stirling's
 	     approximation.  */
-	  long double n = __ceill (13.0L - x);
+	  long double n = ceill (13.0L - x);
 	  x_adj = x + n;
 	  x_eps = (x - (x_adj - n));
 	  prod = __gamma_productl (x_adj - n, x_eps, n, &eps);
--- a/sysdeps/m68k/m680x0/fpu/s_ceil_template.c
+++ b/sysdeps/m68k/m680x0/fpu/s_ceil_template.c
@ -16,6 +16,7 @@
   License along with the GNU C Library.  If not, see
   <http://www.gnu.org/licenses/>.  */

+#define NO_MATH_REDIRECT
 #include <math.h>

 FLOAT
--- a/sysdeps/powerpc/fpu/math_private.h
+++ b/sysdeps/powerpc/fpu/math_private.h
@ -77,26 +77,6 @@ __ieee754_sqrtf128 (_Float128 __x)
     __z; })
 # endif

-# ifndef __ceil
-#  define __ceil(x)			\
-    ({ double __z;			\
-     __asm __volatile (			\
-	"	frip %0,%1\n"		\
-		: "=f" (__z)		\
-		: "f" (x));		\
-     __z; })
-# endif
-# ifndef __ceilf
-#  define __ceilf(x)			\
-    ({ float __z;			\
-     __asm __volatile (			\
-	"	frip %0,%1\n"		\
-	"	frsp %0,%0\n"		\
-		: "=f" (__z)		\
-		: "f" (x));		\
-     __z; })
-# endif
-
 #endif	/* defined _ARCH_PWR5X */

 #endif /* _PPC_MATH_PRIVATE_H_ */
--- a/sysdeps/powerpc/power5+/fpu/s_modf.c
+++ b/sysdeps/powerpc/power5+/fpu/s_modf.c
@ -41,7 +41,7 @@ __modf (double x, double *iptr)
    }
  else
    {
-      *iptr = __ceil (x);
+      *iptr = ceil (x);
      return __copysign (x - *iptr, x);
    }
 }
--- a/sysdeps/powerpc/power5+/fpu/s_modff.c
+++ b/sysdeps/powerpc/power5+/fpu/s_modff.c
@ -40,7 +40,7 @@ __modff (float x, float *iptr)
    }
  else
    {
-      *iptr = __ceilf (x);
+      *iptr = ceilf (x);
      return __copysignf (x - *iptr, x);
    }
 }
--- a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_ceil.c
+++ b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_ceil.c
@ -16,6 +16,7 @@
   License along with the GNU C Library; if not, see
   <http://www.gnu.org/licenses/>.  */

+#define NO_MATH_REDIRECT
 #include <math.h>
 #include <math_ldbl_opt.h>
 #include <shlib-compat.h>
--- a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_ceilf.c
+++ b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_ceilf.c
@ -16,6 +16,7 @@
   License along with the GNU C Library; if not, see
   <http://www.gnu.org/licenses/>.  */

+#define NO_MATH_REDIRECT
 #include <math.h>
 #include <math_ldbl_opt.h>
 #include <shlib-compat.h>
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceil.c
+++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceil.c
@ -16,6 +16,7 @@
   License along with the GNU C Library; if not, see
   <http://www.gnu.org/licenses/>.  */

+#define NO_MATH_REDIRECT
 #include <math.h>
 #include <math_ldbl_opt.h>
 #include <shlib-compat.h>
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceilf.c
+++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceilf.c
@ -16,6 +16,7 @@
   License along with the GNU C Library; if not, see
   <http://www.gnu.org/licenses/>.  */

+#define NO_MATH_REDIRECT
 #include <math.h>
 #include <math_ldbl_opt.h>
 #include <shlib-compat.h>
--- a/sysdeps/riscv/rv64/rvd/s_ceil.c
+++ b/sysdeps/riscv/rv64/rvd/s_ceil.c
@ -16,6 +16,7 @@
   License along with the GNU C Library.  If not, see
   <http://www.gnu.org/licenses/>.  */

+#define NO_MATH_REDIRECT
 #include <math.h>
 #include <math_private.h>
 #include <fenv_private.h>
--- a/sysdeps/riscv/rvf/s_ceilf.c
+++ b/sysdeps/riscv/rvf/s_ceilf.c
@ -16,6 +16,7 @@
   License along with the GNU C Library.  If not, see
   <http://www.gnu.org/licenses/>.  */

+#define NO_MATH_REDIRECT
 #include <math.h>
 #include <math_private.h>
 #include <fenv_private.h>
--- a/sysdeps/sparc/sparc64/fpu/multiarch/s_ceil.c
+++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_ceil.c
@ -16,6 +16,7 @@
   License along with the GNU C Library; if not, see
   <http://www.gnu.org/licenses/>.  */

+#define NO_MATH_REDIRECT
 #include <sparc-ifunc.h>
 #include <math.h>
 #include <libm-alias-double.h>
--- a/sysdeps/sparc/sparc64/fpu/multiarch/s_ceilf.c
+++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_ceilf.c
@ -16,6 +16,7 @@
   License along with the GNU C Library; if not, see
   <http://www.gnu.org/licenses/>.  */

+#define NO_MATH_REDIRECT
 #include <sparc-ifunc.h>
 #include <math.h>
 #include <libm-alias-float.h>
--- a/sysdeps/x86_64/fpu/multiarch/s_ceil.c
+++ b/sysdeps/x86_64/fpu/multiarch/s_ceil.c
@ -16,6 +16,7 @@
   License along with the GNU C Library; if not, see
   <http://www.gnu.org/licenses/>.  */

+#define NO_MATH_REDIRECT
 #include <libm-alias-double.h>

 #define ceil __redirect_ceil
--- a/sysdeps/x86_64/fpu/multiarch/s_ceilf.c
+++ b/sysdeps/x86_64/fpu/multiarch/s_ceilf.c
@ -16,6 +16,7 @@
   License along with the GNU C Library; if not, see
   <http://www.gnu.org/licenses/>.  */

+#define NO_MATH_REDIRECT
 #include <libm-alias-float.h>

 #define ceilf __redirect_ceilf