From aa630f590c9c7d070a7cdf3a2a88069ad6b63de9 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Fri, 26 Apr 2013 13:00:56 -0500 Subject: PowerPC: modf optimization fix This patch fix the 3c0265394d9ffedff2b0de508602dc52e077ce5c commits by correctly setting minimum architecture for modf PPC optimization to power5+ instead of power5 (since only on power5+ round/ceil will be inline to inline assembly). --- sysdeps/powerpc/power5+/fpu/s_modf.c | 58 +++++++++++++++++++++++++++++++ sysdeps/powerpc/power5+/fpu/s_modff.c | 46 ++++++++++++++++++++++++ sysdeps/powerpc/power5/fpu/s_modf.c | 58 ------------------------------- sysdeps/powerpc/power5/fpu/s_modff.c | 46 ------------------------ sysdeps/powerpc/powerpc32/power5+/Implies | 2 ++ sysdeps/powerpc/powerpc64/power5+/Implies | 2 ++ 6 files changed, 108 insertions(+), 104 deletions(-) create mode 100644 sysdeps/powerpc/power5+/fpu/s_modf.c create mode 100644 sysdeps/powerpc/power5+/fpu/s_modff.c delete mode 100644 sysdeps/powerpc/power5/fpu/s_modf.c delete mode 100644 sysdeps/powerpc/power5/fpu/s_modff.c (limited to 'sysdeps/powerpc') diff --git a/sysdeps/powerpc/power5+/fpu/s_modf.c b/sysdeps/powerpc/power5+/fpu/s_modf.c new file mode 100644 index 0000000000..b45bf66169 --- /dev/null +++ b/sysdeps/powerpc/power5+/fpu/s_modf.c @@ -0,0 +1,58 @@ +/* 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 Library General Public License as + published by the Free Software Foundation; either version 2 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If + not, see . */ + +#include +#include +#include + +double +__modf (double x, double *iptr) +{ + if (__builtin_isinf (x)) + { + *iptr = x; + return __copysign (0.0, x); + } + else if (__builtin_isnan (x)) + { + *iptr = NAN; + return NAN; + } + + if (x >= 0.0) + { + *iptr = __floor (x); + return (x - *iptr); + } + else + { + *iptr = __ceil (x); + return (x - *iptr); + } +} +weak_alias (__modf, modf) +#ifdef NO_LONG_DOUBLE +strong_alias (__modf, __modfl) +weak_alias (__modf, modfl) +#endif +#ifdef IS_IN_libm +# if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0) +compat_symbol (libm, __modf, modfl, GLIBC_2_0); +# endif +#elif LONG_DOUBLE_COMPAT(libc, GLIBC_2_0) +compat_symbol (libc, __modf, modfl, GLIBC_2_0); +#endif diff --git a/sysdeps/powerpc/power5+/fpu/s_modff.c b/sysdeps/powerpc/power5+/fpu/s_modff.c new file mode 100644 index 0000000000..55759cde05 --- /dev/null +++ b/sysdeps/powerpc/power5+/fpu/s_modff.c @@ -0,0 +1,46 @@ +/* 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 Library General Public License as + published by the Free Software Foundation; either version 2 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If + not, see . */ + +#include +#include + +float +__modff (float x, float *iptr) +{ + if (__builtin_isinff (x)) + { + *iptr = x; + return __copysignf (0.0, x); + } + else if (__builtin_isnanf (x)) + { + *iptr = NAN; + return NAN; + } + + if (x >= 0.0) + { + *iptr = __floorf (x); + return (x - *iptr); + } + else + { + *iptr = __ceilf (x); + return (x - *iptr); + } +} +weak_alias (__modff, modff) diff --git a/sysdeps/powerpc/power5/fpu/s_modf.c b/sysdeps/powerpc/power5/fpu/s_modf.c deleted file mode 100644 index b45bf66169..0000000000 --- a/sysdeps/powerpc/power5/fpu/s_modf.c +++ /dev/null @@ -1,58 +0,0 @@ -/* 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 Library General Public License as - published by the Free Software Foundation; either version 2 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If - not, see . */ - -#include -#include -#include - -double -__modf (double x, double *iptr) -{ - if (__builtin_isinf (x)) - { - *iptr = x; - return __copysign (0.0, x); - } - else if (__builtin_isnan (x)) - { - *iptr = NAN; - return NAN; - } - - if (x >= 0.0) - { - *iptr = __floor (x); - return (x - *iptr); - } - else - { - *iptr = __ceil (x); - return (x - *iptr); - } -} -weak_alias (__modf, modf) -#ifdef NO_LONG_DOUBLE -strong_alias (__modf, __modfl) -weak_alias (__modf, modfl) -#endif -#ifdef IS_IN_libm -# if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0) -compat_symbol (libm, __modf, modfl, GLIBC_2_0); -# endif -#elif LONG_DOUBLE_COMPAT(libc, GLIBC_2_0) -compat_symbol (libc, __modf, modfl, GLIBC_2_0); -#endif diff --git a/sysdeps/powerpc/power5/fpu/s_modff.c b/sysdeps/powerpc/power5/fpu/s_modff.c deleted file mode 100644 index 55759cde05..0000000000 --- a/sysdeps/powerpc/power5/fpu/s_modff.c +++ /dev/null @@ -1,46 +0,0 @@ -/* 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 Library General Public License as - published by the Free Software Foundation; either version 2 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If - not, see . */ - -#include -#include - -float -__modff (float x, float *iptr) -{ - if (__builtin_isinff (x)) - { - *iptr = x; - return __copysignf (0.0, x); - } - else if (__builtin_isnanf (x)) - { - *iptr = NAN; - return NAN; - } - - if (x >= 0.0) - { - *iptr = __floorf (x); - return (x - *iptr); - } - else - { - *iptr = __ceilf (x); - return (x - *iptr); - } -} -weak_alias (__modff, modff) diff --git a/sysdeps/powerpc/powerpc32/power5+/Implies b/sysdeps/powerpc/powerpc32/power5+/Implies index a51d2fdf95..02d222d22a 100644 --- a/sysdeps/powerpc/powerpc32/power5+/Implies +++ b/sysdeps/powerpc/powerpc32/power5+/Implies @@ -1,2 +1,4 @@ +powerpc/power5+/fpu +powerpc/power5+ powerpc/powerpc32/power5/fpu powerpc/powerpc32/power5 diff --git a/sysdeps/powerpc/powerpc64/power5+/Implies b/sysdeps/powerpc/powerpc64/power5+/Implies index a01a13ab12..565bc94471 100644 --- a/sysdeps/powerpc/powerpc64/power5+/Implies +++ b/sysdeps/powerpc/powerpc64/power5+/Implies @@ -1,2 +1,4 @@ +powerpc/power5+/fpu +powerpc/power5+ powerpc/powerpc64/power5/fpu powerpc/powerpc64/power5 -- cgit 1.4.1