|
 |
00db10 |
Consolidated two commits:
|
|
|
00db10 |
|
|
|
00db10 |
From 51c33bd233d00d77f268ec28565506a6cd1e7d10 Mon Sep 17 00:00:00 2001
|
|
|
00db10 |
From: Adhemerval Zanella <azanella@linux.vnet.ibm.com>
|
|
|
00db10 |
Date: Mon, 25 Mar 2013 16:10:06 -0500
|
|
|
00db10 |
Subject: [PATCH 25/42] PowerPC: modf optimization
|
|
|
00db10 |
|
|
|
00db10 |
This patch implements modf/modff optimization for POWER by focus
|
|
|
00db10 |
on FP operations instead of relying in integer ones.
|
|
|
00db10 |
(backported from commit 3c0265394d9ffedff2b0de508602dc52e077ce5c)
|
|
|
00db10 |
|
|
|
00db10 |
This backport does not include the benchmark tests from the original
|
|
|
00db10 |
commit.
|
|
|
00db10 |
|
|
|
00db10 |
From 599fefcc3e7fbf65d9c441bf1b336b272c39f262 Mon Sep 17 00:00:00 2001
|
|
|
00db10 |
From: Adhemerval Zanella <azanella@linux.vnet.ibm.com>
|
|
|
00db10 |
Date: Fri, 26 Apr 2013 13:00:56 -0500
|
|
|
00db10 |
Subject: [PATCH 26/42] PowerPC: modf optimization fix
|
|
|
00db10 |
|
|
|
00db10 |
This patch fix the 3c0265394d9ffedff2b0de508602dc52e077ce5c commits
|
|
|
00db10 |
by correctly setting minimum architecture for modf PPC optimization
|
|
|
00db10 |
to power5+ instead of power5 (since only on power5+ round/ceil will
|
|
|
00db10 |
be inline to inline assembly).
|
|
|
00db10 |
(cherry picked from commit aa630f590c9c7d070a7cdf3a2a88069ad6b63de9)
|
|
|
00db10 |
|
|
|
00db10 |
diff -pruN glibc-2.17-c758a686/sysdeps/powerpc/power5+/fpu/s_modf.c glibc-2.17-c758a686/sysdeps/powerpc/power5+/fpu/s_modf.c
|
|
|
00db10 |
--- glibc-2.17-c758a686/sysdeps/powerpc/power5+/fpu/s_modf.c 1970-01-01 05:30:00.000000000 +0530
|
|
|
00db10 |
+++ glibc-2.17-c758a686/sysdeps/powerpc/power5+/fpu/s_modf.c 2013-08-06 17:48:57.609526556 +0530
|
|
|
00db10 |
@@ -0,0 +1,58 @@
|
|
|
00db10 |
+/* Copyright (C) 2013 Free Software Foundation, Inc.
|
|
|
00db10 |
+ This file is part of the GNU C Library
|
|
|
00db10 |
+
|
|
|
00db10 |
+ The GNU C Library is free software; you can redistribute it and/or
|
|
|
00db10 |
+ modify it under the terms of the GNU Library General Public License as
|
|
|
00db10 |
+ published by the Free Software Foundation; either version 2 of the
|
|
|
00db10 |
+ License, or (at your option) any later version.
|
|
|
00db10 |
+
|
|
|
00db10 |
+ The GNU C Library is distributed in the hope that it will be useful,
|
|
|
00db10 |
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
00db10 |
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
00db10 |
+ Library General Public License for more details.
|
|
|
00db10 |
+
|
|
|
00db10 |
+ You should have received a copy of the GNU Library General Public
|
|
|
00db10 |
+ License along with the GNU C Library; see the file COPYING.LIB. If
|
|
|
00db10 |
+ not, see <http://www.gnu.org/licenses/>. */
|
|
|
00db10 |
+
|
|
|
00db10 |
+#include <math.h>
|
|
|
00db10 |
+#include <math_private.h>
|
|
|
00db10 |
+#include <math_ldbl_opt.h>
|
|
|
00db10 |
+
|
|
|
00db10 |
+double
|
|
|
00db10 |
+__modf (double x, double *iptr)
|
|
|
00db10 |
+{
|
|
|
00db10 |
+ if (__builtin_isinf (x))
|
|
|
00db10 |
+ {
|
|
|
00db10 |
+ *iptr = x;
|
|
|
00db10 |
+ return __copysign (0.0, x);
|
|
|
00db10 |
+ }
|
|
|
00db10 |
+ else if (__builtin_isnan (x))
|
|
|
00db10 |
+ {
|
|
|
00db10 |
+ *iptr = NAN;
|
|
|
00db10 |
+ return NAN;
|
|
|
00db10 |
+ }
|
|
|
00db10 |
+
|
|
|
00db10 |
+ if (x >= 0.0)
|
|
|
00db10 |
+ {
|
|
|
00db10 |
+ *iptr = __floor (x);
|
|
|
00db10 |
+ return (x - *iptr);
|
|
|
00db10 |
+ }
|
|
|
00db10 |
+ else
|
|
|
00db10 |
+ {
|
|
|
00db10 |
+ *iptr = __ceil (x);
|
|
|
00db10 |
+ return (x - *iptr);
|
|
|
00db10 |
+ }
|
|
|
00db10 |
+}
|
|
|
00db10 |
+weak_alias (__modf, modf)
|
|
|
00db10 |
+#ifdef NO_LONG_DOUBLE
|
|
|
00db10 |
+strong_alias (__modf, __modfl)
|
|
|
00db10 |
+weak_alias (__modf, modfl)
|
|
|
00db10 |
+#endif
|
|
|
00db10 |
+#ifdef IS_IN_libm
|
|
|
00db10 |
+# if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
|
|
|
00db10 |
+compat_symbol (libm, __modf, modfl, GLIBC_2_0);
|
|
|
00db10 |
+# endif
|
|
|
00db10 |
+#elif LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)
|
|
|
00db10 |
+compat_symbol (libc, __modf, modfl, GLIBC_2_0);
|
|
|
00db10 |
+#endif
|
|
|
00db10 |
diff -pruN glibc-2.17-c758a686/sysdeps/powerpc/power5+/fpu/s_modff.c glibc-2.17-c758a686/sysdeps/powerpc/power5+/fpu/s_modff.c
|
|
|
00db10 |
--- glibc-2.17-c758a686/sysdeps/powerpc/power5+/fpu/s_modff.c 1970-01-01 05:30:00.000000000 +0530
|
|
|
00db10 |
+++ glibc-2.17-c758a686/sysdeps/powerpc/power5+/fpu/s_modff.c 2013-08-06 17:48:57.609526556 +0530
|
|
|
00db10 |
@@ -0,0 +1,46 @@
|
|
|
00db10 |
+/* Copyright (C) 2013 Free Software Foundation, Inc.
|
|
|
00db10 |
+ This file is part of the GNU C Library
|
|
|
00db10 |
+
|
|
|
00db10 |
+ The GNU C Library is free software; you can redistribute it and/or
|
|
|
00db10 |
+ modify it under the terms of the GNU Library General Public License as
|
|
|
00db10 |
+ published by the Free Software Foundation; either version 2 of the
|
|
|
00db10 |
+ License, or (at your option) any later version.
|
|
|
00db10 |
+
|
|
|
00db10 |
+ The GNU C Library is distributed in the hope that it will be useful,
|
|
|
00db10 |
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
00db10 |
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
00db10 |
+ Library General Public License for more details.
|
|
|
00db10 |
+
|
|
|
00db10 |
+ You should have received a copy of the GNU Library General Public
|
|
|
00db10 |
+ License along with the GNU C Library; see the file COPYING.LIB. If
|
|
|
00db10 |
+ not, see <http://www.gnu.org/licenses/>. */
|
|
|
00db10 |
+
|
|
|
00db10 |
+#include <math.h>
|
|
|
00db10 |
+#include <math_private.h>
|
|
|
00db10 |
+
|
|
|
00db10 |
+float
|
|
|
00db10 |
+__modff (float x, float *iptr)
|
|
|
00db10 |
+{
|
|
|
00db10 |
+ if (__builtin_isinff (x))
|
|
|
00db10 |
+ {
|
|
|
00db10 |
+ *iptr = x;
|
|
|
00db10 |
+ return __copysignf (0.0, x);
|
|
|
00db10 |
+ }
|
|
|
00db10 |
+ else if (__builtin_isnanf (x))
|
|
|
00db10 |
+ {
|
|
|
00db10 |
+ *iptr = NAN;
|
|
|
00db10 |
+ return NAN;
|
|
|
00db10 |
+ }
|
|
|
00db10 |
+
|
|
|
00db10 |
+ if (x >= 0.0)
|
|
|
00db10 |
+ {
|
|
|
00db10 |
+ *iptr = __floorf (x);
|
|
|
00db10 |
+ return (x - *iptr);
|
|
|
00db10 |
+ }
|
|
|
00db10 |
+ else
|
|
|
00db10 |
+ {
|
|
|
00db10 |
+ *iptr = __ceilf (x);
|
|
|
00db10 |
+ return (x - *iptr);
|
|
|
00db10 |
+ }
|
|
|
00db10 |
+}
|
|
|
00db10 |
+weak_alias (__modff, modff)
|
|
|
00db10 |
diff -pruN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power5/Implies glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power5/Implies
|
|
|
00db10 |
--- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power5/Implies 2012-12-25 08:32:13.000000000 +0530
|
|
|
00db10 |
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power5/Implies 2013-08-06 17:48:54.266526703 +0530
|
|
|
00db10 |
@@ -1,2 +1,4 @@
|
|
|
00db10 |
+powerpc/power5/fpu
|
|
|
00db10 |
+powerpc/power5
|
|
|
00db10 |
powerpc/powerpc32/power4/fpu
|
|
|
00db10 |
powerpc/powerpc32/power4
|
|
|
00db10 |
diff -pruN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power5+/Implies glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power5+/Implies
|
|
|
00db10 |
--- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power5+/Implies 2012-12-25 08:32:13.000000000 +0530
|
|
|
00db10 |
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power5+/Implies 2013-08-06 17:48:57.609526556 +0530
|
|
|
00db10 |
@@ -1,2 +1,4 @@
|
|
|
00db10 |
+powerpc/power5+/fpu
|
|
|
00db10 |
+powerpc/power5+
|
|
|
00db10 |
powerpc/powerpc32/power5/fpu
|
|
|
00db10 |
powerpc/powerpc32/power5
|
|
|
00db10 |
diff -pruN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power5/Implies glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power5/Implies
|
|
|
00db10 |
--- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power5/Implies 2012-12-25 08:32:13.000000000 +0530
|
|
|
00db10 |
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power5/Implies 2013-08-06 17:48:54.266526703 +0530
|
|
|
00db10 |
@@ -1,2 +1,4 @@
|
|
|
00db10 |
+powerpc/power5/fpu
|
|
|
00db10 |
+powerpc/power5
|
|
|
00db10 |
powerpc/powerpc64/power4/fpu
|
|
|
00db10 |
powerpc/powerpc64/power4
|
|
|
00db10 |
diff -pruN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power5+/Implies glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power5+/Implies
|
|
|
00db10 |
--- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power5+/Implies 2012-12-25 08:32:13.000000000 +0530
|
|
|
00db10 |
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power5+/Implies 2013-08-06 17:48:57.610526556 +0530
|
|
|
00db10 |
@@ -1,2 +1,4 @@
|
|
|
00db10 |
+powerpc/power5+/fpu
|
|
|
00db10 |
+powerpc/power5+
|
|
|
00db10 |
powerpc/powerpc64/power5/fpu
|
|
|
00db10 |
powerpc/powerpc64/power5
|