Re: [musl] [PATCH v3] math: add riscv64 round/roundf

[Szabolcs Nagy <nsz@port70.net>]

* Meng Zhuo <mzh@mzh.io> [2024-06-13 00:06:12 +0800]:

> ---
> First of all, sorry for any inconvenience.
> This is my first time try to contribute with mail list.
> ---
> v1 -> v3:
> * using isfinite to check NaN,+-inf and in range without raising INVALID
> * inlined copysign(f)
> ---
>  src/math/riscv64/round.c  | 20 ++++++++++++++++++++
>  src/math/riscv64/roundf.c | 20 ++++++++++++++++++++
>  2 files changed, 40 insertions(+)
>  create mode 100644 src/math/riscv64/round.c
>  create mode 100644 src/math/riscv64/roundf.c
> 
> diff --git a/src/math/riscv64/round.c b/src/math/riscv64/round.c
> new file mode 100644
> index 00000000..6d91c093
> --- /dev/null
> +++ b/src/math/riscv64/round.c
> @@ -0,0 +1,20 @@
> +#include <math.h>
> +
> +#if __riscv_flen >= 64
> +
> +double round(double x)
> +{
> +	if (!isfinite(x)) return x;

!isfinite(x) && fabs(x) >= 0x1p52

otherwise n can overflow below.

(note that the check can be a single cmp+branch on the bit representation of x)

> +	double tmp;
> +	long long n;
> +	__asm__ ("fcvt.l.d %0, %1, rmm" : "=r"(n) : "f"(x));
> +	__asm__ ("fcvt.d.l %0, %1" : "=f"(tmp) : "r"(n));
> +	__asm__ ("fsgnj.d %0, %1, %2" : "=f"(x) : "f"(tmp), "f"(x));

i'd add a comment that the sign bit is only copied to handle round(-0.0)

> +	return x;
> +}
> +
> +#else
> +
> +#include "../round.c"
> +
> +#endif
> diff --git a/src/math/riscv64/roundf.c b/src/math/riscv64/roundf.c
> new file mode 100644
> index 00000000..e67e791f
> --- /dev/null
> +++ b/src/math/riscv64/roundf.c
> @@ -0,0 +1,20 @@
> +#include <math.h>
> +
> +#if __riscv_flen >= 32
> +
> +float roundf(float x)
> +{
> +	if (!isfinite(x)) return x;

&& fabs(x) >= 0x1p23

> +	float tmp;
> +	long n;
> +	__asm__ ("fcvt.w.s %0, %1, rmm" : "=r"(n) : "f"(x));
> +	__asm__ ("fcvt.s.w %0, %1" : "=f"(tmp) : "r"(n));
> +	__asm__ ("fsgnj.s %0, %1, %2" : "=f"(x) : "f"(tmp), "f"(x));
> +	return x;
> +}
> +
> +#else
> +
> +#include "../roundf.c"
> +
> +#endif
> -- 
> 2.39.2