| Message ID | 1509044813-9951-13-git-send-email-adhemerval.zanella@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | Refactor IFUNC selection in C | expand |
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_rint{f}-generic.S). > > Checked on sparc64-linux-gnu and sparcv9-linux-gnu. > > * sysdeps/sparc/sparc64/fpu/multiarch/Makefile > (libm-sysdep_routines): Add s_rintf-generic and s_rint-generic > objects. > * sysdeps/sparc/sparc64/fpu/multiarch/s_rint-generic.S: New file. > * sysdeps/sparc/sparc64/fpu/multiarch/s_rint.c: Likewise. > * sysdeps/sparc/sparc64/fpu/multiarch/s_rintf-generic.S: Likewise. > * sysdeps/sparc/sparc64/fpu/multiarch/s_rintf.c: Likewise. > * sysdeps/sparc/sparc64/fpu/multiarch/s_rint.S: Remove file. > * sysdeps/sparc/sparc64/fpu/multiarch/s_rintf.S: Likewise. > > Signed-off-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> > --- > ChangeLog | 10 ++++++++ > sysdeps/sparc/sparc64/fpu/multiarch/Makefile | 1 + > .../sparc/sparc64/fpu/multiarch/s_rint-generic.S | 4 +++ > sysdeps/sparc/sparc64/fpu/multiarch/s_rint.S | 12 --------- > sysdeps/sparc/sparc64/fpu/multiarch/s_rint.c | 29 ++++++++++++++++++++++ > .../sparc/sparc64/fpu/multiarch/s_rintf-generic.S | 4 +++ > sysdeps/sparc/sparc64/fpu/multiarch/s_rintf.S | 12 --------- > sysdeps/sparc/sparc64/fpu/multiarch/s_rintf.c | 29 ++++++++++++++++++++++ > 8 files changed, 77 insertions(+), 24 deletions(-) > create mode 100644 sysdeps/sparc/sparc64/fpu/multiarch/s_rint-generic.S > delete mode 100644 sysdeps/sparc/sparc64/fpu/multiarch/s_rint.S > create mode 100644 sysdeps/sparc/sparc64/fpu/multiarch/s_rint.c > create mode 100644 sysdeps/sparc/sparc64/fpu/multiarch/s_rintf-generic.S > delete mode 100644 sysdeps/sparc/sparc64/fpu/multiarch/s_rintf.S > create mode 100644 sysdeps/sparc/sparc64/fpu/multiarch/s_rintf.c > > diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/Makefile b/sysdeps/sparc/sparc64/fpu/multiarch/Makefile > index d0a87d1..3321e1d 100644 > --- a/sysdeps/sparc/sparc64/fpu/multiarch/Makefile > +++ b/sysdeps/sparc/sparc64/fpu/multiarch/Makefile > @@ -11,6 +11,7 @@ sysdep_calls := s_signbitf-vis3 s_signbit-vis3 s_signbitf-generic \ > sysdep_routines += $(sysdep_calls) > libm-sysdep_routines += s_lrintf-vis3 s_lrint-vis3 s_lrintf-generic \ > s_lrint-generic s_rintf-vis3 s_rint-vis3 \ > + s_rintf-generic s_rint-generic \ > s_fmaf-vis3 s_fma-vis3 s_fmaf-generic s_fma-generic \ > s_nearbyint-vis3 s_nearbyintf-vis3 \ > s_nearbyint-generic s_nearbyintf-generic \ > diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_rint-generic.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_rint-generic.S > new file mode 100644 > index 0000000..d927434 > --- /dev/null > +++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_rint-generic.S > @@ -0,0 +1,4 @@ > +#define __rint __rint_generic > +#undef weak_alias > +#define weak_alias(a, b) > +#include <sysdeps/sparc/sparc64/fpu/s_rint.S> > diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_rint.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_rint.S > deleted file mode 100644 > index cc980eb..0000000 > --- a/sysdeps/sparc/sparc64/fpu/multiarch/s_rint.S > +++ /dev/null > @@ -1,12 +0,0 @@ > -#include <sparc-ifunc.h> > - > -SPARC_ASM_VIS3_IFUNC(rint) > - > -weak_alias (__rint, rint) > - > -# undef weak_alias > -# define weak_alias(a, b) > - > -#define __rint __rint_generic > - > -#include "../s_rint.S" > diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_rint.c b/sysdeps/sparc/sparc64/fpu/multiarch/s_rint.c > new file mode 100644 > index 0000000..ca566c2 > --- /dev/null > +++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_rint.c > @@ -0,0 +1,29 @@ > +/* rint 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 (rint) __rint_vis3 attribute_hidden; > +extern __typeof (rint) __rint_generic attribute_hidden; > + > +sparc_libm_ifunc (__rint, > + hwcap & HWCAP_SPARC_VIS3 > + ? __rint_vis3 > + : __rint_generic); > +weak_alias (__rint, rint) > diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_rintf-generic.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_rintf-generic.S > new file mode 100644 > index 0000000..30da5f0 > --- /dev/null > +++ b/sysdeps/sparc/sparc64/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/sparc64/fpu/s_rintf.S> > diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_rintf.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_rintf.S > deleted file mode 100644 > index 38fd936..0000000 > --- a/sysdeps/sparc/sparc64/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/sparc64/fpu/multiarch/s_rintf.c b/sysdeps/sparc/sparc64/fpu/multiarch/s_rintf.c > new file mode 100644 > index 0000000..67f166c > --- /dev/null > +++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_rintf.c > @@ -0,0 +1,29 @@ > +/* rintf 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 (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) >
diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/Makefile b/sysdeps/sparc/sparc64/fpu/multiarch/Makefile index d0a87d1..3321e1d 100644 --- a/sysdeps/sparc/sparc64/fpu/multiarch/Makefile +++ b/sysdeps/sparc/sparc64/fpu/multiarch/Makefile @@ -11,6 +11,7 @@ sysdep_calls := s_signbitf-vis3 s_signbit-vis3 s_signbitf-generic \ sysdep_routines += $(sysdep_calls) libm-sysdep_routines += s_lrintf-vis3 s_lrint-vis3 s_lrintf-generic \ s_lrint-generic s_rintf-vis3 s_rint-vis3 \ + s_rintf-generic s_rint-generic \ s_fmaf-vis3 s_fma-vis3 s_fmaf-generic s_fma-generic \ s_nearbyint-vis3 s_nearbyintf-vis3 \ s_nearbyint-generic s_nearbyintf-generic \ diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_rint-generic.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_rint-generic.S new file mode 100644 index 0000000..d927434 --- /dev/null +++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_rint-generic.S @@ -0,0 +1,4 @@ +#define __rint __rint_generic +#undef weak_alias +#define weak_alias(a, b) +#include <sysdeps/sparc/sparc64/fpu/s_rint.S> diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_rint.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_rint.S deleted file mode 100644 index cc980eb..0000000 --- a/sysdeps/sparc/sparc64/fpu/multiarch/s_rint.S +++ /dev/null @@ -1,12 +0,0 @@ -#include <sparc-ifunc.h> - -SPARC_ASM_VIS3_IFUNC(rint) - -weak_alias (__rint, rint) - -# undef weak_alias -# define weak_alias(a, b) - -#define __rint __rint_generic - -#include "../s_rint.S" diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_rint.c b/sysdeps/sparc/sparc64/fpu/multiarch/s_rint.c new file mode 100644 index 0000000..ca566c2 --- /dev/null +++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_rint.c @@ -0,0 +1,29 @@ +/* rint 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 (rint) __rint_vis3 attribute_hidden; +extern __typeof (rint) __rint_generic attribute_hidden; + +sparc_libm_ifunc (__rint, + hwcap & HWCAP_SPARC_VIS3 + ? __rint_vis3 + : __rint_generic); +weak_alias (__rint, rint) diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_rintf-generic.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_rintf-generic.S new file mode 100644 index 0000000..30da5f0 --- /dev/null +++ b/sysdeps/sparc/sparc64/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/sparc64/fpu/s_rintf.S> diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_rintf.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_rintf.S deleted file mode 100644 index 38fd936..0000000 --- a/sysdeps/sparc/sparc64/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/sparc64/fpu/multiarch/s_rintf.c b/sysdeps/sparc/sparc64/fpu/multiarch/s_rintf.c new file mode 100644 index 0000000..67f166c --- /dev/null +++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_rintf.c @@ -0,0 +1,29 @@ +/* rintf 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 (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)
This patch refactors the sparc64 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/sparc64/fpu/multiarch/Makefile (libm-sysdep_routines): Add s_rintf-generic and s_rint-generic objects. * sysdeps/sparc/sparc64/fpu/multiarch/s_rint-generic.S: New file. * sysdeps/sparc/sparc64/fpu/multiarch/s_rint.c: Likewise. * sysdeps/sparc/sparc64/fpu/multiarch/s_rintf-generic.S: Likewise. * sysdeps/sparc/sparc64/fpu/multiarch/s_rintf.c: Likewise. * sysdeps/sparc/sparc64/fpu/multiarch/s_rint.S: Remove file. * sysdeps/sparc/sparc64/fpu/multiarch/s_rintf.S: Likewise. Signed-off-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> --- ChangeLog | 10 ++++++++ sysdeps/sparc/sparc64/fpu/multiarch/Makefile | 1 + .../sparc/sparc64/fpu/multiarch/s_rint-generic.S | 4 +++ sysdeps/sparc/sparc64/fpu/multiarch/s_rint.S | 12 --------- sysdeps/sparc/sparc64/fpu/multiarch/s_rint.c | 29 ++++++++++++++++++++++ .../sparc/sparc64/fpu/multiarch/s_rintf-generic.S | 4 +++ sysdeps/sparc/sparc64/fpu/multiarch/s_rintf.S | 12 --------- sysdeps/sparc/sparc64/fpu/multiarch/s_rintf.c | 29 ++++++++++++++++++++++ 8 files changed, 77 insertions(+), 24 deletions(-) create mode 100644 sysdeps/sparc/sparc64/fpu/multiarch/s_rint-generic.S delete mode 100644 sysdeps/sparc/sparc64/fpu/multiarch/s_rint.S create mode 100644 sysdeps/sparc/sparc64/fpu/multiarch/s_rint.c create mode 100644 sysdeps/sparc/sparc64/fpu/multiarch/s_rintf-generic.S delete mode 100644 sysdeps/sparc/sparc64/fpu/multiarch/s_rintf.S create mode 100644 sysdeps/sparc/sparc64/fpu/multiarch/s_rintf.c -- 2.7.4