]> git.ipfire.org Git - thirdparty/glibc.git/commitdiff
PowerPC: Optimized isnan/isnanf for POWER8
authorAdhemerval Zanella <azanella@linux.vnet.ibm.com>
Thu, 27 Feb 2014 15:43:51 +0000 (09:43 -0600)
committerAdhemerval Zanella <azanella@linux.vnet.ibm.com>
Thu, 27 Feb 2014 18:58:32 +0000 (12:58 -0600)
This patch add a optimized isnan/isnanf implementation for POWER8
using the new Move From VSR Doubleword instruction to gains some
cycles from FP to GRP register move.

ChangeLog
sysdeps/powerpc/powerpc32/power4/multiarch/init-arch.h
sysdeps/powerpc/powerpc64/fpu/multiarch/Makefile
sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power8.S [new file with mode: 0644]
sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan.c
sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnanf.c
sysdeps/powerpc/powerpc64/power8/fpu/s_isnan.S [new file with mode: 0644]
sysdeps/powerpc/powerpc64/power8/fpu/s_isnanf.S [new file with mode: 0644]

index 98d40f28c473ef5113e1e8048e05c9c84140633d..45e17cc31ad64079a2302d508eefb672766d4676 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2014-02-27  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
+
+       * sysdeps/powerpc/powerpc32/power4/multiarch/init-arch.h (INIT_ARCH):
+       Add hwcap2 initialization.
+       * sysdeps/powerpc/powerpc64/fpu/multiarch/Makefile: Add isnan power8
+       implementation.
+       * sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power8.S: New file:
+       POWER8 isnan ifunc implementation.
+       * sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan.c (__isnan): Add
+       POWER8 implementation.
+       * sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnanf.c (__isnanf):
+       Likewise.
+       * sysdeps/powerpc/powerpc64/power8/fpu/s_isnan.S: New file:
+       POWER8 isnan implementation.
+       * sysdeps/powerpc/powerpc64/power8/fpu/s_isnanf.S: New file.
+
 2014-02-27  Joey Ye  <joey.ye@arm.com>
 
        * sysdeps/arm/soft-fp/sfp-machine.h (_FP_NANFRAC_S, _FP_NANFRAC_D)
index 51a34f258849c9e619e4185c13826e740f779911..72d720d55ac71115289f621452e8a33defa7679f 100644 (file)
@@ -36,6 +36,7 @@
    and fills the previous ones.  */
 #define INIT_ARCH() \
   unsigned long int hwcap = __GLRO(dl_hwcap);                  \
+  unsigned long int __attribute__((unused)) hwcap2 = __GLRO(dl_hwcap2); \
   if (hwcap & PPC_FEATURE_ARCH_2_06)                           \
     hwcap |= PPC_FEATURE_ARCH_2_05 |                           \
             PPC_FEATURE_POWER5_PLUS |                          \
index ebf957e40b6d52453cf41b8bed07956fa59cb09a..124d325adf3fdec69c8c3d97558657b2c49658e6 100644 (file)
@@ -4,7 +4,7 @@ sysdep_routines += s_isnan-power7 s_isnan-power6x s_isnan-power6 \
                   s_copysign-ppc64 s_finite-power7 s_finite-ppc64 \
                   s_finitef-ppc64 s_isinff-ppc64 s_isinf-power7 \
                   s_isinf-ppc64 s_modf-power5+ s_modf-ppc64 \
-                  s_modff-power5+ s_modff-ppc64
+                  s_modff-power5+ s_modff-ppc64 s_isnan-power8
 
 libm-sysdep_routines += s_isnan-power7 s_isnan-power6x s_isnan-power6 \
                        s_isnan-power5 s_isnan-ppc64 s_llround-power6x \
@@ -21,7 +21,8 @@ libm-sysdep_routines += s_isnan-power7 s_isnan-power6x s_isnan-power6 \
                        s_logbl-power7 s_logb-ppc64 s_logbf-ppc64 \
                        s_logbl-ppc64 s_modf-power5+ s_modf-ppc64 \
                        s_modff-power5+ s_modff-ppc64 e_hypot-ppc64 \
-                       e_hypot-power7 e_hypotf-ppc64 e_hypotf-power7
+                       e_hypot-power7 e_hypotf-ppc64 e_hypotf-power7 \
+                       s_isnan-power8
 
 CFLAGS-s_logbf-power7.c = -mcpu=power7
 CFLAGS-s_logbl-power7.c = -mcpu=power7
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power8.S b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power8.S
new file mode 100644 (file)
index 0000000..c176d5a
--- /dev/null
@@ -0,0 +1,33 @@
+/* isnan().  PowerPC64/POWER7 version.
+   Copyright (C) 2014 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 <sysdep.h>
+#include <math_ldbl_opt.h>
+
+#undef hidden_def
+#define hidden_def(name)
+#undef weak_alias
+#define weak_alias(name, alias)
+#undef strong_alias
+#define strong_alias(name, alias)
+#undef compat_symbol
+#define compat_symbol(lib, name, symbol, ver)
+
+#define __isnan __isnan_power8
+
+#include <sysdeps/powerpc/powerpc64/power8/fpu/s_isnan.S>
index 0de833e73ae556ff8a008e53d349c0b79892f704..65a5ca0cf69d59296b5dbb0903ce8c05fcc5afde 100644 (file)
@@ -26,16 +26,19 @@ extern __typeof (__isnan) __isnan_power5 attribute_hidden;
 extern __typeof (__isnan) __isnan_power6 attribute_hidden;
 extern __typeof (__isnan) __isnan_power6x attribute_hidden;
 extern __typeof (__isnan) __isnan_power7 attribute_hidden;
+extern __typeof (__isnan) __isnan_power8 attribute_hidden;
 
 libc_ifunc (__isnan,
-           (hwcap & PPC_FEATURE_ARCH_2_06)
-           ? __isnan_power7 :
-             (hwcap & PPC_FEATURE_POWER6_EXT)
+           (hwcap2 & PPC_FEATURE2_ARCH_2_07)
+           ? __isnan_power8 :
+             (hwcap & PPC_FEATURE_ARCH_2_06)
+             ? __isnan_power7 :
+               (hwcap & PPC_FEATURE_POWER6_EXT)
                ? __isnan_power6x :
-               (hwcap & PPC_FEATURE_ARCH_2_05)
-                 ? __isnan_power6 :
-                 (hwcap & PPC_FEATURE_POWER5)
-                   ? __isnan_power5
+                 (hwcap & PPC_FEATURE_ARCH_2_05)
+                   ? __isnan_power6 :
+                   (hwcap & PPC_FEATURE_POWER5)
+                     ? __isnan_power5
             : __isnan_ppc64);
 
 weak_alias (__isnan, isnan)
index b237455949ec9db0ee5a535309d2e1567651fa32..eb68a508332cc520af28bba1be06ebc0b0e56227 100644 (file)
@@ -25,16 +25,19 @@ extern __typeof (__isnanf) __isnan_power5 attribute_hidden;
 extern __typeof (__isnanf) __isnan_power6 attribute_hidden;
 extern __typeof (__isnanf) __isnan_power6x attribute_hidden;
 extern __typeof (__isnanf) __isnan_power7 attribute_hidden;
+extern __typeof (__isnanf) __isnan_power8 attribute_hidden;
 
 libc_ifunc (__isnanf,
-           (hwcap & PPC_FEATURE_ARCH_2_06)
-           ? __isnan_power7 :
-             (hwcap & PPC_FEATURE_POWER6_EXT)
-               ? __isnan_power6x :
-               (hwcap & PPC_FEATURE_ARCH_2_05)
-                 ? __isnan_power6 :
-                 (hwcap & PPC_FEATURE_POWER5)
-                   ? __isnan_power5
+           (hwcap2 & PPC_FEATURE2_ARCH_2_07)
+           ? __isnan_power8 :
+             (hwcap & PPC_FEATURE_ARCH_2_06)
+             ? __isnan_power7 :
+               (hwcap & PPC_FEATURE_POWER6_EXT)
+                 ? __isnan_power6x :
+                 (hwcap & PPC_FEATURE_ARCH_2_05)
+                   ? __isnan_power6 :
+                   (hwcap & PPC_FEATURE_POWER5)
+                     ? __isnan_power5
             : __isnan_ppc64);
 
 weak_alias (__isnanf, isnanf)
diff --git a/sysdeps/powerpc/powerpc64/power8/fpu/s_isnan.S b/sysdeps/powerpc/powerpc64/power8/fpu/s_isnan.S
new file mode 100644 (file)
index 0000000..c1ca9a5
--- /dev/null
@@ -0,0 +1,53 @@
+/* isnan().  PowerPC64/POWER8 version.
+   Copyright (C) 2014 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 <sysdep.h>
+#include <math_ldbl_opt.h>
+
+#define MFVSRD_R3_V1  .byte 0x7c,0x23,0x00,0x66     /* mfvsrd  r3,vs1  */
+
+/* int [r3] __isnan([f1] x)  */
+
+EALIGN (__isnan, 4, 0)
+       CALL_MCOUNT 0
+       MFVSRD_R3_V1
+       lis     r9,0x7ff0
+       clrldi  r3,r3,1       /* r3 = r3 & 0x8000000000000000  */
+       rldicr  r9,r9,32,31   /* r9 = (r9 << 32) & 0xffffffff  */
+       subf    r3,r3,r9
+       rldicl  r3,r3,1,63
+       blr
+END (__isnan)
+
+/* It turns out that the 'double' version will also always work for
+   single-precision.  */
+strong_alias (__isnan, __isnanf)
+hidden_def (__isnanf)
+weak_alias (__isnanf, isnanf)
+
+#ifdef NO_LONG_DOUBLE
+strong_alias (__isnan, __isnanl)
+weak_alias (__isnan, isnanl)
+#endif
+
+#ifndef IS_IN_libm
+# if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)
+compat_symbol (libc, __isnan, __isnanl, GLIBC_2_0);
+compat_symbol (libc, isnan, isnanl, GLIBC_2_0);
+# endif
+#endif
diff --git a/sysdeps/powerpc/powerpc64/power8/fpu/s_isnanf.S b/sysdeps/powerpc/powerpc64/power8/fpu/s_isnanf.S
new file mode 100644 (file)
index 0000000..b48c85e
--- /dev/null
@@ -0,0 +1 @@
+/* This function uses the same code as s_isnan.S.  */