This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: [PATCH 22/25] sparc: refactor sparc32 nearbyint{f} selector to C
- From: Adhemerval Zanella <adhemerval dot zanella at linaro dot org>
- To: libc-alpha at sourceware dot org
- Date: Thu, 30 Nov 2017 18:33:16 -0200
- Subject: Re: [PATCH 22/25] sparc: refactor sparc32 nearbyint{f} selector to C
- Authentication-results: sourceware.org; auth=none
- References: <1509044813-9951-1-git-send-email-adhemerval.zanella@linaro.org> <1509044813-9951-23-git-send-email-adhemerval.zanella@linaro.org>
If no one opposes it, I will commit it shortly. I had to adjust to use
Joseph recent changes to use libc_alias_{float,double}.
On 26/10/2017 17:06, Adhemerval Zanella wrote:
> This patch refactors the sparc32 ifunc selector to a C implementation.
> Also, the generic symbol is moved to its own implementation file
> s_nearbyint{f}-generic.S).
>
> Checked on sparc64-linux-gnu and sparcv9-linux-gnu.
>
> * sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/Makefile
> (libm-sysdep_routines): Add s_nearbyintf-generic and
> s_nearbyint-generic.
> * sysdeps/sparc/sparcv9/fpu/multiarch/s_nearbyint-generic.S: New
> file.
> * sysdeps/sparc32/sparcv9/fpu/multiarch/s_nearbyint.c: Likewise.
> * sysdeps/sparc32/sparcv9/fpu/multiarch/s_nearbyintf-generic.S:
> Likewise.
> * sysdeps/sparc32/sparcv9/fpu/multiarch/s_nearbyintf.c: Likewise.
> * sysdeps/sparc32/sparcv9/fpu/multiarch/s_nearbyint.S: Remove file.
> * sysdeps/sparc32/sparcv9/fpu/multiarch/s_nearbyintf.S: Likewise.
>
> Signed-off-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
> ---
> ChangeLog | 12 ++++++++
> .../sparc/sparc32/sparcv9/fpu/multiarch/Makefile | 6 ++--
> .../sparcv9/fpu/multiarch/s_nearbyint-generic.S | 9 ++++++
> .../sparc32/sparcv9/fpu/multiarch/s_nearbyint.S | 19 ------------
> .../sparc32/sparcv9/fpu/multiarch/s_nearbyint.c | 35 ++++++++++++++++++++++
> .../sparcv9/fpu/multiarch/s_nearbyintf-generic.S | 4 +++
> .../sparc32/sparcv9/fpu/multiarch/s_nearbyintf.S | 12 --------
> .../sparc32/sparcv9/fpu/multiarch/s_nearbyintf.c | 29 ++++++++++++++++++
> 8 files changed, 92 insertions(+), 34 deletions(-)
> create mode 100644 sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_nearbyint-generic.S
> delete mode 100644 sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_nearbyint.S
> create mode 100644 sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_nearbyint.c
> create mode 100644 sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_nearbyintf-generic.S
> delete mode 100644 sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_nearbyintf.S
> create mode 100644 sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_nearbyintf.c
>
> diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/Makefile b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/Makefile
> index 459c0e5..1a26ee1 100644
> --- a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/Makefile
> +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/Makefile
> @@ -11,9 +11,9 @@ libm-sysdep_routines += s_fabs-vis3 s_fabsf-vis3 s_fabs-generic \
> s_fabsf-generic s_llrintf-vis3 s_llrint-vis3 \
> s_llrintf-generic s_llrint-generic \
> s_rintf-vis3 s_rint-vis3 s_rintf-generic \
> - s_rint-generic \
> - s_fmaf-vis3 s_fma-vis3 s_fma-generic s_fmaf-generic \
> - s_nearbyint-vis3 s_nearbyintf-vis3 \
> + s_rint-generic s_fmaf-vis3 s_fma-vis3 s_fma-generic \
> + s_fmaf-generic s_nearbyint-vis3 s_nearbyintf-vis3 \
> + s_nearbyint-generic s_nearbyintf-generic \
> s_fdimf-vis3 s_fdim-vis3 s_fdim-generic \
> s_fdimf-generic \
> $(sysdep_calls:s_%=m_%)
> diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_nearbyint-generic.S b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_nearbyint-generic.S
> new file mode 100644
> index 0000000..fd4112e
> --- /dev/null
> +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_nearbyint-generic.S
> @@ -0,0 +1,9 @@
> +#include <math_ldbl_opt.h>
> +
> +#define __nearbyint __nearbyint_generic
> +#undef weak_alias
> +#define weak_alias(a, b)
> +#undef compat_symbol
> +#define compat_symbol(a, b, c, d)
> +
> +#include <sysdeps/sparc/sparc32/sparcv9/fpu/s_nearbyint.S>
> diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_nearbyint.S b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_nearbyint.S
> deleted file mode 100644
> index 47da9ea..0000000
> --- a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_nearbyint.S
> +++ /dev/null
> @@ -1,19 +0,0 @@
> -#include <sparc-ifunc.h>
> -#include <math_ldbl_opt.h>
> -
> -SPARC_ASM_VIS3_IFUNC(nearbyint)
> -
> -weak_alias (__nearbyint, nearbyint)
> -
> -#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)
> -compat_symbol (libm, __nearbyint, nearbyintl, GLIBC_2_1)
> -#endif
> -
> -# undef weak_alias
> -# define weak_alias(a, b)
> -# undef compat_symbol
> -# define compat_symbol(a, b, c, d)
> -
> -#define __nearbyint __nearbyint_generic
> -
> -#include "../s_nearbyint.S"
> diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_nearbyint.c b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_nearbyint.c
> new file mode 100644
> index 0000000..5a2b6e4
> --- /dev/null
> +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_nearbyint.c
> @@ -0,0 +1,35 @@
> +/* nearbyint ifunc resolver, Linux/sparc32 version.
> + Copyright (C) 2017 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
> + <http://www.gnu.org/licenses/>. */
> +
> +#define __nearbyint __redirect_nearbyint
> +#include <math.h>
> +#undef __nearbyint
> +#include <math_ldbl_opt.h>
> +#include <sparc-ifunc.h>
> +
> +extern __typeof (__redirect_nearbyint) __nearbyint_vis3 attribute_hidden;
> +extern __typeof (__redirect_nearbyint) __nearbyint_generic attribute_hidden;
> +
> +sparc_libm_ifunc_redirected (__redirect_nearbyint, __nearbyint,
> + hwcap & HWCAP_SPARC_VIS3
> + ? __nearbyint_vis3
> + : __nearbyint_generic);
> +weak_alias (__nearbyint, nearbyint)
> +#if LONG_DOUBLE_COMPAT (libm, GLIBC_2_1)
> +compat_symbol (libm, __nearbyint, nearbyintl, GLIBC_2_1);
> +#endif
> diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_nearbyintf-generic.S b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_nearbyintf-generic.S
> new file mode 100644
> index 0000000..8f9088e
> --- /dev/null
> +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_nearbyintf-generic.S
> @@ -0,0 +1,4 @@
> +#define __nearbyintf __nearbyintf_generic
> +#undef weak_alias
> +#define weak_alias(a, b)
> +#include <sysdeps/sparc/sparc32/sparcv9/fpu/s_nearbyintf.S>
> diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_nearbyintf.S b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_nearbyintf.S
> deleted file mode 100644
> index 95100c1..0000000
> --- a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_nearbyintf.S
> +++ /dev/null
> @@ -1,12 +0,0 @@
> -#include <sparc-ifunc.h>
> -
> -SPARC_ASM_VIS3_IFUNC(nearbyintf)
> -
> -weak_alias (__nearbyintf, nearbyintf)
> -
> -# undef weak_alias
> -# define weak_alias(a, b)
> -
> -#define __nearbyintf __nearbyintf_generic
> -
> -#include "../s_nearbyintf.S"
> diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_nearbyintf.c b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_nearbyintf.c
> new file mode 100644
> index 0000000..a513fa7
> --- /dev/null
> +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_nearbyintf.c
> @@ -0,0 +1,29 @@
> +/* nearbyintf ifunc resolver, Linux/sparc32 version.
> + Copyright (C) 2017 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
> + <http://www.gnu.org/licenses/>. */
> +
> +#include <math.h>
> +#include <sparc-ifunc.h>
> +
> +extern __typeof (nearbyintf) __nearbyintf_vis3 attribute_hidden;
> +extern __typeof (nearbyintf) __nearbyintf_generic attribute_hidden;
> +
> +sparc_libm_ifunc (__nearbyintf,
> + hwcap & HWCAP_SPARC_VIS3
> + ? __nearbyintf_vis3
> + : __nearbyintf_generic);
> +weak_alias (__nearbyintf, nearbyintf)
>