From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2130) id A4C383858293; Wed, 21 Sep 2022 18:39:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A4C383858293 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1663785547; bh=dvYbCJ/HiluRaafkwP1kCcTL2UHbnTYjfsjLTRP02Xo=; h=From:To:Subject:Date:From; b=FmVt/28eyLoAV/lVAaA5DY3MegLbQqVz08DjYHqUxhoxQYzcAccAMt2sVVslpTtEe ZQiB7Um/A7vfMXZdKnDYta5/B71rMMsYaJHvYt0Z+B3apqi12Ti/XOMoSNUBectFQ8 OoDYcouNlQ+Ct2ElNvwOHIVKS1X7y5gABSZipCBk= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: DJ Delorie To: glibc-cvs@sourceware.org Subject: [glibc] riscv: Remove RV32 floating point functions X-Act-Checkin: glibc X-Git-Author: Alistair Francis X-Git-Refname: refs/heads/master X-Git-Oldrev: 73e9fe43acb15722ebe06de741dbdb8cdb768ad1 X-Git-Newrev: 2e81493fa6f45e2df14a735b95717e867f716ebb Message-Id: <20220921183907.A4C383858293@sourceware.org> Date: Wed, 21 Sep 2022 18:39:07 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=2e81493fa6f45e2df14a735b95717e867f716ebb commit 2e81493fa6f45e2df14a735b95717e867f716ebb Author: Alistair Francis Date: Tue Sep 20 15:21:13 2022 -0400 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 Diff: --- 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(-) 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 - . */ - -#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 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 - . */ - -#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 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 - . */ - -#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 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 - . */ - -#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/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 #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) { - 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 #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) { - 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 #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) { - 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 #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) { - 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; }