From 5dd54f715f971aa3e58e87c32aa71df4491ae59c Mon Sep 17 00:00:00 2001 From: amemov Date: Mon, 7 Apr 2025 14:23:14 +0000 Subject: [PATCH 01/19] fix --- libc/config/linux/x86_64/entrypoints.txt | 1 + libc/docs/headers/math/index.rst | 2 +- libc/include/math.yaml | 46 +------ libc/src/math/CMakeLists.txt | 1 + libc/src/math/acospif16.h | 21 +++ libc/src/math/generic/CMakeLists.txt | 20 +++ libc/src/math/generic/acospif16.cpp | 137 ++++++++++++++++++++ libc/test/src/math/CMakeLists.txt | 11 ++ libc/test/src/math/acospif16_test.cpp | 42 ++++++ libc/test/src/math/smoke/CMakeLists.txt | 11 ++ libc/test/src/math/smoke/acospif16_test.cpp | 39 ++++++ libc/utils/MPFRWrapper/MPCommon.cpp | 6 + libc/utils/MPFRWrapper/MPFRUtils.cpp | 2 + 13 files changed, 299 insertions(+), 40 deletions(-) create mode 100644 libc/src/math/acospif16.h create mode 100644 libc/src/math/generic/acospif16.cpp create mode 100644 libc/test/src/math/acospif16_test.cpp create mode 100644 libc/test/src/math/smoke/acospif16_test.cpp diff --git a/libc/config/linux/x86_64/entrypoints.txt b/libc/config/linux/x86_64/entrypoints.txt index 1ac3a781d5279..77941c7ad4014 100644 --- a/libc/config/linux/x86_64/entrypoints.txt +++ b/libc/config/linux/x86_64/entrypoints.txt @@ -657,6 +657,7 @@ if(LIBC_TYPES_HAS_FLOAT16) list(APPEND TARGET_LIBM_ENTRYPOINTS # math.h C23 _Float16 entrypoints libc.src.math.acosf16 + libc.src.math.acospif16 libc.src.math.acoshf16 libc.src.math.asinf16 libc.src.math.asinhf16 diff --git a/libc/docs/headers/math/index.rst b/libc/docs/headers/math/index.rst index 947bd4b60b391..cf88e6237d1e3 100644 --- a/libc/docs/headers/math/index.rst +++ b/libc/docs/headers/math/index.rst @@ -253,7 +253,7 @@ Higher Math Functions +-----------+------------------+-----------------+------------------------+----------------------+------------------------+------------------------+----------------------------+ | acosh | |check| | | | |check| | | 7.12.5.1 | F.10.2.1 | +-----------+------------------+-----------------+------------------------+----------------------+------------------------+------------------------+----------------------------+ -| acospi | | | | | | 7.12.4.8 | F.10.1.8 | +| acospi | | | | |check| | | 7.12.4.8 | F.10.1.8 | +-----------+------------------+-----------------+------------------------+----------------------+------------------------+------------------------+----------------------------+ | asin | |check| | | | |check| | | 7.12.4.2 | F.10.1.2 | +-----------+------------------+-----------------+------------------------+----------------------+------------------------+------------------------+----------------------------+ diff --git a/libc/include/math.yaml b/libc/include/math.yaml index fef829422244d..dfe04732fbd03 100644 --- a/libc/include/math.yaml +++ b/libc/include/math.yaml @@ -21,19 +21,19 @@ functions: arguments: - type: _Float16 guard: LIBC_TYPES_HAS_FLOAT16 - - name: acoshf - standards: - - stdc - return_type: float - arguments: - - type: float - name: acoshf16 + - name: acospif16 standards: - stdc return_type: _Float16 arguments: - type: _Float16 guard: LIBC_TYPES_HAS_FLOAT16 + - name: acoshf + standards: + - stdc + return_type: float + arguments: + - type: float - name: asin standards: - stdc @@ -59,13 +59,6 @@ functions: return_type: float arguments: - type: float - - name: asinhf16 - standards: - - stdc - return_type: _Float16 - arguments: - - type: _Float16 - guard: LIBC_TYPES_HAS_FLOAT16 - name: atan standards: - stdc @@ -93,14 +86,6 @@ functions: arguments: - type: long double - type: long double - - name: atan2f128 - standards: - - stdc - return_type: float128 - arguments: - - type: float128 - - type: float128 - guard: LIBC_TYPES_HAS_FLOAT128 - name: atanf standards: - stdc @@ -764,15 +749,6 @@ functions: - type: float - type: float - type: float - - name: fmaf16 - standards: - - stdc - return_type: _Float16 - arguments: - - type: _Float16 - - type: _Float16 - - type: _Float16 - guard: LIBC_TYPES_HAS_FLOAT16 - name: fmax standards: - stdc @@ -1403,14 +1379,6 @@ functions: arguments: - type: float - type: float - - name: hypotf16 - standards: - - stdc - return_type: _Float16 - arguments: - - type: _Float16 - - type: _Float16 - guard: LIBC_TYPES_HAS_FLOAT16 - name: ilogb standards: - stdc diff --git a/libc/src/math/CMakeLists.txt b/libc/src/math/CMakeLists.txt index d177ff79141c0..b43b28a56ca34 100644 --- a/libc/src/math/CMakeLists.txt +++ b/libc/src/math/CMakeLists.txt @@ -43,6 +43,7 @@ endfunction() add_math_entrypoint_object(acos) add_math_entrypoint_object(acosf) add_math_entrypoint_object(acosf16) +add_math_entrypoint_object(acospif16) add_math_entrypoint_object(acosh) add_math_entrypoint_object(acoshf) diff --git a/libc/src/math/acospif16.h b/libc/src/math/acospif16.h new file mode 100644 index 0000000000000..d579c42b19706 --- /dev/null +++ b/libc/src/math/acospif16.h @@ -0,0 +1,21 @@ +//===-- Implementation header for acospif16 ---------------------*- 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_ACOSPIF16_H +#define LLVM_LIBC_SRC_MATH_ACOSPIF16_H + +#include "src/__support/macros/config.h" +#include "src/__support/macros/properties/types.h" + +namespace LIBC_NAMESPACE_DECL { + +float16 acospif16(float16 x); + +} // namespace LIBC_NAMESPACE_DECL + +#endif // LLVM_LIBC_SRC_MATH_ACOSPIF16_H diff --git a/libc/src/math/generic/CMakeLists.txt b/libc/src/math/generic/CMakeLists.txt index f7c36aab77b7d..5f7bb74c2c847 100644 --- a/libc/src/math/generic/CMakeLists.txt +++ b/libc/src/math/generic/CMakeLists.txt @@ -4112,6 +4112,26 @@ add_entrypoint_object( libc.src.__support.macros.properties.types ) +add_entrypoint_object( + acospif16 + SRCS + acospif16.cpp + HDRS + ../acospif16.h + DEPENDS + libc.hdr.errno_macros + libc.hdr.fenv_macros + libc.src.__support.FPUtil.cast + libc.src.__support.FPUtil.except_value_utils + libc.src.__support.FPUtil.fenv_impl + 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_header_library( atan_utils HDRS diff --git a/libc/src/math/generic/acospif16.cpp b/libc/src/math/generic/acospif16.cpp new file mode 100644 index 0000000000000..59f851b8675a3 --- /dev/null +++ b/libc/src/math/generic/acospif16.cpp @@ -0,0 +1,137 @@ +//===-- Half-precision acospif16(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/acospif16.h" +#include "hdr/errno_macros.h" +#include "hdr/fenv_macros.h" +#include "src/__support/FPUtil/FEnvImpl.h" +#include "src/__support/FPUtil/FPBits.h" +#include "src/__support/FPUtil/PolyEval.h" +#include "src/__support/FPUtil/cast.h" +#include "src/__support/FPUtil/except_value_utils.h" +#include "src/__support/FPUtil/multiply_add.h" +#include "src/__support/FPUtil/sqrt.h" +#include "src/__support/macros/optimization.h" // remove unnecessary includes + +namespace LIBC_NAMESPACE_DECL { + +LLVM_LIBC_FUNCTION(float16, acospif16, (float16 x)) { + using FPBits = fputil::FPBits; + FPBits xbits(x); + + uint16_t x_u = xbits.uintval(); + uint16_t x_abs = x_u & 0x7fff; + uint16_t x_sign = x_u >> 15; + + // |x| > 0x1p0, |x| > 1, or x is NaN. + if (LIBC_UNLIKELY(x_abs > 0x3c00)) { + // acospif16(NaN) = NaN + if (xbits.is_nan()) { + if (xbits.is_signaling_nan()) { + fputil::raise_except_if_required(FE_INVALID); + return FPBits::quiet_nan().get_val(); + } + + return x; + } + + // 1 < |x| <= +/-inf + fputil::raise_except_if_required(FE_INVALID); + fputil::set_errno_if_required(EDOM); + + return FPBits::quiet_nan().get_val(); + } + + // |x| == 0x1p0, x is 1 or -1 + // if x is (-)1, return 1 + // if x is (+)1, return 0 + if (LIBC_UNLIKELY(x_abs == 0x3c00)) + return fputil::cast(x_sign ? 1.0f : 0.0f); + + float xf = x; + float xsq = xf * xf; + constexpr float poly_coeffs[5] = {0x1.45f308p-2f, 0x1.b2900cp-5f, + 0x1.897e36p-6f, 0x1.9efafcp-7f, + 0x1.06d884p-6f}; + // |x| <= 0x1p-1, |x| <= 0.5 + if (x_abs <= 0x3800) { + // if x is 0, return 0.5 + if (LIBC_UNLIKELY(x_abs == 0)) + return fputil::cast(0.5f); + + // Note that: acos(x) = pi/2 + asin(-x) = pi/2 - asin(x), then + // acospi(x) = 0.5 - asin(x)/pi + // Degree-6 minimax polynomial of asin(x) generated by Sollya with: + // > P = fpminimax(asin(x)/(pi * x), [|0, 2, 4, 6, 8|], [|SG...|], [0, + // 0.5]); + float interm = + fputil::polyeval(xsq, poly_coeffs[0], poly_coeffs[1], poly_coeffs[2], + poly_coeffs[3], poly_coeffs[4]); + + return fputil::cast(fputil::multiply_add(-xf, interm, 0.5f)); + } + + // When |x| > 0.5, assume that 0.5 < |x| <= 1 + // + // Step-by-step range-reduction proof: + // 1: Let y = asin(x), such that, x = sin(y) + // 2: From complimentary angle identity: + // x = sin(y) = cos(pi/2 - y) + // 3: Let z = pi/2 - y, such that x = cos(z) + // 4: From double angle formula; cos(2A) = 1 - 2 * sin^2(A): + // z = 2A, z/2 = A + // cos(z) = 1 - 2 * sin^2(z/2) + // 5: Make sin(z/2) subject of the formula: + // sin(z/2) = sqrt((1 - cos(z))/2) + // 6: Recall [3]; x = cos(z). Therefore: + // sin(z/2) = sqrt((1 - x)/2) + // 7: Let u = (1 - x)/2 + // 8: Therefore: + // asin(sqrt(u)) = z/2 + // 2 * asin(sqrt(u)) = z + // 9: Recall [3]; z = pi/2 - y. Therefore: + // y = pi/2 - z + // y = pi/2 - 2 * asin(sqrt(u)) + // 10: Recall [1], y = asin(x). Therefore: + // asin(x) = pi/2 - 2 * asin(sqrt(u)) + // 11: Recall that: acos(x) = pi/2 + asin(-x) = pi/2 - asin(x) + // Therefore: + // acos(x) = pi/2 - (pi/2 - 2 * asin(sqrt(u))) + // acos(x) = 2 * asin(sqrt(u)) + // acospi(x) = 2 * (asin(sqrt(u)) / pi) + // + // THE RANGE REDUCTION, HOW? + // 12: Recall [7], u = (1 - x)/2 + // 13: Since 0.5 < x <= 1, therefore: + // 0 <= u <= 0.25 and 0 <= sqrt(u) <= 0.5 + // + // Hence, we can reuse the same [0, 0.5] domain polynomial approximation for + // Step [11] as `sqrt(u)` is in range. + // When -1 < x <= -0.5, the identity: + // acos(x) = pi - acos(-x) + // acospi(x) = 1 - acos(-x)/pi + // allows us to compute for the negative x value (lhs) + // with a positive x value instead (rhs). + + float xf_abs = (xf < 0 ? -xf : xf); + float u = fputil::multiply_add(-0.5f, xf_abs, 0.5f); + float sqrt_u = fputil::sqrt(u); + + // Degree-6 minimax polynomial of asin(x) generated by Sollya with: + // > P = fpminimax(asin(x)/(pi * x), [|0, 2, 4, 6, 8|], [|SG...|], [0, 0.5]); + float asin_sqrt_u = + sqrt_u * fputil::polyeval(u, poly_coeffs[0], poly_coeffs[1], + poly_coeffs[2], poly_coeffs[3], poly_coeffs[4]); + + // Same as acos(x), but devided the expression with pi + return fputil::cast( + x_sign ? fputil::multiply_add(-2.0f, asin_sqrt_u, 1.0f) + : 2.0f * asin_sqrt_u); +} +} // namespace LIBC_NAMESPACE_DECL diff --git a/libc/test/src/math/CMakeLists.txt b/libc/test/src/math/CMakeLists.txt index 7ee8b86135557..ebf9f1c86cf15 100644 --- a/libc/test/src/math/CMakeLists.txt +++ b/libc/test/src/math/CMakeLists.txt @@ -2269,6 +2269,17 @@ add_fp_unittest( libc.src.math.acosf16 ) +add_fp_unittest( + acospif16_test + NEED_MPFR + SUITE + libc-math-unittests + SRCS + acospif16_test.cpp + DEPENDS + libc.src.math.acospif16 +) + add_fp_unittest( atanf_test NEED_MPFR diff --git a/libc/test/src/math/acospif16_test.cpp b/libc/test/src/math/acospif16_test.cpp new file mode 100644 index 0000000000000..e15449b1067e8 --- /dev/null +++ b/libc/test/src/math/acospif16_test.cpp @@ -0,0 +1,42 @@ +//===-- Exhaustive test for acospif16 -------------------------------------===// +// +// 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/acospif16.h" +#include "test/UnitTest/FPMatcher.h" +#include "test/UnitTest/Test.h" +#include "utils/MPFRWrapper/MPFRUtils.h" + +using LlvmLibcAcospif16Test = LIBC_NAMESPACE::testing::FPTest; + +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(LlvmLibcAcospif16Test, PositiveRange) { + for (uint16_t v = POS_START; v <= POS_STOP; ++v) { + float16 x = FPBits(v).get_val(); + + EXPECT_MPFR_MATCH_ALL_ROUNDING(mpfr::Operation::Acospi, x, + LIBC_NAMESPACE::acospif16(x), 0.5); + } +} + +TEST_F(LlvmLibcAcospif16Test, NegativeRange) { + for (uint16_t v = NEG_START; v <= NEG_STOP; ++v) { + float16 x = FPBits(v).get_val(); + + EXPECT_MPFR_MATCH_ALL_ROUNDING(mpfr::Operation::Acospi, x, + LIBC_NAMESPACE::acospif16(x), 0.5); + } +} diff --git a/libc/test/src/math/smoke/CMakeLists.txt b/libc/test/src/math/smoke/CMakeLists.txt index bf6999d5d5649..3579adfcc62ef 100644 --- a/libc/test/src/math/smoke/CMakeLists.txt +++ b/libc/test/src/math/smoke/CMakeLists.txt @@ -4040,6 +4040,17 @@ add_fp_unittest( libc.src.math.acosf16 ) +add_fp_unittest( + acospif16_test + SUITE + libc-math-smoke-tests + SRCS + acospif16_test.cpp + DEPENDS + libc.src.errno.errno + libc.src.math.acospif16 +) + add_fp_unittest( atanf_test SUITE diff --git a/libc/test/src/math/smoke/acospif16_test.cpp b/libc/test/src/math/smoke/acospif16_test.cpp new file mode 100644 index 0000000000000..dbae2c93c78e6 --- /dev/null +++ b/libc/test/src/math/smoke/acospif16_test.cpp @@ -0,0 +1,39 @@ +//===-- Unittests for acospif16 -------------------------------------------===// +// +// +// 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/acospif16.h" +#include "test/UnitTest/FPMatcher.h" +#include "test/UnitTest/Test.h" + +using LlvmLibcAcospif16Test = LIBC_NAMESPACE::testing::FPTest; +TEST_F(LlvmLibcAcospif16Test, SpecialNumbers) { + LIBC_NAMESPACE::libc_errno = 0; + EXPECT_FP_EQ(aNaN, LIBC_NAMESPACE::acospif16(aNaN)); + EXPECT_MATH_ERRNO(0); + + EXPECT_FP_EQ_WITH_EXCEPTION(aNaN, LIBC_NAMESPACE::acospif16(sNaN), + FE_INVALID); + EXPECT_MATH_ERRNO(0); + + EXPECT_FP_EQ(zero, LIBC_NAMESPACE::acospif16(1.0f)); + EXPECT_MATH_ERRNO(0); + + EXPECT_FP_EQ(aNaN, LIBC_NAMESPACE::acospif16(inf)); + EXPECT_MATH_ERRNO(EDOM); + + EXPECT_FP_EQ(aNaN, LIBC_NAMESPACE::acospif16(neg_inf)); + EXPECT_MATH_ERRNO(EDOM); + + EXPECT_FP_EQ(aNaN, LIBC_NAMESPACE::acospif16(2.0f)); + EXPECT_MATH_ERRNO(EDOM); + + EXPECT_FP_EQ(aNaN, LIBC_NAMESPACE::acospif16(-2.0f)); + EXPECT_MATH_ERRNO(EDOM); +} diff --git a/libc/utils/MPFRWrapper/MPCommon.cpp b/libc/utils/MPFRWrapper/MPCommon.cpp index ac8cde2f97221..7bfefa998d155 100644 --- a/libc/utils/MPFRWrapper/MPCommon.cpp +++ b/libc/utils/MPFRWrapper/MPCommon.cpp @@ -64,6 +64,12 @@ MPFRNumber MPFRNumber::acos() const { return result; } +MPFRNumber MPFRNumber::acospi() const { + MPFRNumber result(*this); + mpfr_acospi(result.value, value, mpfr_rounding); + return result; +} + MPFRNumber MPFRNumber::acosh() const { MPFRNumber result(*this); mpfr_acosh(result.value, value, mpfr_rounding); diff --git a/libc/utils/MPFRWrapper/MPFRUtils.cpp b/libc/utils/MPFRWrapper/MPFRUtils.cpp index 4a033dbc2049b..bbafa497e9e72 100644 --- a/libc/utils/MPFRWrapper/MPFRUtils.cpp +++ b/libc/utils/MPFRWrapper/MPFRUtils.cpp @@ -32,6 +32,8 @@ unary_operation(Operation op, InputType input, unsigned int precision, return mpfrInput.acos(); case Operation::Acosh: return mpfrInput.acosh(); + case Operation::Acospi: + return mpfrInput.acospi(); case Operation::Asin: return mpfrInput.asin(); case Operation::Asinh: From 2f00bcd97f951e1f111263af2849d3e587a92791 Mon Sep 17 00:00:00 2001 From: Anton Date: Sun, 23 Mar 2025 16:50:32 -0400 Subject: [PATCH 02/19] Declared and defined acospif16 - declared acospif16 implementation and header file - declared test files - declared in CMakeLists that the op needs to be checked - defined the op in math.yaml - declared in the index.rst that the op needs to be checked for float16 - declared an entrypoint for linux x86_64 --- libc/src/math/acospif16.h | 42 ++++++++++++++--------------- libc/src/math/generic/acospif16.cpp | 2 +- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/libc/src/math/acospif16.h b/libc/src/math/acospif16.h index d579c42b19706..e94a35bdf6fb7 100644 --- a/libc/src/math/acospif16.h +++ b/libc/src/math/acospif16.h @@ -1,21 +1,21 @@ -//===-- Implementation header for acospif16 ---------------------*- 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_ACOSPIF16_H -#define LLVM_LIBC_SRC_MATH_ACOSPIF16_H - -#include "src/__support/macros/config.h" -#include "src/__support/macros/properties/types.h" - -namespace LIBC_NAMESPACE_DECL { - -float16 acospif16(float16 x); - -} // namespace LIBC_NAMESPACE_DECL - -#endif // LLVM_LIBC_SRC_MATH_ACOSPIF16_H +//===-- Implementation header for acospif16 ---------------------*- 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_ACOSPIF16_H +#define LLVM_LIBC_SRC_MATH_ACOSPIF16_H + +#include "src/__support/macros/config.h" +#include "src/__support/macros/properties/types.h" + +namespace LIBC_NAMESPACE_DECL { + +float16 acospif16(float16 x); + +} // namespace LIBC_NAMESPACE_DECL + +#endif // LLVM_LIBC_SRC_MATH_ACOSPIF16_H diff --git a/libc/src/math/generic/acospif16.cpp b/libc/src/math/generic/acospif16.cpp index 59f851b8675a3..6b2817c4cf75d 100644 --- a/libc/src/math/generic/acospif16.cpp +++ b/libc/src/math/generic/acospif16.cpp @@ -17,7 +17,7 @@ #include "src/__support/FPUtil/except_value_utils.h" #include "src/__support/FPUtil/multiply_add.h" #include "src/__support/FPUtil/sqrt.h" -#include "src/__support/macros/optimization.h" // remove unnecessary includes +#include "src/__support/macros/optimization.h" namespace LIBC_NAMESPACE_DECL { From f3f675c0f8807181539f3b02650865d3c0cc037e Mon Sep 17 00:00:00 2001 From: amemov Date: Mon, 24 Mar 2025 14:38:29 +0000 Subject: [PATCH 03/19] Implemented the function and tests - Implemented acospif16.cpp - Implemented acospif16_test.cpp for both unit tests and exhaustive tests TODO: - Before editing, ninja check-libc was failing the tests. Need to fix --- libc/src/math/acospif16.h | 1 + libc/src/math/generic/acospif16.cpp | 5 -- libc/test/src/math/acospif16_test.cpp | 84 ++++++++++----------- libc/test/src/math/smoke/acospif16_test.cpp | 78 +++++++++---------- 4 files changed, 82 insertions(+), 86 deletions(-) diff --git a/libc/src/math/acospif16.h b/libc/src/math/acospif16.h index e94a35bdf6fb7..6145bf4b949ef 100644 --- a/libc/src/math/acospif16.h +++ b/libc/src/math/acospif16.h @@ -11,6 +11,7 @@ #include "src/__support/macros/config.h" #include "src/__support/macros/properties/types.h" +#include "src/math/acosf16.h" namespace LIBC_NAMESPACE_DECL { diff --git a/libc/src/math/generic/acospif16.cpp b/libc/src/math/generic/acospif16.cpp index 6b2817c4cf75d..a4191426cbfbe 100644 --- a/libc/src/math/generic/acospif16.cpp +++ b/libc/src/math/generic/acospif16.cpp @@ -8,11 +8,6 @@ //===----------------------------------------------------------------------===// #include "src/math/acospif16.h" -#include "hdr/errno_macros.h" -#include "hdr/fenv_macros.h" -#include "src/__support/FPUtil/FEnvImpl.h" -#include "src/__support/FPUtil/FPBits.h" -#include "src/__support/FPUtil/PolyEval.h" #include "src/__support/FPUtil/cast.h" #include "src/__support/FPUtil/except_value_utils.h" #include "src/__support/FPUtil/multiply_add.h" diff --git a/libc/test/src/math/acospif16_test.cpp b/libc/test/src/math/acospif16_test.cpp index e15449b1067e8..1dd951f602c90 100644 --- a/libc/test/src/math/acospif16_test.cpp +++ b/libc/test/src/math/acospif16_test.cpp @@ -1,42 +1,42 @@ -//===-- Exhaustive test for acospif16 -------------------------------------===// -// -// 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/acospif16.h" -#include "test/UnitTest/FPMatcher.h" -#include "test/UnitTest/Test.h" -#include "utils/MPFRWrapper/MPFRUtils.h" - -using LlvmLibcAcospif16Test = LIBC_NAMESPACE::testing::FPTest; - -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(LlvmLibcAcospif16Test, PositiveRange) { - for (uint16_t v = POS_START; v <= POS_STOP; ++v) { - float16 x = FPBits(v).get_val(); - - EXPECT_MPFR_MATCH_ALL_ROUNDING(mpfr::Operation::Acospi, x, - LIBC_NAMESPACE::acospif16(x), 0.5); - } -} - -TEST_F(LlvmLibcAcospif16Test, NegativeRange) { - for (uint16_t v = NEG_START; v <= NEG_STOP; ++v) { - float16 x = FPBits(v).get_val(); - - EXPECT_MPFR_MATCH_ALL_ROUNDING(mpfr::Operation::Acospi, x, - LIBC_NAMESPACE::acospif16(x), 0.5); - } -} +//===-- Exhaustive test for acospif16 -------------------------------------===// +// +// 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/acospif16.h" +#include "test/UnitTest/FPMatcher.h" +#include "test/UnitTest/Test.h" +#include "utils/MPFRWrapper/MPFRUtils.h" + +using LlvmLibcAcospif16Test = LIBC_NAMESPACE::testing::FPTest; + +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(LlvmLibcAcospif16Test, PositiveRange) { + for (uint16_t v = POS_START; v <= POS_STOP; ++v) { + float16 x = FPBits(v).get_val(); + + EXPECT_MPFR_MATCH_ALL_ROUNDING(mpfr::Operation::Acospi, x, + LIBC_NAMESPACE::acospif16(x), 0.5); + } +} + +TEST_F(LlvmLibcAcospif16Test, NegativeRange) { + for (uint16_t v = NEG_START; v <= NEG_STOP; ++v) { + float16 x = FPBits(v).get_val(); + + EXPECT_MPFR_MATCH_ALL_ROUNDING(mpfr::Operation::Acospi, x, + LIBC_NAMESPACE::acospif16(x), 0.5); + } +} diff --git a/libc/test/src/math/smoke/acospif16_test.cpp b/libc/test/src/math/smoke/acospif16_test.cpp index dbae2c93c78e6..1e689bb393e00 100644 --- a/libc/test/src/math/smoke/acospif16_test.cpp +++ b/libc/test/src/math/smoke/acospif16_test.cpp @@ -1,39 +1,39 @@ -//===-- Unittests for acospif16 -------------------------------------------===// -// -// -// 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/acospif16.h" -#include "test/UnitTest/FPMatcher.h" -#include "test/UnitTest/Test.h" - -using LlvmLibcAcospif16Test = LIBC_NAMESPACE::testing::FPTest; -TEST_F(LlvmLibcAcospif16Test, SpecialNumbers) { - LIBC_NAMESPACE::libc_errno = 0; - EXPECT_FP_EQ(aNaN, LIBC_NAMESPACE::acospif16(aNaN)); - EXPECT_MATH_ERRNO(0); - - EXPECT_FP_EQ_WITH_EXCEPTION(aNaN, LIBC_NAMESPACE::acospif16(sNaN), - FE_INVALID); - EXPECT_MATH_ERRNO(0); - - EXPECT_FP_EQ(zero, LIBC_NAMESPACE::acospif16(1.0f)); - EXPECT_MATH_ERRNO(0); - - EXPECT_FP_EQ(aNaN, LIBC_NAMESPACE::acospif16(inf)); - EXPECT_MATH_ERRNO(EDOM); - - EXPECT_FP_EQ(aNaN, LIBC_NAMESPACE::acospif16(neg_inf)); - EXPECT_MATH_ERRNO(EDOM); - - EXPECT_FP_EQ(aNaN, LIBC_NAMESPACE::acospif16(2.0f)); - EXPECT_MATH_ERRNO(EDOM); - - EXPECT_FP_EQ(aNaN, LIBC_NAMESPACE::acospif16(-2.0f)); - EXPECT_MATH_ERRNO(EDOM); -} +//===-- Unittests for acospif16 -------------------------------------------===// +// +// +// 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/acospif16.h" +#include "test/UnitTest/FPMatcher.h" +#include "test/UnitTest/Test.h" + +using LlvmLibcAcospif16Test = LIBC_NAMESPACE::testing::FPTest; +TEST_F(LlvmLibcAcospif16Test, SpecialNumbers) { + LIBC_NAMESPACE::libc_errno = 0; + EXPECT_FP_EQ(aNaN, LIBC_NAMESPACE::acospif16(aNaN)); + EXPECT_MATH_ERRNO(0); + + EXPECT_FP_EQ_WITH_EXCEPTION(aNaN, LIBC_NAMESPACE::acospif16(sNaN), + FE_INVALID); + EXPECT_MATH_ERRNO(0); + + EXPECT_FP_EQ(zero, LIBC_NAMESPACE::acospif16(1.0f)); + EXPECT_MATH_ERRNO(0); + + EXPECT_FP_EQ(aNaN, LIBC_NAMESPACE::acospif16(inf)); + EXPECT_MATH_ERRNO(EDOM); + + EXPECT_FP_EQ(aNaN, LIBC_NAMESPACE::acospif16(neg_inf)); + EXPECT_MATH_ERRNO(EDOM); + + EXPECT_FP_EQ(aNaN, LIBC_NAMESPACE::acospif16(2.0f)); + EXPECT_MATH_ERRNO(EDOM); + + EXPECT_FP_EQ(aNaN, LIBC_NAMESPACE::acospif16(-2.0f)); + EXPECT_MATH_ERRNO(EDOM); +} From 4ed3c48ad3d7fb5d575ee0782d46c70fd2342f49 Mon Sep 17 00:00:00 2001 From: Anton <44649959+amemov@users.noreply.github.com> Date: Mon, 7 Apr 2025 08:58:53 -0400 Subject: [PATCH 04/19] Update entrypoints.txt --- libc/config/linux/x86_64/entrypoints.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/libc/config/linux/x86_64/entrypoints.txt b/libc/config/linux/x86_64/entrypoints.txt index 77941c7ad4014..5ba326a787a64 100644 --- a/libc/config/linux/x86_64/entrypoints.txt +++ b/libc/config/linux/x86_64/entrypoints.txt @@ -412,6 +412,7 @@ set(TARGET_LIBM_ENTRYPOINTS # math.h entrypoints libc.src.math.acosf + libc.src.math.acospif16 libc.src.math.acoshf libc.src.math.asinf libc.src.math.asinhf From 1d0ce869b156ddc1d9ddcd375205bda5d7f09949 Mon Sep 17 00:00:00 2001 From: amemov Date: Mon, 7 Apr 2025 13:15:41 +0000 Subject: [PATCH 05/19] Upd to resolve merge conflict --- libc/config/linux/x86_64/entrypoints.txt | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/libc/config/linux/x86_64/entrypoints.txt b/libc/config/linux/x86_64/entrypoints.txt index 5ba326a787a64..1483411170627 100644 --- a/libc/config/linux/x86_64/entrypoints.txt +++ b/libc/config/linux/x86_64/entrypoints.txt @@ -193,7 +193,6 @@ set(TARGET_LIBC_ENTRYPOINTS libc.src.stdlib.ldiv libc.src.stdlib.llabs libc.src.stdlib.lldiv - libc.src.stdlib.memalignment libc.src.stdlib.qsort libc.src.stdlib.qsort_r libc.src.stdlib.rand @@ -288,9 +287,6 @@ set(TARGET_LIBC_ENTRYPOINTS libc.src.sys.statvfs.fstatvfs libc.src.sys.statvfs.statvfs - # sys/utimes.h entrypoints - libc.src.sys.time.utimes - # sys/utsname.h entrypoints libc.src.sys.utsname.uname @@ -412,7 +408,6 @@ set(TARGET_LIBM_ENTRYPOINTS # math.h entrypoints libc.src.math.acosf - libc.src.math.acospif16 libc.src.math.acoshf libc.src.math.asinf libc.src.math.asinhf @@ -659,9 +654,6 @@ if(LIBC_TYPES_HAS_FLOAT16) # math.h C23 _Float16 entrypoints libc.src.math.acosf16 libc.src.math.acospif16 - libc.src.math.acoshf16 - libc.src.math.asinf16 - libc.src.math.asinhf16 libc.src.math.canonicalizef16 libc.src.math.ceilf16 libc.src.math.copysignf16 @@ -695,7 +687,6 @@ if(LIBC_TYPES_HAS_FLOAT16) libc.src.math.fabsf16 libc.src.math.fdimf16 libc.src.math.floorf16 - libc.src.math.fmaf16 libc.src.math.fmaxf16 libc.src.math.fmaximum_mag_numf16 libc.src.math.fmaximum_magf16 @@ -711,7 +702,6 @@ if(LIBC_TYPES_HAS_FLOAT16) libc.src.math.fromfpf16 libc.src.math.fromfpxf16 libc.src.math.getpayloadf16 - libc.src.math.hypotf16 libc.src.math.ilogbf16 libc.src.math.iscanonicalf16 libc.src.math.issignalingf16 @@ -781,7 +771,6 @@ endif() if(LIBC_TYPES_HAS_FLOAT128) list(APPEND TARGET_LIBM_ENTRYPOINTS # math.h C23 _Float128 entrypoints - libc.src.math.atan2f128 libc.src.math.canonicalizef128 libc.src.math.ceilf128 libc.src.math.copysignf128 From c208512c522ad50d370423745f1719b2c37ef203 Mon Sep 17 00:00:00 2001 From: amemov Date: Mon, 7 Apr 2025 13:20:21 +0000 Subject: [PATCH 06/19] Sync file with upstream main to resolve merge conflicts --- libc/config/linux/x86_64/entrypoints.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libc/config/linux/x86_64/entrypoints.txt b/libc/config/linux/x86_64/entrypoints.txt index 1483411170627..77941c7ad4014 100644 --- a/libc/config/linux/x86_64/entrypoints.txt +++ b/libc/config/linux/x86_64/entrypoints.txt @@ -193,6 +193,7 @@ set(TARGET_LIBC_ENTRYPOINTS libc.src.stdlib.ldiv libc.src.stdlib.llabs libc.src.stdlib.lldiv + libc.src.stdlib.memalignment libc.src.stdlib.qsort libc.src.stdlib.qsort_r libc.src.stdlib.rand @@ -287,6 +288,9 @@ set(TARGET_LIBC_ENTRYPOINTS libc.src.sys.statvfs.fstatvfs libc.src.sys.statvfs.statvfs + # sys/utimes.h entrypoints + libc.src.sys.time.utimes + # sys/utsname.h entrypoints libc.src.sys.utsname.uname @@ -654,6 +658,9 @@ if(LIBC_TYPES_HAS_FLOAT16) # math.h C23 _Float16 entrypoints libc.src.math.acosf16 libc.src.math.acospif16 + libc.src.math.acoshf16 + libc.src.math.asinf16 + libc.src.math.asinhf16 libc.src.math.canonicalizef16 libc.src.math.ceilf16 libc.src.math.copysignf16 @@ -687,6 +694,7 @@ if(LIBC_TYPES_HAS_FLOAT16) libc.src.math.fabsf16 libc.src.math.fdimf16 libc.src.math.floorf16 + libc.src.math.fmaf16 libc.src.math.fmaxf16 libc.src.math.fmaximum_mag_numf16 libc.src.math.fmaximum_magf16 @@ -702,6 +710,7 @@ if(LIBC_TYPES_HAS_FLOAT16) libc.src.math.fromfpf16 libc.src.math.fromfpxf16 libc.src.math.getpayloadf16 + libc.src.math.hypotf16 libc.src.math.ilogbf16 libc.src.math.iscanonicalf16 libc.src.math.issignalingf16 @@ -771,6 +780,7 @@ endif() if(LIBC_TYPES_HAS_FLOAT128) list(APPEND TARGET_LIBM_ENTRYPOINTS # math.h C23 _Float128 entrypoints + libc.src.math.atan2f128 libc.src.math.canonicalizef128 libc.src.math.ceilf128 libc.src.math.copysignf128 From 3df9b8fc4e1d126b51210e95994904aa1d376d7a Mon Sep 17 00:00:00 2001 From: amemov Date: Mon, 7 Apr 2025 13:24:05 +0000 Subject: [PATCH 07/19] Use upstream version of file to resolve merge conflict --- libc/config/linux/x86_64/entrypoints.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/libc/config/linux/x86_64/entrypoints.txt b/libc/config/linux/x86_64/entrypoints.txt index 77941c7ad4014..1ac3a781d5279 100644 --- a/libc/config/linux/x86_64/entrypoints.txt +++ b/libc/config/linux/x86_64/entrypoints.txt @@ -657,7 +657,6 @@ if(LIBC_TYPES_HAS_FLOAT16) list(APPEND TARGET_LIBM_ENTRYPOINTS # math.h C23 _Float16 entrypoints libc.src.math.acosf16 - libc.src.math.acospif16 libc.src.math.acoshf16 libc.src.math.asinf16 libc.src.math.asinhf16 From 34af54495183f370ca02cac2a7104c6906bee2e2 Mon Sep 17 00:00:00 2001 From: amemov Date: Mon, 7 Apr 2025 13:27:24 +0000 Subject: [PATCH 08/19] Added entrypoint of acospif16 to file after syncing with upstream main --- libc/config/linux/x86_64/entrypoints.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/libc/config/linux/x86_64/entrypoints.txt b/libc/config/linux/x86_64/entrypoints.txt index 1ac3a781d5279..77941c7ad4014 100644 --- a/libc/config/linux/x86_64/entrypoints.txt +++ b/libc/config/linux/x86_64/entrypoints.txt @@ -657,6 +657,7 @@ if(LIBC_TYPES_HAS_FLOAT16) list(APPEND TARGET_LIBM_ENTRYPOINTS # math.h C23 _Float16 entrypoints libc.src.math.acosf16 + libc.src.math.acospif16 libc.src.math.acoshf16 libc.src.math.asinf16 libc.src.math.asinhf16 From 774fd600dad410074d1d3bafcb4d3ebe968d9af3 Mon Sep 17 00:00:00 2001 From: amemov Date: Mon, 7 Apr 2025 16:39:25 +0000 Subject: [PATCH 09/19] Addressed the feedback: - Moved comments about polynomial in line 55 to remove redundancy - Renamed constexpr array with capital letters - Added file that was missed in initial commit - Ran clang-format on files --- libc/src/math/generic/acospif16.cpp | 19 +++++++++---------- libc/utils/MPFRWrapper/MPCommon.h | 1 + libc/utils/MPFRWrapper/MPFRUtils.cpp | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/libc/src/math/generic/acospif16.cpp b/libc/src/math/generic/acospif16.cpp index a4191426cbfbe..8907912d11dc0 100644 --- a/libc/src/math/generic/acospif16.cpp +++ b/libc/src/math/generic/acospif16.cpp @@ -51,7 +51,11 @@ LLVM_LIBC_FUNCTION(float16, acospif16, (float16 x)) { float xf = x; float xsq = xf * xf; - constexpr float poly_coeffs[5] = {0x1.45f308p-2f, 0x1.b2900cp-5f, + + // Degree-6 minimax polynomial coefficients of asin(x) generated by Sollya + // with: > P = fpminimax(asin(x)/(pi * x), [|0, 2, 4, 6, 8|], [|SG...|], [0, + // 0.5]); + constexpr float POLY_COEFFS[5] = {0x1.45f308p-2f, 0x1.b2900cp-5f, 0x1.897e36p-6f, 0x1.9efafcp-7f, 0x1.06d884p-6f}; // |x| <= 0x1p-1, |x| <= 0.5 @@ -62,12 +66,9 @@ LLVM_LIBC_FUNCTION(float16, acospif16, (float16 x)) { // Note that: acos(x) = pi/2 + asin(-x) = pi/2 - asin(x), then // acospi(x) = 0.5 - asin(x)/pi - // Degree-6 minimax polynomial of asin(x) generated by Sollya with: - // > P = fpminimax(asin(x)/(pi * x), [|0, 2, 4, 6, 8|], [|SG...|], [0, - // 0.5]); float interm = - fputil::polyeval(xsq, poly_coeffs[0], poly_coeffs[1], poly_coeffs[2], - poly_coeffs[3], poly_coeffs[4]); + fputil::polyeval(xsq, POLY_COEFFS[0], POLY_COEFFS[1], POLY_COEFFS[2], + POLY_COEFFS[3], POLY_COEFFS[4]); return fputil::cast(fputil::multiply_add(-xf, interm, 0.5f)); } @@ -118,11 +119,9 @@ LLVM_LIBC_FUNCTION(float16, acospif16, (float16 x)) { float u = fputil::multiply_add(-0.5f, xf_abs, 0.5f); float sqrt_u = fputil::sqrt(u); - // Degree-6 minimax polynomial of asin(x) generated by Sollya with: - // > P = fpminimax(asin(x)/(pi * x), [|0, 2, 4, 6, 8|], [|SG...|], [0, 0.5]); float asin_sqrt_u = - sqrt_u * fputil::polyeval(u, poly_coeffs[0], poly_coeffs[1], - poly_coeffs[2], poly_coeffs[3], poly_coeffs[4]); + sqrt_u * fputil::polyeval(u, POLY_COEFFS[0], POLY_COEFFS[1], + POLY_COEFFS[2], POLY_COEFFS[3], POLY_COEFFS[4]); // Same as acos(x), but devided the expression with pi return fputil::cast( diff --git a/libc/utils/MPFRWrapper/MPCommon.h b/libc/utils/MPFRWrapper/MPCommon.h index eaa512e30bc86..72e52795cd914 100644 --- a/libc/utils/MPFRWrapper/MPCommon.h +++ b/libc/utils/MPFRWrapper/MPCommon.h @@ -180,6 +180,7 @@ class MPFRNumber { bool is_nan() const; MPFRNumber abs() const; MPFRNumber acos() const; + MPFRNumber acospi() const; MPFRNumber acosh() const; MPFRNumber add(const MPFRNumber &b) const; MPFRNumber asin() const; diff --git a/libc/utils/MPFRWrapper/MPFRUtils.cpp b/libc/utils/MPFRWrapper/MPFRUtils.cpp index bbafa497e9e72..8853f96ef8f92 100644 --- a/libc/utils/MPFRWrapper/MPFRUtils.cpp +++ b/libc/utils/MPFRWrapper/MPFRUtils.cpp @@ -33,7 +33,7 @@ unary_operation(Operation op, InputType input, unsigned int precision, case Operation::Acosh: return mpfrInput.acosh(); case Operation::Acospi: - return mpfrInput.acospi(); + return mpfrInput.acospi(); case Operation::Asin: return mpfrInput.asin(); case Operation::Asinh: From 4d69d5f1feb66b36980656771d4c8d8bcd9c477b Mon Sep 17 00:00:00 2001 From: amemov Date: Tue, 8 Apr 2025 00:45:18 +0000 Subject: [PATCH 10/19] Added missing Operation for MPFRUtils.h --- libc/utils/MPFRWrapper/MPFRUtils.h | 1 + 1 file changed, 1 insertion(+) diff --git a/libc/utils/MPFRWrapper/MPFRUtils.h b/libc/utils/MPFRWrapper/MPFRUtils.h index bc65f87c6b5ab..c77a6aa3adeae 100644 --- a/libc/utils/MPFRWrapper/MPFRUtils.h +++ b/libc/utils/MPFRWrapper/MPFRUtils.h @@ -28,6 +28,7 @@ enum class Operation : int { Abs, Acos, Acosh, + Acospi, Asin, Asinh, Atan, From 687dac4f24b1f8d57cff506e14bac110ccfbc350 Mon Sep 17 00:00:00 2001 From: amemov Date: Tue, 8 Apr 2025 16:11:37 +0000 Subject: [PATCH 11/19] acospif16.h - removed acosf16.h acospif16.cpp - added missing header CMakeLists - changed dependencies for acospif16, since it doesn't use ExceptValues like acosf16 --- libc/src/math/acospif16.h | 1 - libc/src/math/generic/CMakeLists.txt | 1 - libc/src/math/generic/acospif16.cpp | 6 +++++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libc/src/math/acospif16.h b/libc/src/math/acospif16.h index 6145bf4b949ef..e94a35bdf6fb7 100644 --- a/libc/src/math/acospif16.h +++ b/libc/src/math/acospif16.h @@ -11,7 +11,6 @@ #include "src/__support/macros/config.h" #include "src/__support/macros/properties/types.h" -#include "src/math/acosf16.h" namespace LIBC_NAMESPACE_DECL { diff --git a/libc/src/math/generic/CMakeLists.txt b/libc/src/math/generic/CMakeLists.txt index 5f7bb74c2c847..e7e5efa475816 100644 --- a/libc/src/math/generic/CMakeLists.txt +++ b/libc/src/math/generic/CMakeLists.txt @@ -4122,7 +4122,6 @@ add_entrypoint_object( libc.hdr.errno_macros libc.hdr.fenv_macros libc.src.__support.FPUtil.cast - libc.src.__support.FPUtil.except_value_utils libc.src.__support.FPUtil.fenv_impl libc.src.__support.FPUtil.fp_bits libc.src.__support.FPUtil.multiply_add diff --git a/libc/src/math/generic/acospif16.cpp b/libc/src/math/generic/acospif16.cpp index 8907912d11dc0..12efc15323851 100644 --- a/libc/src/math/generic/acospif16.cpp +++ b/libc/src/math/generic/acospif16.cpp @@ -8,8 +8,12 @@ //===----------------------------------------------------------------------===// #include "src/math/acospif16.h" +#include "hdr/errno_macros.h" +#include "hdr/fenv_macros.h" +#include "src/__support/FPUtil/FEnvImpl.h" +#include "src/__support/FPUtil/FPBits.h" +#include "src/__support/FPUtil/PolyEval.h" #include "src/__support/FPUtil/cast.h" -#include "src/__support/FPUtil/except_value_utils.h" #include "src/__support/FPUtil/multiply_add.h" #include "src/__support/FPUtil/sqrt.h" #include "src/__support/macros/optimization.h" From d820ed52273adf60c0f57904685047d93882a4f8 Mon Sep 17 00:00:00 2001 From: amemov Date: Thu, 10 Apr 2025 14:57:15 +0000 Subject: [PATCH 12/19] Addressed style comments: - Everything pointed out by @overmighty - Fixed math.yaml to make sure it has all functions from upstream TODO: - Modify MPFRWrapper to work with acospi using older version of MPFR --- libc/config/linux/x86_64/entrypoints.txt | 2 +- libc/include/math.yaml | 47 +++++++++++++++++++-- libc/src/math/generic/acospif16.cpp | 5 +-- libc/test/src/math/smoke/acospif16_test.cpp | 1 - 4 files changed, 46 insertions(+), 9 deletions(-) diff --git a/libc/config/linux/x86_64/entrypoints.txt b/libc/config/linux/x86_64/entrypoints.txt index 77941c7ad4014..394452e916d33 100644 --- a/libc/config/linux/x86_64/entrypoints.txt +++ b/libc/config/linux/x86_64/entrypoints.txt @@ -657,8 +657,8 @@ if(LIBC_TYPES_HAS_FLOAT16) list(APPEND TARGET_LIBM_ENTRYPOINTS # math.h C23 _Float16 entrypoints libc.src.math.acosf16 - libc.src.math.acospif16 libc.src.math.acoshf16 + libc.src.math.acospif16 libc.src.math.asinf16 libc.src.math.asinhf16 libc.src.math.canonicalizef16 diff --git a/libc/include/math.yaml b/libc/include/math.yaml index dfe04732fbd03..b725c33c0bb06 100644 --- a/libc/include/math.yaml +++ b/libc/include/math.yaml @@ -21,19 +21,26 @@ functions: arguments: - type: _Float16 guard: LIBC_TYPES_HAS_FLOAT16 - - name: acospif16 + - name: acoshf + standards: + - stdc + return_type: float + arguments: + - type: float + name: acoshf16 standards: - stdc return_type: _Float16 arguments: - type: _Float16 guard: LIBC_TYPES_HAS_FLOAT16 - - name: acoshf + name: acospif16 standards: - stdc - return_type: float + return_type: _Float16 arguments: - - type: float + - type: _Float16 + guard: LIBC_TYPES_HAS_FLOAT16 - name: asin standards: - stdc @@ -59,6 +66,13 @@ functions: return_type: float arguments: - type: float + - name: asinhf16 + standards: + - stdc + return_type: _Float16 + arguments: + - type: _Float16 + guard: LIBC_TYPES_HAS_FLOAT16 - name: atan standards: - stdc @@ -86,6 +100,14 @@ functions: arguments: - type: long double - type: long double + - name: atan2f128 + standards: + - stdc + return_type: float128 + arguments: + - type: float128 + - type: float128 + guard: LIBC_TYPES_HAS_FLOAT128 - name: atanf standards: - stdc @@ -749,6 +771,15 @@ functions: - type: float - type: float - type: float + - name: fmaf16 + standards: + - stdc + return_type: _Float16 + arguments: + - type: _Float16 + - type: _Float16 + - type: _Float16 + guard: LIBC_TYPES_HAS_FLOAT16 - name: fmax standards: - stdc @@ -1379,6 +1410,14 @@ functions: arguments: - type: float - type: float + - name: hypotf16 + standards: + - stdc + return_type: _Float16 + arguments: + - type: _Float16 + - type: _Float16 + guard: LIBC_TYPES_HAS_FLOAT16 - name: ilogb standards: - stdc diff --git a/libc/src/math/generic/acospif16.cpp b/libc/src/math/generic/acospif16.cpp index 12efc15323851..7a7b56cfa67c9 100644 --- a/libc/src/math/generic/acospif16.cpp +++ b/libc/src/math/generic/acospif16.cpp @@ -1,10 +1,9 @@ -//===-- Half-precision acospif16(x) function ------------------------------===// +//===-- Half-precision acospi 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/acospif16.h" @@ -40,7 +39,7 @@ LLVM_LIBC_FUNCTION(float16, acospif16, (float16 x)) { return x; } - // 1 < |x| <= +/-inf + // 1 < |x| <= +inf fputil::raise_except_if_required(FE_INVALID); fputil::set_errno_if_required(EDOM); diff --git a/libc/test/src/math/smoke/acospif16_test.cpp b/libc/test/src/math/smoke/acospif16_test.cpp index 1e689bb393e00..66b94706eab94 100644 --- a/libc/test/src/math/smoke/acospif16_test.cpp +++ b/libc/test/src/math/smoke/acospif16_test.cpp @@ -1,6 +1,5 @@ //===-- Unittests for acospif16 -------------------------------------------===// // -// // 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. From b2e47da2cbae061ad23f65c3bfd629e14bd60ddd Mon Sep 17 00:00:00 2001 From: amemov Date: Sat, 12 Apr 2025 00:57:34 +0000 Subject: [PATCH 13/19] Addressed some potential style comments: - Changed order in MPCommon.h and .cpp Added workaround for older MPFR version - Support for acospi Fixed some nit in acospif16.cpp for the comments to look nice --- libc/src/math/generic/acospif16.cpp | 2 +- libc/utils/MPFRWrapper/MPCommon.cpp | 18 ++++++++++++++---- libc/utils/MPFRWrapper/MPCommon.h | 2 +- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/libc/src/math/generic/acospif16.cpp b/libc/src/math/generic/acospif16.cpp index 7a7b56cfa67c9..bfdf1694e3ba6 100644 --- a/libc/src/math/generic/acospif16.cpp +++ b/libc/src/math/generic/acospif16.cpp @@ -1,4 +1,4 @@ -//===-- Half-precision acospi function ------------------------------===// +//===-- Half-precision acospi function ------------------------------------===// // // 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/utils/MPFRWrapper/MPCommon.cpp b/libc/utils/MPFRWrapper/MPCommon.cpp index 7bfefa998d155..a275ab3bd44cb 100644 --- a/libc/utils/MPFRWrapper/MPCommon.cpp +++ b/libc/utils/MPFRWrapper/MPCommon.cpp @@ -64,16 +64,26 @@ MPFRNumber MPFRNumber::acos() const { return result; } -MPFRNumber MPFRNumber::acospi() const { +MPFRNumber MPFRNumber::acosh() const { MPFRNumber result(*this); - mpfr_acospi(result.value, value, mpfr_rounding); + mpfr_acosh(result.value, value, mpfr_rounding); return result; } -MPFRNumber MPFRNumber::acosh() const { +MPFRNumber MPFRNumber::acospi() const { MPFRNumber result(*this); - mpfr_acosh(result.value, value, mpfr_rounding); + +#if MPFR_VERSION_MAJOR > 4 || \ + (MPFR_VERSION_MAJOR == 4 && MPFR_VERSION_MINOR >= 2) + mpfr_acospi(result.value, value, mpfr_rounding); + return result; +#else + mpfr_acos(result.value, value, mpfr_rounding); + MPFRNumber value_pi(0.0, 1280); + mpfr_const_pi(value_pi.value, MPFR_RNDN); + mpfr_div(result.value, result.value, value_pi.value, mpfr_rounding); return result; +#endif } MPFRNumber MPFRNumber::add(const MPFRNumber &b) const { diff --git a/libc/utils/MPFRWrapper/MPCommon.h b/libc/utils/MPFRWrapper/MPCommon.h index 72e52795cd914..99cb7ec66a2ca 100644 --- a/libc/utils/MPFRWrapper/MPCommon.h +++ b/libc/utils/MPFRWrapper/MPCommon.h @@ -180,8 +180,8 @@ class MPFRNumber { bool is_nan() const; MPFRNumber abs() const; MPFRNumber acos() const; - MPFRNumber acospi() const; MPFRNumber acosh() const; + MPFRNumber acospi() const; MPFRNumber add(const MPFRNumber &b) const; MPFRNumber asin() const; MPFRNumber asinh() const; From aac813723ccb703a9d0ea9c7ed717ee90566431e Mon Sep 17 00:00:00 2001 From: amemov Date: Sat, 12 Apr 2025 01:30:09 +0000 Subject: [PATCH 14/19] Changed rounding for mpfr_const_pi in MPCommon.cpp for acospi --- libc/utils/MPFRWrapper/MPCommon.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libc/utils/MPFRWrapper/MPCommon.cpp b/libc/utils/MPFRWrapper/MPCommon.cpp index a275ab3bd44cb..64ed5e025d162 100644 --- a/libc/utils/MPFRWrapper/MPCommon.cpp +++ b/libc/utils/MPFRWrapper/MPCommon.cpp @@ -80,7 +80,7 @@ MPFRNumber MPFRNumber::acospi() const { #else mpfr_acos(result.value, value, mpfr_rounding); MPFRNumber value_pi(0.0, 1280); - mpfr_const_pi(value_pi.value, MPFR_RNDN); + mpfr_const_pi(value_pi.value, mpfr_rounding); mpfr_div(result.value, result.value, value_pi.value, mpfr_rounding); return result; #endif From 5b417cfc4035bd09aa096e4b1c978f9d6ddb950b Mon Sep 17 00:00:00 2001 From: amemov Date: Sat, 12 Apr 2025 01:54:07 +0000 Subject: [PATCH 15/19] some tweaking in MPCommon.cpp --- libc/utils/MPFRWrapper/MPCommon.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libc/utils/MPFRWrapper/MPCommon.cpp b/libc/utils/MPFRWrapper/MPCommon.cpp index 64ed5e025d162..b0449f51c580c 100644 --- a/libc/utils/MPFRWrapper/MPCommon.cpp +++ b/libc/utils/MPFRWrapper/MPCommon.cpp @@ -80,8 +80,8 @@ MPFRNumber MPFRNumber::acospi() const { #else mpfr_acos(result.value, value, mpfr_rounding); MPFRNumber value_pi(0.0, 1280); - mpfr_const_pi(value_pi.value, mpfr_rounding); - mpfr_div(result.value, result.value, value_pi.value, mpfr_rounding); + mpfr_const_pi(value_pi.value, MPFR_RNDN); + mpfr_div(result.value, value, value_pi.value, mpfr_rounding); return result; #endif } From 3b17d52a7d812135392aa8573e149ba4b0497f8a Mon Sep 17 00:00:00 2001 From: amemov Date: Sat, 12 Apr 2025 02:06:38 +0000 Subject: [PATCH 16/19] Fix for NaN values --- libc/utils/MPFRWrapper/MPCommon.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libc/utils/MPFRWrapper/MPCommon.cpp b/libc/utils/MPFRWrapper/MPCommon.cpp index b0449f51c580c..d0a957818eece 100644 --- a/libc/utils/MPFRWrapper/MPCommon.cpp +++ b/libc/utils/MPFRWrapper/MPCommon.cpp @@ -78,6 +78,9 @@ MPFRNumber MPFRNumber::acospi() const { mpfr_acospi(result.value, value, mpfr_rounding); return result; #else + if (result.is_nan()) { + return result; + } mpfr_acos(result.value, value, mpfr_rounding); MPFRNumber value_pi(0.0, 1280); mpfr_const_pi(value_pi.value, MPFR_RNDN); From 60b2292f158cb0c8a426caaa0c1e1c7957004006 Mon Sep 17 00:00:00 2001 From: amemov Date: Thu, 17 Apr 2025 15:46:22 +0000 Subject: [PATCH 17/19] Addressed the feedback for MPCommon.cpp --- libc/utils/MPFRWrapper/MPCommon.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libc/utils/MPFRWrapper/MPCommon.cpp b/libc/utils/MPFRWrapper/MPCommon.cpp index d0a957818eece..ccd4d2d01a4e2 100644 --- a/libc/utils/MPFRWrapper/MPCommon.cpp +++ b/libc/utils/MPFRWrapper/MPCommon.cpp @@ -78,13 +78,11 @@ MPFRNumber MPFRNumber::acospi() const { mpfr_acospi(result.value, value, mpfr_rounding); return result; #else - if (result.is_nan()) { - return result; - } - mpfr_acos(result.value, value, mpfr_rounding); + MPFRNumber value_acos(0.0, 1280); + mpfr_acos(value_acos.value, value, MPFR_RNDN); MPFRNumber value_pi(0.0, 1280); mpfr_const_pi(value_pi.value, MPFR_RNDN); - mpfr_div(result.value, value, value_pi.value, mpfr_rounding); + mpfr_div(result.value, value_acos.value, value_pi.value, mpfr_rounding); return result; #endif } From f6f551a1257c7c98e27706eae4b15d29ab42c711 Mon Sep 17 00:00:00 2001 From: amemov Date: Thu, 24 Apr 2025 19:04:33 +0000 Subject: [PATCH 18/19] Reordered 'acos' entrypoint in alphabetical order --- libc/src/math/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libc/src/math/CMakeLists.txt b/libc/src/math/CMakeLists.txt index b43b28a56ca34..1571ae9686639 100644 --- a/libc/src/math/CMakeLists.txt +++ b/libc/src/math/CMakeLists.txt @@ -41,14 +41,14 @@ function(add_math_entrypoint_object name) endfunction() add_math_entrypoint_object(acos) -add_math_entrypoint_object(acosf) -add_math_entrypoint_object(acosf16) -add_math_entrypoint_object(acospif16) - add_math_entrypoint_object(acosh) +add_math_entrypoint_object(acosf) add_math_entrypoint_object(acoshf) +add_math_entrypoint_object(acosf16) add_math_entrypoint_object(acoshf16) +add_math_entrypoint_object(acospif16) + add_math_entrypoint_object(asin) add_math_entrypoint_object(asinf) add_math_entrypoint_object(asinf16) From d9aa746f5cea3945d1cafdf2b29bcc5f46ea3ec3 Mon Sep 17 00:00:00 2001 From: amemov Date: Thu, 24 Apr 2025 19:22:30 +0000 Subject: [PATCH 19/19] Fixed the ordering --- libc/src/math/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libc/src/math/CMakeLists.txt b/libc/src/math/CMakeLists.txt index 1571ae9686639..5161b2b61aa94 100644 --- a/libc/src/math/CMakeLists.txt +++ b/libc/src/math/CMakeLists.txt @@ -41,10 +41,11 @@ function(add_math_entrypoint_object name) endfunction() add_math_entrypoint_object(acos) -add_math_entrypoint_object(acosh) add_math_entrypoint_object(acosf) -add_math_entrypoint_object(acoshf) add_math_entrypoint_object(acosf16) + +add_math_entrypoint_object(acosh) +add_math_entrypoint_object(acoshf) add_math_entrypoint_object(acoshf16) add_math_entrypoint_object(acospif16)