From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oa1-x31.google.com (mail-oa1-x31.google.com [IPv6:2001:4860:4864:20::31]) by sourceware.org (Postfix) with ESMTPS id 9C12438582AF for ; Wed, 21 Sep 2022 17:37:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 9C12438582AF Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org Received: by mail-oa1-x31.google.com with SMTP id 586e51a60fabf-12803ac8113so10108527fac.8 for ; Wed, 21 Sep 2022 10:37:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:in-reply-to:organization:from:references :to:content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date; bh=W/eO9/aPRcXU1hfOSXUHgwYWt2PWKuCH5U3rxQyzvbI=; b=WtCgVVQyLVw9xzCEPWz0OxrDD6F7/j2zwmngKJJst1tCvoLopqumMnWQgL0i7hlske oN9OHESUuis9LT+UkuNVgwtODxGBW4H/es9GO+mrLPqLTVOHnsbT7O8Zr6YabEDahTv4 sfLnq15qI655Yt3ox+PmyUp2vjyHukNqU16uS7M10ydJuf31hlt+3a9+5K6ngvZ8Ub8k j53Ll64aJfmzZ4vy3X8ldS0QXG92HGep6MJxQW0oEzDvK7bZ5gD2gY32mTqFxYQ2xaZm ikjRoNa8qbOquuT20PJ8e1GVWFczWk4fC/gETBPGrUXTVf2q5cefpOdrYayqfpRfJrMp 0H4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:organization:from:references :to:content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date; bh=W/eO9/aPRcXU1hfOSXUHgwYWt2PWKuCH5U3rxQyzvbI=; b=jpuJu5GIy8ariHBzO0Oqjhs++ICpcADP5lQU6qwSqs6ivT8v8DyhZUX3SDXYWjUxgp O301NIcVpQCOChiNkKNrt7qeJZWAKHZsgkmRbZtYY7q45sDeMxp/jlr2vYtP/FfyouWW reVwmYFPGN/D+066pimexC6AgjEqnOzBi5u2quxlbmodXznTsm9rxa6DoRw3U1ffQ7SF E1f9q6cpZmcvzVAw/fnv3MuJ1wJ7K4NljKvqhcDxqEBnmd+iv7cDK7KYn+i1ivykFrIx cMUkehbf2SBVCCHZJaroW9ZLzIU68nLs6yhSXRq6FRuvlwDtZtNtmvDQraNPaCY5hdKE wvGQ== X-Gm-Message-State: ACrzQf2Yk9bZ72BU5yFROMrPQp1dAROOY5azZrHiKwz9jeZKrfisPokF s0TirT+p7nQNUdnuZV05/cc7ixzMBKlFAfGJ X-Google-Smtp-Source: AMsMyM77hljvhAVfMF1T83FBjn6/zMkCDEFUNuc2hTz0UAykASutYlHWMFTAr1ON9aO4w4IFyE3XRw== X-Received: by 2002:a05:6870:2382:b0:12d:4848:fbcc with SMTP id e2-20020a056870238200b0012d4848fbccmr5728150oap.111.1663781822866; Wed, 21 Sep 2022 10:37:02 -0700 (PDT) Received: from ?IPV6:2804:1b3:a7c1:c266:cc93:9f8:1eba:d2e8? ([2804:1b3:a7c1:c266:cc93:9f8:1eba:d2e8]) by smtp.gmail.com with ESMTPSA id s130-20020acac288000000b00344a22e71a9sm1502422oif.9.2022.09.21.10.37.01 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 21 Sep 2022 10:37:02 -0700 (PDT) Message-ID: Date: Wed, 21 Sep 2022 14:37:00 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.2.2 Subject: Re: [PATCH 2/2] riscv: Remove RV32 floating point functions Content-Language: en-US To: DJ Delorie , libc-alpha@sourceware.org References: From: Adhemerval Zanella Netto Organization: Linaro In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-14.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_ASCII_DIVIDERS,KAM_SHORT,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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 > --- > 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 > - . */ > - > -#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; > } >