From 2e81493fa6f45e2df14a735b95717e867f716ebb Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Tue, 20 Sep 2022 15:21:13 -0400 Subject: riscv: Remove RV32 floating point functions We don't need RV32 specific floating point functions, instead make them generic for RISC-V. Reviewed-by: Adhemerval Zanella --- 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 | 30 ----------------------------- sysdeps/riscv/rv64/rvd/s_lround.c | 30 ----------------------------- sysdeps/riscv/rv64/rvf/s_lrintf.c | 31 ------------------------------ sysdeps/riscv/rv64/rvf/s_lroundf.c | 31 ------------------------------ sysdeps/riscv/rvd/s_lrint.c | 38 +++++++++++++++++++++++++++++++++++++ sysdeps/riscv/rvd/s_lround.c | 38 +++++++++++++++++++++++++++++++++++++ sysdeps/riscv/rvf/s_lrintf.c | 39 ++++++++++++++++++++++++++++++++++++++ sysdeps/riscv/rvf/s_lroundf.c | 39 ++++++++++++++++++++++++++++++++++++++ 12 files changed, 154 insertions(+), 246 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 delete mode 100644 sysdeps/riscv/rv64/rvd/s_lrint.c delete mode 100644 sysdeps/riscv/rv64/rvd/s_lround.c delete mode 100644 sysdeps/riscv/rv64/rvf/s_lrintf.c delete mode 100644 sysdeps/riscv/rv64/rvf/s_lroundf.c create mode 100644 sysdeps/riscv/rvd/s_lrint.c create mode 100644 sysdeps/riscv/rvd/s_lround.c create mode 100644 sysdeps/riscv/rvf/s_lrintf.c create mode 100644 sysdeps/riscv/rvf/s_lroundf.c (limited to 'sysdeps/riscv') diff --git a/sysdeps/riscv/rv32/rvd/s_lrint.c b/sysdeps/riscv/rv32/rvd/s_lrint.c deleted file mode 100644 index f0a4d61..0000000 --- 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 - . */ - -#include -#include -#include - -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 7549461..0000000 --- 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 - . */ - -#include -#include -#include - -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 6cc281f..0000000 --- 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 - . */ - -#include -#include -#include - -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 dcaef30..0000000 --- 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 - . */ - -#include -#include -#include - -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/rv64/rvd/s_lrint.c deleted file mode 100644 index 64bf72e..0000000 --- a/sysdeps/riscv/rv64/rvd/s_lrint.c +++ /dev/null @@ -1,30 +0,0 @@ -/* lrint(). RISC-V version. - Copyright (C) 2017-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 - . */ - -#include -#include - -long int -__lrint (double x) -{ - int64_t res; - asm ("fcvt.l.d %0, %1" : "=r" (res) : "f" (x)); - return res; -} - -libm_alias_double (__lrint, lrint) diff --git a/sysdeps/riscv/rv64/rvd/s_lround.c b/sysdeps/riscv/rv64/rvd/s_lround.c deleted file mode 100644 index 1b55d99..0000000 --- a/sysdeps/riscv/rv64/rvd/s_lround.c +++ /dev/null @@ -1,30 +0,0 @@ -/* llround(). RISC-V version. - Copyright (C) 2017-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 - . */ - -#include -#include - -long int -__lround (double x) -{ - int64_t res; - asm ("fcvt.l.d %0, %1, rmm" : "=r" (res) : "f" (x)); - return res; -} - -libm_alias_double (__lround, lround) diff --git a/sysdeps/riscv/rv64/rvf/s_lrintf.c b/sysdeps/riscv/rv64/rvf/s_lrintf.c deleted file mode 100644 index ca97bc1..0000000 --- a/sysdeps/riscv/rv64/rvf/s_lrintf.c +++ /dev/null @@ -1,31 +0,0 @@ -/* lrintf(). RISC-V version. - Copyright (C) 2017-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 - . */ - -#include -#include -#include - -long int -__lrintf (float x) -{ - int64_t res; - asm ("fcvt.l.s %0, %1" : "=r" (res) : "f" (x)); - return res; -} - -libm_alias_float (__lrint, lrint) diff --git a/sysdeps/riscv/rv64/rvf/s_lroundf.c b/sysdeps/riscv/rv64/rvf/s_lroundf.c deleted file mode 100644 index 046870d..0000000 --- a/sysdeps/riscv/rv64/rvf/s_lroundf.c +++ /dev/null @@ -1,31 +0,0 @@ -/* lroundf(). RISC-V version. - Copyright (C) 2017-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 - . */ - -#include -#include -#include - -long int -__lroundf (float x) -{ - int64_t res; - asm ("fcvt.l.s %0, %1, rmm" : "=r" (res) : "f" (x)); - return res; -} - -libm_alias_float (__lround, lround) diff --git a/sysdeps/riscv/rvd/s_lrint.c b/sysdeps/riscv/rvd/s_lrint.c new file mode 100644 index 0000000..5a96930 --- /dev/null +++ b/sysdeps/riscv/rvd/s_lrint.c @@ -0,0 +1,38 @@ +/* lrint(). RISC-V version. + Copyright (C) 2017-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 + . */ + +#include +#include + +#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) +{ + long int res; + asm (OP "\t%0, %1" : "=r" (res) : "f" (x)); + return res; +} + +libm_alias_double (__lrint, lrint) diff --git a/sysdeps/riscv/rvd/s_lround.c b/sysdeps/riscv/rvd/s_lround.c new file mode 100644 index 0000000..f869aa4 --- /dev/null +++ b/sysdeps/riscv/rvd/s_lround.c @@ -0,0 +1,38 @@ +/* llround(). RISC-V version. + Copyright (C) 2017-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 + . */ + +#include +#include + +#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) +{ + long int res; + asm (OP "\t%0, %1, rmm" : "=r" (res) : "f" (x)); + return res; +} + +libm_alias_double (__lround, lround) diff --git a/sysdeps/riscv/rvf/s_lrintf.c b/sysdeps/riscv/rvf/s_lrintf.c new file mode 100644 index 0000000..0bd4945 --- /dev/null +++ b/sysdeps/riscv/rvf/s_lrintf.c @@ -0,0 +1,39 @@ +/* lrintf(). RISC-V version. + Copyright (C) 2017-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 + . */ + +#include +#include +#include + +#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) +{ + long int res; + asm (OP "\t%0, %1" : "=r" (res) : "f" (x)); + return res; +} + +libm_alias_float (__lrint, lrint) diff --git a/sysdeps/riscv/rvf/s_lroundf.c b/sysdeps/riscv/rvf/s_lroundf.c new file mode 100644 index 0000000..c6dd141 --- /dev/null +++ b/sysdeps/riscv/rvf/s_lroundf.c @@ -0,0 +1,39 @@ +/* lroundf(). RISC-V version. + Copyright (C) 2017-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 + . */ + +#include +#include +#include + +#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) +{ + long int res; + asm (OP "\t%0, %1, rmm" : "=r" (res) : "f" (x)); + return res; +} + +libm_alias_float (__lround, lround) -- cgit v1.1