[03/13] s390x: Use fma{f} builtin

  Checked on s390x-linux-gnu.
---
 sysdeps/s390/fpu/math-use-builtins-fma.h |  4 +++
 sysdeps/s390/fpu/s_fma.c                 | 32 ------------------------
 sysdeps/s390/fpu/s_fmaf.c                | 32 ------------------------
 3 files changed, 4 insertions(+), 64 deletions(-)
 create mode 100644 sysdeps/s390/fpu/math-use-builtins-fma.h
 delete mode 100644 sysdeps/s390/fpu/s_fma.c
 delete mode 100644 sysdeps/s390/fpu/s_fmaf.c
  

On 6/9/20 11:32 PM, Adhemerval Zanella via Libc-alpha wrote:
> Checked on s390x-linux-gnu.
> ---
>  sysdeps/s390/fpu/math-use-builtins-fma.h |  4 +++
>  sysdeps/s390/fpu/s_fma.c                 | 32 ------------------------
>  sysdeps/s390/fpu/s_fmaf.c                | 32 ------------------------
>  3 files changed, 4 insertions(+), 64 deletions(-)
>  create mode 100644 sysdeps/s390/fpu/math-use-builtins-fma.h
>  delete mode 100644 sysdeps/s390/fpu/s_fma.c
>  delete mode 100644 sysdeps/s390/fpu/s_fmaf.c
> 
> diff --git a/sysdeps/s390/fpu/math-use-builtins-fma.h b/sysdeps/s390/fpu/math-use-builtins-fma.h
> new file mode 100644
> index 0000000000..eede75aa41
> --- /dev/null
> +++ b/sysdeps/s390/fpu/math-use-builtins-fma.h
> @@ -0,0 +1,4 @@
> +#define USE_FMA_BUILTIN 1
> +#define USE_FMAF_BUILTIN 1
> +#define USE_FMAL_BUILTIN 0
> +#define USE_FMAF128_BUILTIN 0
> diff --git a/sysdeps/s390/fpu/s_fma.c b/sysdeps/s390/fpu/s_fma.c
> deleted file mode 100644
> index ae924d05e8..0000000000
> --- a/sysdeps/s390/fpu/s_fma.c
> +++ /dev/null
> @@ -1,32 +0,0 @@
> -/* Compute x * y + z as ternary operation.  S/390 version.
> -   Copyright (C) 2010-2020 Free Software Foundation, Inc.
> -   This file is part of the GNU C Library.
> -   Contributed by Jakub Jelinek <jakub@redhat.com>, 2010.
> -
> -   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 <math.h>
> -#include <libm-alias-double.h>
> -
> -double
> -__fma (double x, double y, double z)
> -{
> -  double r;
> -  __asm__ ("madbr %0,%1,%2" : "=f" (r) : "%f" (x), "fR" (y), "0" (z));
> -  return r;
> -}
> -#ifndef __fma
> -libm_alias_double (__fma, fma)
> -#endif
> diff --git a/sysdeps/s390/fpu/s_fmaf.c b/sysdeps/s390/fpu/s_fmaf.c
> deleted file mode 100644
> index 9e5bc533b8..0000000000
> --- a/sysdeps/s390/fpu/s_fmaf.c
> +++ /dev/null
> @@ -1,32 +0,0 @@
> -/* Compute x * y + z as ternary operation.  S/390 version.
> -   Copyright (C) 2010-2020 Free Software Foundation, Inc.
> -   This file is part of the GNU C Library.
> -   Contributed by Jakub Jelinek <jakub@redhat.com>, 2010.
> -
> -   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 <math.h>
> -#include <libm-alias-float.h>
> -
> -float
> -__fmaf (float x, float y, float z)
> -{
> -  float r;
> -  __asm__ ("maebr %0,%1,%2" : "=f" (r) : "%f" (x), "fR" (y), "0" (z));
> -  return r;
> -}
> -#ifndef __fmaf
> -libm_alias_float (__fma, fma)
> -#endif
> 


Hi Adhemerval,

I've applied your patches and successfully run some test builds on
s390x/s390. Using the builtins for fma and fmaf works fine.

This patch is okay.

Thanks,
Stefan