[07/25] sparc: refactor sparc64 isnan{f} selector to C
Commit Message
This patch refactors the sparc64 ifunc selector to a C implementation.
Also, the generic symbol is moved to its own implementation file
(s_isnan-generic.S).
Checked on sparc64-linux-gnu and sparcv9-linux-gnu.
* sysdeps/sparc/sparc64/fpu/multiarch/Makefile (sysdeps_calls):
Add s_isnanf-generic and s_isnan-generic objects.
* sysdeps/sparc/sparc64/fpu/multiarch/s_isnan-generic.S: New file.
* sysdeps/sparc/sparc64/fpu/multiarch/s_isnanf-generic.S: Likewise.
* sysdeps/sparc/sparc64/fpu/multiarch/s_isnan.c: Likewise.
* sysdeps/sparc/sparc64/fpu/multiarch/s_isnanf.c: Likewise.
* sysdeps/sparc/sparc64/fpu/multiarch/s_isnan.S: Remove file.
* sysdeps/sparc/sparc64/fpu/multiarch/s_isnanf.S: Likewise.
Signed-off-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
---
ChangeLog | 9 ++++++
sysdeps/sparc/sparc64/fpu/multiarch/Makefile | 2 +-
.../sparc/sparc64/fpu/multiarch/s_isnan-generic.S | 6 ++++
sysdeps/sparc/sparc64/fpu/multiarch/s_isnan.S | 15 ---------
sysdeps/sparc/sparc64/fpu/multiarch/s_isnan.c | 37 ++++++++++++++++++++++
.../sparc/sparc64/fpu/multiarch/s_isnanf-generic.S | 6 ++++
sysdeps/sparc/sparc64/fpu/multiarch/s_isnanf.S | 15 ---------
sysdeps/sparc/sparc64/fpu/multiarch/s_isnanf.c | 33 +++++++++++++++++++
8 files changed, 92 insertions(+), 31 deletions(-)
create mode 100644 sysdeps/sparc/sparc64/fpu/multiarch/s_isnan-generic.S
delete mode 100644 sysdeps/sparc/sparc64/fpu/multiarch/s_isnan.S
create mode 100644 sysdeps/sparc/sparc64/fpu/multiarch/s_isnan.c
create mode 100644 sysdeps/sparc/sparc64/fpu/multiarch/s_isnanf-generic.S
delete mode 100644 sysdeps/sparc/sparc64/fpu/multiarch/s_isnanf.S
create mode 100644 sysdeps/sparc/sparc64/fpu/multiarch/s_isnanf.c
Comments
If no one opposes it, I will commit it shortly.
On 26/10/2017 17:06, Adhemerval Zanella wrote:
> This patch refactors the sparc64 ifunc selector to a C implementation.
> Also, the generic symbol is moved to its own implementation file
> (s_isnan-generic.S).
>
> Checked on sparc64-linux-gnu and sparcv9-linux-gnu.
>
> * sysdeps/sparc/sparc64/fpu/multiarch/Makefile (sysdeps_calls):
> Add s_isnanf-generic and s_isnan-generic objects.
> * sysdeps/sparc/sparc64/fpu/multiarch/s_isnan-generic.S: New file.
> * sysdeps/sparc/sparc64/fpu/multiarch/s_isnanf-generic.S: Likewise.
> * sysdeps/sparc/sparc64/fpu/multiarch/s_isnan.c: Likewise.
> * sysdeps/sparc/sparc64/fpu/multiarch/s_isnanf.c: Likewise.
> * sysdeps/sparc/sparc64/fpu/multiarch/s_isnan.S: Remove file.
> * sysdeps/sparc/sparc64/fpu/multiarch/s_isnanf.S: Likewise.
>
> Signed-off-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
> ---
> ChangeLog | 9 ++++++
> sysdeps/sparc/sparc64/fpu/multiarch/Makefile | 2 +-
> .../sparc/sparc64/fpu/multiarch/s_isnan-generic.S | 6 ++++
> sysdeps/sparc/sparc64/fpu/multiarch/s_isnan.S | 15 ---------
> sysdeps/sparc/sparc64/fpu/multiarch/s_isnan.c | 37 ++++++++++++++++++++++
> .../sparc/sparc64/fpu/multiarch/s_isnanf-generic.S | 6 ++++
> sysdeps/sparc/sparc64/fpu/multiarch/s_isnanf.S | 15 ---------
> sysdeps/sparc/sparc64/fpu/multiarch/s_isnanf.c | 33 +++++++++++++++++++
> 8 files changed, 92 insertions(+), 31 deletions(-)
> create mode 100644 sysdeps/sparc/sparc64/fpu/multiarch/s_isnan-generic.S
> delete mode 100644 sysdeps/sparc/sparc64/fpu/multiarch/s_isnan.S
> create mode 100644 sysdeps/sparc/sparc64/fpu/multiarch/s_isnan.c
> create mode 100644 sysdeps/sparc/sparc64/fpu/multiarch/s_isnanf-generic.S
> delete mode 100644 sysdeps/sparc/sparc64/fpu/multiarch/s_isnanf.S
> create mode 100644 sysdeps/sparc/sparc64/fpu/multiarch/s_isnanf.c
>
> diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/Makefile b/sysdeps/sparc/sparc64/fpu/multiarch/Makefile
> index 702452c..a46773b 100644
> --- a/sysdeps/sparc/sparc64/fpu/multiarch/Makefile
> +++ b/sysdeps/sparc/sparc64/fpu/multiarch/Makefile
> @@ -5,7 +5,7 @@ ifeq ($(subdir),math)
> sysdep_calls := s_signbitf-vis3 s_signbit-vis3 s_signbitf-generic \
> s_signbit-generic s_finitef-vis3 \
> s_finite-vis3 s_isinff-vis3 s_isinf-vis3 \
> - s_isnanf-vis3 s_isnan-vis3
> + s_isnanf-vis3 s_isnan-vis3 s_isnanf-generic s_isnan-generic
>
> sysdep_routines += $(sysdep_calls)
> libm-sysdep_routines += s_lrintf-vis3 s_lrint-vis3 s_rintf-vis3 s_rint-vis3 \
> diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_isnan-generic.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_isnan-generic.S
> new file mode 100644
> index 0000000..64d4430
> --- /dev/null
> +++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_isnan-generic.S
> @@ -0,0 +1,6 @@
> +#define __isnan __isnan_generic
> +#undef hidden_def
> +#define hidden_def(a)
> +#undef weak_alias
> +#define weak_alias(a,b)
> +#include <sysdeps/sparc/sparc64/fpu/s_isnan.S>
> diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_isnan.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_isnan.S
> deleted file mode 100644
> index 40e985a..0000000
> --- a/sysdeps/sparc/sparc64/fpu/multiarch/s_isnan.S
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -#include <sparc-ifunc.h>
> -
> -SPARC_ASM_VIS3_IFUNC(isnan)
> -
> -hidden_def (__isnan)
> -weak_alias (__isnan, isnan)
> -
> -# undef weak_alias
> -# define weak_alias(a, b)
> -# undef hidden_def
> -# define hidden_def(a)
> -
> -#define __isnan __isnan_generic
> -
> -#include "../s_isnan.S"
> diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_isnan.c b/sysdeps/sparc/sparc64/fpu/multiarch/s_isnan.c
> new file mode 100644
> index 0000000..3b3d700
> --- /dev/null
> +++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_isnan.c
> @@ -0,0 +1,37 @@
> +/* isnan ifunc resolver, Linux/sparc64 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 __isnan __redirect___isnan
> +#define __isnanf __redirect___isnanf
> +#define __isnanl __redirect___isnanl
> +#include <math.h>
> +#undef __isnan
> +#undef __isnanf
> +#undef __isnanl
> +#include <sparc-ifunc.h>
> +
> +extern __typeof (isnan) __isnan_vis3 attribute_hidden;
> +extern __typeof (isnan) __isnan_generic attribute_hidden;
> +
> +sparc_libm_ifunc_redirected (__redirect___isnan, __isnan,
> + hwcap & HWCAP_SPARC_VIS3
> + ? __isnan_vis3
> + : __isnan_generic);
> +
> +sparc_ifunc_redirected_hidden_def (__redirect___isnan, __isnan)
> +weak_alias (__isnan, isnan)
> diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_isnanf-generic.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_isnanf-generic.S
> new file mode 100644
> index 0000000..5c82f7d
> --- /dev/null
> +++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_isnanf-generic.S
> @@ -0,0 +1,6 @@
> +#define __isnanf __isnanf_generic
> +#undef hidden_def
> +#define hidden_def(a)
> +#undef weak_alias
> +#define weak_alias(a,b)
> +#include <sysdeps/sparc/sparc64/fpu/s_isnanf.S>
> diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_isnanf.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_isnanf.S
> deleted file mode 100644
> index 6b53b69..0000000
> --- a/sysdeps/sparc/sparc64/fpu/multiarch/s_isnanf.S
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -#include <sparc-ifunc.h>
> -
> -SPARC_ASM_VIS3_IFUNC(isnanf)
> -
> -hidden_def (__isnanf)
> -weak_alias (__isnanf, isnanf)
> -
> -# undef weak_alias
> -# define weak_alias(a, b)
> -# undef hidden_def
> -# define hidden_def(a)
> -
> -#define __isnanf __isnanf_generic
> -
> -#include "../s_isnanf.S"
> diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_isnanf.c b/sysdeps/sparc/sparc64/fpu/multiarch/s_isnanf.c
> new file mode 100644
> index 0000000..f6a6380
> --- /dev/null
> +++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_isnanf.c
> @@ -0,0 +1,33 @@
> +/* isnanf ifunc resolver, Linux/sparc64 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 __isnanf __redirect___isnanf
> +#include <math.h>
> +#undef __isnanf
> +#include <sparc-ifunc.h>
> +
> +extern __typeof (isnanf) __isnanf_vis3 attribute_hidden;
> +extern __typeof (isnanf) __isnanf_generic attribute_hidden;
> +
> +sparc_libm_ifunc_redirected (__redirect___isnanf, __isnanf,
> + hwcap & HWCAP_SPARC_VIS3
> + ? __isnanf_vis3
> + : __isnanf_generic);
> +
> +sparc_ifunc_redirected_hidden_def (__redirect___isnanf,__isnanf)
> +weak_alias (__isnanf, isnanf)
>
@@ -5,7 +5,7 @@ ifeq ($(subdir),math)
sysdep_calls := s_signbitf-vis3 s_signbit-vis3 s_signbitf-generic \
s_signbit-generic s_finitef-vis3 \
s_finite-vis3 s_isinff-vis3 s_isinf-vis3 \
- s_isnanf-vis3 s_isnan-vis3
+ s_isnanf-vis3 s_isnan-vis3 s_isnanf-generic s_isnan-generic
sysdep_routines += $(sysdep_calls)
libm-sysdep_routines += s_lrintf-vis3 s_lrint-vis3 s_rintf-vis3 s_rint-vis3 \
new file mode 100644
@@ -0,0 +1,6 @@
+#define __isnan __isnan_generic
+#undef hidden_def
+#define hidden_def(a)
+#undef weak_alias
+#define weak_alias(a,b)
+#include <sysdeps/sparc/sparc64/fpu/s_isnan.S>
deleted file mode 100644
@@ -1,15 +0,0 @@
-#include <sparc-ifunc.h>
-
-SPARC_ASM_VIS3_IFUNC(isnan)
-
-hidden_def (__isnan)
-weak_alias (__isnan, isnan)
-
-# undef weak_alias
-# define weak_alias(a, b)
-# undef hidden_def
-# define hidden_def(a)
-
-#define __isnan __isnan_generic
-
-#include "../s_isnan.S"
new file mode 100644
@@ -0,0 +1,37 @@
+/* isnan ifunc resolver, Linux/sparc64 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 __isnan __redirect___isnan
+#define __isnanf __redirect___isnanf
+#define __isnanl __redirect___isnanl
+#include <math.h>
+#undef __isnan
+#undef __isnanf
+#undef __isnanl
+#include <sparc-ifunc.h>
+
+extern __typeof (isnan) __isnan_vis3 attribute_hidden;
+extern __typeof (isnan) __isnan_generic attribute_hidden;
+
+sparc_libm_ifunc_redirected (__redirect___isnan, __isnan,
+ hwcap & HWCAP_SPARC_VIS3
+ ? __isnan_vis3
+ : __isnan_generic);
+
+sparc_ifunc_redirected_hidden_def (__redirect___isnan, __isnan)
+weak_alias (__isnan, isnan)
new file mode 100644
@@ -0,0 +1,6 @@
+#define __isnanf __isnanf_generic
+#undef hidden_def
+#define hidden_def(a)
+#undef weak_alias
+#define weak_alias(a,b)
+#include <sysdeps/sparc/sparc64/fpu/s_isnanf.S>
deleted file mode 100644
@@ -1,15 +0,0 @@
-#include <sparc-ifunc.h>
-
-SPARC_ASM_VIS3_IFUNC(isnanf)
-
-hidden_def (__isnanf)
-weak_alias (__isnanf, isnanf)
-
-# undef weak_alias
-# define weak_alias(a, b)
-# undef hidden_def
-# define hidden_def(a)
-
-#define __isnanf __isnanf_generic
-
-#include "../s_isnanf.S"
new file mode 100644
@@ -0,0 +1,33 @@
+/* isnanf ifunc resolver, Linux/sparc64 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 __isnanf __redirect___isnanf
+#include <math.h>
+#undef __isnanf
+#include <sparc-ifunc.h>
+
+extern __typeof (isnanf) __isnanf_vis3 attribute_hidden;
+extern __typeof (isnanf) __isnanf_generic attribute_hidden;
+
+sparc_libm_ifunc_redirected (__redirect___isnanf, __isnanf,
+ hwcap & HWCAP_SPARC_VIS3
+ ? __isnanf_vis3
+ : __isnanf_generic);
+
+sparc_ifunc_redirected_hidden_def (__redirect___isnanf,__isnanf)
+weak_alias (__isnanf, isnanf)