[08/13] mips: Use sqrt{f} builtin

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

Commit Message

Checked with a build against mips-linux-gnu and mips64-linux-gnu
and comparing the resulting binaries.
---
 sysdeps/mips/fpu/e_sqrt.c                 | 38 -----------------------
 sysdeps/mips/fpu/e_sqrtf.c                | 38 -----------------------
 sysdeps/mips/fpu/math-use-builtins-sqrt.h |  6 ++++
 sysdeps/mips/mips32/fpu/e_sqrt.c          |  1 -
 sysdeps/mips/mips32/fpu/e_sqrtf.c         |  1 -
 sysdeps/mips/mips64/n32/fpu/e_sqrt.c      |  1 -
 sysdeps/mips/mips64/n32/fpu/e_sqrtf.c     |  1 -
 sysdeps/mips/mips64/n64/fpu/e_sqrt.c      |  1 -
 sysdeps/mips/mips64/n64/fpu/e_sqrtf.c     |  1 -
 9 files changed, 6 insertions(+), 82 deletions(-)
 delete mode 100644 sysdeps/mips/fpu/e_sqrt.c
 delete mode 100644 sysdeps/mips/fpu/e_sqrtf.c
 create mode 100644 sysdeps/mips/fpu/math-use-builtins-sqrt.h
 delete mode 100644 sysdeps/mips/mips32/fpu/e_sqrt.c
 delete mode 100644 sysdeps/mips/mips32/fpu/e_sqrtf.c
 delete mode 100644 sysdeps/mips/mips64/n32/fpu/e_sqrt.c
 delete mode 100644 sysdeps/mips/mips64/n32/fpu/e_sqrtf.c
 delete mode 100644 sysdeps/mips/mips64/n64/fpu/e_sqrt.c
 delete mode 100644 sysdeps/mips/mips64/n64/fpu/e_sqrtf.c

-- 
2.25.1

Comments

If no one opposes I will commit this.

On 09/06/2020 18:32, Adhemerval Zanella wrote:
> Checked with a build against mips-linux-gnu and mips64-linux-gnu

> and comparing the resulting binaries.

> ---

>  sysdeps/mips/fpu/e_sqrt.c                 | 38 -----------------------

>  sysdeps/mips/fpu/e_sqrtf.c                | 38 -----------------------

>  sysdeps/mips/fpu/math-use-builtins-sqrt.h |  6 ++++

>  sysdeps/mips/mips32/fpu/e_sqrt.c          |  1 -

>  sysdeps/mips/mips32/fpu/e_sqrtf.c         |  1 -

>  sysdeps/mips/mips64/n32/fpu/e_sqrt.c      |  1 -

>  sysdeps/mips/mips64/n32/fpu/e_sqrtf.c     |  1 -

>  sysdeps/mips/mips64/n64/fpu/e_sqrt.c      |  1 -

>  sysdeps/mips/mips64/n64/fpu/e_sqrtf.c     |  1 -

>  9 files changed, 6 insertions(+), 82 deletions(-)

>  delete mode 100644 sysdeps/mips/fpu/e_sqrt.c

>  delete mode 100644 sysdeps/mips/fpu/e_sqrtf.c

>  create mode 100644 sysdeps/mips/fpu/math-use-builtins-sqrt.h

>  delete mode 100644 sysdeps/mips/mips32/fpu/e_sqrt.c

>  delete mode 100644 sysdeps/mips/mips32/fpu/e_sqrtf.c

>  delete mode 100644 sysdeps/mips/mips64/n32/fpu/e_sqrt.c

>  delete mode 100644 sysdeps/mips/mips64/n32/fpu/e_sqrtf.c

>  delete mode 100644 sysdeps/mips/mips64/n64/fpu/e_sqrt.c

>  delete mode 100644 sysdeps/mips/mips64/n64/fpu/e_sqrtf.c

> 

> diff --git a/sysdeps/mips/fpu/e_sqrt.c b/sysdeps/mips/fpu/e_sqrt.c

> deleted file mode 100644

> index 47488e993c..0000000000

> --- a/sysdeps/mips/fpu/e_sqrt.c

> +++ /dev/null

> @@ -1,38 +0,0 @@

> -/* Copyright (C) 2002-2020 Free Software Foundation, Inc.

> -   This file is part of the GNU C Library.

> -   Contributed by Hartvig Ekner <hartvige@mips.com>, 2002.

> -

> -   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 <sgidefs.h>

> -#include <libm-alias-finite.h>

> -

> -#if (_MIPS_ISA >= _MIPS_ISA_MIPS2)

> -

> -double __attribute__ ((nomips16))

> -__ieee754_sqrt (double x)

> -{

> -  double z;

> -  __asm__ ("sqrt.d %0,%1" : "=f" (z) : "f" (x));

> -  return z;

> -}

> -libm_alias_finite (__ieee754_sqrt, __sqrt)

> -

> -#else

> -

> -#include <sysdeps/ieee754/dbl-64/e_sqrt.c>

> -

> -#endif

> diff --git a/sysdeps/mips/fpu/e_sqrtf.c b/sysdeps/mips/fpu/e_sqrtf.c

> deleted file mode 100644

> index dc33788bf3..0000000000

> --- a/sysdeps/mips/fpu/e_sqrtf.c

> +++ /dev/null

> @@ -1,38 +0,0 @@

> -/* Copyright (C) 2002-2020 Free Software Foundation, Inc.

> -   This file is part of the GNU C Library.

> -   Contributed by Hartvig Ekner <hartvige@mips.com>, 2002.

> -

> -   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 <sgidefs.h>

> -#include <libm-alias-finite.h>

> -

> -#if (_MIPS_ISA >= _MIPS_ISA_MIPS2)

> -

> -float __attribute__ ((nomips16))

> -__ieee754_sqrtf (float x)

> -{

> -  float z;

> -  __asm__ ("sqrt.s %0,%1" : "=f" (z) : "f" (x));

> -  return z;

> -}

> -libm_alias_finite (__ieee754_sqrtf, __sqrtf)

> -

> -#else

> -

> -#include <sysdeps/ieee754/flt-32/e_sqrtf.c>

> -

> -#endif

> diff --git a/sysdeps/mips/fpu/math-use-builtins-sqrt.h b/sysdeps/mips/fpu/math-use-builtins-sqrt.h

> new file mode 100644

> index 0000000000..37f49ebc9f

> --- /dev/null

> +++ b/sysdeps/mips/fpu/math-use-builtins-sqrt.h

> @@ -0,0 +1,6 @@

> +#include <sgidefs.h>

> +

> +#define USE_SQRT_BUILTIN (_MIPS_ISA >= _MIPS_ISA_MIPS2)

> +#define USE_SQRTF_BUILTIN (_MIPS_ISA >= _MIPS_ISA_MIPS2)

> +#define USE_SQRTL_BUILTIN 0

> +#define USE_SQRTF128_BUILTIN 0

> diff --git a/sysdeps/mips/mips32/fpu/e_sqrt.c b/sysdeps/mips/mips32/fpu/e_sqrt.c

> deleted file mode 100644

> index 81f4e77697..0000000000

> --- a/sysdeps/mips/mips32/fpu/e_sqrt.c

> +++ /dev/null

> @@ -1 +0,0 @@

> -#include <sysdeps/mips/fpu/e_sqrt.c>

> diff --git a/sysdeps/mips/mips32/fpu/e_sqrtf.c b/sysdeps/mips/mips32/fpu/e_sqrtf.c

> deleted file mode 100644

> index fb0700d45c..0000000000

> --- a/sysdeps/mips/mips32/fpu/e_sqrtf.c

> +++ /dev/null

> @@ -1 +0,0 @@

> -#include <sysdeps/mips/fpu/e_sqrtf.c>

> diff --git a/sysdeps/mips/mips64/n32/fpu/e_sqrt.c b/sysdeps/mips/mips64/n32/fpu/e_sqrt.c

> deleted file mode 100644

> index 81f4e77697..0000000000

> --- a/sysdeps/mips/mips64/n32/fpu/e_sqrt.c

> +++ /dev/null

> @@ -1 +0,0 @@

> -#include <sysdeps/mips/fpu/e_sqrt.c>

> diff --git a/sysdeps/mips/mips64/n32/fpu/e_sqrtf.c b/sysdeps/mips/mips64/n32/fpu/e_sqrtf.c

> deleted file mode 100644

> index fb0700d45c..0000000000

> --- a/sysdeps/mips/mips64/n32/fpu/e_sqrtf.c

> +++ /dev/null

> @@ -1 +0,0 @@

> -#include <sysdeps/mips/fpu/e_sqrtf.c>

> diff --git a/sysdeps/mips/mips64/n64/fpu/e_sqrt.c b/sysdeps/mips/mips64/n64/fpu/e_sqrt.c

> deleted file mode 100644

> index 81f4e77697..0000000000

> --- a/sysdeps/mips/mips64/n64/fpu/e_sqrt.c

> +++ /dev/null

> @@ -1 +0,0 @@

> -#include <sysdeps/mips/fpu/e_sqrt.c>

> diff --git a/sysdeps/mips/mips64/n64/fpu/e_sqrtf.c b/sysdeps/mips/mips64/n64/fpu/e_sqrtf.c

> deleted file mode 100644

> index fb0700d45c..0000000000

> --- a/sysdeps/mips/mips64/n64/fpu/e_sqrtf.c

> +++ /dev/null

> @@ -1 +0,0 @@

> -#include <sysdeps/mips/fpu/e_sqrtf.c>

>

Patch

diff --git a/sysdeps/mips/fpu/e_sqrt.c b/sysdeps/mips/fpu/e_sqrt.c
deleted file mode 100644
index 47488e993c..0000000000
--- a/sysdeps/mips/fpu/e_sqrt.c
+++ /dev/null
@@ -1,38 +0,0 @@ 
-/* Copyright (C) 2002-2020 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Hartvig Ekner <hartvige@mips.com>, 2002.
-
-   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 <sgidefs.h>
-#include <libm-alias-finite.h>
-
-#if (_MIPS_ISA >= _MIPS_ISA_MIPS2)
-
-double __attribute__ ((nomips16))
-__ieee754_sqrt (double x)
-{
-  double z;
-  __asm__ ("sqrt.d %0,%1" : "=f" (z) : "f" (x));
-  return z;
-}
-libm_alias_finite (__ieee754_sqrt, __sqrt)
-
-#else
-
-#include <sysdeps/ieee754/dbl-64/e_sqrt.c>
-
-#endif
diff --git a/sysdeps/mips/fpu/e_sqrtf.c b/sysdeps/mips/fpu/e_sqrtf.c
deleted file mode 100644
index dc33788bf3..0000000000
--- a/sysdeps/mips/fpu/e_sqrtf.c
+++ /dev/null
@@ -1,38 +0,0 @@ 
-/* Copyright (C) 2002-2020 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Hartvig Ekner <hartvige@mips.com>, 2002.
-
-   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 <sgidefs.h>
-#include <libm-alias-finite.h>
-
-#if (_MIPS_ISA >= _MIPS_ISA_MIPS2)
-
-float __attribute__ ((nomips16))
-__ieee754_sqrtf (float x)
-{
-  float z;
-  __asm__ ("sqrt.s %0,%1" : "=f" (z) : "f" (x));
-  return z;
-}
-libm_alias_finite (__ieee754_sqrtf, __sqrtf)
-
-#else
-
-#include <sysdeps/ieee754/flt-32/e_sqrtf.c>
-
-#endif
diff --git a/sysdeps/mips/fpu/math-use-builtins-sqrt.h b/sysdeps/mips/fpu/math-use-builtins-sqrt.h
new file mode 100644
index 0000000000..37f49ebc9f
--- /dev/null
+++ b/sysdeps/mips/fpu/math-use-builtins-sqrt.h
@@ -0,0 +1,6 @@ 
+#include <sgidefs.h>
+
+#define USE_SQRT_BUILTIN (_MIPS_ISA >= _MIPS_ISA_MIPS2)
+#define USE_SQRTF_BUILTIN (_MIPS_ISA >= _MIPS_ISA_MIPS2)
+#define USE_SQRTL_BUILTIN 0
+#define USE_SQRTF128_BUILTIN 0
diff --git a/sysdeps/mips/mips32/fpu/e_sqrt.c b/sysdeps/mips/mips32/fpu/e_sqrt.c
deleted file mode 100644
index 81f4e77697..0000000000
--- a/sysdeps/mips/mips32/fpu/e_sqrt.c
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <sysdeps/mips/fpu/e_sqrt.c>
diff --git a/sysdeps/mips/mips32/fpu/e_sqrtf.c b/sysdeps/mips/mips32/fpu/e_sqrtf.c
deleted file mode 100644
index fb0700d45c..0000000000
--- a/sysdeps/mips/mips32/fpu/e_sqrtf.c
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <sysdeps/mips/fpu/e_sqrtf.c>
diff --git a/sysdeps/mips/mips64/n32/fpu/e_sqrt.c b/sysdeps/mips/mips64/n32/fpu/e_sqrt.c
deleted file mode 100644
index 81f4e77697..0000000000
--- a/sysdeps/mips/mips64/n32/fpu/e_sqrt.c
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <sysdeps/mips/fpu/e_sqrt.c>
diff --git a/sysdeps/mips/mips64/n32/fpu/e_sqrtf.c b/sysdeps/mips/mips64/n32/fpu/e_sqrtf.c
deleted file mode 100644
index fb0700d45c..0000000000
--- a/sysdeps/mips/mips64/n32/fpu/e_sqrtf.c
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <sysdeps/mips/fpu/e_sqrtf.c>
diff --git a/sysdeps/mips/mips64/n64/fpu/e_sqrt.c b/sysdeps/mips/mips64/n64/fpu/e_sqrt.c
deleted file mode 100644
index 81f4e77697..0000000000
--- a/sysdeps/mips/mips64/n64/fpu/e_sqrt.c
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <sysdeps/mips/fpu/e_sqrt.c>
diff --git a/sysdeps/mips/mips64/n64/fpu/e_sqrtf.c b/sysdeps/mips/mips64/n64/fpu/e_sqrtf.c
deleted file mode 100644
index fb0700d45c..0000000000
--- a/sysdeps/mips/mips64/n64/fpu/e_sqrtf.c
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <sysdeps/mips/fpu/e_sqrtf.c>