[09/25] sparc: refactor sparc64 finite{f} selector to C

Message ID 1509044813-9951-10-git-send-email-adhemerval.zanella@linaro.org
State New
Headers show
Series
  • Refactor IFUNC selection in C
Related show

Commit Message

Adhemerval Zanella Oct. 26, 2017, 7:06 p.m.
This patch refactors the sparc64 ifunc selector to a C implementation.
Also, the generic symbol is moved to its own implementation file
s_finite{f}-generic.S).

Checked on sparc64-linux-gnu and sparcv9-linux-gnu.

	* sysdeps/sparc/sparc64/fpu/multiarch/Makefile (sysdeps_calls):
	Add s_finitef-generic and s_finite-generic objects.
	* sysdeps/sparc/sparc64/fpu/multiarch/s_finite-generic.S: New file.
	* sysdeps/sparc/sparc64/fpu/multiarch/s_finite.c: Likewise.
	* sysdeps/sparc/sparc64/fpu/multiarch/s_finitef-generic.S: Likewise.
	* sysdeps/sparc/sparc64/fpu/multiarch/s_finitef.c: Likewise.
	* sysdeps/sparc/sparc64/fpu/multiarch/s_finite.S: Remove file.
	* sysdeps/sparc/sparc64/fpu/multiarch/s_finitef.S: Remove file.

Signed-off-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>

---
 ChangeLog                                          |  9 ++++++
 sysdeps/sparc/sparc64/fpu/multiarch/Makefile       |  1 +
 .../sparc/sparc64/fpu/multiarch/s_finite-generic.S |  6 ++++
 sysdeps/sparc/sparc64/fpu/multiarch/s_finite.S     | 15 ---------
 sysdeps/sparc/sparc64/fpu/multiarch/s_finite.c     | 37 ++++++++++++++++++++++
 .../sparc64/fpu/multiarch/s_finitef-generic.S      |  6 ++++
 sysdeps/sparc/sparc64/fpu/multiarch/s_finitef.S    | 15 ---------
 sysdeps/sparc/sparc64/fpu/multiarch/s_finitef.c    | 33 +++++++++++++++++++
 8 files changed, 92 insertions(+), 30 deletions(-)
 create mode 100644 sysdeps/sparc/sparc64/fpu/multiarch/s_finite-generic.S
 delete mode 100644 sysdeps/sparc/sparc64/fpu/multiarch/s_finite.S
 create mode 100644 sysdeps/sparc/sparc64/fpu/multiarch/s_finite.c
 create mode 100644 sysdeps/sparc/sparc64/fpu/multiarch/s_finitef-generic.S
 delete mode 100644 sysdeps/sparc/sparc64/fpu/multiarch/s_finitef.S
 create mode 100644 sysdeps/sparc/sparc64/fpu/multiarch/s_finitef.c

-- 
2.7.4

Comments

Adhemerval Zanella Nov. 29, 2017, 1:40 p.m. | #1
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_finite{f}-generic.S).

> 

> Checked on sparc64-linux-gnu and sparcv9-linux-gnu.

> 

> 	* sysdeps/sparc/sparc64/fpu/multiarch/Makefile (sysdeps_calls):

> 	Add s_finitef-generic and s_finite-generic objects.

> 	* sysdeps/sparc/sparc64/fpu/multiarch/s_finite-generic.S: New file.

> 	* sysdeps/sparc/sparc64/fpu/multiarch/s_finite.c: Likewise.

> 	* sysdeps/sparc/sparc64/fpu/multiarch/s_finitef-generic.S: Likewise.

> 	* sysdeps/sparc/sparc64/fpu/multiarch/s_finitef.c: Likewise.

> 	* sysdeps/sparc/sparc64/fpu/multiarch/s_finite.S: Remove file.

> 	* sysdeps/sparc/sparc64/fpu/multiarch/s_finitef.S: Remove file.

> 

> Signed-off-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>

> ---

>  ChangeLog                                          |  9 ++++++

>  sysdeps/sparc/sparc64/fpu/multiarch/Makefile       |  1 +

>  .../sparc/sparc64/fpu/multiarch/s_finite-generic.S |  6 ++++

>  sysdeps/sparc/sparc64/fpu/multiarch/s_finite.S     | 15 ---------

>  sysdeps/sparc/sparc64/fpu/multiarch/s_finite.c     | 37 ++++++++++++++++++++++

>  .../sparc64/fpu/multiarch/s_finitef-generic.S      |  6 ++++

>  sysdeps/sparc/sparc64/fpu/multiarch/s_finitef.S    | 15 ---------

>  sysdeps/sparc/sparc64/fpu/multiarch/s_finitef.c    | 33 +++++++++++++++++++

>  8 files changed, 92 insertions(+), 30 deletions(-)

>  create mode 100644 sysdeps/sparc/sparc64/fpu/multiarch/s_finite-generic.S

>  delete mode 100644 sysdeps/sparc/sparc64/fpu/multiarch/s_finite.S

>  create mode 100644 sysdeps/sparc/sparc64/fpu/multiarch/s_finite.c

>  create mode 100644 sysdeps/sparc/sparc64/fpu/multiarch/s_finitef-generic.S

>  delete mode 100644 sysdeps/sparc/sparc64/fpu/multiarch/s_finitef.S

>  create mode 100644 sysdeps/sparc/sparc64/fpu/multiarch/s_finitef.c

> 

> diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/Makefile b/sysdeps/sparc/sparc64/fpu/multiarch/Makefile

> index f0c8fa3..d19a446 100644

> --- a/sysdeps/sparc/sparc64/fpu/multiarch/Makefile

> +++ b/sysdeps/sparc/sparc64/fpu/multiarch/Makefile

> @@ -4,6 +4,7 @@ ifeq ($(subdir),math)

>  # prefixed with  m_.

>  sysdep_calls := s_signbitf-vis3 s_signbit-vis3 s_signbitf-generic \

>  		s_signbit-generic s_finitef-vis3 s_finite-vis3 \

> +		s_finitef-generic s_finite-generic \

>  		s_isinff-vis3 s_isinf-vis3 s_isinff-generic s_isinf-generic \

>  		s_isnanf-vis3 s_isnan-vis3 s_isnanf-generic s_isnan-generic

>  

> diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_finite-generic.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_finite-generic.S

> new file mode 100644

> index 0000000..dfbf32f

> --- /dev/null

> +++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_finite-generic.S

> @@ -0,0 +1,6 @@

> +#define __finite __finite_generic

> +#undef hidden_def

> +#define hidden_def(a)

> +#undef weak_alias

> +#define weak_alias(a,b)

> +#include <sysdeps/sparc/sparc64/fpu/s_finite.S>

> diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_finite.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_finite.S

> deleted file mode 100644

> index 78406a6..0000000

> --- a/sysdeps/sparc/sparc64/fpu/multiarch/s_finite.S

> +++ /dev/null

> @@ -1,15 +0,0 @@

> -#include <sparc-ifunc.h>

> -

> -SPARC_ASM_VIS3_IFUNC(finite)

> -

> -hidden_def (__finite)

> -weak_alias (__finite, finite)

> -

> -# undef weak_alias

> -# define weak_alias(a, b)

> -# undef hidden_def

> -# define hidden_def(a)

> -

> -#define __finite __finite_generic

> -

> -#include "../s_finite.S"

> diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_finite.c b/sysdeps/sparc/sparc64/fpu/multiarch/s_finite.c

> new file mode 100644

> index 0000000..22e46c4

> --- /dev/null

> +++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_finite.c

> @@ -0,0 +1,37 @@

> +/* finite 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 __finite __redirect___finite

> +#define __finitef __redirect___finitef

> +#define __finitel __redirect___finitel

> +#include <math.h>

> +#undef __finite

> +#undef __finitef

> +#undef __finitel

> +#include <sparc-ifunc.h>

> +

> +extern __typeof (finite) __finite_vis3 attribute_hidden;

> +extern __typeof (finite) __finite_generic attribute_hidden;

> +

> +sparc_libm_ifunc_redirected (__redirect___finite, __finite,

> +			     hwcap & HWCAP_SPARC_VIS3

> +			     ? __finite_vis3

> +			     : __finite_generic);

> +

> +sparc_ifunc_redirected_hidden_def (__redirect___finite, __finite)

> +weak_alias (__finite, finite)

> diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_finitef-generic.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_finitef-generic.S

> new file mode 100644

> index 0000000..3888076

> --- /dev/null

> +++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_finitef-generic.S

> @@ -0,0 +1,6 @@

> +#define __finitef __finitef_generic

> +#undef hidden_def

> +#define hidden_def(a)

> +#undef weak_alias

> +#define weak_alias(a,b)

> +#include <sysdeps/sparc/sparc64/fpu/s_finitef.S>

> diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_finitef.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_finitef.S

> deleted file mode 100644

> index cafd41f..0000000

> --- a/sysdeps/sparc/sparc64/fpu/multiarch/s_finitef.S

> +++ /dev/null

> @@ -1,15 +0,0 @@

> -#include <sparc-ifunc.h>

> -

> -SPARC_ASM_VIS3_IFUNC(finitef)

> -

> -hidden_def (__finitef)

> -weak_alias (__finitef, finitef)

> -

> -# undef weak_alias

> -# define weak_alias(a, b)

> -# undef hidden_def

> -# define hidden_def(a)

> -

> -#define __finitef __finitef_generic

> -

> -#include "../s_finitef.S"

> diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_finitef.c b/sysdeps/sparc/sparc64/fpu/multiarch/s_finitef.c

> new file mode 100644

> index 0000000..695e8a0

> --- /dev/null

> +++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_finitef.c

> @@ -0,0 +1,33 @@

> +/* finitef 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 __finitef __redirect___finitef

> +#include <math.h>

> +#undef __finitef

> +#include <sparc-ifunc.h>

> +

> +extern __typeof (finitef) __finitef_vis3 attribute_hidden;

> +extern __typeof (finitef) __finitef_generic attribute_hidden;

> +

> +sparc_libm_ifunc_redirected (__redirect___finitef, __finitef,

> +			     hwcap & HWCAP_SPARC_VIS3

> +			     ? __finitef_vis3

> +			     : __finitef_generic);

> +

> +sparc_ifunc_redirected_hidden_def (__redirect___finitef, __finitef)

> +weak_alias (__finitef, finitef)

>

Patch

diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/Makefile b/sysdeps/sparc/sparc64/fpu/multiarch/Makefile
index f0c8fa3..d19a446 100644
--- a/sysdeps/sparc/sparc64/fpu/multiarch/Makefile
+++ b/sysdeps/sparc/sparc64/fpu/multiarch/Makefile
@@ -4,6 +4,7 @@  ifeq ($(subdir),math)
 # prefixed with  m_.
 sysdep_calls := s_signbitf-vis3 s_signbit-vis3 s_signbitf-generic \
 		s_signbit-generic s_finitef-vis3 s_finite-vis3 \
+		s_finitef-generic s_finite-generic \
 		s_isinff-vis3 s_isinf-vis3 s_isinff-generic s_isinf-generic \
 		s_isnanf-vis3 s_isnan-vis3 s_isnanf-generic s_isnan-generic
 
diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_finite-generic.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_finite-generic.S
new file mode 100644
index 0000000..dfbf32f
--- /dev/null
+++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_finite-generic.S
@@ -0,0 +1,6 @@ 
+#define __finite __finite_generic
+#undef hidden_def
+#define hidden_def(a)
+#undef weak_alias
+#define weak_alias(a,b)
+#include <sysdeps/sparc/sparc64/fpu/s_finite.S>
diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_finite.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_finite.S
deleted file mode 100644
index 78406a6..0000000
--- a/sysdeps/sparc/sparc64/fpu/multiarch/s_finite.S
+++ /dev/null
@@ -1,15 +0,0 @@ 
-#include <sparc-ifunc.h>
-
-SPARC_ASM_VIS3_IFUNC(finite)
-
-hidden_def (__finite)
-weak_alias (__finite, finite)
-
-# undef weak_alias
-# define weak_alias(a, b)
-# undef hidden_def
-# define hidden_def(a)
-
-#define __finite __finite_generic
-
-#include "../s_finite.S"
diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_finite.c b/sysdeps/sparc/sparc64/fpu/multiarch/s_finite.c
new file mode 100644
index 0000000..22e46c4
--- /dev/null
+++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_finite.c
@@ -0,0 +1,37 @@ 
+/* finite 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 __finite __redirect___finite
+#define __finitef __redirect___finitef
+#define __finitel __redirect___finitel
+#include <math.h>
+#undef __finite
+#undef __finitef
+#undef __finitel
+#include <sparc-ifunc.h>
+
+extern __typeof (finite) __finite_vis3 attribute_hidden;
+extern __typeof (finite) __finite_generic attribute_hidden;
+
+sparc_libm_ifunc_redirected (__redirect___finite, __finite,
+			     hwcap & HWCAP_SPARC_VIS3
+			     ? __finite_vis3
+			     : __finite_generic);
+
+sparc_ifunc_redirected_hidden_def (__redirect___finite, __finite)
+weak_alias (__finite, finite)
diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_finitef-generic.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_finitef-generic.S
new file mode 100644
index 0000000..3888076
--- /dev/null
+++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_finitef-generic.S
@@ -0,0 +1,6 @@ 
+#define __finitef __finitef_generic
+#undef hidden_def
+#define hidden_def(a)
+#undef weak_alias
+#define weak_alias(a,b)
+#include <sysdeps/sparc/sparc64/fpu/s_finitef.S>
diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_finitef.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_finitef.S
deleted file mode 100644
index cafd41f..0000000
--- a/sysdeps/sparc/sparc64/fpu/multiarch/s_finitef.S
+++ /dev/null
@@ -1,15 +0,0 @@ 
-#include <sparc-ifunc.h>
-
-SPARC_ASM_VIS3_IFUNC(finitef)
-
-hidden_def (__finitef)
-weak_alias (__finitef, finitef)
-
-# undef weak_alias
-# define weak_alias(a, b)
-# undef hidden_def
-# define hidden_def(a)
-
-#define __finitef __finitef_generic
-
-#include "../s_finitef.S"
diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_finitef.c b/sysdeps/sparc/sparc64/fpu/multiarch/s_finitef.c
new file mode 100644
index 0000000..695e8a0
--- /dev/null
+++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_finitef.c
@@ -0,0 +1,33 @@ 
+/* finitef 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 __finitef __redirect___finitef
+#include <math.h>
+#undef __finitef
+#include <sparc-ifunc.h>
+
+extern __typeof (finitef) __finitef_vis3 attribute_hidden;
+extern __typeof (finitef) __finitef_generic attribute_hidden;
+
+sparc_libm_ifunc_redirected (__redirect___finitef, __finitef,
+			     hwcap & HWCAP_SPARC_VIS3
+			     ? __finitef_vis3
+			     : __finitef_generic);
+
+sparc_ifunc_redirected_hidden_def (__redirect___finitef, __finitef)
+weak_alias (__finitef, finitef)