[11/13] riscv: Use sqrt{f} builtin

Message ID 20200609213301.3591135-11-adhemerval.zanella@linaro.org
State New
Headers show
Series
  • [01/13] math: Decompose math-use-builtins.h
Related show

Commit Message

Alistair Francis via Libc-alpha June 9, 2020, 9:32 p.m.
Checked with a build for riscv64-linux-gnu-rv64imac-lp64 (no
builtin support), riscv64-linux-gnu-rv64imafdc-lp64, and
riscv64-linux-gnu-rv64imafdc-lp64d.
---
 sysdeps/riscv/rvd/e_sqrt.c                 | 28 ----------------------
 sysdeps/riscv/rvd/math-use-builtins-sqrt.h |  4 ++++
 sysdeps/riscv/rvf/e_sqrtf.c                | 28 ----------------------
 3 files changed, 4 insertions(+), 56 deletions(-)
 delete mode 100644 sysdeps/riscv/rvd/e_sqrt.c
 create mode 100644 sysdeps/riscv/rvd/math-use-builtins-sqrt.h
 delete mode 100644 sysdeps/riscv/rvf/e_sqrtf.c

-- 
2.25.1

Comments

Alistair Francis via Libc-alpha June 19, 2020, 7:17 p.m. | #1
If no one opposes I will commit this.

On 09/06/2020 18:32, Adhemerval Zanella wrote:
> Checked with a build for riscv64-linux-gnu-rv64imac-lp64 (no

> builtin support), riscv64-linux-gnu-rv64imafdc-lp64, and

> riscv64-linux-gnu-rv64imafdc-lp64d.

> ---

>  sysdeps/riscv/rvd/e_sqrt.c                 | 28 ----------------------

>  sysdeps/riscv/rvd/math-use-builtins-sqrt.h |  4 ++++

>  sysdeps/riscv/rvf/e_sqrtf.c                | 28 ----------------------

>  3 files changed, 4 insertions(+), 56 deletions(-)

>  delete mode 100644 sysdeps/riscv/rvd/e_sqrt.c

>  create mode 100644 sysdeps/riscv/rvd/math-use-builtins-sqrt.h

>  delete mode 100644 sysdeps/riscv/rvf/e_sqrtf.c

> 

> diff --git a/sysdeps/riscv/rvd/e_sqrt.c b/sysdeps/riscv/rvd/e_sqrt.c

> deleted file mode 100644

> index 7defcb5785..0000000000

> --- a/sysdeps/riscv/rvd/e_sqrt.c

> +++ /dev/null

> @@ -1,28 +0,0 @@

> -/* Double precision floating point square root.  RISC-V version.

> -   Copyright (C) 2017-2020 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-finite.h>

> -

> -double

> -__ieee754_sqrt (double x)

> -{

> -  asm ("fsqrt.d %0, %1" : "=f" (x) : "f" (x));

> -  return x;

> -}

> -libm_alias_finite (__ieee754_sqrt, __sqrt)

> diff --git a/sysdeps/riscv/rvd/math-use-builtins-sqrt.h b/sysdeps/riscv/rvd/math-use-builtins-sqrt.h

> new file mode 100644

> index 0000000000..e94c915ba6

> --- /dev/null

> +++ b/sysdeps/riscv/rvd/math-use-builtins-sqrt.h

> @@ -0,0 +1,4 @@

> +#define USE_SQRT_BUILTIN 1

> +#define USE_SQRTF_BUILTIN 1

> +#define USE_SQRTL_BUILTIN 0

> +#define USE_SQRTF128_BUILTIN 0

> diff --git a/sysdeps/riscv/rvf/e_sqrtf.c b/sysdeps/riscv/rvf/e_sqrtf.c

> deleted file mode 100644

> index 04835e3e53..0000000000

> --- a/sysdeps/riscv/rvf/e_sqrtf.c

> +++ /dev/null

> @@ -1,28 +0,0 @@

> -/* Single precision floating point square root.  RISC-V version.

> -   Copyright (C) 2017-2020 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-finite.h>

> -

> -float

> -__ieee754_sqrtf (float x)

> -{

> -  asm ("fsqrt.s %0, %1" : "=f" (x) : "f" (x));

> -  return x;

> -}

> -libm_alias_finite (__ieee754_sqrtf, __sqrtf)

>

Patch

diff --git a/sysdeps/riscv/rvd/e_sqrt.c b/sysdeps/riscv/rvd/e_sqrt.c
deleted file mode 100644
index 7defcb5785..0000000000
--- a/sysdeps/riscv/rvd/e_sqrt.c
+++ /dev/null
@@ -1,28 +0,0 @@ 
-/* Double precision floating point square root.  RISC-V version.
-   Copyright (C) 2017-2020 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-finite.h>
-
-double
-__ieee754_sqrt (double x)
-{
-  asm ("fsqrt.d %0, %1" : "=f" (x) : "f" (x));
-  return x;
-}
-libm_alias_finite (__ieee754_sqrt, __sqrt)
diff --git a/sysdeps/riscv/rvd/math-use-builtins-sqrt.h b/sysdeps/riscv/rvd/math-use-builtins-sqrt.h
new file mode 100644
index 0000000000..e94c915ba6
--- /dev/null
+++ b/sysdeps/riscv/rvd/math-use-builtins-sqrt.h
@@ -0,0 +1,4 @@ 
+#define USE_SQRT_BUILTIN 1
+#define USE_SQRTF_BUILTIN 1
+#define USE_SQRTL_BUILTIN 0
+#define USE_SQRTF128_BUILTIN 0
diff --git a/sysdeps/riscv/rvf/e_sqrtf.c b/sysdeps/riscv/rvf/e_sqrtf.c
deleted file mode 100644
index 04835e3e53..0000000000
--- a/sysdeps/riscv/rvf/e_sqrtf.c
+++ /dev/null
@@ -1,28 +0,0 @@ 
-/* Single precision floating point square root.  RISC-V version.
-   Copyright (C) 2017-2020 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-finite.h>
-
-float
-__ieee754_sqrtf (float x)
-{
-  asm ("fsqrt.s %0, %1" : "=f" (x) : "f" (x));
-  return x;
-}
-libm_alias_finite (__ieee754_sqrtf, __sqrtf)