From efd13567f7ff1be010c10e3fef010b9165d1b0ad Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Mon, 24 Feb 2025 20:49:17 +0800 Subject: [PATCH] LoongArch: Optimize f{max,min}imum_num{,f} Following the logic of the previous commits. Signed-off-by: Xi Ruoyao --- sysdeps/loongarch/fpu/s_fmaximum_num.c | 48 ------------------ .../loongarch/fpu/s_fmaximum_num_template.c | 39 +++++++++++++++ sysdeps/loongarch/fpu/s_fmaximum_numf.c | 49 ------------------- sysdeps/loongarch/fpu/s_fminimum_num.c | 48 ------------------ .../loongarch/fpu/s_fminimum_num_template.c | 39 +++++++++++++++ sysdeps/loongarch/fpu/s_fminimum_numf.c | 48 ------------------ 6 files changed, 78 insertions(+), 193 deletions(-) delete mode 100644 sysdeps/loongarch/fpu/s_fmaximum_num.c create mode 100644 sysdeps/loongarch/fpu/s_fmaximum_num_template.c delete mode 100644 sysdeps/loongarch/fpu/s_fmaximum_numf.c delete mode 100644 sysdeps/loongarch/fpu/s_fminimum_num.c create mode 100644 sysdeps/loongarch/fpu/s_fminimum_num_template.c delete mode 100644 sysdeps/loongarch/fpu/s_fminimum_numf.c diff --git a/sysdeps/loongarch/fpu/s_fmaximum_num.c b/sysdeps/loongarch/fpu/s_fmaximum_num.c deleted file mode 100644 index a7d47f5950..0000000000 --- a/sysdeps/loongarch/fpu/s_fmaximum_num.c +++ /dev/null @@ -1,48 +0,0 @@ -/* fmaximum_num(). 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 - . */ - -#define NO_MATH_REDIRECT -#include -#include -#include - -double -__fmaximum_num (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 & _FCLASS_NAN) && !(y_cond & _FCLASS_NAN))) - { - asm volatile ("fmax.d \t%0, %1, %2" : "=f" (x) : "f" (x), "f" (y)); - return y; - } - else if (__glibc_unlikely(!(x_cond & _FCLASS_NAN) && (y_cond & _FCLASS_NAN))) - { - asm volatile ("fmax.d \t%0, %1, %2" : "=f" (y) : "f" (x), "f" (y)); - return x; - } - else - { - asm volatile ("fmax.d \t%0, %1, %2" : "=f" (x) : "f" (x), "f" (y)); - return x; - } -} -libm_alias_double (__fmaximum_num, fmaximum_num) diff --git a/sysdeps/loongarch/fpu/s_fmaximum_num_template.c b/sysdeps/loongarch/fpu/s_fmaximum_num_template.c new file mode 100644 index 0000000000..34f563444b --- /dev/null +++ b/sysdeps/loongarch/fpu/s_fmaximum_num_template.c @@ -0,0 +1,39 @@ +/* Return maximum number of X and Y. 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 + . */ + +#ifndef INSN_FMT +#include_next +#else + +#include + +FLOAT +M_DECL_FUNC (__fmaximum_num) (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, %3, %2, $fcc0\n\t" + "fsel" "\t%1, %2, %3, $fcc1\n\t" + "fmax." INSN_FMT "\t%1, %0, %1" + : "=&f" (a), "=f" (b) : "f" (x), "f" (y) : "fcc0", "fcc1"); + return b; +} +declare_mgen_alias (__fmaximum_num, fmaximum_num); + +#endif diff --git a/sysdeps/loongarch/fpu/s_fmaximum_numf.c b/sysdeps/loongarch/fpu/s_fmaximum_numf.c deleted file mode 100644 index f107391ae6..0000000000 --- a/sysdeps/loongarch/fpu/s_fmaximum_numf.c +++ /dev/null @@ -1,49 +0,0 @@ -/* fmaximum_numf(). 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 - . */ - -#define NO_MATH_REDIRECT -#include -#include -#include - -float -__fmaximum_numf (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 & _FCLASS_NAN) && !(y_cond & _FCLASS_NAN))) - { - asm volatile ("fmax.s \t%0, %1, %2" : "=f" (x) : "f" (x), "f" (y)); - return y; - } - else if (__glibc_unlikely(!(x_cond & _FCLASS_NAN) && (y_cond & _FCLASS_NAN))) - { - asm volatile ("fmax.s \t%0, %1, %2" : "=f" (y) : "f" (x), "f" (y)); - return x; - } - else - { - asm volatile ("fmax.s \t%0, %1, %2" : "=f" (x) : "f" (x), "f" (y)); - return x; - } -} -libm_alias_float (__fmaximum_num, fmaximum_num) diff --git a/sysdeps/loongarch/fpu/s_fminimum_num.c b/sysdeps/loongarch/fpu/s_fminimum_num.c deleted file mode 100644 index 769efc2ff4..0000000000 --- a/sysdeps/loongarch/fpu/s_fminimum_num.c +++ /dev/null @@ -1,48 +0,0 @@ -/* fminimum_num(). 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 - . */ - -#define NO_MATH_REDIRECT -#include -#include -#include - -double -__fminimum_num (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 & _FCLASS_NAN) && !(y_cond & _FCLASS_NAN))) - { - asm volatile ("fmin.d \t%0, %1, %2" : "=f" (x) : "f" (x), "f" (y)); - return y; - } - else if (__glibc_unlikely(!(x_cond & _FCLASS_NAN) && (y_cond & _FCLASS_NAN))) - { - asm volatile ("fmin.d \t%0, %1, %2" : "=f" (y) : "f" (x), "f" (y)); - return x; - } - else - { - asm volatile ("fmin.d \t%0, %1, %2" : "=f" (x) : "f" (x), "f" (y)); - return x; - } -} -libm_alias_double (__fminimum_num, fminimum_num) diff --git a/sysdeps/loongarch/fpu/s_fminimum_num_template.c b/sysdeps/loongarch/fpu/s_fminimum_num_template.c new file mode 100644 index 0000000000..035cfbdbcf --- /dev/null +++ b/sysdeps/loongarch/fpu/s_fminimum_num_template.c @@ -0,0 +1,39 @@ +/* Return minimum number of X and Y. 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 + . */ + +#ifndef INSN_FMT +#include_next +#else + +#include + +FLOAT +M_DECL_FUNC (__fminimum_num) (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, %3, %2, $fcc0\n\t" + "fsel" "\t%1, %2, %3, $fcc1\n\t" + "fmin." INSN_FMT "\t%1, %0, %1" + : "=&f" (a), "=f" (b) : "f" (x), "f" (y) : "fcc0", "fcc1"); + return b; +} +declare_mgen_alias (__fminimum_num, fminimum_num); + +#endif diff --git a/sysdeps/loongarch/fpu/s_fminimum_numf.c b/sysdeps/loongarch/fpu/s_fminimum_numf.c deleted file mode 100644 index 6900aeaf2f..0000000000 --- a/sysdeps/loongarch/fpu/s_fminimum_numf.c +++ /dev/null @@ -1,48 +0,0 @@ -/* fminimum_numf(). 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 - . */ - -#define NO_MATH_REDIRECT -#include -#include -#include - -float -__fminimum_numf (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 & _FCLASS_NAN) && !(y_cond & _FCLASS_NAN))) - { - asm volatile ("fmin.s \t%0, %1, %2" : "=f" (x) : "f" (x), "f" (y)); - return y; - } - else if (__glibc_unlikely(!(x_cond & _FCLASS_NAN) && (y_cond & _FCLASS_NAN))) - { - asm volatile ("fmin.s \t%0, %1, %2" : "=f" (y) : "f" (x), "f" (y)); - return x; - } - else - { - asm volatile ("fmin.s \t%0, %1, %2" : "=f" (x) : "f" (x), "f" (y)); - return x; - } -} -libm_alias_float (__fminimum_num, fminimum_num)