Message ID | 20171211205342.GA29631@gmail.com |
---|---|
State | New |
Headers | show |
Series | x86-64: Add cosf with FMA | expand |
On 11/12/2017 18:53, H.J. Lu wrote: > On Skylake, bench-cosf reports performance improvement: > > Before After Improvement > max 135.362 94.552 43% > min 8.532 7.688 11% > mean 17.1446 11.8128 45% > > Any comments? LGTM. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> > > H.J. > --- > * sysdeps/x86_64/fpu/multiarch/Makefile (libm-sysdep_routines): > Add s_cosf-sse2 and s_cosf-fma. > (CFLAGS-s_cosf-fma.c): New. > * sysdeps/x86_64/fpu/multiarch/s_cosf-fma.c: New file. > * sysdeps/x86_64/fpu/multiarch/s_cosf-sse2.c: Likewise. > * sysdeps/x86_64/fpu/multiarch/s_cosf.c: Likewise. > --- > sysdeps/x86_64/fpu/multiarch/Makefile | 5 +++-- > sysdeps/x86_64/fpu/multiarch/s_cosf-fma.c | 2 ++ > sysdeps/x86_64/fpu/multiarch/s_cosf-sse2.c | 2 ++ > sysdeps/x86_64/fpu/multiarch/s_cosf.c | 28 ++++++++++++++++++++++++++++ > 4 files changed, 35 insertions(+), 2 deletions(-) > create mode 100644 sysdeps/x86_64/fpu/multiarch/s_cosf-fma.c > create mode 100644 sysdeps/x86_64/fpu/multiarch/s_cosf-sse2.c > create mode 100644 sysdeps/x86_64/fpu/multiarch/s_cosf.c > > diff --git a/sysdeps/x86_64/fpu/multiarch/Makefile b/sysdeps/x86_64/fpu/multiarch/Makefile > index cab84bff3a..0825340c0c 100644 > --- a/sysdeps/x86_64/fpu/multiarch/Makefile > +++ b/sysdeps/x86_64/fpu/multiarch/Makefile > @@ -37,10 +37,10 @@ CFLAGS-slowpow-fma.c = -mfma -mavx2 > CFLAGS-s_sin-fma.c = -mfma -mavx2 > CFLAGS-s_tan-fma.c = -mfma -mavx2 > > -libm-sysdep_routines += s_sinf-sse2 > +libm-sysdep_routines += s_sinf-sse2 s_cosf-sse2 > > libm-sysdep_routines += e_exp2f-fma e_expf-fma e_log2f-fma e_logf-fma \ > - e_powf-fma s_sinf-fma > + e_powf-fma s_sinf-fma s_cosf-fma > > CFLAGS-e_exp2f-fma.c = -mfma -mavx2 > CFLAGS-e_expf-fma.c = -mfma -mavx2 > @@ -48,6 +48,7 @@ CFLAGS-e_log2f-fma.c = -mfma -mavx2 > CFLAGS-e_logf-fma.c = -mfma -mavx2 > CFLAGS-e_powf-fma.c = -mfma -mavx2 > CFLAGS-s_sinf-fma.c = -mfma -mavx2 > +CFLAGS-s_cosf-fma.c = -mfma -mavx2 > > libm-sysdep_routines += e_exp-fma4 e_log-fma4 e_pow-fma4 s_atan-fma4 \ > e_asin-fma4 e_atan2-fma4 s_sin-fma4 s_tan-fma4 \ > diff --git a/sysdeps/x86_64/fpu/multiarch/s_cosf-fma.c b/sysdeps/x86_64/fpu/multiarch/s_cosf-fma.c > new file mode 100644 > index 0000000000..5f9191aef9 > --- /dev/null > +++ b/sysdeps/x86_64/fpu/multiarch/s_cosf-fma.c > @@ -0,0 +1,2 @@ > +#define COSF __cosf_fma > +#include <sysdeps/ieee754/flt-32/s_cosf.c> > diff --git a/sysdeps/x86_64/fpu/multiarch/s_cosf-sse2.c b/sysdeps/x86_64/fpu/multiarch/s_cosf-sse2.c > new file mode 100644 > index 0000000000..87cf42a82a > --- /dev/null > +++ b/sysdeps/x86_64/fpu/multiarch/s_cosf-sse2.c > @@ -0,0 +1,2 @@ > +#define COSF __cosf_sse2 > +#include <sysdeps/ieee754/flt-32/s_cosf.c> > diff --git a/sysdeps/x86_64/fpu/multiarch/s_cosf.c b/sysdeps/x86_64/fpu/multiarch/s_cosf.c > new file mode 100644 > index 0000000000..356c3b63c7 > --- /dev/null > +++ b/sysdeps/x86_64/fpu/multiarch/s_cosf.c > @@ -0,0 +1,28 @@ > +/* Multiple versions of cosf. > + 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 <libm-alias-float.h> > + > +extern float __redirect_cosf (float); > + > +#define SYMBOL_NAME cosf > +#include "ifunc-fma.h" > + > +libc_ifunc_redirected (__redirect_cosf, __cosf, IFUNC_SELECTOR ()); > + > +libm_alias_float (__cos, cos) >
diff --git a/sysdeps/x86_64/fpu/multiarch/Makefile b/sysdeps/x86_64/fpu/multiarch/Makefile index cab84bff3a..0825340c0c 100644 --- a/sysdeps/x86_64/fpu/multiarch/Makefile +++ b/sysdeps/x86_64/fpu/multiarch/Makefile @@ -37,10 +37,10 @@ CFLAGS-slowpow-fma.c = -mfma -mavx2 CFLAGS-s_sin-fma.c = -mfma -mavx2 CFLAGS-s_tan-fma.c = -mfma -mavx2 -libm-sysdep_routines += s_sinf-sse2 +libm-sysdep_routines += s_sinf-sse2 s_cosf-sse2 libm-sysdep_routines += e_exp2f-fma e_expf-fma e_log2f-fma e_logf-fma \ - e_powf-fma s_sinf-fma + e_powf-fma s_sinf-fma s_cosf-fma CFLAGS-e_exp2f-fma.c = -mfma -mavx2 CFLAGS-e_expf-fma.c = -mfma -mavx2 @@ -48,6 +48,7 @@ CFLAGS-e_log2f-fma.c = -mfma -mavx2 CFLAGS-e_logf-fma.c = -mfma -mavx2 CFLAGS-e_powf-fma.c = -mfma -mavx2 CFLAGS-s_sinf-fma.c = -mfma -mavx2 +CFLAGS-s_cosf-fma.c = -mfma -mavx2 libm-sysdep_routines += e_exp-fma4 e_log-fma4 e_pow-fma4 s_atan-fma4 \ e_asin-fma4 e_atan2-fma4 s_sin-fma4 s_tan-fma4 \ diff --git a/sysdeps/x86_64/fpu/multiarch/s_cosf-fma.c b/sysdeps/x86_64/fpu/multiarch/s_cosf-fma.c new file mode 100644 index 0000000000..5f9191aef9 --- /dev/null +++ b/sysdeps/x86_64/fpu/multiarch/s_cosf-fma.c @@ -0,0 +1,2 @@ +#define COSF __cosf_fma +#include <sysdeps/ieee754/flt-32/s_cosf.c> diff --git a/sysdeps/x86_64/fpu/multiarch/s_cosf-sse2.c b/sysdeps/x86_64/fpu/multiarch/s_cosf-sse2.c new file mode 100644 index 0000000000..87cf42a82a --- /dev/null +++ b/sysdeps/x86_64/fpu/multiarch/s_cosf-sse2.c @@ -0,0 +1,2 @@ +#define COSF __cosf_sse2 +#include <sysdeps/ieee754/flt-32/s_cosf.c> diff --git a/sysdeps/x86_64/fpu/multiarch/s_cosf.c b/sysdeps/x86_64/fpu/multiarch/s_cosf.c new file mode 100644 index 0000000000..356c3b63c7 --- /dev/null +++ b/sysdeps/x86_64/fpu/multiarch/s_cosf.c @@ -0,0 +1,28 @@ +/* Multiple versions of cosf. + 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 <libm-alias-float.h> + +extern float __redirect_cosf (float); + +#define SYMBOL_NAME cosf +#include "ifunc-fma.h" + +libc_ifunc_redirected (__redirect_cosf, __cosf, IFUNC_SELECTOR ()); + +libm_alias_float (__cos, cos)