LoongArch: Optimize f{max,min}imum_mag{,f}

Following the logic of the previous commit.

Signed-off-by: Xi Ruoyao <xry111@xry111.site>

diff --git a/sysdeps/loongarch/fpu/s_fmaximum_mag.c b/sysdeps/loongarch/fpu/s_fmaximum_mag.c
deleted file mode 100644 (file)
index af37892..0000000
--- 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_magf.c b/sysdeps/loongarch/fpu/s_fmaximum_mag_template.c
similarity index 55%
rename from sysdeps/loongarch/fpu/s_fmaximum_magf.c
rename to sysdeps/loongarch/fpu/s_fmaximum_mag_template.c
index 7802dfebb09505272dbab230b526bc5a6afe54e3..7aa32c72ed9efc4adfa8abd492685ee8c8fece89 100644 (file)
--- a/sysdeps/loongarch/fpu/s_fmaximum_magf.c
+++ b/sysdeps/loongarch/fpu/s_fmaximum_mag_template.c
@@ -1,5 +1,5 @@
-/* fmaximum_magf().  LoongArch version.
-   Copyright (C) 2022-2025 Free Software Foundation, Inc.
+/* 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
@@ -16,25 +16,24 @@
    License along with the GNU C Library; if not, see
    <https://www.gnu.org/licenses/>.  */
 
-#define NO_MATH_REDIRECT
+#ifndef INSN_FMT
+#include_next <s_fmaximum_mag_template.c>
+#else
+
 #include <math.h>
-#include <libm-alias-float.h>
-#include <fpu_control.h>
 
-float
-__fmaximum_magf (float x, float y)
+FLOAT
+M_DECL_FUNC (__fmaximum_mag) (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;
-    }
+  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;
 }
-libm_alias_float (__fmaximum_mag, fmaximum_mag)
+declare_mgen_alias (__fmaximum_mag, fmaximum_mag);
+
+#endif

diff --git a/sysdeps/loongarch/fpu/s_fminimum_mag.c b/sysdeps/loongarch/fpu/s_fminimum_mag.c
deleted file mode 100644 (file)
index e1812fe..0000000
--- 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_magf.c b/sysdeps/loongarch/fpu/s_fminimum_mag_template.c
similarity index 55%
rename from sysdeps/loongarch/fpu/s_fminimum_magf.c
rename to sysdeps/loongarch/fpu/s_fminimum_mag_template.c
index 21cbb65813137ae4195a1ee162e9fc2ec47b00f0..39601a8e9052c7117215018bda75adffba207dac 100644 (file)
--- a/sysdeps/loongarch/fpu/s_fminimum_magf.c
+++ b/sysdeps/loongarch/fpu/s_fminimum_mag_template.c
@@ -1,5 +1,5 @@
-/* fminimum_magf().  LoongArch version.
-   Copyright (C) 2022-2025 Free Software Foundation, Inc.
+/* 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
@@ -16,25 +16,24 @@
    License along with the GNU C Library; if not, see
    <https://www.gnu.org/licenses/>.  */
 
-#define NO_MATH_REDIRECT
+#ifndef INSN_FMT
+#include_next <s_fminimum_mag_template.c>
+#else
+
 #include <math.h>
-#include <libm-alias-float.h>
-#include <fpu_control.h>
 
-float
-__fminimum_magf (float x, float y)
+FLOAT
+M_DECL_FUNC (__fminimum_mag) (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;
-    }
+  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;
 }
-libm_alias_float (__fminimum_mag, fminimum_mag)
+declare_mgen_alias (__fminimum_mag, fminimum_mag);
+
+#endif