From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: libc-alpha@sourceware.org
Subject: [PATCH 21/25] sparc: refactor sparc32 rint{f} selector to C
Date: Thu, 26 Oct 2017 19:07:00 -0000 [thread overview]
Message-ID: <1509044813-9951-22-git-send-email-adhemerval.zanella@linaro.org> (raw)
In-Reply-To: <1509044813-9951-1-git-send-email-adhemerval.zanella@linaro.org>
This patch refactors the sparc32 ifunc selector to a C implementation.
Also, the generic symbol is moved to its own implementation file
s_rint{f}-generic.S).
Checked on sparc64-linux-gnu and sparcv9-linux-gnu.
* sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/Makefile
(libm-sysdep_routines): Add s_rintf-generic and s_rint-generic.
* sysdeps/sparc/sparcv9/fpu/multiarch/s_rint-generic.S: New
file.
* sysdeps/sparc32/sparcv9/fpu/multiarch/s_rint.c: Likewise.
* sysdeps/sparc32/sparcv9/fpu/multiarch/s_rintf-generic.S:
Likewise.
* sysdeps/sparc32/sparcv9/fpu/multiarch/s_rintf.c: Likewise.
* sysdeps/sparc32/sparcv9/fpu/multiarch/s_rint.S: Remove file.
* sysdeps/sparc32/sparcv9/fpu/multiarch/s_rintf.S: Likewise.
Signed-off-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
---
ChangeLog | 11 +++++++
.../sparc/sparc32/sparcv9/fpu/multiarch/Makefile | 3 +-
.../sparc32/sparcv9/fpu/multiarch/s_rint-generic.S | 8 +++++
.../sparc/sparc32/sparcv9/fpu/multiarch/s_rint.S | 19 ------------
.../sparc/sparc32/sparcv9/fpu/multiarch/s_rint.c | 35 ++++++++++++++++++++++
.../sparcv9/fpu/multiarch/s_rintf-generic.S | 4 +++
.../sparc/sparc32/sparcv9/fpu/multiarch/s_rintf.S | 12 --------
.../sparc/sparc32/sparcv9/fpu/multiarch/s_rintf.c | 29 ++++++++++++++++++
8 files changed, 89 insertions(+), 32 deletions(-)
create mode 100644 sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rint-generic.S
delete mode 100644 sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rint.S
create mode 100644 sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rint.c
create mode 100644 sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rintf-generic.S
delete mode 100644 sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rintf.S
create mode 100644 sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rintf.c
diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/Makefile b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/Makefile
index 5b6e2a6..459c0e5 100644
--- a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/Makefile
+++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/Makefile
@@ -10,7 +10,8 @@ sysdep_routines += $(sysdep_calls)
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-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_fdimf-vis3 s_fdim-vis3 s_fdim-generic \
diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rint-generic.S b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rint-generic.S
new file mode 100644
index 0000000..9709b1e
--- /dev/null
+++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rint-generic.S
@@ -0,0 +1,8 @@
+#include <math_ldbl_opt.h>
+
+#define __rint __rint_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_rint.S>
diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rint.S b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rint.S
deleted file mode 100644
index de893fa..0000000
--- a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rint.S
+++ /dev/null
@@ -1,19 +0,0 @@
-#include <sparc-ifunc.h>
-#include <math_ldbl_opt.h>
-
-SPARC_ASM_VIS3_IFUNC(rint)
-
-weak_alias (__rint, rint)
-
-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
-compat_symbol (libm, __rint, rintl, GLIBC_2_0)
-#endif
-
-# undef weak_alias
-# define weak_alias(a, b)
-# undef compat_symbol
-# define compat_symbol(a, b, c, d)
-
-#define __rint __rint_generic
-
-#include "../s_rint.S"
diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rint.c b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rint.c
new file mode 100644
index 0000000..b6714e6
--- /dev/null
+++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rint.c
@@ -0,0 +1,35 @@
+/* rint 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 __rint __redirect_rint
+#include <math.h>
+#undef __rint
+#include <math_ldbl_opt.h>
+#include <sparc-ifunc.h>
+
+extern __typeof (__redirect_rint) __rint_vis3 attribute_hidden;
+extern __typeof (__redirect_rint) __rint_generic attribute_hidden;
+
+sparc_libm_ifunc_redirected (__redirect_rint, __rint,
+ hwcap & HWCAP_SPARC_VIS3
+ ? __rint_vis3
+ : __rint_generic);
+weak_alias (__rint, rint)
+#if LONG_DOUBLE_COMPAT (libm, GLIBC_2_0)
+compat_symbol (libm, __rint, rintl, GLIBC_2_0);
+#endif
diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rintf-generic.S b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rintf-generic.S
new file mode 100644
index 0000000..185ba6b
--- /dev/null
+++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rintf-generic.S
@@ -0,0 +1,4 @@
+#define __rintf __rintf_generic
+#undef weak_alias
+#define weak_alias(a, b)
+#include <sysdeps/sparc/sparc32/sparcv9/fpu/s_rintf.S>
diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rintf.S b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rintf.S
deleted file mode 100644
index 38fd936..0000000
--- a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rintf.S
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <sparc-ifunc.h>
-
-SPARC_ASM_VIS3_IFUNC(rintf)
-
-weak_alias (__rintf, rintf)
-
-# undef weak_alias
-# define weak_alias(a, b)
-
-#define __rintf __rintf_generic
-
-#include "../s_rintf.S"
diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rintf.c b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rintf.c
new file mode 100644
index 0000000..bfe35d5
--- /dev/null
+++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rintf.c
@@ -0,0 +1,29 @@
+/* rintf 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 (rintf) __rintf_vis3 attribute_hidden;
+extern __typeof (rintf) __rintf_generic attribute_hidden;
+
+sparc_libm_ifunc (__rintf,
+ hwcap & HWCAP_SPARC_VIS3
+ ? __rintf_vis3
+ : __rintf_generic);
+weak_alias (__rintf, rintf)
--
2.7.4
next prev parent reply other threads:[~2017-10-26 19:07 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-26 19:07 [PATCH 00/25] Refactor IFUNC selection in C Adhemerval Zanella
2017-10-26 19:07 ` [PATCH 22/25] sparc: refactor sparc32 nearbyint{f} selector to C Adhemerval Zanella
2017-11-30 20:33 ` Adhemerval Zanella
2017-10-26 19:07 ` [PATCH 10/25] sparc: refactor sparc64 " Adhemerval Zanella
2017-11-29 13:40 ` Adhemerval Zanella
2017-10-26 19:07 ` [PATCH 03/25] sparc: Implement memcpy/mempcpy ifunc selection in C Adhemerval Zanella
2017-10-26 19:07 ` [PATCH 19/25] sparc: refactor sparc32 fabs{f} selector to C Adhemerval Zanella
2017-11-30 20:33 ` Adhemerval Zanella
2017-10-26 19:07 ` [PATCH 11/25] sparc: refactor sparc64 lrint{f} " Adhemerval Zanella
2017-11-29 13:41 ` Adhemerval Zanella
2017-10-26 19:07 ` [PATCH 01/25] arm: Implement memcpy ifunc selection in C Adhemerval Zanella
2017-10-31 18:16 ` Joseph Myers
2017-10-26 19:07 ` [PATCH 18/25] sparc: refactor sparc32 copysign selector to C Adhemerval Zanella
2017-11-30 20:33 ` Adhemerval Zanella
2017-12-01 17:13 ` Joseph Myers
2017-12-01 17:48 ` Adhemerval Zanella
2017-10-26 19:07 ` [PATCH 06/25] sparc: refactor sparc64 signbit{f} " Adhemerval Zanella
2017-11-29 13:40 ` Adhemerval Zanella
2017-10-26 19:07 ` [PATCH 15/25] sparc: refactor sparc64 __mpn_addmul_1 " Adhemerval Zanella
2017-11-30 13:09 ` Adhemerval Zanella
2017-10-26 19:07 ` Adhemerval Zanella [this message]
2017-11-30 20:33 ` [PATCH 21/25] sparc: refactor sparc32 rint{f} " Adhemerval Zanella
2017-10-26 19:07 ` [PATCH 16/25] sparc: refactor sparc64 __mpn_submul_1 " Adhemerval Zanella
2017-11-30 13:09 ` Adhemerval Zanella
2017-10-26 19:07 ` [PATCH 08/25] sparc: refactor sparc64 isinf{f} " Adhemerval Zanella
2017-11-29 13:40 ` Adhemerval Zanella
2017-10-26 19:07 ` [PATCH 14/25] sparc: refactor sparc64 __mpn_sub_n " Adhemerval Zanella
2017-11-30 13:09 ` Adhemerval Zanella
2017-10-26 19:07 ` [PATCH 20/25] sparc: refactor sparc32 llrint{f} " Adhemerval Zanella
2017-11-30 20:33 ` Adhemerval Zanella
2017-10-26 19:07 ` [PATCH 05/25] sparc: Assume VIS3 support Adhemerval Zanella
2017-11-28 17:51 ` Adhemerval Zanella
2017-10-26 19:07 ` [PATCH 02/25] arm: Implement memchr ifunc selection in C Adhemerval Zanella
2017-10-31 18:18 ` Joseph Myers
2017-10-26 19:07 ` [PATCH 04/25] sparc: Implement memset/bzero " Adhemerval Zanella
2017-10-26 19:07 ` [PATCH 13/25] sparc: refactor sparc64 __mpn_mul_1 selector to C Adhemerval Zanella
2017-11-30 13:09 ` Adhemerval Zanella
2017-10-26 19:07 ` [PATCH 12/25] sparc: refactor sparc64 rint{f} " Adhemerval Zanella
2017-11-29 13:41 ` Adhemerval Zanella
2017-10-26 19:07 ` [PATCH 09/25] sparc: refactor sparc64 finite{f} " Adhemerval Zanella
2017-11-29 13:40 ` Adhemerval Zanella
2017-10-26 19:07 ` [PATCH 07/25] sparc: refactor sparc64 isnan{f} " Adhemerval Zanella
2017-11-29 13:40 ` Adhemerval Zanella
2017-10-26 19:07 ` [PATCH 25/25] x32: Remove unused getcpu implementation Adhemerval Zanella
2017-12-01 14:49 ` Adhemerval Zanella
2017-10-26 19:07 ` [PATCH 23/25] sparc: refactor cpu_relax to C Adhemerval Zanella
2017-11-30 20:33 ` Adhemerval Zanella
2017-10-26 19:07 ` [PATCH 24/25] sparc: Remove ununsed ifunc assembly macros Adhemerval Zanella
2017-12-01 14:49 ` Adhemerval Zanella
2017-10-26 19:07 ` [PATCH 17/25] sparc: refactor sparc64 __mpn_add_n selector to C Adhemerval Zanella
2017-11-30 13:09 ` Adhemerval Zanella
2017-11-24 18:54 ` [PATCH 00/25] Refactor IFUNC selection in C Adhemerval Zanella
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1509044813-9951-22-git-send-email-adhemerval.zanella@linaro.org \
--to=adhemerval.zanella@linaro.org \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).