This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: [PATCH] x86-64: Add sinf with FMA
On Thu, Dec 7, 2017 at 4:20 AM, Adhemerval Zanella
<adhemerval.zanella@linaro.org> wrote:
>
>
> On 05/12/2017 17:03, H.J. Lu wrote:
>> diff --git a/sysdeps/x86_64/fpu/multiarch/s_sinf.c b/sysdeps/x86_64/fpu/multiarch/s_sinf.c
>> new file mode 100644
>> index 0000000000..f91f866cdc
>> --- /dev/null
>> +++ b/sysdeps/x86_64/fpu/multiarch/s_sinf.c
>> @@ -0,0 +1,31 @@
>> +/* Multiple versions of sinf.
>> + 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_sinf (float);
>> +
>> +#define SYMBOL_NAME sinf
>> +#include "ifunc-fma.h"
>> +
>> +libc_ifunc_redirected (__redirect_sinf, __sinf, IFUNC_SELECTOR ());
>> +
>> +libm_alias_float (__sin, sin)
>> +
>> +#define SINF __sinf_sse2
>> +#include <sysdeps/ieee754/flt-32/s_sinf.c>
>> -- 2.14.3
>
> I would prefer if we move the default version to specific files instead
> of incorporate them on ifunc resolver itself. In this case add a
> sysdeps/x86_64/fpu/multiarch/s_sinf-sse2.c file with:
>
> #define SINF __sinf_sse2
> #include <sysdeps/ieee754/flt-32/s_sinf.c>
>
> LGTM with this change.
This is what I am checking in.
Thanks.
--
H.J.
From 9d0ffa60ad88799b33ab6437ba0f29b39c019462 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Thu, 7 Dec 2017 10:11:02 -0800
Subject: [PATCH] x86-64: Add sinf with FMA
On Skylake, bench-sinf reports performance improvement:
Before After Improvement
max 153.996 100.094 54%
min 8.546 6.852 25%
mean 18.1223 11.802 54%
* sysdeps/x86_64/fpu/multiarch/Makefile (libm-sysdep_routines):
Add s_sinf-sse2 and s_sinf-fma.
(CFLAGS-s_sinf-fma.c): New.
* sysdeps/x86_64/fpu/multiarch/s_sinf-fma.c: New file.
* sysdeps/x86_64/fpu/multiarch/s_sinf-sse2.c: Likewise.
* sysdeps/x86_64/fpu/multiarch/s_sinf.c: Likewise.
---
ChangeLog | 9 +++++++++
NEWS | 4 ++--
sysdeps/x86_64/fpu/multiarch/Makefile | 5 ++++-
sysdeps/x86_64/fpu/multiarch/s_sinf-fma.c | 2 ++
sysdeps/x86_64/fpu/multiarch/s_sinf-sse2.c | 2 ++
sysdeps/x86_64/fpu/multiarch/s_sinf.c | 28 ++++++++++++++++++++++++++++
6 files changed, 47 insertions(+), 3 deletions(-)
create mode 100644 sysdeps/x86_64/fpu/multiarch/s_sinf-fma.c
create mode 100644 sysdeps/x86_64/fpu/multiarch/s_sinf-sse2.c
create mode 100644 sysdeps/x86_64/fpu/multiarch/s_sinf.c
diff --git a/ChangeLog b/ChangeLog
index 37b73bf0cc..910bf679d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2017-12-07 H.J. Lu <hongjiu.lu@intel.com>
+
+ * sysdeps/x86_64/fpu/multiarch/Makefile (libm-sysdep_routines):
+ Add s_sinf-sse2 and s_sinf-fma.
+ (CFLAGS-s_sinf-fma.c): New.
+ * sysdeps/x86_64/fpu/multiarch/s_sinf-fma.c: New file.
+ * sysdeps/x86_64/fpu/multiarch/s_sinf-sse2.c: Likewise.
+ * sysdeps/x86_64/fpu/multiarch/s_sinf.c: Likewise.
+
2017-12-07 H.J. Lu <hongjiu.lu@intel.com>
* sysdeps/x86_64/fpu/s_sinf.S: Removed.
diff --git a/NEWS b/NEWS
index 3065153746..25a2116cdd 100644
--- a/NEWS
+++ b/NEWS
@@ -9,8 +9,8 @@ Version 2.27
Major new features:
-* Optimized x86-64 asin, atan2, exp, expf, log, pow, atan, sin and tan
- with FMA, contributed by Arjan van de Ven and H.J. Lu from Intel.
+* Optimized x86-64 asin, atan2, exp, expf, log, pow, atan, sin, sinf and
+ tan with FMA, contributed by Arjan van de Ven and H.J. Lu from Intel.
* Optimized x86-64 trunc and truncf for processors with SSE4.1.
diff --git a/sysdeps/x86_64/fpu/multiarch/Makefile b/sysdeps/x86_64/fpu/multiarch/Makefile
index c78624b47d..cab84bff3a 100644
--- a/sysdeps/x86_64/fpu/multiarch/Makefile
+++ b/sysdeps/x86_64/fpu/multiarch/Makefile
@@ -37,14 +37,17 @@ 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 += e_exp2f-fma e_expf-fma e_log2f-fma e_logf-fma \
- e_powf-fma
+ e_powf-fma s_sinf-fma
CFLAGS-e_exp2f-fma.c = -mfma -mavx2
CFLAGS-e_expf-fma.c = -mfma -mavx2
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
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_sinf-fma.c b/sysdeps/x86_64/fpu/multiarch/s_sinf-fma.c
new file mode 100644
index 0000000000..34440ebf4a
--- /dev/null
+++ b/sysdeps/x86_64/fpu/multiarch/s_sinf-fma.c
@@ -0,0 +1,2 @@
+#define SINF __sinf_fma
+#include <sysdeps/ieee754/flt-32/s_sinf.c>
diff --git a/sysdeps/x86_64/fpu/multiarch/s_sinf-sse2.c b/sysdeps/x86_64/fpu/multiarch/s_sinf-sse2.c
new file mode 100644
index 0000000000..74e32c98db
--- /dev/null
+++ b/sysdeps/x86_64/fpu/multiarch/s_sinf-sse2.c
@@ -0,0 +1,2 @@
+#define SINF __sinf_sse2
+#include <sysdeps/ieee754/flt-32/s_sinf.c>
diff --git a/sysdeps/x86_64/fpu/multiarch/s_sinf.c b/sysdeps/x86_64/fpu/multiarch/s_sinf.c
new file mode 100644
index 0000000000..831bc6f131
--- /dev/null
+++ b/sysdeps/x86_64/fpu/multiarch/s_sinf.c
@@ -0,0 +1,28 @@
+/* Multiple versions of sinf.
+ 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_sinf (float);
+
+#define SYMBOL_NAME sinf
+#include "ifunc-fma.h"
+
+libc_ifunc_redirected (__redirect_sinf, __sinf, IFUNC_SELECTOR ());
+
+libm_alias_float (__sin, sin)
--
2.14.3