On 29/05/2020 23:00, Vineet Gupta wrote: LGTM, thanks. This new addition, along with the aarch64 one, makes me wonder if it would be better to decompose the USE_* defined in multiple files so the architecture adds only the required ones (instead of copy/paste the whole file with the generic ones). Also for powerpc, maybe a future cleanup would to move the logic to select the builtin to math-use-builtins.h. Something like: #ifdef _ARCH_PWR5X # define USE_FLOOR_BUILTIN 1 # define USE_FLOORF_BUILTIN 1 #else # define USE_FLOOR_BUILTIN 0 # define USE_FLOORF_BUILTIN 0 #endif #define USE_FLOORL_BUILTIN 0 #define USE_FLOORF128_BUILTIN 0 Reviewed-by: Adhemerval Zanella <adhemerval.zanella@xxxxxxxxxx> > --- > sysdeps/powerpc/fpu/math-use-builtins.h | 70 +++++++++++++++++++++++++ > sysdeps/powerpc/fpu/s_fma.c | 27 ---------- > sysdeps/powerpc/fpu/s_fmaf.c | 27 ---------- > 3 files changed, 70 insertions(+), 54 deletions(-) > create mode 100644 sysdeps/powerpc/fpu/math-use-builtins.h > delete mode 100644 sysdeps/powerpc/fpu/s_fma.c > delete mode 100644 sysdeps/powerpc/fpu/s_fmaf.c > > diff --git a/sysdeps/powerpc/fpu/math-use-builtins.h b/sysdeps/powerpc/fpu/math-use-builtins.h > new file mode 100644 > index 000000000000..9bdde66cf1de > --- /dev/null > +++ b/sysdeps/powerpc/fpu/math-use-builtins.h > @@ -0,0 +1,70 @@ > +/* Using math gcc builtins instead of generic implementation. PowerPC version. > + Copyright (C) 2019-2020 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 > + <https://www.gnu.org/licenses/>. */ > + > +#ifndef MATH_USE_BUILTINS_H > +#define MATH_USE_BUILTINS_H 1 > + > +#include <features.h> /* For __GNUC_PREREQ. */ > + > +/* Define these macros to 1 to use __builtin_xyz instead of the > + generic implementation. */ > +#define USE_NEARBYINT_BUILTIN 0 > +#define USE_NEARBYINTF_BUILTIN 0 > +#define USE_NEARBYINTL_BUILTIN 0 > +#define USE_NEARBYINTF128_BUILTIN 0 > + > +#define USE_RINT_BUILTIN 0 > +#define USE_RINTF_BUILTIN 0 > +#define USE_RINTL_BUILTIN 0 > +#define USE_RINTF128_BUILTIN 0 > + > +#define USE_FLOOR_BUILTIN 0 > +#define USE_FLOORF_BUILTIN 0 > +#define USE_FLOORL_BUILTIN 0 > +#define USE_FLOORF128_BUILTIN 0 > + > +#define USE_CEIL_BUILTIN 0 > +#define USE_CEILF_BUILTIN 0 > +#define USE_CEILL_BUILTIN 0 > +#define USE_CEILF128_BUILTIN 0 > + > +#define USE_TRUNC_BUILTIN 0 > +#define USE_TRUNCF_BUILTIN 0 > +#define USE_TRUNCL_BUILTIN 0 > +#define USE_TRUNCF128_BUILTIN 0 > + > +#define USE_ROUND_BUILTIN 0 > +#define USE_ROUNDF_BUILTIN 0 > +#define USE_ROUNDL_BUILTIN 0 > +#define USE_ROUNDF128_BUILTIN 0 > + > +#define USE_COPYSIGNL_BUILTIN 1 > +#if __GNUC_PREREQ (7, 0) > +# define USE_COPYSIGNF128_BUILTIN 1 > +#else > +# define USE_COPYSIGNF128_BUILTIN 0 > +#endif > + > +#define USE_SQRT_BUILTIN 0 > +#define USE_SQRTF_BUILTIN 0 > + > +#define USE_FMA_BUILTIN 1 > +#define USE_FMAF_BUILTIN 1 > +#define USE_FMAL_BUILTIN 0 > + > +#endif /* math-use-builtins.h */ Ok. > diff --git a/sysdeps/powerpc/fpu/s_fma.c b/sysdeps/powerpc/fpu/s_fma.c > deleted file mode 100644 > index 9ddd13253485..000000000000 > --- a/sysdeps/powerpc/fpu/s_fma.c > +++ /dev/null > @@ -1,27 +0,0 @@ > -/* Compute x * y + z as ternary operation. PowerPC version. > - Copyright (C) 2019-2020 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 > - <https://www.gnu.org/licenses/>. */ > - > -#include <sysdep.h> > -#include <libm-alias-double.h> > - > -double > -__fma (double x, double y, double z) > -{ > - return __builtin_fma (x, y, z); > -} > -libm_alias_double (__fma, fma) Ok. > diff --git a/sysdeps/powerpc/fpu/s_fmaf.c b/sysdeps/powerpc/fpu/s_fmaf.c > deleted file mode 100644 > index d132c20125bb..000000000000 > --- a/sysdeps/powerpc/fpu/s_fmaf.c > +++ /dev/null > @@ -1,27 +0,0 @@ > -/* Compute x * y + z as ternary operation. PowerPC version. > - Copyright (C) 2019-2020 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 > - <https://www.gnu.org/licenses/>. */ > - > -#include <sysdep.h> > -#include <libm-alias-float.h> > - > -float > -__fmaf (float x, float y, float z) > -{ > - return __builtin_fmaf (x, y, z); > -} > -libm_alias_float (__fma, fma) > Ok. _______________________________________________ linux-snps-arc mailing list linux-snps-arc@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/linux-snps-arc
