[PATCH v2 2/4] LoongArch: Optimize f{max,min}imum_mag{,f}

[caiyinyu]

LGTM

在 2025/2/24 下午8:49, Xi Ruoyao 写道:
> Following the logic of the previous commit.
>
> Signed-off-by: Xi Ruoyao <xry111@xry111.site>
> ---
>   sysdeps/loongarch/fpu/s_fmaximum_mag.c        | 40 -------------------
>   .../loongarch/fpu/s_fmaximum_mag_template.c   | 39 ++++++++++++++++++
>   sysdeps/loongarch/fpu/s_fmaximum_magf.c       | 40 -------------------
>   sysdeps/loongarch/fpu/s_fminimum_mag.c        | 40 -------------------
>   .../loongarch/fpu/s_fminimum_mag_template.c   | 39 ++++++++++++++++++
>   sysdeps/loongarch/fpu/s_fminimum_magf.c       | 40 -------------------
>   6 files changed, 78 insertions(+), 160 deletions(-)
>   delete mode 100644 sysdeps/loongarch/fpu/s_fmaximum_mag.c
>   create mode 100644 sysdeps/loongarch/fpu/s_fmaximum_mag_template.c
>   delete mode 100644 sysdeps/loongarch/fpu/s_fmaximum_magf.c
>   delete mode 100644 sysdeps/loongarch/fpu/s_fminimum_mag.c
>   create mode 100644 sysdeps/loongarch/fpu/s_fminimum_mag_template.c
>   delete mode 100644 sysdeps/loongarch/fpu/s_fminimum_magf.c
>
> diff --git a/sysdeps/loongarch/fpu/s_fmaximum_mag.c b/sysdeps/loongarch/fpu/s_fmaximum_mag.c
> deleted file mode 100644
> index af37892521..0000000000
> --- a/sysdeps/loongarch/fpu/s_fmaximum_mag.c
> +++ /dev/null
> @@ -1,40 +0,0 @@
> -/* fmaximum_mag().  LoongArch version.
> -   Copyright (C) 2022-2025 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/>.  */
> -
> -#define NO_MATH_REDIRECT
> -#include <math.h>
> -#include <libm-alias-double.h>
> -#include <fpu_control.h>
> -
> -double
> -__fmaximum_mag (double x, double y)
> -{
> -  int x_cond;
> -  int y_cond;
> -  asm volatile ("fclass.d \t%0, %1" : "=f" (x_cond) : "f" (x));
> -  asm volatile ("fclass.d \t%0, %1" : "=f" (y_cond) : "f" (y));
> -
> -  if (__glibc_unlikely((x_cond | y_cond) & _FCLASS_NAN))
> -      return x * y;
> -  else
> -    {
> -      asm volatile ("fmaxa.d \t%0, %1, %2" : "=f" (x) : "f" (x), "f" (y));
> -      return x;
> -    }
> -}
> -libm_alias_double (__fmaximum_mag, fmaximum_mag)
> diff --git a/sysdeps/loongarch/fpu/s_fmaximum_mag_template.c b/sysdeps/loongarch/fpu/s_fmaximum_mag_template.c
> new file mode 100644
> index 0000000000..7aa32c72ed
> --- /dev/null
> +++ b/sysdeps/loongarch/fpu/s_fmaximum_mag_template.c
> @@ -0,0 +1,39 @@
> +/* Return value with maximum magnitude.  LoongArch version.
> +   Copyright (C) 2025 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 INSN_FMT
> +#include_next <s_fmaximum_mag_template.c>
> +#else
> +
> +#include <math.h>
> +
> +FLOAT
> +M_DECL_FUNC (__fmaximum_mag) (FLOAT x, FLOAT y)
> +{
> +  FLOAT a, b;
> +  asm("fcmp.cor." INSN_FMT "\t$fcc0, %2, %2\n\t"
> +      "fcmp.cor." INSN_FMT "\t$fcc1, %3, %3\n\t"
> +      "fsel"		   "\t%0, %2, %3, $fcc0\n\t"
> +      "fsel"		   "\t%1, %3, %2, $fcc1\n\t"
> +      "fmaxa."	  INSN_FMT "\t%1, %0, %1"
> +      : "=&f" (a), "=f" (b) : "f" (x), "f" (y) : "fcc0", "fcc1");
> +  return b;
> +}
> +declare_mgen_alias (__fmaximum_mag, fmaximum_mag);
> +
> +#endif
> diff --git a/sysdeps/loongarch/fpu/s_fmaximum_magf.c b/sysdeps/loongarch/fpu/s_fmaximum_magf.c
> deleted file mode 100644
> index 7802dfebb0..0000000000
> --- a/sysdeps/loongarch/fpu/s_fmaximum_magf.c
> +++ /dev/null
> @@ -1,40 +0,0 @@
> -/* fmaximum_magf().  LoongArch version.
> -   Copyright (C) 2022-2025 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/>.  */
> -
> -#define NO_MATH_REDIRECT
> -#include <math.h>
> -#include <libm-alias-float.h>
> -#include <fpu_control.h>
> -
> -float
> -__fmaximum_magf (float x, float y)
> -{
> -  int x_cond;
> -  int y_cond;
> -  asm volatile ("fclass.s \t%0, %1" : "=f" (x_cond) : "f" (x));
> -  asm volatile ("fclass.s \t%0, %1" : "=f" (y_cond) : "f" (y));
> -
> -  if (__glibc_unlikely((x_cond | y_cond) & _FCLASS_NAN))
> -      return x * y;
> -  else
> -    {
> -      asm volatile ("fmaxa.s \t%0, %1, %2" : "=f" (x) : "f" (x), "f" (y));
> -      return x;
> -    }
> -}
> -libm_alias_float (__fmaximum_mag, fmaximum_mag)
> diff --git a/sysdeps/loongarch/fpu/s_fminimum_mag.c b/sysdeps/loongarch/fpu/s_fminimum_mag.c
> deleted file mode 100644
> index e1812fe47b..0000000000
> --- a/sysdeps/loongarch/fpu/s_fminimum_mag.c
> +++ /dev/null
> @@ -1,40 +0,0 @@
> -/* fminimum_mag().  LoongArch version.
> -   Copyright (C) 2022-2025 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/>.  */
> -
> -#define NO_MATH_REDIRECT
> -#include <math.h>
> -#include <libm-alias-double.h>
> -#include <fpu_control.h>
> -
> -double
> -__fminimum_mag (double x, double y)
> -{
> -  int x_cond;
> -  int y_cond;
> -  asm volatile ("fclass.d \t%0, %1" : "=f" (x_cond) : "f" (x));
> -  asm volatile ("fclass.d \t%0, %1" : "=f" (y_cond) : "f" (y));
> -
> -  if (__glibc_unlikely((x_cond | y_cond) & _FCLASS_NAN))
> -      return x * y;
> -  else
> -    {
> -      asm volatile ("fmina.d \t%0, %1, %2" : "=f" (x) : "f" (x), "f" (y));
> -      return x;
> -    }
> -}
> -libm_alias_double (__fminimum_mag, fminimum_mag)
> diff --git a/sysdeps/loongarch/fpu/s_fminimum_mag_template.c b/sysdeps/loongarch/fpu/s_fminimum_mag_template.c
> new file mode 100644
> index 0000000000..39601a8e90
> --- /dev/null
> +++ b/sysdeps/loongarch/fpu/s_fminimum_mag_template.c
> @@ -0,0 +1,39 @@
> +/* Return value with minimum magnitude.  LoongArch version.
> +   Copyright (C) 2025 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 INSN_FMT
> +#include_next <s_fminimum_mag_template.c>
> +#else
> +
> +#include <math.h>
> +
> +FLOAT
> +M_DECL_FUNC (__fminimum_mag) (FLOAT x, FLOAT y)
> +{
> +  FLOAT a, b;
> +  asm("fcmp.cor." INSN_FMT "\t$fcc0, %2, %2\n\t"
> +      "fcmp.cor." INSN_FMT "\t$fcc1, %3, %3\n\t"
> +      "fsel"		   "\t%0, %2, %3, $fcc0\n\t"
> +      "fsel"		   "\t%1, %3, %2, $fcc1\n\t"
> +      "fmina."	  INSN_FMT "\t%1, %0, %1"
> +      : "=&f" (a), "=f" (b) : "f" (x), "f" (y) : "fcc0", "fcc1");
> +  return b;
> +}
> +declare_mgen_alias (__fminimum_mag, fminimum_mag);
> +
> +#endif
> diff --git a/sysdeps/loongarch/fpu/s_fminimum_magf.c b/sysdeps/loongarch/fpu/s_fminimum_magf.c
> deleted file mode 100644
> index 21cbb65813..0000000000
> --- a/sysdeps/loongarch/fpu/s_fminimum_magf.c
> +++ /dev/null
> @@ -1,40 +0,0 @@
> -/* fminimum_magf().  LoongArch version.
> -   Copyright (C) 2022-2025 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/>.  */
> -
> -#define NO_MATH_REDIRECT
> -#include <math.h>
> -#include <libm-alias-float.h>
> -#include <fpu_control.h>
> -
> -float
> -__fminimum_magf (float x, float y)
> -{
> -  int x_cond;
> -  int y_cond;
> -  asm volatile ("fclass.s \t%0, %1" : "=f" (x_cond) : "f" (x));
> -  asm volatile ("fclass.s \t%0, %1" : "=f" (y_cond) : "f" (y));
> -
> -  if (__glibc_unlikely((x_cond | y_cond) & _FCLASS_NAN))
> -      return x * y;
> -  else
> -    {
> -      asm volatile ("fmina.s \t%0, %1, %2" : "=f" (x) : "f" (x), "f" (y));
> -      return x;
> -    }
> -}
> -libm_alias_float (__fminimum_mag, fminimum_mag)