[libc-commits] [libc] [libc][math][c23] Add asinhf16() function (PR #131351)
Tejas Vipin via libc-commits
libc-commits at lists.llvm.org
Tue Mar 18 06:08:45 PDT 2025
https://github.com/meltq updated https://github.com/llvm/llvm-project/pull/131351
>From 75ec8ec56aafe9c38fecde76ff175979a494b503 Mon Sep 17 00:00:00 2001
From: meltq <alissxlace at proton.me>
Date: Fri, 14 Mar 2025 21:33:04 +0530
Subject: [PATCH 1/7] Add asinhf16() function
---
libc/config/linux/x86_64/entrypoints.txt | 1 +
libc/docs/headers/math/index.rst | 2 +-
libc/include/math.yaml | 7 ++
libc/src/math/CMakeLists.txt | 1 +
libc/src/math/asinhf16.h | 21 ++++++
libc/src/math/generic/CMakeLists.txt | 20 +++++
libc/src/math/generic/asinhf16.cpp | 85 ++++++++++++++++++++++
libc/test/src/math/CMakeLists.txt | 12 +++
libc/test/src/math/asinhf16_test.cpp | 42 +++++++++++
libc/test/src/math/smoke/CMakeLists.txt | 12 +++
libc/test/src/math/smoke/asinhf16_test.cpp | 35 +++++++++
11 files changed, 237 insertions(+), 1 deletion(-)
create mode 100644 libc/src/math/asinhf16.h
create mode 100644 libc/src/math/generic/asinhf16.cpp
create mode 100644 libc/test/src/math/asinhf16_test.cpp
create mode 100644 libc/test/src/math/smoke/asinhf16_test.cpp
diff --git a/libc/config/linux/x86_64/entrypoints.txt b/libc/config/linux/x86_64/entrypoints.txt
index a29478898fe70..85263a0dce24b 100644
--- a/libc/config/linux/x86_64/entrypoints.txt
+++ b/libc/config/linux/x86_64/entrypoints.txt
@@ -411,6 +411,7 @@ set(TARGET_LIBM_ENTRYPOINTS
libc.src.math.acoshf
libc.src.math.asinf
libc.src.math.asinhf
+ libc.src.math.asinhf16
libc.src.math.atan2
libc.src.math.atan2f
libc.src.math.atanf
diff --git a/libc/docs/headers/math/index.rst b/libc/docs/headers/math/index.rst
index 5b855ce4881c3..b3ac6a9732da7 100644
--- a/libc/docs/headers/math/index.rst
+++ b/libc/docs/headers/math/index.rst
@@ -257,7 +257,7 @@ Higher Math Functions
+-----------+------------------+-----------------+------------------------+----------------------+------------------------+------------------------+----------------------------+
| asin | |check| | | | |check| | | 7.12.4.2 | F.10.1.2 |
+-----------+------------------+-----------------+------------------------+----------------------+------------------------+------------------------+----------------------------+
-| asinh | |check| | | | | | 7.12.5.2 | F.10.2.2 |
+| asinh | |check| | | | |check| | | 7.12.5.2 | F.10.2.2 |
+-----------+------------------+-----------------+------------------------+----------------------+------------------------+------------------------+----------------------------+
| asinpi | | | | | | 7.12.4.9 | F.10.1.9 |
+-----------+------------------+-----------------+------------------------+----------------------+------------------------+------------------------+----------------------------+
diff --git a/libc/include/math.yaml b/libc/include/math.yaml
index a66f981030864..a124a1cf3e946 100644
--- a/libc/include/math.yaml
+++ b/libc/include/math.yaml
@@ -52,6 +52,13 @@ functions:
return_type: float
arguments:
- type: float
+ - name: asinhf16
+ standards:
+ - stdc
+ return_type: _Float16
+ arguments:
+ - type: _Float16
+ guard: LIBC_TYPES_HAS_FLOAT16
- name: atan2
standards:
- stdc
diff --git a/libc/src/math/CMakeLists.txt b/libc/src/math/CMakeLists.txt
index f18a73d46f9aa..fe6d0d520e207 100644
--- a/libc/src/math/CMakeLists.txt
+++ b/libc/src/math/CMakeLists.txt
@@ -53,6 +53,7 @@ add_math_entrypoint_object(asinf16)
add_math_entrypoint_object(asinh)
add_math_entrypoint_object(asinhf)
+add_math_entrypoint_object(asinhf16)
add_math_entrypoint_object(atan)
add_math_entrypoint_object(atanf)
diff --git a/libc/src/math/asinhf16.h b/libc/src/math/asinhf16.h
new file mode 100644
index 0000000000000..2969a3498164f
--- /dev/null
+++ b/libc/src/math/asinhf16.h
@@ -0,0 +1,21 @@
+//===-- Implementation header for asinhf16 -----------------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_SRC_MATH_ASINHF16_H
+#define LLVM_LIBC_SRC_MATH_ASINHF16_H
+
+#include "src/__support/macros/config.h"
+#include "src/__support/macros/properties/types.h"
+
+namespace LIBC_NAMESPACE_DECL {
+
+float16 asinhf16(float16 x);
+
+} // namespace LIBC_NAMESPACE_DECL
+
+#endif // LLVM_LIBC_SRC_MATH_ASINHF16_H
diff --git a/libc/src/math/generic/CMakeLists.txt b/libc/src/math/generic/CMakeLists.txt
index 3114289bad486..3b982af2b7a2d 100644
--- a/libc/src/math/generic/CMakeLists.txt
+++ b/libc/src/math/generic/CMakeLists.txt
@@ -3959,6 +3959,26 @@ add_entrypoint_object(
libc.src.__support.macros.optimization
)
+add_entrypoint_object(
+ asinhf16
+ SRCS
+ asinhf16.cpp
+ HDRS
+ ../asinhf16.h
+ DEPENDS
+ .explogxf
+ libc.hdr.fenv_macros
+ libc.src.__support.FPUtil.cast
+ libc.src.__support.FPUtil.fenv_impl
+ libc.src.__support.FPUtil.fp_bits
+ libc.src.__support.FPUtil.fp_bits
+ libc.src.__support.FPUtil.multiply_add
+ libc.src.__support.FPUtil.polyeval
+ libc.src.__support.FPUtil.sqrt
+ libc.src.__support.macros.optimization
+ libc.src.__support.macros.properties.types
+)
+
add_entrypoint_object(
atanhf
SRCS
diff --git a/libc/src/math/generic/asinhf16.cpp b/libc/src/math/generic/asinhf16.cpp
new file mode 100644
index 0000000000000..d8a6058623514
--- /dev/null
+++ b/libc/src/math/generic/asinhf16.cpp
@@ -0,0 +1,85 @@
+//===-- Half-precision asinhf16(x) function --------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception.
+//
+//
+//===----------------------------------------------------------------------===//
+
+#include "src/math/asinhf16.h"
+#include "src/math/generic/explogxf.h"
+#include "src/__support/FPUtil/except_value_utils.h"
+#include "src/__support/FPUtil/generic/sqrt.h"
+#include "src/__support/FPUtil/multiply_add.h"
+#include "src/__support/common.h"
+#include "src/__support/macros/config.h"
+#include "src/__support/macros/properties/types.h"
+
+namespace LIBC_NAMESPACE_DECL {
+
+#ifndef LIBC_MATH_HAS_SKIP_ACCURATE_PASS
+static constexpr size_t N_EXCEPTS = 8;
+
+static constexpr fputil::ExceptValues<float16, N_EXCEPTS> ASINHF16_EXCEPTS{{
+ // (input, RZ output, RU offset, RD offset, RN offset)
+ {0x3769, 0x372A, 1, 0, 1},
+ {0x3B5B, 0x3A96, 1, 0, 0},
+ {0x4B1F, 0x42B3, 1, 0, 0},
+ {0x4C9B, 0x4336, 1, 0, 1},
+ {0xB769, 0xB72A, 0, 1, 1},
+ {0xBB5B, 0xBA96, 0, 1, 0},
+ {0xCB1F, 0xC2B3, 0, 1, 0},
+ {0xCC9B, 0xC336, 0, 1, 1}
+}};
+#endif // !LIBC_MATH_HAS_SKIP_ACCURATE_PASS
+
+LLVM_LIBC_FUNCTION(float16, asinhf16, (float16 x)) {
+ using FPBits = fputil::FPBits<float16>;
+ FPBits xbits(x);
+
+ float x_d = x;
+ uint16_t x_u = xbits.uintval();
+ uint16_t x_abs = x_u & 0x7fff;
+
+ if (LIBC_UNLIKELY(xbits.is_inf_or_nan())) {
+ if (xbits.is_signaling_nan()) {
+ fputil::raise_except_if_required(FE_INVALID);
+ return FPBits::quiet_nan().get_val();
+ }
+
+ return x;
+ }
+
+#ifndef LIBC_MATH_HAS_SKIP_ACCURATE_PASS
+ // Handle exceptional values
+ if (auto r = ASINHF16_EXCEPTS.lookup(x_u); LIBC_UNLIKELY(r.has_value()))
+ return r.value();
+#endif // !LIBC_MATH_HAS_SKIP_ACCURATE_PASS
+
+ const float SIGN[2] = {1.0f, -1.0f};
+ float x_sign = SIGN[x_u >> 15];
+
+ // |x| <= 0.25
+ if (LIBC_UNLIKELY(x_abs <= 0x3400)) {
+ if (LIBC_UNLIKELY(x_abs == 0))
+ return x;
+ if (LIBC_UNLIKELY((fputil::get_round() == FE_UPWARD) &&
+ (x_u >= 0x8401) && (x_u <= 0x90E6)))
+ return static_cast<float16>(x_d + 0x1p-24f);
+
+ float x_sq = x_d * x_d;
+ // Generated by Sollya with:
+ // > P = fpminimax(asinh(x)/x, [|0, 2, 4, 6, 8|], [|SG...|],[0, 2^-2]);
+ float p = fputil::polyeval(x_sq, 1.0f, -0x1.555556p-3f, 0x1.3334dep-4f,
+ -0x1.6f3e2p-5f, 0x1.51d012p-5f);
+
+ return static_cast<float16>(fputil::multiply_add(x_d, p, 0.0f));
+ }
+
+ // General case: asinh(x) = ln(x + sqrt(x^2 + 1))
+ float sqrt_term = fputil::sqrt<float>(fputil::multiply_add(x_d, x_d, 1.0f));
+ return fputil::cast<float16>(x_sign * log_eval(
+ fputil::multiply_add(x_d, x_sign, sqrt_term)));
+}
+}
diff --git a/libc/test/src/math/CMakeLists.txt b/libc/test/src/math/CMakeLists.txt
index 53ddd301900c0..01b802ff4c943 100644
--- a/libc/test/src/math/CMakeLists.txt
+++ b/libc/test/src/math/CMakeLists.txt
@@ -2160,6 +2160,18 @@ add_fp_unittest(
libc.src.__support.FPUtil.fp_bits
)
+
+add_fp_unittest(
+ asinhf16_test
+ NEED_MPFR
+ SUITE
+ libc-math-unittests
+ SRCS
+ asinhf16_test.cpp
+ DEPENDS
+ libc.src.math.asinhf16
+)
+
add_fp_unittest(
acoshf_test
NEED_MPFR
diff --git a/libc/test/src/math/asinhf16_test.cpp b/libc/test/src/math/asinhf16_test.cpp
new file mode 100644
index 0000000000000..32f3aa141d685
--- /dev/null
+++ b/libc/test/src/math/asinhf16_test.cpp
@@ -0,0 +1,42 @@
+//===-- Exhaustive test for asinhf16 ---------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "src/math/asinhf16.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
+#include "utils/MPFRWrapper/MPFRUtils.h"
+
+using LlvmLibcAsinhf16Test = LIBC_NAMESPACE::testing::FPTest<float16>;
+
+namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
+
+// Range: [0, Inf]
+static constexpr uint16_t POS_START = 0x0000U;
+static constexpr uint16_t POS_STOP = 0x7c00U;
+
+// Range: [-Inf, 0]
+static constexpr uint16_t NEG_START = 0x8000U;
+static constexpr uint16_t NEG_STOP = 0xfc00U;
+
+TEST_F(LlvmLibcAsinhf16Test, PositiveRange) {
+ for (uint16_t v = POS_START; v <= POS_STOP; ++v) {
+ float16 x = FPBits(v).get_val();
+
+ EXPECT_MPFR_MATCH_ALL_ROUNDING(mpfr::Operation::Asinh, x,
+ LIBC_NAMESPACE::asinhf16(x), 0.5);
+ }
+}
+
+TEST_F(LlvmLibcAsinhf16Test, NegativeRange) {
+ for (uint16_t v = NEG_START; v <= NEG_STOP; ++v) {
+ float16 x = FPBits(v).get_val();
+
+ EXPECT_MPFR_MATCH_ALL_ROUNDING(mpfr::Operation::Asinh, x,
+ LIBC_NAMESPACE::asinhf16(x), 0.5);
+ }
+}
diff --git a/libc/test/src/math/smoke/CMakeLists.txt b/libc/test/src/math/smoke/CMakeLists.txt
index 6f94440d826d9..bb304f0beff1f 100644
--- a/libc/test/src/math/smoke/CMakeLists.txt
+++ b/libc/test/src/math/smoke/CMakeLists.txt
@@ -3933,6 +3933,18 @@ add_fp_unittest(
libc.src.__support.FPUtil.fp_bits
)
+add_fp_unittest(
+ asinhf16_test
+ SUITE
+ libc-math-smoke-tests
+ SRCS
+ asinhf16_test.cpp
+ DEPENDS
+ libc.src.errno.errno
+ libc.src.math.asinhf16
+ libc.src.__support.FPUtil.fp_bits
+)
+
add_fp_unittest(
acoshf_test
SUITE
diff --git a/libc/test/src/math/smoke/asinhf16_test.cpp b/libc/test/src/math/smoke/asinhf16_test.cpp
new file mode 100644
index 0000000000000..6faac38067ca8
--- /dev/null
+++ b/libc/test/src/math/smoke/asinhf16_test.cpp
@@ -0,0 +1,35 @@
+//===-- Unittests for asinhf16 ----------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "src/errno/libc_errno.h"
+#include "src/math/asinhf16.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
+
+using LlvmLibcAsinhf16Test = LIBC_NAMESPACE::testing::FPTest<float16>;
+
+TEST_F(LlvmLibcAsinhf16Test, SpecialNumbers) {
+ LIBC_NAMESPACE::libc_errno = 0;
+ EXPECT_FP_EQ(aNaN, LIBC_NAMESPACE::asinhf16(aNaN));
+ EXPECT_MATH_ERRNO(0);
+
+ EXPECT_FP_EQ_WITH_EXCEPTION(aNaN, LIBC_NAMESPACE::asinhf16(sNaN), FE_INVALID);
+ EXPECT_MATH_ERRNO(0);
+
+ EXPECT_FP_EQ(0.0f, LIBC_NAMESPACE::asinhf16(0.0f));
+ EXPECT_MATH_ERRNO(0);
+
+ EXPECT_FP_EQ(-0.0f, LIBC_NAMESPACE::asinhf16(-0.0f));
+ EXPECT_MATH_ERRNO(0);
+
+ EXPECT_FP_EQ(inf, LIBC_NAMESPACE::asinhf16(inf));
+ EXPECT_MATH_ERRNO(0);
+
+ EXPECT_FP_EQ(neg_inf, LIBC_NAMESPACE::asinhf16(neg_inf));
+ EXPECT_MATH_ERRNO(0);
+}
>From b0e8a937509e1f66a8e4caf690f59fec52a7814b Mon Sep 17 00:00:00 2001
From: meltq <alissxlace at proton.me>
Date: Fri, 14 Mar 2025 22:29:35 +0530
Subject: [PATCH 2/7] Fixed format errors
---
libc/src/math/asinhf16.h | 2 +-
libc/src/math/generic/asinhf16.cpp | 35 +++++++++++-----------
libc/test/src/math/asinhf16_test.cpp | 2 +-
libc/test/src/math/smoke/asinhf16_test.cpp | 2 +-
4 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/libc/src/math/asinhf16.h b/libc/src/math/asinhf16.h
index 2969a3498164f..b6893416d46b8 100644
--- a/libc/src/math/asinhf16.h
+++ b/libc/src/math/asinhf16.h
@@ -1,4 +1,4 @@
-//===-- Implementation header for asinhf16 -----------------------*- C++ -*-===//
+//===-- Implementation header for asinhf16 -----------------------*- C++-*-===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
diff --git a/libc/src/math/generic/asinhf16.cpp b/libc/src/math/generic/asinhf16.cpp
index d8a6058623514..7591a8bf9b633 100644
--- a/libc/src/math/generic/asinhf16.cpp
+++ b/libc/src/math/generic/asinhf16.cpp
@@ -1,4 +1,4 @@
-//===-- Half-precision asinhf16(x) function --------------------------------===//
+//===-- Half-precision asinhf16(x) function--------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
@@ -8,30 +8,29 @@
//===----------------------------------------------------------------------===//
#include "src/math/asinhf16.h"
-#include "src/math/generic/explogxf.h"
#include "src/__support/FPUtil/except_value_utils.h"
#include "src/__support/FPUtil/generic/sqrt.h"
#include "src/__support/FPUtil/multiply_add.h"
#include "src/__support/common.h"
#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
+#include "src/math/generic/explogxf.h"
namespace LIBC_NAMESPACE_DECL {
#ifndef LIBC_MATH_HAS_SKIP_ACCURATE_PASS
static constexpr size_t N_EXCEPTS = 8;
-static constexpr fputil::ExceptValues<float16, N_EXCEPTS> ASINHF16_EXCEPTS{{
- // (input, RZ output, RU offset, RD offset, RN offset)
- {0x3769, 0x372A, 1, 0, 1},
- {0x3B5B, 0x3A96, 1, 0, 0},
- {0x4B1F, 0x42B3, 1, 0, 0},
- {0x4C9B, 0x4336, 1, 0, 1},
- {0xB769, 0xB72A, 0, 1, 1},
- {0xBB5B, 0xBA96, 0, 1, 0},
- {0xCB1F, 0xC2B3, 0, 1, 0},
- {0xCC9B, 0xC336, 0, 1, 1}
-}};
+static constexpr fputil::ExceptValues<float16, N_EXCEPTS> ASINHF16_EXCEPTS{
+ {// (input, RZ output, RU offset, RD offset, RN offset)
+ {0x3769, 0x372A, 1, 0, 1},
+ {0x3B5B, 0x3A96, 1, 0, 0},
+ {0x4B1F, 0x42B3, 1, 0, 0},
+ {0x4C9B, 0x4336, 1, 0, 1},
+ {0xB769, 0xB72A, 0, 1, 1},
+ {0xBB5B, 0xBA96, 0, 1, 0},
+ {0xCB1F, 0xC2B3, 0, 1, 0},
+ {0xCC9B, 0xC336, 0, 1, 1}}};
#endif // !LIBC_MATH_HAS_SKIP_ACCURATE_PASS
LLVM_LIBC_FUNCTION(float16, asinhf16, (float16 x)) {
@@ -64,8 +63,8 @@ LLVM_LIBC_FUNCTION(float16, asinhf16, (float16 x)) {
if (LIBC_UNLIKELY(x_abs <= 0x3400)) {
if (LIBC_UNLIKELY(x_abs == 0))
return x;
- if (LIBC_UNLIKELY((fputil::get_round() == FE_UPWARD) &&
- (x_u >= 0x8401) && (x_u <= 0x90E6)))
+ if (LIBC_UNLIKELY((fputil::get_round() == FE_UPWARD) && (x_u >= 0x8401) &&
+ (x_u <= 0x90E6)))
return static_cast<float16>(x_d + 0x1p-24f);
float x_sq = x_d * x_d;
@@ -79,7 +78,7 @@ LLVM_LIBC_FUNCTION(float16, asinhf16, (float16 x)) {
// General case: asinh(x) = ln(x + sqrt(x^2 + 1))
float sqrt_term = fputil::sqrt<float>(fputil::multiply_add(x_d, x_d, 1.0f));
- return fputil::cast<float16>(x_sign * log_eval(
- fputil::multiply_add(x_d, x_sign, sqrt_term)));
-}
+ return fputil::cast<float16>(
+ x_sign * log_eval(fputil::multiply_add(x_d, x_sign, sqrt_term)));
}
+} // namespace LIBC_NAMESPACE_DECL
diff --git a/libc/test/src/math/asinhf16_test.cpp b/libc/test/src/math/asinhf16_test.cpp
index 32f3aa141d685..6673251c5db16 100644
--- a/libc/test/src/math/asinhf16_test.cpp
+++ b/libc/test/src/math/asinhf16_test.cpp
@@ -1,4 +1,4 @@
-//===-- Exhaustive test for asinhf16 ---------------------------------------===//
+//===-- Exhaustive test for asinhf16---------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
diff --git a/libc/test/src/math/smoke/asinhf16_test.cpp b/libc/test/src/math/smoke/asinhf16_test.cpp
index 6faac38067ca8..efa088f6e1437 100644
--- a/libc/test/src/math/smoke/asinhf16_test.cpp
+++ b/libc/test/src/math/smoke/asinhf16_test.cpp
@@ -1,4 +1,4 @@
-//===-- Unittests for asinhf16 ----------------------------------------------===//
+//===-- Unittests for asinhf16---------------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
>From c27cf2b742b0775ce28cd561b131c50e3144e330 Mon Sep 17 00:00:00 2001
From: meltq <alissxlace at proton.me>
Date: Sat, 15 Mar 2025 23:43:15 +0530
Subject: [PATCH 3/7] Removed repeated dependency in CMakeLists
---
libc/src/math/generic/CMakeLists.txt | 1 -
1 file changed, 1 deletion(-)
diff --git a/libc/src/math/generic/CMakeLists.txt b/libc/src/math/generic/CMakeLists.txt
index 3b982af2b7a2d..1bccc43e328d0 100644
--- a/libc/src/math/generic/CMakeLists.txt
+++ b/libc/src/math/generic/CMakeLists.txt
@@ -3971,7 +3971,6 @@ add_entrypoint_object(
libc.src.__support.FPUtil.cast
libc.src.__support.FPUtil.fenv_impl
libc.src.__support.FPUtil.fp_bits
- libc.src.__support.FPUtil.fp_bits
libc.src.__support.FPUtil.multiply_add
libc.src.__support.FPUtil.polyeval
libc.src.__support.FPUtil.sqrt
>From 4ad0f21381cc14c8ae482ced116b377ac07cfea1 Mon Sep 17 00:00:00 2001
From: meltq <alissxlace at proton.me>
Date: Mon, 17 Mar 2025 14:59:41 +0530
Subject: [PATCH 4/7] Suggested changes
---
libc/config/linux/x86_64/entrypoints.txt | 2 +-
libc/src/math/asinhf16.h | 2 +-
libc/src/math/generic/asinhf16.cpp | 77 +++++++++++++---------
libc/test/src/math/asinhf16_test.cpp | 2 +-
libc/test/src/math/smoke/CMakeLists.txt | 1 -
libc/test/src/math/smoke/asinhf16_test.cpp | 6 +-
6 files changed, 53 insertions(+), 37 deletions(-)
diff --git a/libc/config/linux/x86_64/entrypoints.txt b/libc/config/linux/x86_64/entrypoints.txt
index 85263a0dce24b..b4b5cd1680437 100644
--- a/libc/config/linux/x86_64/entrypoints.txt
+++ b/libc/config/linux/x86_64/entrypoints.txt
@@ -411,7 +411,6 @@ set(TARGET_LIBM_ENTRYPOINTS
libc.src.math.acoshf
libc.src.math.asinf
libc.src.math.asinhf
- libc.src.math.asinhf16
libc.src.math.atan2
libc.src.math.atan2f
libc.src.math.atanf
@@ -653,6 +652,7 @@ if(LIBC_TYPES_HAS_FLOAT16)
list(APPEND TARGET_LIBM_ENTRYPOINTS
# math.h C23 _Float16 entrypoints
libc.src.math.asinf16
+ libc.src.math.asinhf16
libc.src.math.acosf16
libc.src.math.canonicalizef16
libc.src.math.ceilf16
diff --git a/libc/src/math/asinhf16.h b/libc/src/math/asinhf16.h
index b6893416d46b8..bb40e208d7ee3 100644
--- a/libc/src/math/asinhf16.h
+++ b/libc/src/math/asinhf16.h
@@ -1,4 +1,4 @@
-//===-- Implementation header for asinhf16 -----------------------*- C++-*-===//
+//===-- Implementation header for asinhf16 ----------------------*- C++ -*-===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
diff --git a/libc/src/math/generic/asinhf16.cpp b/libc/src/math/generic/asinhf16.cpp
index 7591a8bf9b633..2a5fbd5a6102b 100644
--- a/libc/src/math/generic/asinhf16.cpp
+++ b/libc/src/math/generic/asinhf16.cpp
@@ -1,43 +1,50 @@
-//===-- Half-precision asinhf16(x) function--------------------------------===//
+//===-- Half-precision asinh(x) function ----------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception.
//
-//
//===----------------------------------------------------------------------===//
#include "src/math/asinhf16.h"
+#include "explogxf.h"
+#include "hdr/fenv_macros.h"
+#include "src/__support/FPUtil/cast.h"
#include "src/__support/FPUtil/except_value_utils.h"
-#include "src/__support/FPUtil/generic/sqrt.h"
#include "src/__support/FPUtil/multiply_add.h"
+#include "src/__support/FPUtil/sqrt.h"
#include "src/__support/common.h"
#include "src/__support/macros/config.h"
-#include "src/__support/macros/properties/types.h"
-#include "src/math/generic/explogxf.h"
+#include "src/__support/macros/optimization.h"
namespace LIBC_NAMESPACE_DECL {
-#ifndef LIBC_MATH_HAS_SKIP_ACCURATE_PASS
static constexpr size_t N_EXCEPTS = 8;
static constexpr fputil::ExceptValues<float16, N_EXCEPTS> ASINHF16_EXCEPTS{
{// (input, RZ output, RU offset, RD offset, RN offset)
- {0x3769, 0x372A, 1, 0, 1},
- {0x3B5B, 0x3A96, 1, 0, 0},
- {0x4B1F, 0x42B3, 1, 0, 0},
- {0x4C9B, 0x4336, 1, 0, 1},
- {0xB769, 0xB72A, 0, 1, 1},
- {0xBB5B, 0xBA96, 0, 1, 0},
- {0xCB1F, 0xC2B3, 0, 1, 0},
- {0xCC9B, 0xC336, 0, 1, 1}}};
-#endif // !LIBC_MATH_HAS_SKIP_ACCURATE_PASS
+
+ // x = 0x1.da4p-2, asinhf16(x) = 0x1.ca8p-2 (RZ)
+ {0x3769, 0x372a, 1, 0, 1},
+ // x = 0x1.d6cp-1, asinhf16(x) = 0x1.a58p-1 (RZ)
+ {0x3b5b, 0x3a96, 1, 0, 0},
+ // x = 0x1.c7cp+3, asinhf16(x) = 0x1.accp+1 (RZ)
+ {0x4b1f, 0x42b3, 1, 0, 0},
+ // x = 0x1.26cp+4, asinhf16(x) = 0x1.cd8p+1 (RZ)
+ {0x4c9b, 0x4336, 1, 0, 1},
+ // x = -0x1.da4p-2, asinhf16(x) = -0x1.ca8p-2 (RZ)
+ {0xb769, 0xb72a, 0, 1, 1},
+ // x = -0x1.d6cp-1, asinhf16(x) = -0x1.a58p-1 (RZ)
+ {0xbb5b, 0xba96, 0, 1, 0},
+ // x = -0x1.c7cp+3, asinhf16(x) = -0x1.accp+1 (RZ)
+ {0xcb1f, 0xc2b3, 0, 1, 0},
+ // x = -0x1.26cp+4, asinhf16(x) = -0x1.cd8p+1 (RZ)
+ {0xcc9b, 0xc336, 0, 1, 1}}};
LLVM_LIBC_FUNCTION(float16, asinhf16, (float16 x)) {
using FPBits = fputil::FPBits<float16>;
FPBits xbits(x);
- float x_d = x;
uint16_t x_u = xbits.uintval();
uint16_t x_abs = x_u & 0x7fff;
@@ -50,35 +57,45 @@ LLVM_LIBC_FUNCTION(float16, asinhf16, (float16 x)) {
return x;
}
-#ifndef LIBC_MATH_HAS_SKIP_ACCURATE_PASS
// Handle exceptional values
if (auto r = ASINHF16_EXCEPTS.lookup(x_u); LIBC_UNLIKELY(r.has_value()))
return r.value();
-#endif // !LIBC_MATH_HAS_SKIP_ACCURATE_PASS
+ float xf = x;
const float SIGN[2] = {1.0f, -1.0f};
float x_sign = SIGN[x_u >> 15];
// |x| <= 0.25
if (LIBC_UNLIKELY(x_abs <= 0x3400)) {
- if (LIBC_UNLIKELY(x_abs == 0))
- return x;
- if (LIBC_UNLIKELY((fputil::get_round() == FE_UPWARD) && (x_u >= 0x8401) &&
- (x_u <= 0x90E6)))
- return static_cast<float16>(x_d + 0x1p-24f);
- float x_sq = x_d * x_d;
+ // when |x| < 0x1.718p-5, asinhf16(x) = x. Adjust by 1 ULP for certain
+ // rounding types.
+ if (LIBC_UNLIKELY(x_abs < 0x29c6)) {
+ if (((fputil::get_round() == FE_UPWARD) ||
+ (fputil::get_round() == FE_TOWARDZERO)) &&
+ xf < 0)
+ return fputil::cast<float16>(xf + 0x1p-24f);
+ if (((fputil::get_round() == FE_DOWNWARD) ||
+ (fputil::get_round() == FE_TOWARDZERO)) &&
+ xf > 0)
+ return fputil::cast<float16>(xf - 0x1p-24f);
+ return fputil::cast<float16>(xf);
+ }
+
+ float x_sq = xf * xf;
// Generated by Sollya with:
- // > P = fpminimax(asinh(x)/x, [|0, 2, 4, 6, 8|], [|SG...|],[0, 2^-2]);
- float p = fputil::polyeval(x_sq, 1.0f, -0x1.555556p-3f, 0x1.3334dep-4f,
- -0x1.6f3e2p-5f, 0x1.51d012p-5f);
+ // > P = fpminimax(asinh(x)/x, [|0, 2, 4, 6, 8|], [|SG...|], [0, 2^-2]);
+ // The last coefficient 0x1.bd114ep-6f has been changed to 0x1.bd114ep-5f
+ // for better accuracy.
+ float p = fputil::polyeval(x_sq, 1.0f, -0x1.555552p-3f, 0x1.332f6ap-4f,
+ -0x1.6c53dep-5f, 0x1.bd114ep-5f);
- return static_cast<float16>(fputil::multiply_add(x_d, p, 0.0f));
+ return fputil::cast<float16>(xf * p);
}
// General case: asinh(x) = ln(x + sqrt(x^2 + 1))
- float sqrt_term = fputil::sqrt<float>(fputil::multiply_add(x_d, x_d, 1.0f));
+ float sqrt_term = fputil::sqrt<float>(fputil::multiply_add(xf, xf, 1.0f));
return fputil::cast<float16>(
- x_sign * log_eval(fputil::multiply_add(x_d, x_sign, sqrt_term)));
+ x_sign * log_eval(fputil::multiply_add(xf, x_sign, sqrt_term)));
}
} // namespace LIBC_NAMESPACE_DECL
diff --git a/libc/test/src/math/asinhf16_test.cpp b/libc/test/src/math/asinhf16_test.cpp
index 6673251c5db16..929d13713d197 100644
--- a/libc/test/src/math/asinhf16_test.cpp
+++ b/libc/test/src/math/asinhf16_test.cpp
@@ -1,4 +1,4 @@
-//===-- Exhaustive test for asinhf16---------------------------------------===//
+//===-- Exhaustive test for asinhf16 --------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
diff --git a/libc/test/src/math/smoke/CMakeLists.txt b/libc/test/src/math/smoke/CMakeLists.txt
index bb304f0beff1f..f189facd26fd8 100644
--- a/libc/test/src/math/smoke/CMakeLists.txt
+++ b/libc/test/src/math/smoke/CMakeLists.txt
@@ -3942,7 +3942,6 @@ add_fp_unittest(
DEPENDS
libc.src.errno.errno
libc.src.math.asinhf16
- libc.src.__support.FPUtil.fp_bits
)
add_fp_unittest(
diff --git a/libc/test/src/math/smoke/asinhf16_test.cpp b/libc/test/src/math/smoke/asinhf16_test.cpp
index efa088f6e1437..dcaab217331c7 100644
--- a/libc/test/src/math/smoke/asinhf16_test.cpp
+++ b/libc/test/src/math/smoke/asinhf16_test.cpp
@@ -1,4 +1,4 @@
-//===-- Unittests for asinhf16---------------------------------------------===//
+//===-- Unittests for asinhf16 --------------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
@@ -21,10 +21,10 @@ TEST_F(LlvmLibcAsinhf16Test, SpecialNumbers) {
EXPECT_FP_EQ_WITH_EXCEPTION(aNaN, LIBC_NAMESPACE::asinhf16(sNaN), FE_INVALID);
EXPECT_MATH_ERRNO(0);
- EXPECT_FP_EQ(0.0f, LIBC_NAMESPACE::asinhf16(0.0f));
+ EXPECT_FP_EQ(zero, LIBC_NAMESPACE::asinhf16(zero));
EXPECT_MATH_ERRNO(0);
- EXPECT_FP_EQ(-0.0f, LIBC_NAMESPACE::asinhf16(-0.0f));
+ EXPECT_FP_EQ(neg_zero, LIBC_NAMESPACE::asinhf16(neg_zero));
EXPECT_MATH_ERRNO(0);
EXPECT_FP_EQ(inf, LIBC_NAMESPACE::asinhf16(inf));
>From dc07f5287aa7286f9ec3d57dd3dd63221a2bdbc3 Mon Sep 17 00:00:00 2001
From: meltq <alissxlace at proton.me>
Date: Tue, 18 Mar 2025 12:47:41 +0530
Subject: [PATCH 5/7] Format LUT
---
libc/src/math/generic/asinhf16.cpp | 39 +++++++++++++++---------------
1 file changed, 20 insertions(+), 19 deletions(-)
diff --git a/libc/src/math/generic/asinhf16.cpp b/libc/src/math/generic/asinhf16.cpp
index 2a5fbd5a6102b..e7b3ebd20f0f3 100644
--- a/libc/src/math/generic/asinhf16.cpp
+++ b/libc/src/math/generic/asinhf16.cpp
@@ -21,25 +21,26 @@ namespace LIBC_NAMESPACE_DECL {
static constexpr size_t N_EXCEPTS = 8;
-static constexpr fputil::ExceptValues<float16, N_EXCEPTS> ASINHF16_EXCEPTS{
- {// (input, RZ output, RU offset, RD offset, RN offset)
-
- // x = 0x1.da4p-2, asinhf16(x) = 0x1.ca8p-2 (RZ)
- {0x3769, 0x372a, 1, 0, 1},
- // x = 0x1.d6cp-1, asinhf16(x) = 0x1.a58p-1 (RZ)
- {0x3b5b, 0x3a96, 1, 0, 0},
- // x = 0x1.c7cp+3, asinhf16(x) = 0x1.accp+1 (RZ)
- {0x4b1f, 0x42b3, 1, 0, 0},
- // x = 0x1.26cp+4, asinhf16(x) = 0x1.cd8p+1 (RZ)
- {0x4c9b, 0x4336, 1, 0, 1},
- // x = -0x1.da4p-2, asinhf16(x) = -0x1.ca8p-2 (RZ)
- {0xb769, 0xb72a, 0, 1, 1},
- // x = -0x1.d6cp-1, asinhf16(x) = -0x1.a58p-1 (RZ)
- {0xbb5b, 0xba96, 0, 1, 0},
- // x = -0x1.c7cp+3, asinhf16(x) = -0x1.accp+1 (RZ)
- {0xcb1f, 0xc2b3, 0, 1, 0},
- // x = -0x1.26cp+4, asinhf16(x) = -0x1.cd8p+1 (RZ)
- {0xcc9b, 0xc336, 0, 1, 1}}};
+static constexpr fputil::ExceptValues<float16, N_EXCEPTS> ASINHF16_EXCEPTS{{
+ // (input, RZ output, RU offset, RD offset, RN offset)
+
+ // x = 0x1.da4p-2, asinhf16(x) = 0x1.ca8p-2 (RZ)
+ {0x3769, 0x372a, 1, 0, 1},
+ // x = 0x1.d6cp-1, asinhf16(x) = 0x1.a58p-1 (RZ)
+ {0x3b5b, 0x3a96, 1, 0, 0},
+ // x = 0x1.c7cp+3, asinhf16(x) = 0x1.accp+1 (RZ)
+ {0x4b1f, 0x42b3, 1, 0, 0},
+ // x = 0x1.26cp+4, asinhf16(x) = 0x1.cd8p+1 (RZ)
+ {0x4c9b, 0x4336, 1, 0, 1},
+ // x = -0x1.da4p-2, asinhf16(x) = -0x1.ca8p-2 (RZ)
+ {0xb769, 0xb72a, 0, 1, 1},
+ // x = -0x1.d6cp-1, asinhf16(x) = -0x1.a58p-1 (RZ)
+ {0xbb5b, 0xba96, 0, 1, 0},
+ // x = -0x1.c7cp+3, asinhf16(x) = -0x1.accp+1 (RZ)
+ {0xcb1f, 0xc2b3, 0, 1, 0},
+ // x = -0x1.26cp+4, asinhf16(x) = -0x1.cd8p+1 (RZ)
+ {0xcc9b, 0xc336, 0, 1, 1}
+}};
LLVM_LIBC_FUNCTION(float16, asinhf16, (float16 x)) {
using FPBits = fputil::FPBits<float16>;
>From 270958a26b405cca76b1939e4e7fee1c086ddbec Mon Sep 17 00:00:00 2001
From: meltq <alissxlace at proton.me>
Date: Tue, 18 Mar 2025 12:53:47 +0530
Subject: [PATCH 6/7] Add back LIBC_MATH_HAS_SKIP_ACCURATE_PASS check
---
libc/src/math/generic/asinhf16.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/libc/src/math/generic/asinhf16.cpp b/libc/src/math/generic/asinhf16.cpp
index e7b3ebd20f0f3..7110d1f5cc963 100644
--- a/libc/src/math/generic/asinhf16.cpp
+++ b/libc/src/math/generic/asinhf16.cpp
@@ -19,6 +19,7 @@
namespace LIBC_NAMESPACE_DECL {
+#ifndef LIBC_MATH_HAS_SKIP_ACCURATE_PASS
static constexpr size_t N_EXCEPTS = 8;
static constexpr fputil::ExceptValues<float16, N_EXCEPTS> ASINHF16_EXCEPTS{{
@@ -41,6 +42,7 @@ static constexpr fputil::ExceptValues<float16, N_EXCEPTS> ASINHF16_EXCEPTS{{
// x = -0x1.26cp+4, asinhf16(x) = -0x1.cd8p+1 (RZ)
{0xcc9b, 0xc336, 0, 1, 1}
}};
+#endif // !LIBC_MATH_HAS_SKIP_ACCURATE_PASS
LLVM_LIBC_FUNCTION(float16, asinhf16, (float16 x)) {
using FPBits = fputil::FPBits<float16>;
@@ -58,9 +60,11 @@ LLVM_LIBC_FUNCTION(float16, asinhf16, (float16 x)) {
return x;
}
+#ifndef LIBC_MATH_HAS_SKIP_ACCURATE_PASS
// Handle exceptional values
if (auto r = ASINHF16_EXCEPTS.lookup(x_u); LIBC_UNLIKELY(r.has_value()))
return r.value();
+#endif // !LIBC_MATH_HAS_SKIP_ACCURATE_PASS
float xf = x;
const float SIGN[2] = {1.0f, -1.0f};
>From fb91b51fdaa75c9a2c8d3fd552cd31f04c515808 Mon Sep 17 00:00:00 2001
From: meltq <alissxlace at proton.me>
Date: Tue, 18 Mar 2025 17:53:00 +0530
Subject: [PATCH 7/7] Added trailing comma
---
libc/src/math/generic/asinhf16.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libc/src/math/generic/asinhf16.cpp b/libc/src/math/generic/asinhf16.cpp
index 7110d1f5cc963..3b5d12562b658 100644
--- a/libc/src/math/generic/asinhf16.cpp
+++ b/libc/src/math/generic/asinhf16.cpp
@@ -40,7 +40,7 @@ static constexpr fputil::ExceptValues<float16, N_EXCEPTS> ASINHF16_EXCEPTS{{
// x = -0x1.c7cp+3, asinhf16(x) = -0x1.accp+1 (RZ)
{0xcb1f, 0xc2b3, 0, 1, 0},
// x = -0x1.26cp+4, asinhf16(x) = -0x1.cd8p+1 (RZ)
- {0xcc9b, 0xc336, 0, 1, 1}
+ {0xcc9b, 0xc336, 0, 1, 1},
}};
#endif // !LIBC_MATH_HAS_SKIP_ACCURATE_PASS
More information about the libc-commits
mailing list