From c24517c9dd9e92b4fa81e192967c63e56c1726e2 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Fri, 13 Dec 2013 14:56:09 -0500 Subject: [PATCH] PowerPC: Cleaning up uneeded sqrt routines For PPC64, all the wrappers at sysdeps are superfluous: they are basically the same implementation from math/w_sqrt.c with the '#ifdef _IEEE_LIBM'. And the power4 version just force the 'fsqrt' instruction utilization with an inline assembly, which is already handled by math_private.h __ieee754_sqrt implementation. --- ChangeLog | 7 ++++ sysdeps/powerpc/fpu/w_sqrt.c | 48 ---------------------- sysdeps/powerpc/fpu/w_sqrtf.c | 46 --------------------- sysdeps/powerpc/powerpc64/power4/fpu/w_sqrt.c | 55 -------------------------- sysdeps/powerpc/powerpc64/power4/fpu/w_sqrtf.c | 53 ------------------------- 5 files changed, 7 insertions(+), 202 deletions(-) delete mode 100644 sysdeps/powerpc/fpu/w_sqrt.c delete mode 100644 sysdeps/powerpc/fpu/w_sqrtf.c delete mode 100644 sysdeps/powerpc/powerpc64/power4/fpu/w_sqrt.c delete mode 100644 sysdeps/powerpc/powerpc64/power4/fpu/w_sqrtf.c diff --git a/ChangeLog b/ChangeLog index cf36980..26ed103 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2013-12-13 Adhemerval Zanella + * sysdeps/powerpc/fpu/w_sqrt.c: Remove file + * sysdeps/powerpc/fpu/w_sqrtf.c: Likewise. + * sysdeps/powerpc/powerpc64/power4/fpu/w_sqrt.c: Likewise. + * sysdeps/powerpc/powerpc64/power4/fpu/w_sqrtf.c: Likewise. + +2013-12-13 Adhemerval Zanella + * sysdeps/powerpc/powerpc64/multiarch/Makefile: Add stpcpy multiarch implementations. * sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c diff --git a/sysdeps/powerpc/fpu/w_sqrt.c b/sysdeps/powerpc/fpu/w_sqrt.c deleted file mode 100644 index 70f28dd..0000000 --- a/sysdeps/powerpc/fpu/w_sqrt.c +++ /dev/null @@ -1,48 +0,0 @@ -/* Double-precision floating point square root wrapper. - Copyright (C) 2004-2013 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#include -#include -#include -#include - -double -__sqrt (double x) /* wrapper sqrt */ -{ -#ifdef _IEEE_LIBM - return __ieee754_sqrt (x); -#else - double z; - z = __ieee754_sqrt (x); - if (_LIB_VERSION == _IEEE_ || (x != x)) - return z; - - if (x < 0.0) - return __kernel_standard (x, x, 26); /* sqrt(negative) */ - else - return z; -#endif -} - -weak_alias (__sqrt, sqrt) -#ifdef NO_LONG_DOUBLE - strong_alias (__sqrt, __sqrtl) weak_alias (__sqrt, sqrtl) -#endif -#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0) -compat_symbol (libm, __sqrt, sqrtl, GLIBC_2_0); -#endif diff --git a/sysdeps/powerpc/fpu/w_sqrtf.c b/sysdeps/powerpc/fpu/w_sqrtf.c deleted file mode 100644 index aef8267..0000000 --- a/sysdeps/powerpc/fpu/w_sqrtf.c +++ /dev/null @@ -1,46 +0,0 @@ -/* Single-precision floating point square root wrapper. - Copyright (C) 2004-2013 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#include -#include -#include - -#include -#include - -float -__sqrtf (float x) /* wrapper sqrtf */ -{ -#ifdef _IEEE_LIBM - return __ieee754_sqrtf (x); -#else - float z; - z = __ieee754_sqrtf (x); - - if (_LIB_VERSION == _IEEE_ || (x != x)) - return z; - - if (x < (float) 0.0) - /* sqrtf(negative) */ - return (float) __kernel_standard ((double) x, (double) x, 126); - else - return z; -#endif -} - -weak_alias (__sqrtf, sqrtf) diff --git a/sysdeps/powerpc/powerpc64/power4/fpu/w_sqrt.c b/sysdeps/powerpc/powerpc64/power4/fpu/w_sqrt.c deleted file mode 100644 index 78bba57..0000000 --- a/sysdeps/powerpc/powerpc64/power4/fpu/w_sqrt.c +++ /dev/null @@ -1,55 +0,0 @@ -/* Double-precision floating point square root wrapper. - Copyright (C) 2004-2013 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#include -#include -#include -#include - -double -__sqrt (double x) /* wrapper sqrt */ -{ - double z; -/* Power4 (ISA V2.0) and above implement sqrt in hardware. */ - __asm __volatile ( - " fsqrt %0,%1\n" - : "=f" (z) - : "f" (x)); -#ifdef _IEEE_LIBM - return z; -#else - if (__builtin_expect (_LIB_VERSION == _IEEE_, 0)) - return z; - - if (__builtin_expect (x != x, 0)) - return z; - - if (__builtin_expect (x < 0.0, 0)) - return __kernel_standard (x, x, 26); /* sqrt(negative) */ - else - return z; -#endif -} - -weak_alias (__sqrt, sqrt) -#ifdef NO_LONG_DOUBLE - strong_alias (__sqrt, __sqrtl) weak_alias (__sqrt, sqrtl) -#endif -#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0) -compat_symbol (libm, __sqrt, sqrtl, GLIBC_2_0); -#endif diff --git a/sysdeps/powerpc/powerpc64/power4/fpu/w_sqrtf.c b/sysdeps/powerpc/powerpc64/power4/fpu/w_sqrtf.c deleted file mode 100644 index 12d9f62..0000000 --- a/sysdeps/powerpc/powerpc64/power4/fpu/w_sqrtf.c +++ /dev/null @@ -1,53 +0,0 @@ -/* Single-precision floating point square root wrapper. - Copyright (C) 2004-2013 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#include -#include -#include - -#include -#include - -float -__sqrtf (float x) /* wrapper sqrtf */ -{ -#ifdef _IEEE_LIBM - return __ieee754_sqrtf (x); -#else - float z; -/* Power4 (ISA V2.0) and above implement sqrtf in hardware. */ - __asm __volatile ( - " fsqrts %0,%1\n" - : "=f" (z) - : "f" (x)); - - if (__builtin_expect (_LIB_VERSION == _IEEE_, 0)) - return z; - - if (__builtin_expect (x != x, 0)) - return z; - - if (__builtin_expect (x < 0.0, 0)) - /* sqrtf(negative) */ - return (float) __kernel_standard ((double) x, (double) x, 126); - else - return z; -#endif -} - -weak_alias (__sqrtf, sqrtf) -- 2.7.4