Message ID | 1509044813-9951-21-git-send-email-adhemerval.zanella@linaro.org |
---|---|
State | Superseded |
Headers | show |
Series | Refactor IFUNC selection in C | expand |
If no one opposes it, I will commit it shortly. I had to adjust to use Joseph recent changes to use libc_alias_{float,double}. On 26/10/2017 17:06, Adhemerval Zanella wrote: > This patch refactors the sparc32 ifunc selector to a C implementation. > Also, the generic symbol is moved to its own implementation file > s_llrint{f}-generic.S). > > Checked on sparc64-linux-gnu and sparcv9-linux-gnu. > > * sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/Makefile > (libm-sysdep_routines): Add s_llrintf-generic and s_llrint-generic. > * sysdeps/sparc/sparcv9/fpu/multiarch/s_llrint-generic.S: New > file. > * sysdeps/sparc32/sparcv9/fpu/multiarch/s_llrint.c: Likewise. > * sysdeps/sparc32/sparcv9/fpu/multiarch/s_llrintf-generic.S: > Likewise. > * sysdeps/sparc32/sparcv9/fpu/multiarch/s_llrintf.c: Likewise. > * sysdeps/sparc32/sparcv9/fpu/multiarch/s_llrint.S: Remove file. > * sysdeps/sparc32/sparcv9/fpu/multiarch/s_llrintf.S: Likewise. > > Signed-off-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> > --- > ChangeLog | 11 +++++++ > .../sparc/sparc32/sparcv9/fpu/multiarch/Makefile | 1 + > .../sparcv9/fpu/multiarch/s_llrint-generic.S | 8 +++++ > .../sparc/sparc32/sparcv9/fpu/multiarch/s_llrint.S | 24 --------------- > .../sparc/sparc32/sparcv9/fpu/multiarch/s_llrint.c | 36 ++++++++++++++++++++++ > .../sparcv9/fpu/multiarch/s_llrintf-generic.S | 4 +++ > .../sparc32/sparcv9/fpu/multiarch/s_llrintf.S | 17 ---------- > .../sparc32/sparcv9/fpu/multiarch/s_llrintf.c | 29 +++++++++++++++++ > 8 files changed, 89 insertions(+), 41 deletions(-) > create mode 100644 sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrint-generic.S > delete mode 100644 sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrint.S > create mode 100644 sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrint.c > create mode 100644 sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrintf-generic.S > delete mode 100644 sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrintf.S > create mode 100644 sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrintf.c > > diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/Makefile b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/Makefile > index bd8e341..5b6e2a6 100644 > --- a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/Makefile > +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/Makefile > @@ -9,6 +9,7 @@ sysdep_calls := s_copysignf-vis3 s_copysign-vis3 s_copysignf-generic \ > 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_fmaf-vis3 s_fma-vis3 s_fma-generic s_fmaf-generic \ > s_nearbyint-vis3 s_nearbyintf-vis3 \ > diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrint-generic.S b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrint-generic.S > new file mode 100644 > index 0000000..ceb5d14 > --- /dev/null > +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrint-generic.S > @@ -0,0 +1,8 @@ > +#include <math_ldbl_opt.h> > + > +#define __llrint __llrint_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_llrint.S> > diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrint.S b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrint.S > deleted file mode 100644 > index fd23041..0000000 > --- a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrint.S > +++ /dev/null > @@ -1,24 +0,0 @@ > -#include <sparc-ifunc.h> > -#include <math_ldbl_opt.h> > - > -SPARC_ASM_VIS3_IFUNC(llrint) > - > -weak_alias (__llrint, llrint) > - > -strong_alias (__llrint, __lllrint) > -weak_alias (__lllrint, lllrint) > - > -#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1) > -compat_symbol (libm, __llrint, llrintl, GLIBC_2_1) > -#endif > - > -# undef weak_alias > -# define weak_alias(a, b) > -# undef strong_alias > -# define strong_alias(a, b) > -# undef compat_symbol > -# define compat_symbol(a, b, c, d) > - > -#define __llrint __llrint_generic > - > -#include "../s_llrint.S" > diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrint.c b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrint.c > new file mode 100644 > index 0000000..b10cad4 > --- /dev/null > +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrint.c > @@ -0,0 +1,36 @@ > +/* llrint 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 __llrint __redirect_llrint > +#include <math.h> > +#undef __llrint > +#include <math_ldbl_opt.h> > +#include <sparc-ifunc.h> > + > +extern __typeof (__redirect_llrint) __llrint_vis3 attribute_hidden; > +extern __typeof (__redirect_llrint) __llrint_generic attribute_hidden; > + > +sparc_libm_ifunc_redirected (__redirect_llrint, __llrint, > + hwcap & HWCAP_SPARC_VIS3 > + ? __llrint_vis3 > + : __llrint_generic); > +weak_alias (__llrint, llrint) > + > +#if LONG_DOUBLE_COMPAT (libm, GLIBC_2_1) > +compat_symbol (libm, __llrint, llrintl, GLIBC_2_1); > +#endif > diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrintf-generic.S b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrintf-generic.S > new file mode 100644 > index 0000000..83c462c > --- /dev/null > +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrintf-generic.S > @@ -0,0 +1,4 @@ > +#define __llrintf __llrintf_generic > +#undef weak_alias > +#define weak_alias(a, b) > +#include <sysdeps/sparc/sparc32/sparcv9/fpu/s_llrintf.S> > diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrintf.S b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrintf.S > deleted file mode 100644 > index 8af5244..0000000 > --- a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrintf.S > +++ /dev/null > @@ -1,17 +0,0 @@ > -#include <sparc-ifunc.h> > - > -SPARC_ASM_VIS3_IFUNC(llrintf) > - > -weak_alias (__llrintf, llrintf) > - > -strong_alias (__llrintf, __lllrintf) > -weak_alias (__lllrintf, lllrintf) > - > -# undef weak_alias > -# define weak_alias(a, b) > -# undef strong_alias > -# define strong_alias(a, b) > - > -#define __llrintf __llrintf_generic > - > -#include "../s_llrintf.S" > diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrintf.c b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrintf.c > new file mode 100644 > index 0000000..0594a16 > --- /dev/null > +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrintf.c > @@ -0,0 +1,29 @@ > +/* llrintf 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 (llrintf) __llrintf_vis3 attribute_hidden; > +extern __typeof (llrintf) __llrintf_generic attribute_hidden; > + > +sparc_libm_ifunc (__llrintf, > + hwcap & HWCAP_SPARC_VIS3 > + ? __llrintf_vis3 > + : __llrintf_generic); > +weak_alias (__llrintf, llrintf) >
diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/Makefile b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/Makefile index bd8e341..5b6e2a6 100644 --- a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/Makefile +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/Makefile @@ -9,6 +9,7 @@ sysdep_calls := s_copysignf-vis3 s_copysign-vis3 s_copysignf-generic \ 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_fmaf-vis3 s_fma-vis3 s_fma-generic s_fmaf-generic \ s_nearbyint-vis3 s_nearbyintf-vis3 \ diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrint-generic.S b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrint-generic.S new file mode 100644 index 0000000..ceb5d14 --- /dev/null +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrint-generic.S @@ -0,0 +1,8 @@ +#include <math_ldbl_opt.h> + +#define __llrint __llrint_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_llrint.S> diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrint.S b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrint.S deleted file mode 100644 index fd23041..0000000 --- a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrint.S +++ /dev/null @@ -1,24 +0,0 @@ -#include <sparc-ifunc.h> -#include <math_ldbl_opt.h> - -SPARC_ASM_VIS3_IFUNC(llrint) - -weak_alias (__llrint, llrint) - -strong_alias (__llrint, __lllrint) -weak_alias (__lllrint, lllrint) - -#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1) -compat_symbol (libm, __llrint, llrintl, GLIBC_2_1) -#endif - -# undef weak_alias -# define weak_alias(a, b) -# undef strong_alias -# define strong_alias(a, b) -# undef compat_symbol -# define compat_symbol(a, b, c, d) - -#define __llrint __llrint_generic - -#include "../s_llrint.S" diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrint.c b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrint.c new file mode 100644 index 0000000..b10cad4 --- /dev/null +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrint.c @@ -0,0 +1,36 @@ +/* llrint 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 __llrint __redirect_llrint +#include <math.h> +#undef __llrint +#include <math_ldbl_opt.h> +#include <sparc-ifunc.h> + +extern __typeof (__redirect_llrint) __llrint_vis3 attribute_hidden; +extern __typeof (__redirect_llrint) __llrint_generic attribute_hidden; + +sparc_libm_ifunc_redirected (__redirect_llrint, __llrint, + hwcap & HWCAP_SPARC_VIS3 + ? __llrint_vis3 + : __llrint_generic); +weak_alias (__llrint, llrint) + +#if LONG_DOUBLE_COMPAT (libm, GLIBC_2_1) +compat_symbol (libm, __llrint, llrintl, GLIBC_2_1); +#endif diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrintf-generic.S b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrintf-generic.S new file mode 100644 index 0000000..83c462c --- /dev/null +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrintf-generic.S @@ -0,0 +1,4 @@ +#define __llrintf __llrintf_generic +#undef weak_alias +#define weak_alias(a, b) +#include <sysdeps/sparc/sparc32/sparcv9/fpu/s_llrintf.S> diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrintf.S b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrintf.S deleted file mode 100644 index 8af5244..0000000 --- a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrintf.S +++ /dev/null @@ -1,17 +0,0 @@ -#include <sparc-ifunc.h> - -SPARC_ASM_VIS3_IFUNC(llrintf) - -weak_alias (__llrintf, llrintf) - -strong_alias (__llrintf, __lllrintf) -weak_alias (__lllrintf, lllrintf) - -# undef weak_alias -# define weak_alias(a, b) -# undef strong_alias -# define strong_alias(a, b) - -#define __llrintf __llrintf_generic - -#include "../s_llrintf.S" diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrintf.c b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrintf.c new file mode 100644 index 0000000..0594a16 --- /dev/null +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrintf.c @@ -0,0 +1,29 @@ +/* llrintf 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 (llrintf) __llrintf_vis3 attribute_hidden; +extern __typeof (llrintf) __llrintf_generic attribute_hidden; + +sparc_libm_ifunc (__llrintf, + hwcap & HWCAP_SPARC_VIS3 + ? __llrintf_vis3 + : __llrintf_generic); +weak_alias (__llrintf, llrintf)
This patch refactors the sparc32 ifunc selector to a C implementation. Also, the generic symbol is moved to its own implementation file s_llrint{f}-generic.S). Checked on sparc64-linux-gnu and sparcv9-linux-gnu. * sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/Makefile (libm-sysdep_routines): Add s_llrintf-generic and s_llrint-generic. * sysdeps/sparc/sparcv9/fpu/multiarch/s_llrint-generic.S: New file. * sysdeps/sparc32/sparcv9/fpu/multiarch/s_llrint.c: Likewise. * sysdeps/sparc32/sparcv9/fpu/multiarch/s_llrintf-generic.S: Likewise. * sysdeps/sparc32/sparcv9/fpu/multiarch/s_llrintf.c: Likewise. * sysdeps/sparc32/sparcv9/fpu/multiarch/s_llrint.S: Remove file. * sysdeps/sparc32/sparcv9/fpu/multiarch/s_llrintf.S: Likewise. Signed-off-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> --- ChangeLog | 11 +++++++ .../sparc/sparc32/sparcv9/fpu/multiarch/Makefile | 1 + .../sparcv9/fpu/multiarch/s_llrint-generic.S | 8 +++++ .../sparc/sparc32/sparcv9/fpu/multiarch/s_llrint.S | 24 --------------- .../sparc/sparc32/sparcv9/fpu/multiarch/s_llrint.c | 36 ++++++++++++++++++++++ .../sparcv9/fpu/multiarch/s_llrintf-generic.S | 4 +++ .../sparc32/sparcv9/fpu/multiarch/s_llrintf.S | 17 ---------- .../sparc32/sparcv9/fpu/multiarch/s_llrintf.c | 29 +++++++++++++++++ 8 files changed, 89 insertions(+), 41 deletions(-) create mode 100644 sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrint-generic.S delete mode 100644 sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrint.S create mode 100644 sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrint.c create mode 100644 sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrintf-generic.S delete mode 100644 sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrintf.S create mode 100644 sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrintf.c -- 2.7.4