[22/23] math: Use sinhf from CORE-MATH

Message ID 20241129132032.476978-23-adhemerval.zanella@linaro.org
State Superseded
Delegated to: DJ Delorie
Headers
Series Add remaining CORE-MATH binary32 implementations to libm |

Commit Message

Adhemerval Zanella Netto Nov. 29, 2024, 1:17 p.m. UTC
  The CORE-MATH implementation is correctly rounded (for any rounding mode)
and shows slight better performance to the generic sinhf.

The code was adapted to glibc style and to use the definition of
math_config.h (to handle errno, overflow, and underflow).

Benchtest on x64_64 (Ryzen 9 5900X, gcc 14.2.1), aarch64 (Neoverse-N1,
gcc 13.3.1), and powerpc (POWER10, gcc 13.2.1):

Latency                      master        patched   improvement
x86_64                      52.6819        49.1489         6.71%
x86_64v2                    49.1162        42.9447        12.57%
x86_64v3                    46.9732        39.9157        15.02%
i686                       141.1470       129.6410         8.15%
aarch64 (Neoverse)          20.8539        17.1288        17.86%
power10                     14.5258        9.1906         36.73%

reciprocal-throughput        master        patched   improvement
x86_64                      27.5553        23.9395        13.12%
x86_64v2                    21.6423        20.3219         6.10%
x86_64v3                    21.4842        16.0224        25.42%
i686                        87.9709        86.1626         2.06%
aarch64 (Neoverse)          15.1919        12.2744        19.20%
power10                      7.2188         5.2611        27.12%

Signed-off-by: Alexei Sibidanov <sibid@uvic.ca>
Signed-off-by: Paul Zimmermann <Paul.Zimmermann@inria.fr>
Signed-off-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
---
 SHARED-FILES                                  |   4 +
 sysdeps/aarch64/libm-test-ulps                |   4 -
 sysdeps/alpha/fpu/libm-test-ulps              |   4 -
 sysdeps/arc/fpu/libm-test-ulps                |   4 -
 sysdeps/arc/nofpu/libm-test-ulps              |   1 -
 sysdeps/arm/libm-test-ulps                    |   4 -
 sysdeps/csky/fpu/libm-test-ulps               |   4 -
 sysdeps/csky/nofpu/libm-test-ulps             |   4 -
 sysdeps/hppa/fpu/libm-test-ulps               |   4 -
 sysdeps/i386/fpu/libm-test-ulps               |   4 -
 .../i386/i686/fpu/multiarch/libm-test-ulps    |   4 -
 sysdeps/ieee754/flt-32/e_sinhf.c              | 169 ++++++++++++------
 sysdeps/loongarch/lp64/libm-test-ulps         |   4 -
 sysdeps/microblaze/libm-test-ulps             |   1 -
 sysdeps/mips/mips32/libm-test-ulps            |   4 -
 sysdeps/mips/mips64/libm-test-ulps            |   4 -
 sysdeps/or1k/fpu/libm-test-ulps               |   4 -
 sysdeps/or1k/nofpu/libm-test-ulps             |   4 -
 sysdeps/powerpc/fpu/libm-test-ulps            |   4 -
 sysdeps/powerpc/nofpu/libm-test-ulps          |   4 -
 sysdeps/riscv/nofpu/libm-test-ulps            |   4 -
 sysdeps/riscv/rvd/libm-test-ulps              |   4 -
 sysdeps/s390/fpu/libm-test-ulps               |   4 -
 sysdeps/sh/libm-test-ulps                     |   2 -
 sysdeps/sparc/fpu/libm-test-ulps              |   4 -
 sysdeps/x86_64/fpu/libm-test-ulps             |   4 -
 26 files changed, 122 insertions(+), 139 deletions(-)
  

Patch

diff --git a/SHARED-FILES b/SHARED-FILES
index 320e0b3be9..3bd4e7fb4a 100644
--- a/SHARED-FILES
+++ b/SHARED-FILES
@@ -326,3 +326,7 @@  sysdeps/ieee754/flt-32/e_coshf.c:
   (src/binary32/cosh/coshf.c in CORE-MATH)
   - the code was adapted to use glibc code style and internal
     functions to handle errno, overflow, and underflow.
+sysdeps/ieee754/flt-32/e_sinhf.c:
+  (src/binary32/sinh/sinhf.c in CORE-MATH)
+  - the code was adapted to use glibc code style and internal
+    functions to handle errno, overflow, and underflow.
diff --git a/sysdeps/aarch64/libm-test-ulps b/sysdeps/aarch64/libm-test-ulps
index 2bbaf97239..4545d8236b 100644
--- a/sysdeps/aarch64/libm-test-ulps
+++ b/sysdeps/aarch64/libm-test-ulps
@@ -1502,7 +1502,6 @@  ldouble: 3
 
 Function: "sinh":
 double: 2
-float: 2
 ldouble: 2
 
 Function: "sinh_advsimd":
@@ -1511,7 +1510,6 @@  float: 1
 
 Function: "sinh_downward":
 double: 3
-float: 3
 ldouble: 3
 
 Function: "sinh_sve":
@@ -1520,12 +1518,10 @@  float: 1
 
 Function: "sinh_towardzero":
 double: 3
-float: 2
 ldouble: 3
 
 Function: "sinh_upward":
 double: 3
-float: 3
 ldouble: 4
 
 Function: "tan":
diff --git a/sysdeps/alpha/fpu/libm-test-ulps b/sysdeps/alpha/fpu/libm-test-ulps
index 6b433fbba7..d4329e060d 100644
--- a/sysdeps/alpha/fpu/libm-test-ulps
+++ b/sysdeps/alpha/fpu/libm-test-ulps
@@ -1291,22 +1291,18 @@  ldouble: 3
 
 Function: "sinh":
 double: 2
-float: 2
 ldouble: 2
 
 Function: "sinh_downward":
 double: 3
-float: 3
 ldouble: 3
 
 Function: "sinh_towardzero":
 double: 3
-float: 2
 ldouble: 3
 
 Function: "sinh_upward":
 double: 3
-float: 3
 ldouble: 4
 
 Function: "tan":
diff --git a/sysdeps/arc/fpu/libm-test-ulps b/sysdeps/arc/fpu/libm-test-ulps
index a16c1097f0..eb8296d736 100644
--- a/sysdeps/arc/fpu/libm-test-ulps
+++ b/sysdeps/arc/fpu/libm-test-ulps
@@ -1033,19 +1033,15 @@  float: 1
 
 Function: "sinh":
 double: 3
-float: 3
 
 Function: "sinh_downward":
 double: 3
-float: 3
 
 Function: "sinh_towardzero":
 double: 3
-float: 2
 
 Function: "sinh_upward":
 double: 3
-float: 3
 
 Function: "tan":
 double: 1
diff --git a/sysdeps/arc/nofpu/libm-test-ulps b/sysdeps/arc/nofpu/libm-test-ulps
index de09fa9b92..519a174f7a 100644
--- a/sysdeps/arc/nofpu/libm-test-ulps
+++ b/sysdeps/arc/nofpu/libm-test-ulps
@@ -249,7 +249,6 @@  float: 1
 
 Function: "sinh":
 double: 2
-float: 2
 
 Function: "tanh":
 double: 2
diff --git a/sysdeps/arm/libm-test-ulps b/sysdeps/arm/libm-test-ulps
index df423594de..7be1a7c75b 100644
--- a/sysdeps/arm/libm-test-ulps
+++ b/sysdeps/arm/libm-test-ulps
@@ -1030,19 +1030,15 @@  float: 2
 
 Function: "sinh":
 double: 2
-float: 2
 
 Function: "sinh_downward":
 double: 3
-float: 3
 
 Function: "sinh_towardzero":
 double: 3
-float: 2
 
 Function: "sinh_upward":
 double: 3
-float: 3
 
 Function: "tan_downward":
 double: 1
diff --git a/sysdeps/csky/fpu/libm-test-ulps b/sysdeps/csky/fpu/libm-test-ulps
index ee95d85682..ffc0676765 100644
--- a/sysdeps/csky/fpu/libm-test-ulps
+++ b/sysdeps/csky/fpu/libm-test-ulps
@@ -954,19 +954,15 @@  float: 1
 
 Function: "sinh":
 double: 2
-float: 2
 
 Function: "sinh_downward":
 double: 3
-float: 3
 
 Function: "sinh_towardzero":
 double: 3
-float: 2
 
 Function: "sinh_upward":
 double: 3
-float: 3
 
 Function: "tan_downward":
 double: 1
diff --git a/sysdeps/csky/nofpu/libm-test-ulps b/sysdeps/csky/nofpu/libm-test-ulps
index 64239e6e64..a7c85db00d 100644
--- a/sysdeps/csky/nofpu/libm-test-ulps
+++ b/sysdeps/csky/nofpu/libm-test-ulps
@@ -985,19 +985,15 @@  float: 2
 
 Function: "sinh":
 double: 2
-float: 2
 
 Function: "sinh_downward":
 double: 3
-float: 3
 
 Function: "sinh_towardzero":
 double: 2
-float: 2
 
 Function: "sinh_upward":
 double: 3
-float: 3
 
 Function: "tan_downward":
 double: 1
diff --git a/sysdeps/hppa/fpu/libm-test-ulps b/sysdeps/hppa/fpu/libm-test-ulps
index 845f6a8331..0fbb2f81bb 100644
--- a/sysdeps/hppa/fpu/libm-test-ulps
+++ b/sysdeps/hppa/fpu/libm-test-ulps
@@ -1059,19 +1059,15 @@  float: 2
 
 Function: "sinh":
 double: 2
-float: 2
 
 Function: "sinh_downward":
 double: 3
-float: 3
 
 Function: "sinh_towardzero":
 double: 3
-float: 2
 
 Function: "sinh_upward":
 double: 3
-float: 3
 
 Function: "tan":
 double: 1
diff --git a/sysdeps/i386/fpu/libm-test-ulps b/sysdeps/i386/fpu/libm-test-ulps
index f42aed258b..26101c933e 100644
--- a/sysdeps/i386/fpu/libm-test-ulps
+++ b/sysdeps/i386/fpu/libm-test-ulps
@@ -1574,25 +1574,21 @@  ldouble: 3
 
 Function: "sinh":
 double: 2
-float: 2
 float128: 2
 ldouble: 3
 
 Function: "sinh_downward":
 double: 3
-float: 3
 float128: 3
 ldouble: 5
 
 Function: "sinh_towardzero":
 double: 3
-float: 2
 float128: 3
 ldouble: 4
 
 Function: "sinh_upward":
 double: 4
-float: 3
 float128: 4
 ldouble: 5
 
diff --git a/sysdeps/i386/i686/fpu/multiarch/libm-test-ulps b/sysdeps/i386/i686/fpu/multiarch/libm-test-ulps
index 374aa0a939..92e821d609 100644
--- a/sysdeps/i386/i686/fpu/multiarch/libm-test-ulps
+++ b/sysdeps/i386/i686/fpu/multiarch/libm-test-ulps
@@ -1579,25 +1579,21 @@  ldouble: 3
 
 Function: "sinh":
 double: 2
-float: 2
 float128: 2
 ldouble: 3
 
 Function: "sinh_downward":
 double: 3
-float: 3
 float128: 3
 ldouble: 5
 
 Function: "sinh_towardzero":
 double: 3
-float: 2
 float128: 3
 ldouble: 4
 
 Function: "sinh_upward":
 double: 4
-float: 3
 float128: 4
 ldouble: 5
 
diff --git a/sysdeps/ieee754/flt-32/e_sinhf.c b/sysdeps/ieee754/flt-32/e_sinhf.c
index d3998e8336..4295e245c7 100644
--- a/sysdeps/ieee754/flt-32/e_sinhf.c
+++ b/sysdeps/ieee754/flt-32/e_sinhf.c
@@ -1,62 +1,129 @@ 
-/* e_sinhf.c -- float version of e_sinh.c.
- */
+/* Correctly-rounded hyperbolic sine function for binary32 value.
 
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunPro, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
- * is preserved.
- * ====================================================
- */
+Copyright (c) 2022-2024 Alexei Sibidanov.
 
-#include <float.h>
-#include <math.h>
-#include <math-narrow-eval.h>
-#include <math_private.h>
-#include <math-underflow.h>
-#include <libm-alias-finite.h>
+The original version of this file was copied from the CORE-MATH
+project (file src/binary32/sinh/sinhf.c, revision c26f1e4).
 
-static const float one = 1.0, shuge = 1.0e37;
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-float
-__ieee754_sinhf(float x)
-{
-	float t,w,h;
-	int32_t ix,jx;
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
-	GET_FLOAT_WORD(jx,x);
-	ix = jx&0x7fffffff;
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
 
-    /* x is INF or NaN */
-	if(__builtin_expect(ix>=0x7f800000, 0)) return x+x;
+#include <math.h>
+#include <stdint.h>
+#include <libm-alias-finite.h>
+#include <math-narrow-eval.h>
+#include "math_config.h"
 
-	h = 0.5;
-	if (jx<0) h = -h;
-    /* |x| in [0,22], return sign(x)*0.5*(E+E/(E+1))) */
-	if (ix < 0x41b00000) {		/* |x|<22 */
-	    if (__builtin_expect(ix<0x31800000, 0)) {	/* |x|<2**-28 */
-		math_check_force_underflow (x);
-		if(shuge+x>one) return x;/* sinh(tiny) = tiny with inexact */
-	    }
-	    t = __expm1f(fabsf(x));
-	    if(ix<0x3f800000) return h*((float)2.0*t-t*t/(t+one));
-	    return h*(t+t/(t+one));
+float
+__ieee754_sinhf (float x)
+{
+  static const double c[] =
+    {
+      1, 0x1.62e42fef4c4e7p-6, 0x1.ebfd1b232f475p-13, 0x1.c6b19384ecd93p-20
+    };
+  static const double ch[] =
+    {
+      1,                     0x1.62e42fefa39efp-6,  0x1.ebfbdff82c58fp-13,
+      0x1.c6b08d702e0edp-20, 0x1.3b2ab6fb92e5ep-27, 0x1.5d886e6d54203p-35,
+      0x1.430976b8ce6efp-43
+    };
+  static const uint64_t tb[] =
+    {
+      0x3fe0000000000000, 0x3fe059b0d3158574, 0x3fe0b5586cf9890f,
+      0x3fe11301d0125b51, 0x3fe172b83c7d517b, 0x3fe1d4873168b9aa,
+      0x3fe2387a6e756238, 0x3fe29e9df51fdee1, 0x3fe306fe0a31b715,
+      0x3fe371a7373aa9cb, 0x3fe3dea64c123422, 0x3fe44e086061892d,
+      0x3fe4bfdad5362a27, 0x3fe5342b569d4f82, 0x3fe5ab07dd485429,
+      0x3fe6247eb03a5585, 0x3fe6a09e667f3bcd, 0x3fe71f75e8ec5f74,
+      0x3fe7a11473eb0187, 0x3fe82589994cce13, 0x3fe8ace5422aa0db,
+      0x3fe93737b0cdc5e5, 0x3fe9c49182a3f090, 0x3fea5503b23e255d,
+      0x3feae89f995ad3ad, 0x3feb7f76f2fb5e47, 0x3fec199bdd85529c,
+      0x3fecb720dcef9069, 0x3fed5818dcfba487, 0x3fedfc97337b9b5f,
+      0x3feea4afa2a490da, 0x3fef50765b6e4540
+    };
+  static const struct
+  {
+    uint32_t uarg;
+    float rh, rl;
+  } st = { 0x74250bfeu, 0x1.250bfep-11, 0x1p-36 };
+  const double iln2 = 0x1.71547652b82fep+5;
+  double z = x;
+  uint32_t ux = asuint (x) << 1;
+  if (__glibc_unlikely (ux > 0x8565a9f8u))
+    { /* |x| >~ 89.4 */
+      float sgn = copysignf (2.0f, x);
+      if (ux >= 0xff000000u)
+	{
+	  if (ux << 8)
+	    return x + x;			    /* nan */
+	  return copysignf (INFINITY, x); /* +-inf */
 	}
-
-    /* |x| in [22, log(maxdouble)] return 0.5*exp(|x|) */
-	if (ix < 0x42b17180)  return h*__ieee754_expf(fabsf(x));
-
-    /* |x| in [log(maxdouble), overflowthresold] */
-	if (ix<=0x42b2d4fc) {
-	    w = __ieee754_expf((float)0.5*fabsf(x));
-	    t = h*w;
-	    return t*w;
+      float r = math_narrow_eval (sgn * 0x1.fffffep127f);
+      return r;
+    }
+  if (__glibc_unlikely (ux < 0x7c000000u))
+    { /* |x| < 0.125 */
+      if (__glibc_unlikely (ux <= 0x74250bfeu))
+	{					   /* |x| <= 0x1.250bfep-11 */
+	  if (__glibc_unlikely (ux < 0x66000000u)) /* |x| < 0x1p-24 */
+	    return fmaf (x, fabsf (x), x);
+	  if (__glibc_unlikely (st.uarg == asuint (ux)))
+	    {
+	      float sgn = copysignf (1.0f, x);
+	      return sgn * st.rh + sgn * st.rl;
+	    }
+	  return (x * 0x1.555556p-3f) * (x * x) + x;
 	}
-
-    /* |x| > overflowthresold, sinh(x) overflow */
-	return math_narrow_eval (x*shuge);
+      static const double cp[] =
+	{
+	  0x1.5555555555555p-3,  0x1.11111111146e1p-7,
+	  0x1.a01a00930dda6p-13, 0x1.71f92198aa6e9p-19
+	};
+      double z2 = z * z, z4 = z2 * z2;
+      return z + (z2 * z)
+	* ((cp[0] + z2 * cp[1]) + z4 * (cp[2] + z2 * (cp[3])));
+    }
+  double a = iln2 * z;
+  double ia = roundeven_finite (a);
+  double h = a - ia;
+  double h2 = h * h;
+  int64_t jp = asuint64 (ia + 0x1.8p52);
+  int64_t jm = -jp;
+  double sp = asdouble (tb[jp & 31] + ((jp >> 5) << 52));
+  double sm = asdouble (tb[jm & 31] + ((jm >> 5) << 52));
+  double te = c[0] + h2 * c[2], to = (c[1] + h2 * c[3]);
+  double rp = sp * (te + h * to);
+  double rm = sm * (te - h * to);
+  double r = rp - rm;
+  float ub = r;
+  double lb = r - 1.52e-10 * r;
+  if (__glibc_unlikely (ub != lb))
+    {
+      const double iln2h = 0x1.7154765p+5;
+      const double iln2l = 0x1.5c17f0bbbe88p-26;
+      h = (iln2h * z - ia) + iln2l * z;
+      h2 = h * h;
+      te = ch[0] + h2 * ch[2] + (h2 * h2) * (ch[4] + h2 * ch[6]);
+      to = ch[1] + h2 * (ch[3] + h2 * ch[5]);
+      r = sp * (te + h * to) - sm * (te - h * to);
+      ub = r;
+    }
+  return ub;
 }
 libm_alias_finite (__ieee754_sinhf, __sinhf)
diff --git a/sysdeps/loongarch/lp64/libm-test-ulps b/sysdeps/loongarch/lp64/libm-test-ulps
index da24aa920d..1a9ef3c217 100644
--- a/sysdeps/loongarch/lp64/libm-test-ulps
+++ b/sysdeps/loongarch/lp64/libm-test-ulps
@@ -1297,22 +1297,18 @@  ldouble: 3
 
 Function: "sinh":
 double: 2
-float: 2
 ldouble: 2
 
 Function: "sinh_downward":
 double: 3
-float: 3
 ldouble: 3
 
 Function: "sinh_towardzero":
 double: 3
-float: 2
 ldouble: 3
 
 Function: "sinh_upward":
 double: 3
-float: 3
 ldouble: 4
 
 Function: "tan":
diff --git a/sysdeps/microblaze/libm-test-ulps b/sysdeps/microblaze/libm-test-ulps
index 367201f937..c9fc2aa5aa 100644
--- a/sysdeps/microblaze/libm-test-ulps
+++ b/sysdeps/microblaze/libm-test-ulps
@@ -231,7 +231,6 @@  float: 1
 
 Function: "sinh":
 double: 2
-float: 2
 
 Function: "tanh":
 double: 2
diff --git a/sysdeps/mips/mips32/libm-test-ulps b/sysdeps/mips/mips32/libm-test-ulps
index 6a5c723b3a..2155853acf 100644
--- a/sysdeps/mips/mips32/libm-test-ulps
+++ b/sysdeps/mips/mips32/libm-test-ulps
@@ -1033,19 +1033,15 @@  float: 2
 
 Function: "sinh":
 double: 2
-float: 2
 
 Function: "sinh_downward":
 double: 3
-float: 3
 
 Function: "sinh_towardzero":
 double: 3
-float: 2
 
 Function: "sinh_upward":
 double: 3
-float: 3
 
 Function: "tan_downward":
 double: 1
diff --git a/sysdeps/mips/mips64/libm-test-ulps b/sysdeps/mips/mips64/libm-test-ulps
index 0e6a383ad2..c4dfef0b23 100644
--- a/sysdeps/mips/mips64/libm-test-ulps
+++ b/sysdeps/mips/mips64/libm-test-ulps
@@ -1309,22 +1309,18 @@  ldouble: 3
 
 Function: "sinh":
 double: 2
-float: 2
 ldouble: 2
 
 Function: "sinh_downward":
 double: 3
-float: 3
 ldouble: 3
 
 Function: "sinh_towardzero":
 double: 3
-float: 2
 ldouble: 3
 
 Function: "sinh_upward":
 double: 3
-float: 3
 ldouble: 4
 
 Function: "tan":
diff --git a/sysdeps/or1k/fpu/libm-test-ulps b/sysdeps/or1k/fpu/libm-test-ulps
index 3037f731b9..f352f71c7d 100644
--- a/sysdeps/or1k/fpu/libm-test-ulps
+++ b/sysdeps/or1k/fpu/libm-test-ulps
@@ -967,19 +967,15 @@  float: 1
 
 Function: "sinh":
 double: 2
-float: 2
 
 Function: "sinh_downward":
 double: 3
-float: 3
 
 Function: "sinh_towardzero":
 double: 3
-float: 2
 
 Function: "sinh_upward":
 double: 3
-float: 3
 
 Function: "tan_downward":
 double: 1
diff --git a/sysdeps/or1k/nofpu/libm-test-ulps b/sysdeps/or1k/nofpu/libm-test-ulps
index f5646ee5cf..a69026e9ee 100644
--- a/sysdeps/or1k/nofpu/libm-test-ulps
+++ b/sysdeps/or1k/nofpu/libm-test-ulps
@@ -957,19 +957,15 @@  float: 1
 
 Function: "sinh":
 double: 2
-float: 2
 
 Function: "sinh_downward":
 double: 3
-float: 3
 
 Function: "sinh_towardzero":
 double: 2
-float: 2
 
 Function: "sinh_upward":
 double: 3
-float: 3
 
 Function: "tan_downward":
 double: 1
diff --git a/sysdeps/powerpc/fpu/libm-test-ulps b/sysdeps/powerpc/fpu/libm-test-ulps
index 0594638bf5..210ea0a26b 100644
--- a/sysdeps/powerpc/fpu/libm-test-ulps
+++ b/sysdeps/powerpc/fpu/libm-test-ulps
@@ -1663,25 +1663,21 @@  ldouble: 7
 
 Function: "sinh":
 double: 2
-float: 2
 float128: 2
 ldouble: 3
 
 Function: "sinh_downward":
 double: 3
-float: 3
 float128: 3
 ldouble: 6
 
 Function: "sinh_towardzero":
 double: 3
-float: 2
 float128: 3
 ldouble: 6
 
 Function: "sinh_upward":
 double: 3
-float: 3
 float128: 4
 ldouble: 6
 
diff --git a/sysdeps/powerpc/nofpu/libm-test-ulps b/sysdeps/powerpc/nofpu/libm-test-ulps
index 80ff04b318..c2a0a64d50 100644
--- a/sysdeps/powerpc/nofpu/libm-test-ulps
+++ b/sysdeps/powerpc/nofpu/libm-test-ulps
@@ -1406,22 +1406,18 @@  ldouble: 7
 
 Function: "sinh":
 double: 2
-float: 2
 ldouble: 3
 
 Function: "sinh_downward":
 double: 3
-float: 3
 ldouble: 6
 
 Function: "sinh_towardzero":
 double: 3
-float: 2
 ldouble: 6
 
 Function: "sinh_upward":
 double: 3
-float: 3
 ldouble: 6
 
 Function: "sqrt":
diff --git a/sysdeps/riscv/nofpu/libm-test-ulps b/sysdeps/riscv/nofpu/libm-test-ulps
index 48eb063323..b29beefdba 100644
--- a/sysdeps/riscv/nofpu/libm-test-ulps
+++ b/sysdeps/riscv/nofpu/libm-test-ulps
@@ -1238,22 +1238,18 @@  ldouble: 3
 
 Function: "sinh":
 double: 2
-float: 2
 ldouble: 2
 
 Function: "sinh_downward":
 double: 3
-float: 3
 ldouble: 3
 
 Function: "sinh_towardzero":
 double: 2
-float: 2
 ldouble: 3
 
 Function: "sinh_upward":
 double: 3
-float: 3
 ldouble: 4
 
 Function: "tan":
diff --git a/sysdeps/riscv/rvd/libm-test-ulps b/sysdeps/riscv/rvd/libm-test-ulps
index 385c746328..b78c11ec09 100644
--- a/sysdeps/riscv/rvd/libm-test-ulps
+++ b/sysdeps/riscv/rvd/libm-test-ulps
@@ -1296,22 +1296,18 @@  ldouble: 3
 
 Function: "sinh":
 double: 2
-float: 2
 ldouble: 2
 
 Function: "sinh_downward":
 double: 3
-float: 3
 ldouble: 3
 
 Function: "sinh_towardzero":
 double: 3
-float: 2
 ldouble: 3
 
 Function: "sinh_upward":
 double: 3
-float: 3
 ldouble: 4
 
 Function: "tan":
diff --git a/sysdeps/s390/fpu/libm-test-ulps b/sysdeps/s390/fpu/libm-test-ulps
index ccc6e06a97..2beaf10dc4 100644
--- a/sysdeps/s390/fpu/libm-test-ulps
+++ b/sysdeps/s390/fpu/libm-test-ulps
@@ -1295,22 +1295,18 @@  ldouble: 3
 
 Function: "sinh":
 double: 2
-float: 2
 ldouble: 2
 
 Function: "sinh_downward":
 double: 3
-float: 3
 ldouble: 3
 
 Function: "sinh_towardzero":
 double: 3
-float: 2
 ldouble: 3
 
 Function: "sinh_upward":
 double: 3
-float: 3
 ldouble: 4
 
 Function: "tan":
diff --git a/sysdeps/sh/libm-test-ulps b/sysdeps/sh/libm-test-ulps
index f7131fdc86..002218c7fa 100644
--- a/sysdeps/sh/libm-test-ulps
+++ b/sysdeps/sh/libm-test-ulps
@@ -479,11 +479,9 @@  float: 1
 
 Function: "sinh":
 double: 2
-float: 2
 
 Function: "sinh_towardzero":
 double: 3
-float: 2
 
 Function: "tan_towardzero":
 double: 1
diff --git a/sysdeps/sparc/fpu/libm-test-ulps b/sysdeps/sparc/fpu/libm-test-ulps
index b004005134..72ecefff12 100644
--- a/sysdeps/sparc/fpu/libm-test-ulps
+++ b/sysdeps/sparc/fpu/libm-test-ulps
@@ -1309,22 +1309,18 @@  ldouble: 3
 
 Function: "sinh":
 double: 2
-float: 2
 ldouble: 2
 
 Function: "sinh_downward":
 double: 3
-float: 3
 ldouble: 3
 
 Function: "sinh_towardzero":
 double: 3
-float: 2
 ldouble: 3
 
 Function: "sinh_upward":
 double: 3
-float: 3
 ldouble: 4
 
 Function: "tan":
diff --git a/sysdeps/x86_64/fpu/libm-test-ulps b/sysdeps/x86_64/fpu/libm-test-ulps
index 89fef415b5..038622d624 100644
--- a/sysdeps/x86_64/fpu/libm-test-ulps
+++ b/sysdeps/x86_64/fpu/libm-test-ulps
@@ -2061,25 +2061,21 @@  float: 1
 
 Function: "sinh":
 double: 2
-float: 2
 float128: 2
 ldouble: 3
 
 Function: "sinh_downward":
 double: 3
-float: 3
 float128: 3
 ldouble: 5
 
 Function: "sinh_towardzero":
 double: 3
-float: 2
 float128: 3
 ldouble: 4
 
 Function: "sinh_upward":
 double: 3
-float: 3
 float128: 4
 ldouble: 5