From 17ce9917aef371cc762884c671dee39f7c13968a Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Mon, 15 Apr 2013 21:54:06 -0500 Subject: [PATCH] PowerPC: logb/logbf/logbl multilib for PowerPC32 --- sysdeps/ieee754/ldbl-128ibm/s_logbl.c | 2 ++ sysdeps/powerpc/powerpc32/fpu/multiarch/Makefile | 5 ++- sysdeps/powerpc/powerpc32/fpu/multiarch/s_logb-c.c | 10 ++++++ .../fpu/s_logb.c => fpu/multiarch/s_logb-power7.c} | 16 +++------ sysdeps/powerpc/powerpc32/fpu/multiarch/s_logb.c | 41 ++++++++++++++++++++++ .../powerpc/powerpc32/fpu/multiarch/s_logbf-c.c | 8 +++++ .../s_logbf.c => fpu/multiarch/s_logbf-power7.c} | 7 ++-- sysdeps/powerpc/powerpc32/fpu/multiarch/s_logbf.c | 32 +++++++++++++++++ .../powerpc/powerpc32/fpu/multiarch/s_logbl-c.c | 7 ++++ .../s_logbl.c => fpu/multiarch/s_logbl-power7.c} | 6 ++-- sysdeps/powerpc/powerpc32/fpu/multiarch/s_logbl.c | 32 +++++++++++++++++ 11 files changed, 148 insertions(+), 18 deletions(-) create mode 100644 sysdeps/powerpc/powerpc32/fpu/multiarch/s_logb-c.c rename sysdeps/powerpc/powerpc32/{power7/fpu/s_logb.c => fpu/multiarch/s_logb-power7.c} (89%) create mode 100644 sysdeps/powerpc/powerpc32/fpu/multiarch/s_logb.c create mode 100644 sysdeps/powerpc/powerpc32/fpu/multiarch/s_logbf-c.c rename sysdeps/powerpc/powerpc32/{power7/fpu/s_logbf.c => fpu/multiarch/s_logbf-power7.c} (94%) create mode 100644 sysdeps/powerpc/powerpc32/fpu/multiarch/s_logbf.c create mode 100644 sysdeps/powerpc/powerpc32/fpu/multiarch/s_logbl-c.c rename sysdeps/powerpc/powerpc32/{power7/fpu/s_logbl.c => fpu/multiarch/s_logbl-power7.c} (95%) create mode 100644 sysdeps/powerpc/powerpc32/fpu/multiarch/s_logbl.c diff --git a/sysdeps/ieee754/ldbl-128ibm/s_logbl.c b/sysdeps/ieee754/ldbl-128ibm/s_logbl.c index 6cbfcfa1cc..28a50deadc 100644 --- a/sysdeps/ieee754/ldbl-128ibm/s_logbl.c +++ b/sysdeps/ieee754/ldbl-128ibm/s_logbl.c @@ -44,4 +44,6 @@ __logbl (long double x) return (long double) (rhx - 1023); } +#ifndef __logbl long_double_symbol (libm, __logbl, logbl); +#endif diff --git a/sysdeps/powerpc/powerpc32/fpu/multiarch/Makefile b/sysdeps/powerpc/powerpc32/fpu/multiarch/Makefile index 372af26296..10d12c16e2 100644 --- a/sysdeps/powerpc/powerpc32/fpu/multiarch/Makefile +++ b/sysdeps/powerpc/powerpc32/fpu/multiarch/Makefile @@ -33,7 +33,10 @@ libm-sysdep_routines += s_llrintf-power6 s_llrintf-power4 s_llrintf-c \ s_finite-power7 s_finite-c \ s_finitef-c \ s_isinf-power7 s_isinf-c \ - s_isinff-c + s_isinff-c \ + s_logbl-power7 s_logbl-c \ + s_logb-power7 s_logb-c \ + s_logbf-power7 s_logbf-c CFLAGS-s_llround.c = -fno-builtin-llroundf CFLAGS-s_lround.c = -fno-builtin-lroundf diff --git a/sysdeps/powerpc/powerpc32/fpu/multiarch/s_logb-c.c b/sysdeps/powerpc/powerpc32/fpu/multiarch/s_logb-c.c new file mode 100644 index 0000000000..eb98d7436c --- /dev/null +++ b/sysdeps/powerpc/powerpc32/fpu/multiarch/s_logb-c.c @@ -0,0 +1,10 @@ +#include + +#undef weak_alias +#define weak_alias(a, b) +#undef strong_alias +#define strong_alias(a, b) + +#define __logb __logb_ppc32 + +#include diff --git a/sysdeps/powerpc/powerpc32/power7/fpu/s_logb.c b/sysdeps/powerpc/powerpc32/fpu/multiarch/s_logb-power7.c similarity index 89% rename from sysdeps/powerpc/powerpc32/power7/fpu/s_logb.c rename to sysdeps/powerpc/powerpc32/fpu/multiarch/s_logb-power7.c index da2e6b9e49..d54525b080 100644 --- a/sysdeps/powerpc/powerpc32/power7/fpu/s_logb.c +++ b/sysdeps/powerpc/powerpc32/fpu/multiarch/s_logb-power7.c @@ -16,7 +16,10 @@ License along with the GNU C Library; if not, see . */ -#include +#include +#include + +__typeof (__logb) __logb_power7 __attribute__ ((__target__ ("cpu=power7"))); /* This implementation avoids FP to INT conversions by using VSX bitwise instructions over FP values. */ @@ -31,7 +34,7 @@ static const union { } mask = { 0x7ff0000000000000ULL }; double -__logb (double x) +__logb_power7 (double x) { double ret; @@ -67,12 +70,3 @@ __logb (double x) /* Test to avoid logb_downward (0.0) == -0.0. */ return ret == -0.0 ? 0.0 : ret; } -weak_alias (__logb, logb) -#ifdef NO_LONG_DOUBLE -strong_alias (__logb, __logbl) -weak_alias (__logb, logbl) -#endif - -#if LONG_DOUBLE_COMPAT (libm, GLIBC_2_0) -compat_symbol (libm, logb, logbl, GLIBC_2_0); -#endif diff --git a/sysdeps/powerpc/powerpc32/fpu/multiarch/s_logb.c b/sysdeps/powerpc/powerpc32/fpu/multiarch/s_logb.c new file mode 100644 index 0000000000..f55cf519e6 --- /dev/null +++ b/sysdeps/powerpc/powerpc32/fpu/multiarch/s_logb.c @@ -0,0 +1,41 @@ +/* Multiple versions of s_logb. + Copyright (C) 2013 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 + . */ + +#include +#include +#include +#include "init-arch.h" + +extern __typeof (__logb) __logb_ppc32 attribute_hidden; +extern __typeof (__logb) __logb_power7 attribute_hidden; + +libc_ifunc (__logb, + (hwcap & PPC_FEATURE_ARCH_2_06) + ? __logb_power7 + : __logb_ppc32); + +weak_alias (__logb, logb) + +#ifdef NO_LONG_DOUBLE +strong_alias (__logb, __logbl) +weak_alias (__logb, logbl) +#endif + +#if LONG_DOUBLE_COMPAT (libm, GLIBC_2_0) +compat_symbol (libm, logb, logbl, GLIBC_2_0); +#endif diff --git a/sysdeps/powerpc/powerpc32/fpu/multiarch/s_logbf-c.c b/sysdeps/powerpc/powerpc32/fpu/multiarch/s_logbf-c.c new file mode 100644 index 0000000000..b569a1cf45 --- /dev/null +++ b/sysdeps/powerpc/powerpc32/fpu/multiarch/s_logbf-c.c @@ -0,0 +1,8 @@ +#include + +#undef weak_alias +#define weak_alias(a, b) + +#define __logbf __logbf_ppc32 + +#include diff --git a/sysdeps/powerpc/powerpc32/power7/fpu/s_logbf.c b/sysdeps/powerpc/powerpc32/fpu/multiarch/s_logbf-power7.c similarity index 94% rename from sysdeps/powerpc/powerpc32/power7/fpu/s_logbf.c rename to sysdeps/powerpc/powerpc32/fpu/multiarch/s_logbf-power7.c index 05726f2f7f..5d87c6fcc4 100644 --- a/sysdeps/powerpc/powerpc32/power7/fpu/s_logbf.c +++ b/sysdeps/powerpc/powerpc32/fpu/multiarch/s_logbf-power7.c @@ -16,7 +16,9 @@ License along with the GNU C Library; if not, see . */ -#include "math_private.h" +#include + +__typeof (__logbf) __logbf_power7 __attribute__ ((__target__ ("cpu=power7"))); /* This implementation avoids FP to INT conversions by using VSX bitwise instructions over FP values. */ @@ -32,7 +34,7 @@ static const union { } mask = { 0x7ff0000000000000ULL }; float -__logbf (float x) +__logbf_power7 (float x) { /* VSX operation are all done internally as double. */ double ret; @@ -57,4 +59,3 @@ __logbf (float x) The test is to avoid logb_downward (0.0) == -0.0. */ return ret == -0.0 ? 0.0 : ret; } -weak_alias (__logbf, logbf) diff --git a/sysdeps/powerpc/powerpc32/fpu/multiarch/s_logbf.c b/sysdeps/powerpc/powerpc32/fpu/multiarch/s_logbf.c new file mode 100644 index 0000000000..d0b50b0a54 --- /dev/null +++ b/sysdeps/powerpc/powerpc32/fpu/multiarch/s_logbf.c @@ -0,0 +1,32 @@ +/* Multiple versions of s_logb. + Copyright (C) 2013 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 + . */ + +#include +#include +#include +#include "init-arch.h" + +extern __typeof (__logbf) __logbf_ppc32 attribute_hidden; +extern __typeof (__logbf) __logbf_power7 attribute_hidden; + +libc_ifunc (__logbf, + (hwcap & PPC_FEATURE_ARCH_2_06) + ? __logbf_power7 + : __logbf_ppc32); + +weak_alias (__logbf, logbf) diff --git a/sysdeps/powerpc/powerpc32/fpu/multiarch/s_logbl-c.c b/sysdeps/powerpc/powerpc32/fpu/multiarch/s_logbl-c.c new file mode 100644 index 0000000000..1fc965b893 --- /dev/null +++ b/sysdeps/powerpc/powerpc32/fpu/multiarch/s_logbl-c.c @@ -0,0 +1,7 @@ +#include +#include +#include + +#define __logbl __logbl_ppc32 + +#include diff --git a/sysdeps/powerpc/powerpc32/power7/fpu/s_logbl.c b/sysdeps/powerpc/powerpc32/fpu/multiarch/s_logbl-power7.c similarity index 95% rename from sysdeps/powerpc/powerpc32/power7/fpu/s_logbl.c rename to sysdeps/powerpc/powerpc32/fpu/multiarch/s_logbl-power7.c index e008ed0c3d..e783b46c47 100644 --- a/sysdeps/powerpc/powerpc32/power7/fpu/s_logbl.c +++ b/sysdeps/powerpc/powerpc32/fpu/multiarch/s_logbl-power7.c @@ -20,6 +20,8 @@ #include #include +__typeof (__logbl) __logbl_power7 __attribute__ ((__target__ ("cpu=power7"))); + /* This implementation avoids FP to INT conversions by using VSX bitwise instructions over FP values. */ @@ -33,7 +35,7 @@ static const union { } mask = { 0x7ff0000000000000ULL }; long double -__logbl (long double x) +__logbl_power7 (long double x) { double xh, xl; double ret; @@ -66,5 +68,3 @@ __logbl (long double x) /* Test to avoid logb_downward (0.0) == -0.0. */ return ret == -0.0 ? 0.0 : ret; } - -long_double_symbol (libm, __logbl, logbl); diff --git a/sysdeps/powerpc/powerpc32/fpu/multiarch/s_logbl.c b/sysdeps/powerpc/powerpc32/fpu/multiarch/s_logbl.c new file mode 100644 index 0000000000..8703da5ded --- /dev/null +++ b/sysdeps/powerpc/powerpc32/fpu/multiarch/s_logbl.c @@ -0,0 +1,32 @@ +/* Multiple versions of s_finite. + Copyright (C) 2013 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 + . */ + +#include +#include +#include +#include "init-arch.h" + +extern __typeof (__logbl) __logbl_ppc32 attribute_hidden; +extern __typeof (__logbl) __logbl_power7 attribute_hidden; + +libc_ifunc (__logbl, + (hwcap & PPC_FEATURE_ARCH_2_06) + ? __logbl_power7 + : __logbl_ppc32); + +long_double_symbol (libm, __logbl, logbl); -- 2.11.4.GIT