Message ID | f480d279d835b00a7edc03aa930f3e6c574ab000.1663702373.git.dj@redhat.com |
---|---|
State | New |
Headers | show |
Series | coalesce some rv64 and rv32 stuff | expand |
On 20/09/22 16:21, DJ Delorie via Libc-alpha wrote: > > We don't need RV32 specific floating point functions, instead make them > generic for RISC-V. LGTM, thanks. Maybe in the future adapt to use compiler builtins. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> > --- > sysdeps/riscv/rv32/rvd/s_lrint.c | 31 ------------------------ > sysdeps/riscv/rv32/rvd/s_lround.c | 31 ------------------------ > sysdeps/riscv/rv32/rvf/s_lrintf.c | 31 ------------------------ > sysdeps/riscv/rv32/rvf/s_lroundf.c | 31 ------------------------ > sysdeps/riscv/{rv64 => }/rvd/s_lrint.c | 12 +++++++-- > sysdeps/riscv/{rv64 => }/rvd/s_lround.c | 12 +++++++-- > sysdeps/riscv/{rv64 => }/rvf/s_lrintf.c | 12 +++++++-- > sysdeps/riscv/{rv64 => }/rvf/s_lroundf.c | 12 +++++++-- > 8 files changed, 40 insertions(+), 132 deletions(-) > delete mode 100644 sysdeps/riscv/rv32/rvd/s_lrint.c > delete mode 100644 sysdeps/riscv/rv32/rvd/s_lround.c > delete mode 100644 sysdeps/riscv/rv32/rvf/s_lrintf.c > delete mode 100644 sysdeps/riscv/rv32/rvf/s_lroundf.c > rename sysdeps/riscv/{rv64 => }/rvd/s_lrint.c (83%) > rename sysdeps/riscv/{rv64 => }/rvd/s_lround.c (83%) > rename sysdeps/riscv/{rv64 => }/rvf/s_lrintf.c (83%) > rename sysdeps/riscv/{rv64 => }/rvf/s_lroundf.c (83%) > > diff --git a/sysdeps/riscv/rv32/rvd/s_lrint.c b/sysdeps/riscv/rv32/rvd/s_lrint.c > deleted file mode 100644 > index f0a4d6135f..0000000000 > --- a/sysdeps/riscv/rv32/rvd/s_lrint.c > +++ /dev/null > @@ -1,31 +0,0 @@ > -/* lrint(). The 32-bit RISC-V (RV32) version. > - Copyright (C) 2020-2022 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 <stdint.h> > - > -long int > -__lrint (double x) > -{ > - int32_t res; > - asm ("fcvt.w.d %0, %1" : "=r" (res) : "f" (x)); > - return res; > -} > - > -libm_alias_double (__lrint, lrint) > diff --git a/sysdeps/riscv/rv32/rvd/s_lround.c b/sysdeps/riscv/rv32/rvd/s_lround.c > deleted file mode 100644 > index 7549461095..0000000000 > --- a/sysdeps/riscv/rv32/rvd/s_lround.c > +++ /dev/null > @@ -1,31 +0,0 @@ > -/* lround(). 32-bit RISC-V (RV32) version. > - Copyright (C) 2020-2022 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 <stdint.h> > - > -long int > -__lround (double x) > -{ > - int32_t res; > - asm ("fcvt.w.d %0, %1, rmm" : "=r" (res) : "f" (x)); > - return res; > -} > - > -libm_alias_double (__lround, lround) > diff --git a/sysdeps/riscv/rv32/rvf/s_lrintf.c b/sysdeps/riscv/rv32/rvf/s_lrintf.c > deleted file mode 100644 > index 6cc281f82a..0000000000 > --- a/sysdeps/riscv/rv32/rvf/s_lrintf.c > +++ /dev/null > @@ -1,31 +0,0 @@ > -/* lrintf(). 32-bit RISC-V (RV32) version. > - Copyright (C) 2020-2022 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 <stdint.h> > - > -long int > -__lrintf (float x) > -{ > - int32_t res; > - asm ("fcvt.w.s %0, %1" : "=r" (res) : "f" (x)); > - return res; > -} > - > -libm_alias_float (__lrint, lrint) > diff --git a/sysdeps/riscv/rv32/rvf/s_lroundf.c b/sysdeps/riscv/rv32/rvf/s_lroundf.c > deleted file mode 100644 > index dcaef30fc7..0000000000 > --- a/sysdeps/riscv/rv32/rvf/s_lroundf.c > +++ /dev/null > @@ -1,31 +0,0 @@ > -/* lroundf(). 32-bit RISC-V (RV32) version. > - Copyright (C) 2020-2022 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 <stdint.h> > - > -long int > -__lroundf (float x) > -{ > - int32_t res; > - asm ("fcvt.w.s %0, %1, rmm" : "=r" (res) : "f" (x)); > - return res; > -} > - > -libm_alias_float (__lround, lround) > diff --git a/sysdeps/riscv/rv64/rvd/s_lrint.c b/sysdeps/riscv/rvd/s_lrint.c > similarity index 83% > rename from sysdeps/riscv/rv64/rvd/s_lrint.c > rename to sysdeps/riscv/rvd/s_lrint.c > index 64bf72ec02..5a9693034c 100644 > --- a/sysdeps/riscv/rv64/rvd/s_lrint.c > +++ b/sysdeps/riscv/rvd/s_lrint.c > @@ -19,11 +19,19 @@ > #include <libm-alias-double.h> > #include <stdint.h> > > +#if __WORDSIZE == 64 > +# define OP "fcvt.l.d" > +#elif __WORDSIZE == 32 > +# define OP "fcvt.w.d" > +#else > +# error Unsupported > +#endif > + > long int > __lrint (double x) > { > - int64_t res; > - asm ("fcvt.l.d %0, %1" : "=r" (res) : "f" (x)); > + long int res; > + asm (OP "\t%0, %1" : "=r" (res) : "f" (x)); > return res; > } > > diff --git a/sysdeps/riscv/rv64/rvd/s_lround.c b/sysdeps/riscv/rvd/s_lround.c > similarity index 83% > rename from sysdeps/riscv/rv64/rvd/s_lround.c > rename to sysdeps/riscv/rvd/s_lround.c > index 1b55d99a0e..f869aa41ce 100644 > --- a/sysdeps/riscv/rv64/rvd/s_lround.c > +++ b/sysdeps/riscv/rvd/s_lround.c > @@ -19,11 +19,19 @@ > #include <libm-alias-double.h> > #include <stdint.h> > > +#if __WORDSIZE == 64 > +# define OP "fcvt.l.d" > +#elif __WORDSIZE == 32 > +# define OP "fcvt.w.d" > +#else > +# error Unsupported > +#endif > + > long int > __lround (double x) > { > - int64_t res; > - asm ("fcvt.l.d %0, %1, rmm" : "=r" (res) : "f" (x)); > + long int res; > + asm (OP "\t%0, %1, rmm" : "=r" (res) : "f" (x)); > return res; > } > > diff --git a/sysdeps/riscv/rv64/rvf/s_lrintf.c b/sysdeps/riscv/rvf/s_lrintf.c > similarity index 83% > rename from sysdeps/riscv/rv64/rvf/s_lrintf.c > rename to sysdeps/riscv/rvf/s_lrintf.c > index ca97bc108e..0bd4945df7 100644 > --- a/sysdeps/riscv/rv64/rvf/s_lrintf.c > +++ b/sysdeps/riscv/rvf/s_lrintf.c > @@ -20,11 +20,19 @@ > #include <libm-alias-float.h> > #include <stdint.h> > > +#if __WORDSIZE == 64 > +# define OP "fcvt.l.s" > +#elif __WORDSIZE == 32 > +# define OP "fcvt.w.s" > +#else > +# error Unsupported > +#endif > + > long int > __lrintf (float x) > { > - int64_t res; > - asm ("fcvt.l.s %0, %1" : "=r" (res) : "f" (x)); > + long int res; > + asm (OP "\t%0, %1" : "=r" (res) : "f" (x)); > return res; > } > > diff --git a/sysdeps/riscv/rv64/rvf/s_lroundf.c b/sysdeps/riscv/rvf/s_lroundf.c > similarity index 83% > rename from sysdeps/riscv/rv64/rvf/s_lroundf.c > rename to sysdeps/riscv/rvf/s_lroundf.c > index 046870d0a3..c6dd141230 100644 > --- a/sysdeps/riscv/rv64/rvf/s_lroundf.c > +++ b/sysdeps/riscv/rvf/s_lroundf.c > @@ -20,11 +20,19 @@ > #include <libm-alias-float.h> > #include <stdint.h> > > +#if __WORDSIZE == 64 > +# define OP "fcvt.l.s" > +#elif __WORDSIZE == 32 > +# define OP "fcvt.w.s" > +#else > +# error Unsupported > +#endif > + > long int > __lroundf (float x) > { > - int64_t res; > - asm ("fcvt.l.s %0, %1, rmm" : "=r" (res) : "f" (x)); > + long int res; > + asm (OP "\t%0, %1, rmm" : "=r" (res) : "f" (x)); > return res; > } >
diff --git a/sysdeps/riscv/rv32/rvd/s_lrint.c b/sysdeps/riscv/rv32/rvd/s_lrint.c deleted file mode 100644 index f0a4d6135f..0000000000 --- a/sysdeps/riscv/rv32/rvd/s_lrint.c +++ /dev/null @@ -1,31 +0,0 @@ -/* lrint(). The 32-bit RISC-V (RV32) version. - Copyright (C) 2020-2022 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 <stdint.h> - -long int -__lrint (double x) -{ - int32_t res; - asm ("fcvt.w.d %0, %1" : "=r" (res) : "f" (x)); - return res; -} - -libm_alias_double (__lrint, lrint) diff --git a/sysdeps/riscv/rv32/rvd/s_lround.c b/sysdeps/riscv/rv32/rvd/s_lround.c deleted file mode 100644 index 7549461095..0000000000 --- a/sysdeps/riscv/rv32/rvd/s_lround.c +++ /dev/null @@ -1,31 +0,0 @@ -/* lround(). 32-bit RISC-V (RV32) version. - Copyright (C) 2020-2022 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 <stdint.h> - -long int -__lround (double x) -{ - int32_t res; - asm ("fcvt.w.d %0, %1, rmm" : "=r" (res) : "f" (x)); - return res; -} - -libm_alias_double (__lround, lround) diff --git a/sysdeps/riscv/rv32/rvf/s_lrintf.c b/sysdeps/riscv/rv32/rvf/s_lrintf.c deleted file mode 100644 index 6cc281f82a..0000000000 --- a/sysdeps/riscv/rv32/rvf/s_lrintf.c +++ /dev/null @@ -1,31 +0,0 @@ -/* lrintf(). 32-bit RISC-V (RV32) version. - Copyright (C) 2020-2022 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 <stdint.h> - -long int -__lrintf (float x) -{ - int32_t res; - asm ("fcvt.w.s %0, %1" : "=r" (res) : "f" (x)); - return res; -} - -libm_alias_float (__lrint, lrint) diff --git a/sysdeps/riscv/rv32/rvf/s_lroundf.c b/sysdeps/riscv/rv32/rvf/s_lroundf.c deleted file mode 100644 index dcaef30fc7..0000000000 --- a/sysdeps/riscv/rv32/rvf/s_lroundf.c +++ /dev/null @@ -1,31 +0,0 @@ -/* lroundf(). 32-bit RISC-V (RV32) version. - Copyright (C) 2020-2022 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 <stdint.h> - -long int -__lroundf (float x) -{ - int32_t res; - asm ("fcvt.w.s %0, %1, rmm" : "=r" (res) : "f" (x)); - return res; -} - -libm_alias_float (__lround, lround) diff --git a/sysdeps/riscv/rv64/rvd/s_lrint.c b/sysdeps/riscv/rvd/s_lrint.c similarity index 83% rename from sysdeps/riscv/rv64/rvd/s_lrint.c rename to sysdeps/riscv/rvd/s_lrint.c index 64bf72ec02..5a9693034c 100644 --- a/sysdeps/riscv/rv64/rvd/s_lrint.c +++ b/sysdeps/riscv/rvd/s_lrint.c @@ -19,11 +19,19 @@ #include <libm-alias-double.h> #include <stdint.h> +#if __WORDSIZE == 64 +# define OP "fcvt.l.d" +#elif __WORDSIZE == 32 +# define OP "fcvt.w.d" +#else +# error Unsupported +#endif + long int __lrint (double x) { - int64_t res; - asm ("fcvt.l.d %0, %1" : "=r" (res) : "f" (x)); + long int res; + asm (OP "\t%0, %1" : "=r" (res) : "f" (x)); return res; } diff --git a/sysdeps/riscv/rv64/rvd/s_lround.c b/sysdeps/riscv/rvd/s_lround.c similarity index 83% rename from sysdeps/riscv/rv64/rvd/s_lround.c rename to sysdeps/riscv/rvd/s_lround.c index 1b55d99a0e..f869aa41ce 100644 --- a/sysdeps/riscv/rv64/rvd/s_lround.c +++ b/sysdeps/riscv/rvd/s_lround.c @@ -19,11 +19,19 @@ #include <libm-alias-double.h> #include <stdint.h> +#if __WORDSIZE == 64 +# define OP "fcvt.l.d" +#elif __WORDSIZE == 32 +# define OP "fcvt.w.d" +#else +# error Unsupported +#endif + long int __lround (double x) { - int64_t res; - asm ("fcvt.l.d %0, %1, rmm" : "=r" (res) : "f" (x)); + long int res; + asm (OP "\t%0, %1, rmm" : "=r" (res) : "f" (x)); return res; } diff --git a/sysdeps/riscv/rv64/rvf/s_lrintf.c b/sysdeps/riscv/rvf/s_lrintf.c similarity index 83% rename from sysdeps/riscv/rv64/rvf/s_lrintf.c rename to sysdeps/riscv/rvf/s_lrintf.c index ca97bc108e..0bd4945df7 100644 --- a/sysdeps/riscv/rv64/rvf/s_lrintf.c +++ b/sysdeps/riscv/rvf/s_lrintf.c @@ -20,11 +20,19 @@ #include <libm-alias-float.h> #include <stdint.h> +#if __WORDSIZE == 64 +# define OP "fcvt.l.s" +#elif __WORDSIZE == 32 +# define OP "fcvt.w.s" +#else +# error Unsupported +#endif + long int __lrintf (float x) { - int64_t res; - asm ("fcvt.l.s %0, %1" : "=r" (res) : "f" (x)); + long int res; + asm (OP "\t%0, %1" : "=r" (res) : "f" (x)); return res; } diff --git a/sysdeps/riscv/rv64/rvf/s_lroundf.c b/sysdeps/riscv/rvf/s_lroundf.c similarity index 83% rename from sysdeps/riscv/rv64/rvf/s_lroundf.c rename to sysdeps/riscv/rvf/s_lroundf.c index 046870d0a3..c6dd141230 100644 --- a/sysdeps/riscv/rv64/rvf/s_lroundf.c +++ b/sysdeps/riscv/rvf/s_lroundf.c @@ -20,11 +20,19 @@ #include <libm-alias-float.h> #include <stdint.h> +#if __WORDSIZE == 64 +# define OP "fcvt.l.s" +#elif __WORDSIZE == 32 +# define OP "fcvt.w.s" +#else +# error Unsupported +#endif + long int __lroundf (float x) { - int64_t res; - asm ("fcvt.l.s %0, %1, rmm" : "=r" (res) : "f" (x)); + long int res; + asm (OP "\t%0, %1, rmm" : "=r" (res) : "f" (x)); return res; }