| Message ID | 20200609213301.3591135-12-adhemerval.zanella@linaro.org |
|---|---|
| State | Committed |
| Commit | cbf3571f49134388bc589b74445b5d6bdd21ef02 |
| Headers | show |
| Series | [01/13] math: Decompose math-use-builtins.h | expand |
If no one opposes I will commit this. On 09/06/2020 18:33, Adhemerval Zanella wrote: > Checked on arm-linux-gnueabi and armv7-linux-gnueabihf > --- > sysdeps/arm/e_sqrt.c | 46 ---------------------------- > sysdeps/arm/e_sqrtf.c | 46 ---------------------------- > sysdeps/arm/math-use-builtins-sqrt.h | 9 ++++++ > 3 files changed, 9 insertions(+), 92 deletions(-) > delete mode 100644 sysdeps/arm/e_sqrt.c > delete mode 100644 sysdeps/arm/e_sqrtf.c > create mode 100644 sysdeps/arm/math-use-builtins-sqrt.h > > diff --git a/sysdeps/arm/e_sqrt.c b/sysdeps/arm/e_sqrt.c > deleted file mode 100644 > index d264c4263b..0000000000 > --- a/sysdeps/arm/e_sqrt.c > +++ /dev/null > @@ -1,46 +0,0 @@ > -/* Compute square root for double. ARM version. > - Copyright (C) 2016-2020 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 > - <https://www.gnu.org/licenses/>. */ > - > -#ifdef __SOFTFP__ > - > -/* Use architecture-indendent sqrt implementation. */ > -# include <sysdeps/ieee754/dbl-64/e_sqrt.c> > - > -#else > - > -/* Use VFP square root instruction. */ > -# include <math.h> > -# include <sysdep.h> > -# include <libm-alias-finite.h> > - > -double > -__ieee754_sqrt (double x) > -{ > - double ret; > -# if __ARM_ARCH >= 6 > - asm ("vsqrt.f64 %P0, %P1" : "=w" (ret) : "w" (x)); > -# else > - /* As in GCC, for VFP9 Erratum 760019 avoid overwriting the > - input. */ > - asm ("vsqrt.f64 %P0, %P1" : "=&w" (ret) : "w" (x)); > -# endif > - return ret; > -} > -libm_alias_finite (__ieee754_sqrt, __sqrt) > - > -#endif > diff --git a/sysdeps/arm/e_sqrtf.c b/sysdeps/arm/e_sqrtf.c > deleted file mode 100644 > index c3f31119a3..0000000000 > --- a/sysdeps/arm/e_sqrtf.c > +++ /dev/null > @@ -1,46 +0,0 @@ > -/* Compute square root for float. ARM version. > - Copyright (C) 2016-2020 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 > - <https://www.gnu.org/licenses/>. */ > - > -#ifdef __SOFTFP__ > - > -/* Use architecture-indendent sqrtf implementation. */ > -# include <sysdeps/ieee754/flt-32/e_sqrtf.c> > - > -#else > - > -/* Use VFP square root instruction. */ > -# include <math.h> > -# include <sysdep.h> > -# include <libm-alias-finite.h> > - > -float > -__ieee754_sqrtf (float x) > -{ > - float ret; > -# if __ARM_ARCH >= 6 > - asm ("vsqrt.f32 %0, %1" : "=t" (ret) : "t" (x)); > -# else > - /* As in GCC, for VFP9 Erratum 760019 avoid overwriting the > - input. */ > - asm ("vsqrt.f32 %0, %1" : "=&t" (ret) : "t" (x)); > -# endif > - return ret; > -} > -libm_alias_finite (__ieee754_sqrtf, __sqrtf) > - > -#endif > diff --git a/sysdeps/arm/math-use-builtins-sqrt.h b/sysdeps/arm/math-use-builtins-sqrt.h > new file mode 100644 > index 0000000000..e765e7c49d > --- /dev/null > +++ b/sysdeps/arm/math-use-builtins-sqrt.h > @@ -0,0 +1,9 @@ > +#ifdef __SOFTFP__ > +# define USE_SQRT_BUILTIN 0 > +# define USE_SQRTF_BUILTIN 0 > +#else > +# define USE_SQRT_BUILTIN 1 > +# define USE_SQRTF_BUILTIN 1 > +#endif > +#define USE_SQRTL_BUILTIN 0 > +#define USE_SQRTF128_BUILTIN 0 >
diff --git a/sysdeps/arm/e_sqrt.c b/sysdeps/arm/e_sqrt.c deleted file mode 100644 index d264c4263b..0000000000 --- a/sysdeps/arm/e_sqrt.c +++ /dev/null @@ -1,46 +0,0 @@ -/* Compute square root for double. ARM version. - Copyright (C) 2016-2020 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 - <https://www.gnu.org/licenses/>. */ - -#ifdef __SOFTFP__ - -/* Use architecture-indendent sqrt implementation. */ -# include <sysdeps/ieee754/dbl-64/e_sqrt.c> - -#else - -/* Use VFP square root instruction. */ -# include <math.h> -# include <sysdep.h> -# include <libm-alias-finite.h> - -double -__ieee754_sqrt (double x) -{ - double ret; -# if __ARM_ARCH >= 6 - asm ("vsqrt.f64 %P0, %P1" : "=w" (ret) : "w" (x)); -# else - /* As in GCC, for VFP9 Erratum 760019 avoid overwriting the - input. */ - asm ("vsqrt.f64 %P0, %P1" : "=&w" (ret) : "w" (x)); -# endif - return ret; -} -libm_alias_finite (__ieee754_sqrt, __sqrt) - -#endif diff --git a/sysdeps/arm/e_sqrtf.c b/sysdeps/arm/e_sqrtf.c deleted file mode 100644 index c3f31119a3..0000000000 --- a/sysdeps/arm/e_sqrtf.c +++ /dev/null @@ -1,46 +0,0 @@ -/* Compute square root for float. ARM version. - Copyright (C) 2016-2020 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 - <https://www.gnu.org/licenses/>. */ - -#ifdef __SOFTFP__ - -/* Use architecture-indendent sqrtf implementation. */ -# include <sysdeps/ieee754/flt-32/e_sqrtf.c> - -#else - -/* Use VFP square root instruction. */ -# include <math.h> -# include <sysdep.h> -# include <libm-alias-finite.h> - -float -__ieee754_sqrtf (float x) -{ - float ret; -# if __ARM_ARCH >= 6 - asm ("vsqrt.f32 %0, %1" : "=t" (ret) : "t" (x)); -# else - /* As in GCC, for VFP9 Erratum 760019 avoid overwriting the - input. */ - asm ("vsqrt.f32 %0, %1" : "=&t" (ret) : "t" (x)); -# endif - return ret; -} -libm_alias_finite (__ieee754_sqrtf, __sqrtf) - -#endif diff --git a/sysdeps/arm/math-use-builtins-sqrt.h b/sysdeps/arm/math-use-builtins-sqrt.h new file mode 100644 index 0000000000..e765e7c49d --- /dev/null +++ b/sysdeps/arm/math-use-builtins-sqrt.h @@ -0,0 +1,9 @@ +#ifdef __SOFTFP__ +# define USE_SQRT_BUILTIN 0 +# define USE_SQRTF_BUILTIN 0 +#else +# define USE_SQRT_BUILTIN 1 +# define USE_SQRTF_BUILTIN 1 +#endif +#define USE_SQRTL_BUILTIN 0 +#define USE_SQRTF128_BUILTIN 0