[PATCH 6/6] MIPS/math: Implement optimized f(max,min)imum(_mag)_num(f)

[YunQiang Su <syq@gcc.gnu.org>]

MIPSr6 instroduces min.s/min.d/max.s/max.d instructions, which have
slight different with fmaximum_num, when one operand is sNaN.
In this case, these instructions will return qNaN, while fmaximum_num
requires another operand.

For pre-r6 with hardfloat, we determine whether NAN is present, so that
we can use abs.fmt, which can boost performance.  We also use
GET_HIGH_WORD/GET_FLOAT_WORD instead of copysign for the equal cases.

	* sysdeps/mips/ieee754/s_fmaximum_num.c
	* sysdeps/mips/ieee754/s_fmaximum_numf.c
	* sysdeps/mips/ieee754/s_fminimum_num.c
	* sysdeps/mips/ieee754/s_fminimum_numf.c
	* sysdeps/mips/ieee754/s_fmaximum_mag_num.c
	* sysdeps/mips/ieee754/s_fmaximum_mag_numf.c
	* sysdeps/mips/ieee754/s_fminimum_mag_num.c
	* sysdeps/mips/ieee754/s_fminimum_mag_numf.c

Signed-off-by: YunQiang Su <syq@gcc.gnu.org>
---
 sysdeps/mips/ieee754/s_fmaximum_mag_num.c  | 65 ++++++++++++++++++++++
 sysdeps/mips/ieee754/s_fmaximum_mag_numf.c | 64 +++++++++++++++++++++
 sysdeps/mips/ieee754/s_fmaximum_num.c      | 54 ++++++++++++++++++
 sysdeps/mips/ieee754/s_fmaximum_numf.c     | 53 ++++++++++++++++++
 sysdeps/mips/ieee754/s_fminimum_mag_num.c  | 65 ++++++++++++++++++++++
 sysdeps/mips/ieee754/s_fminimum_mag_numf.c | 64 +++++++++++++++++++++
 sysdeps/mips/ieee754/s_fminimum_num.c      | 54 ++++++++++++++++++
 sysdeps/mips/ieee754/s_fminimum_numf.c     | 53 ++++++++++++++++++
 8 files changed, 472 insertions(+)
 create mode 100644 sysdeps/mips/ieee754/s_fmaximum_mag_num.c
 create mode 100644 sysdeps/mips/ieee754/s_fmaximum_mag_numf.c
 create mode 100644 sysdeps/mips/ieee754/s_fmaximum_num.c
 create mode 100644 sysdeps/mips/ieee754/s_fmaximum_numf.c
 create mode 100644 sysdeps/mips/ieee754/s_fminimum_mag_num.c
 create mode 100644 sysdeps/mips/ieee754/s_fminimum_mag_numf.c
 create mode 100644 sysdeps/mips/ieee754/s_fminimum_num.c
 create mode 100644 sysdeps/mips/ieee754/s_fminimum_numf.c

diff --git a/sysdeps/mips/ieee754/s_fmaximum_mag_num.c b/sysdeps/mips/ieee754/s_fmaximum_mag_num.c
new file mode 100644
index 0000000000..83e9a28bed
--- /dev/null
+++ b/sysdeps/mips/ieee754/s_fmaximum_mag_num.c
@@ -0,0 +1,65 @@
+/* fmaximum_mag_num().  MIPS version.
+   Copyright (C) 2024 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 <math.h>
+#include <libm-alias-double.h>
+#include <math_private.h>
+#include <math-type-macros-double.h>
+
+double
+__fmaximum_mag_num (double x, double y)
+{
+#if __mips_isa_rev >= 6 && defined(__mips_hard_float)                         \
+    && !defined(__mips_single_float)
+  double ret;
+  asm volatile("maxa.d	%0, %1, %2" : "=f"(ret) : "f"(x), "f"(y));
+  if (isnan (ret))
+    {
+      if (!__mips_issignaling (x))
+	ret = x;
+      else if (!__mips_issignaling (y))
+	ret = y;
+    }
+  return ret;
+#else
+  double ax;
+  double ay;
+  /* ABS.d signals both sNAN and qNAN on pre-R5.  */
+  if (isunordered (x, y))
+    return isnan (y) ? (isnan (x) ? x + y : x) : y;
+#  if defined(__mips_hard_float) && !defined(__mips_single_float)
+  asm volatile("abs.d	%0, %1" : "=f"(ax) : "f"(x));
+  asm volatile("abs.d	%0, %1" : "=f"(ay) : "f"(y));
+#  else
+  ax = M_FABS (x);
+  ay = M_FABS (y);
+#  endif
+  if (isgreater (ax, ay))
+    return x;
+  else if (isless (ax, ay))
+    return y;
+  else
+    {
+      int32_t xi;
+      GET_HIGH_WORD (xi, x);
+      return (xi < 0 ? y : x);
+    }
+#endif
+}
+
+libm_alias_double (__fmaximum_mag_num, fmaximum_mag_num)
diff --git a/sysdeps/mips/ieee754/s_fmaximum_mag_numf.c b/sysdeps/mips/ieee754/s_fmaximum_mag_numf.c
new file mode 100644
index 0000000000..c0e6589c00
--- /dev/null
+++ b/sysdeps/mips/ieee754/s_fmaximum_mag_numf.c
@@ -0,0 +1,64 @@
+/* fmaximum_mag_numf().  MIPS version.
+   Copyright (C) 2024 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 <math.h>
+#include <libm-alias-float.h>
+#include <math_private.h>
+#include <math-type-macros-float.h>
+
+float
+__fmaximum_mag_numf (float x, float y)
+{
+#if __mips_isa_rev >= 6 && defined(__mips_hard_float)
+  float ret;
+  asm volatile("maxa.s	%0, %1, %2" : "=f"(ret) : "f"(x), "f"(y));
+  if (isnan (ret))
+    {
+      if (!__mips_issignalingf (x))
+	ret = x;
+      else if (!__mips_issignalingf (y))
+	ret = y;
+    }
+  return ret;
+#else
+  float ax;
+  float ay;
+  /* ABS.s signals both sNAN and qNAN on pre-R5.  */
+  if (isunordered (x, y))
+    return isnan (y) ? (isnan (x) ? x + y : x) : y;
+#  if defined(__mips_hard_float)
+  asm volatile("abs.s	%0, %1" : "=f"(ax) : "f"(x));
+  asm volatile("abs.s	%0, %1" : "=f"(ay) : "f"(y));
+#  else
+  ax = M_FABS (x);
+  ay = M_FABS (y);
+#  endif
+  if (isgreater (ax, ay))
+    return x;
+  else if (isless (ax, ay))
+    return y;
+  else
+    {
+      int32_t xi;
+      GET_FLOAT_WORD (xi, x);
+      return (xi < 0 ? y : x);
+    }
+#endif
+}
+
+libm_alias_float (__fmaximum_mag_num, fmaximum_mag_num)
diff --git a/sysdeps/mips/ieee754/s_fmaximum_num.c b/sysdeps/mips/ieee754/s_fmaximum_num.c
new file mode 100644
index 0000000000..85816a12be
--- /dev/null
+++ b/sysdeps/mips/ieee754/s_fmaximum_num.c
@@ -0,0 +1,54 @@
+/* fmaximum_num().  MIPS version.
+   Copyright (C) 2024 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 <math.h>
+#include <libm-alias-double.h>
+#include <math_private.h>
+
+double
+__fmaximum_num (double x, double y)
+{
+#if __mips_isa_rev >= 6 && defined(__mips_hard_float)                         \
+    && !defined(__mips_single_float)
+  double ret;
+  asm volatile("max.d	%0, %1, %2" : "=f"(ret) : "f"(x), "f"(y));
+  if (isnan (ret))
+    {
+      if (!__mips_issignaling (x))
+	ret = x;
+      else if (!__mips_issignaling (y))
+	ret = y;
+    }
+  return ret;
+#else
+  if (isgreater (x, y))
+    return x;
+  else if (isless (x, y))
+    return y;
+  else if (x == y)
+    {
+      int32_t xi;
+      GET_HIGH_WORD (xi, x);
+      return (xi < 0 ? y : x);
+    }
+  else
+    return isnan (y) ? (isnan (x) ? x + y : x) : y;
+#endif
+}
+
+libm_alias_double (__fmaximum_num, fmaximum_num)
diff --git a/sysdeps/mips/ieee754/s_fmaximum_numf.c b/sysdeps/mips/ieee754/s_fmaximum_numf.c
new file mode 100644
index 0000000000..1047f354be
--- /dev/null
+++ b/sysdeps/mips/ieee754/s_fmaximum_numf.c
@@ -0,0 +1,53 @@
+/* fmaximum_numf().  MIPS version.
+   Copyright (C) 2024 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 <math.h>
+#include <libm-alias-float.h>
+#include <math_private.h>
+
+float
+__fmaximum_numf (float x, float y)
+{
+#if __mips_isa_rev >= 6 && defined(__mips_hard_float)
+  float ret;
+  asm volatile("max.s	%0, %1, %2" : "=f"(ret) : "f"(x), "f"(y));
+  if (isnan (ret))
+    {
+      if (!__mips_issignalingf (x))
+	ret = x;
+      if (!__mips_issignalingf (y))
+	ret = y;
+    }
+  return ret;
+#else
+  if (isgreater (x, y))
+    return x;
+  else if (isless (x, y))
+    return y;
+  else if (x == y)
+    {
+      int32_t xi;
+      GET_FLOAT_WORD (xi, x);
+      return (xi < 0 ? y : x);
+    }
+  else
+    return isnan (y) ? (isnan (x) ? x + y : x) : y;
+#endif
+}
+
+libm_alias_float (__fmaximum_num, fmaximum_num)
diff --git a/sysdeps/mips/ieee754/s_fminimum_mag_num.c b/sysdeps/mips/ieee754/s_fminimum_mag_num.c
new file mode 100644
index 0000000000..a6df931aaf
--- /dev/null
+++ b/sysdeps/mips/ieee754/s_fminimum_mag_num.c
@@ -0,0 +1,65 @@
+/* fminimum_mag_num().  MIPS version.
+   Copyright (C) 2024 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 <math.h>
+#include <libm-alias-double.h>
+#include <math_private.h>
+#include <math-type-macros-double.h>
+
+double
+__fminimum_mag_num (double x, double y)
+{
+#if __mips_isa_rev >= 6 && defined(__mips_hard_float)                         \
+    && !defined(__mips_single_float)
+  double ret;
+  asm volatile("mina.d	%0, %1, %2" : "=f"(ret) : "f"(x), "f"(y));
+  if (isnan (ret))
+    {
+      if (!__mips_issignaling (x))
+	ret = x;
+      else if (!__mips_issignaling (y))
+	ret = y;
+    }
+  return ret;
+#else
+  double ax;
+  double ay;
+  /* ABS.d signals both sNAN and qNAN on pre-R5.  */
+  if (isunordered (x, y))
+    return isnan (y) ? (isnan (x) ? x + y : x) : y;
+#  if defined(__mips_hard_float) && !defined(__mips_single_float)
+  asm volatile("abs.d	%0, %1" : "=f"(ax) : "f"(x));
+  asm volatile("abs.d	%0, %1" : "=f"(ay) : "f"(y));
+#  else
+  ax = M_FABS (x);
+  ay = M_FABS (y);
+#  endif
+  if (isgreater (ax, ay))
+    return y;
+  else if (isless (ax, ay))
+    return x;
+  else
+    {
+      int32_t xi;
+      GET_HIGH_WORD (xi, x);
+      return (xi < 0 ? x : y);
+    }
+#endif
+}
+
+libm_alias_double (__fminimum_mag_num, fminimum_mag_num)
diff --git a/sysdeps/mips/ieee754/s_fminimum_mag_numf.c b/sysdeps/mips/ieee754/s_fminimum_mag_numf.c
new file mode 100644
index 0000000000..74d189b380
--- /dev/null
+++ b/sysdeps/mips/ieee754/s_fminimum_mag_numf.c
@@ -0,0 +1,64 @@
+/* fminimum_mag_numf().  MIPS version.
+   Copyright (C) 2024 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 <math.h>
+#include <libm-alias-float.h>
+#include <math_private.h>
+#include <math-type-macros-float.h>
+
+float
+__fminimum_mag_numf (float x, float y)
+{
+#if __mips_isa_rev >= 6 && defined(__mips_hard_float)
+  float ret;
+  asm volatile("mina.s	%0, %1, %2" : "=f"(ret) : "f"(x), "f"(y));
+  if (isnan (ret))
+    {
+      if (!__mips_issignalingf (x))
+	ret = x;
+      else if (!__mips_issignalingf (y))
+	ret = y;
+    }
+  return ret;
+#else
+  float ax;
+  float ay;
+  /* ABS.s signals both sNAN and qNAN on pre-R5.  */
+  if (isunordered (x, y))
+    return isnan (y) ? (isnan (x) ? x + y : x) : y;
+#  if defined(__mips_hard_float)
+  asm volatile("abs.s	%0, %1" : "=f"(ax) : "f"(x));
+  asm volatile("abs.s	%0, %1" : "=f"(ay) : "f"(y));
+#  else
+  ax = M_FABS (x);
+  ay = M_FABS (y);
+#  endif
+  if (isgreater (ax, ay))
+    return y;
+  else if (isless (ax, ay))
+    return x;
+  else
+    {
+      int32_t xi;
+      GET_FLOAT_WORD (xi, x);
+      return (xi < 0 ? x : y);
+    }
+#endif
+}
+
+libm_alias_float (__fminimum_mag_num, fminimum_mag_num)
diff --git a/sysdeps/mips/ieee754/s_fminimum_num.c b/sysdeps/mips/ieee754/s_fminimum_num.c
new file mode 100644
index 0000000000..62fd139d63
--- /dev/null
+++ b/sysdeps/mips/ieee754/s_fminimum_num.c
@@ -0,0 +1,54 @@
+/* fminimum_num().  MIPS version.
+   Copyright (C) 2024 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 <math.h>
+#include <libm-alias-double.h>
+#include <math_private.h>
+
+double
+__fminimum_num (double x, double y)
+{
+#if __mips_isa_rev >= 6 && defined(__mips_hard_float)                         \
+    && !defined(__mips_single_float)
+  double ret;
+  asm volatile("min.d	%0, %1, %2" : "=f"(ret) : "f"(x), "f"(y));
+  if (isnan (ret))
+    {
+      if (!__mips_issignaling (x))
+	ret = x;
+      if (!__mips_issignaling (y))
+	ret = y;
+    }
+  return ret;
+#else
+  if (isgreater (x, y))
+    return y;
+  else if (isless (x, y))
+    return x;
+  else if (x == y)
+    {
+      int32_t xi;
+      GET_HIGH_WORD (xi, x);
+      return (xi < 0 ? x : y);
+    }
+  else
+    return isnan (y) ? (isnan (x) ? x + y : x) : y;
+#endif
+}
+
+libm_alias_double (__fminimum_num, fminimum_num)
diff --git a/sysdeps/mips/ieee754/s_fminimum_numf.c b/sysdeps/mips/ieee754/s_fminimum_numf.c
new file mode 100644
index 0000000000..37d66ff6fa
--- /dev/null
+++ b/sysdeps/mips/ieee754/s_fminimum_numf.c
@@ -0,0 +1,53 @@
+/* fminimum_numf().  MIPS version.
+   Copyright (C) 2024 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 <math.h>
+#include <libm-alias-float.h>
+#include <math_private.h>
+
+float
+__fminimum_numf (float x, float y)
+{
+#if __mips_isa_rev >= 6 && defined(__mips_hard_float)
+  float ret;
+  asm volatile("min.s	%0, %1, %2" : "=f"(ret) : "f"(x), "f"(y));
+  if (isnan (ret))
+    {
+      if (!__mips_issignalingf (x))
+	ret = x;
+      if (!__mips_issignalingf (y))
+	ret = y;
+    }
+  return ret;
+#else
+  if (isgreater (x, y))
+    return y;
+  else if (isless (x, y))
+    return x;
+  else if (x == y)
+    {
+      int32_t xi;
+      GET_FLOAT_WORD (xi, x);
+      return (xi < 0 ? x : y);
+    }
+  else
+    return isnan (y) ? (isnan (x) ? x + y : x) : y;
+#endif
+}
+
+libm_alias_float (__fminimum_num, fminimum_num)
-- 
2.39.2