[10/25] sparc: refactor sparc64 nearbyint{f} selector to C

Message ID 1509044813-9951-11-git-send-email-adhemerval.zanella@linaro.org
State Superseded
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_nearbyint{f}-generic.S).

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

	* sysdeps/sparc/sparc64/fpu/multiarch/Makefile
	(libm-sysdep_routines): Add s_nearbyint-generic and
	s_nearbyintf-generic objects.
	* sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyint-generic.S: New file.
	* sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyint.c: Likewise.
	* sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyintf-generic.S: Likewise.
	* sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyintf.c: Likewise.
	* sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyint.S: Remove file.
	* sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyintf.S: Likewise.

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

---
 ChangeLog                                          | 10 ++++++++
 sysdeps/sparc/sparc64/fpu/multiarch/Makefile       |  1 +
 .../sparc64/fpu/multiarch/s_nearbyint-generic.S    |  4 +++
 sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyint.S  | 12 ---------
 sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyint.c  | 29 ++++++++++++++++++++++
 .../sparc64/fpu/multiarch/s_nearbyintf-generic.S   |  4 +++
 sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyintf.S | 12 ---------
 sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyintf.c | 29 ++++++++++++++++++++++
 8 files changed, 77 insertions(+), 24 deletions(-)
 create mode 100644 sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyint-generic.S
 delete mode 100644 sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyint.S
 create mode 100644 sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyint.c
 create mode 100644 sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyintf-generic.S
 delete mode 100644 sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyintf.S
 create mode 100644 sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyintf.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_nearbyint{f}-generic.S).

> 

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

> 

> 	* sysdeps/sparc/sparc64/fpu/multiarch/Makefile

> 	(libm-sysdep_routines): Add s_nearbyint-generic and

> 	s_nearbyintf-generic objects.

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

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

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

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

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

> 	* sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyintf.S: Likewise.

> 

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

> ---

>  ChangeLog                                          | 10 ++++++++

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

>  .../sparc64/fpu/multiarch/s_nearbyint-generic.S    |  4 +++

>  sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyint.S  | 12 ---------

>  sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyint.c  | 29 ++++++++++++++++++++++

>  .../sparc64/fpu/multiarch/s_nearbyintf-generic.S   |  4 +++

>  sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyintf.S | 12 ---------

>  sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyintf.c | 29 ++++++++++++++++++++++

>  8 files changed, 77 insertions(+), 24 deletions(-)

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

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

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

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

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

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

> 

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

> index d19a446..6062af0 100644

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

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

> @@ -12,6 +12,7 @@ sysdep_routines += $(sysdep_calls)

>  libm-sysdep_routines += s_lrintf-vis3 s_lrint-vis3 s_rintf-vis3 s_rint-vis3 \

>  			s_fmaf-vis3 s_fma-vis3 s_fmaf-generic s_fma-generic \

>  			s_nearbyint-vis3 s_nearbyintf-vis3 \

> +			s_nearbyint-generic s_nearbyintf-generic \

>  			s_ceilf-vis3 s_ceil-vis3 s_ceilf-generic \

>  			s_ceil-generic s_floorf-vis3 s_floor-vis3 \

>  			s_floorf-generic s_floor-generic s_truncf-vis3 \

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

> new file mode 100644

> index 0000000..efe2383

> --- /dev/null

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

> @@ -0,0 +1,4 @@

> +#define __nearbyint __nearbyint_generic

> +#undef weak_alias

> +#define weak_alias(a,b)

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

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

> deleted file mode 100644

> index bb75ab3..0000000

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

> +++ /dev/null

> @@ -1,12 +0,0 @@

> -#include <sparc-ifunc.h>

> -

> -SPARC_ASM_VIS3_IFUNC(nearbyint)

> -

> -weak_alias (__nearbyint, nearbyint)

> -

> -# undef weak_alias

> -# define weak_alias(a, b)

> -

> -#define __nearbyint __nearbyint_generic

> -

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

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

> new file mode 100644

> index 0000000..3ccb3be

> --- /dev/null

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

> @@ -0,0 +1,29 @@

> +/* nearbyint 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/>.  */

> +

> +#include <math.h>

> +#include <sparc-ifunc.h>

> +

> +extern __typeof (nearbyint) __nearbyint_vis3 attribute_hidden;

> +extern __typeof (nearbyint) __nearbyint_generic attribute_hidden;

> +

> +sparc_libm_ifunc (__nearbyint,

> +		  hwcap & HWCAP_SPARC_VIS3

> +		  ? __nearbyint_vis3

> +		  : __nearbyint_generic);

> +weak_alias (__nearbyint, nearbyint)

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

> new file mode 100644

> index 0000000..a2e38e9

> --- /dev/null

> +++ b/sysdeps/sparc/sparc64/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/sparc64/fpu/s_nearbyintf.S>

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

> deleted file mode 100644

> index 95100c1..0000000

> --- a/sysdeps/sparc/sparc64/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/sparc64/fpu/multiarch/s_nearbyintf.c b/sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyintf.c

> new file mode 100644

> index 0000000..23e3c13

> --- /dev/null

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

> @@ -0,0 +1,29 @@

> +/* nearbyintf 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/>.  */

> +

> +#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)

>

Patch

diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/Makefile b/sysdeps/sparc/sparc64/fpu/multiarch/Makefile
index d19a446..6062af0 100644
--- a/sysdeps/sparc/sparc64/fpu/multiarch/Makefile
+++ b/sysdeps/sparc/sparc64/fpu/multiarch/Makefile
@@ -12,6 +12,7 @@  sysdep_routines += $(sysdep_calls)
 libm-sysdep_routines += s_lrintf-vis3 s_lrint-vis3 s_rintf-vis3 s_rint-vis3 \
 			s_fmaf-vis3 s_fma-vis3 s_fmaf-generic s_fma-generic \
 			s_nearbyint-vis3 s_nearbyintf-vis3 \
+			s_nearbyint-generic s_nearbyintf-generic \
 			s_ceilf-vis3 s_ceil-vis3 s_ceilf-generic \
 			s_ceil-generic s_floorf-vis3 s_floor-vis3 \
 			s_floorf-generic s_floor-generic s_truncf-vis3 \
diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyint-generic.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyint-generic.S
new file mode 100644
index 0000000..efe2383
--- /dev/null
+++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyint-generic.S
@@ -0,0 +1,4 @@ 
+#define __nearbyint __nearbyint_generic
+#undef weak_alias
+#define weak_alias(a,b)
+#include <sysdeps/sparc/sparc64/fpu/s_nearbyint.S>
diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyint.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyint.S
deleted file mode 100644
index bb75ab3..0000000
--- a/sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyint.S
+++ /dev/null
@@ -1,12 +0,0 @@ 
-#include <sparc-ifunc.h>
-
-SPARC_ASM_VIS3_IFUNC(nearbyint)
-
-weak_alias (__nearbyint, nearbyint)
-
-# undef weak_alias
-# define weak_alias(a, b)
-
-#define __nearbyint __nearbyint_generic
-
-#include "../s_nearbyint.S"
diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyint.c b/sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyint.c
new file mode 100644
index 0000000..3ccb3be
--- /dev/null
+++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyint.c
@@ -0,0 +1,29 @@ 
+/* nearbyint 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/>.  */
+
+#include <math.h>
+#include <sparc-ifunc.h>
+
+extern __typeof (nearbyint) __nearbyint_vis3 attribute_hidden;
+extern __typeof (nearbyint) __nearbyint_generic attribute_hidden;
+
+sparc_libm_ifunc (__nearbyint,
+		  hwcap & HWCAP_SPARC_VIS3
+		  ? __nearbyint_vis3
+		  : __nearbyint_generic);
+weak_alias (__nearbyint, nearbyint)
diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyintf-generic.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyintf-generic.S
new file mode 100644
index 0000000..a2e38e9
--- /dev/null
+++ b/sysdeps/sparc/sparc64/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/sparc64/fpu/s_nearbyintf.S>
diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyintf.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyintf.S
deleted file mode 100644
index 95100c1..0000000
--- a/sysdeps/sparc/sparc64/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/sparc64/fpu/multiarch/s_nearbyintf.c b/sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyintf.c
new file mode 100644
index 0000000..23e3c13
--- /dev/null
+++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyintf.c
@@ -0,0 +1,29 @@ 
+/* nearbyintf 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/>.  */
+
+#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)