[libc-commits] [libc] [libc][math][c23] Add f16sqrt{, l, f128} C23 math functions (PR #96642)
via libc-commits
libc-commits at lists.llvm.org
Tue Jun 25 07:26:01 PDT 2024
https://github.com/overmighty created https://github.com/llvm/llvm-project/pull/96642
Part of #93566.
>From 60f802bc65f282f89331f1bcbaec0a8f848082da Mon Sep 17 00:00:00 2001
From: OverMighty <its.overmighty at gmail.com>
Date: Tue, 25 Jun 2024 02:03:45 +0200
Subject: [PATCH 1/3] [libc][math][c23] Add f16sqrt C23 math function
---
libc/config/linux/aarch64/entrypoints.txt | 1 +
libc/config/linux/x86_64/entrypoints.txt | 1 +
libc/docs/math/index.rst | 2 +-
libc/spec/stdc.td | 1 +
.../__support/FPUtil/generic/CMakeLists.txt | 1 +
libc/src/__support/FPUtil/generic/sqrt.h | 102 +++---------------
libc/src/math/CMakeLists.txt | 1 +
libc/src/math/f16sqrt.h | 20 ++++
libc/src/math/generic/CMakeLists.txt | 13 +++
libc/src/math/generic/f16sqrt.cpp | 19 ++++
libc/test/src/math/CMakeLists.txt | 31 ++++--
libc/test/src/math/SqrtTest.h | 43 +++-----
libc/test/src/math/f16sqrt_test.cpp | 13 +++
libc/test/src/math/smoke/CMakeLists.txt | 12 +++
libc/test/src/math/smoke/f16sqrt_test.cpp | 13 +++
libc/utils/MPFRWrapper/MPFRUtils.cpp | 5 +
16 files changed, 156 insertions(+), 122 deletions(-)
create mode 100644 libc/src/math/f16sqrt.h
create mode 100644 libc/src/math/generic/f16sqrt.cpp
create mode 100644 libc/test/src/math/f16sqrt_test.cpp
create mode 100644 libc/test/src/math/smoke/f16sqrt_test.cpp
diff --git a/libc/config/linux/aarch64/entrypoints.txt b/libc/config/linux/aarch64/entrypoints.txt
index a875a17f06b3e..e606b82747873 100644
--- a/libc/config/linux/aarch64/entrypoints.txt
+++ b/libc/config/linux/aarch64/entrypoints.txt
@@ -507,6 +507,7 @@ if(LIBC_TYPES_HAS_FLOAT16)
libc.src.math.copysignf16
libc.src.math.f16divf
libc.src.math.f16fmaf
+ libc.src.math.f16sqrt
libc.src.math.f16sqrtf
libc.src.math.fabsf16
libc.src.math.fdimf16
diff --git a/libc/config/linux/x86_64/entrypoints.txt b/libc/config/linux/x86_64/entrypoints.txt
index 34748ff5950ad..dfb8fabaf383a 100644
--- a/libc/config/linux/x86_64/entrypoints.txt
+++ b/libc/config/linux/x86_64/entrypoints.txt
@@ -538,6 +538,7 @@ if(LIBC_TYPES_HAS_FLOAT16)
libc.src.math.copysignf16
libc.src.math.f16divf
libc.src.math.f16fmaf
+ libc.src.math.f16sqrt
libc.src.math.f16sqrtf
libc.src.math.fabsf16
libc.src.math.fdimf16
diff --git a/libc/docs/math/index.rst b/libc/docs/math/index.rst
index 95f450ab75960..1e4862e05ea6e 100644
--- a/libc/docs/math/index.rst
+++ b/libc/docs/math/index.rst
@@ -292,7 +292,7 @@ Higher Math Functions
+-----------+------------------+-----------------+------------------------+----------------------+------------------------+------------------------+----------------------------+
| fma | |check| | |check| | | | | 7.12.13.1 | F.10.10.1 |
+-----------+------------------+-----------------+------------------------+----------------------+------------------------+------------------------+----------------------------+
-| f16sqrt | |check| | | | N/A | | 7.12.14.6 | F.10.11 |
+| f16sqrt | |check| | |check| | | N/A | | 7.12.14.6 | F.10.11 |
+-----------+------------------+-----------------+------------------------+----------------------+------------------------+------------------------+----------------------------+
| fsqrt | N/A | | | N/A | | 7.12.14.6 | F.10.11 |
+-----------+------------------+-----------------+------------------------+----------------------+------------------------+------------------------+----------------------------+
diff --git a/libc/spec/stdc.td b/libc/spec/stdc.td
index 651f49deef4c1..7448c9ec4711a 100644
--- a/libc/spec/stdc.td
+++ b/libc/spec/stdc.td
@@ -728,6 +728,7 @@ def StdC : StandardSpec<"stdc"> {
GuardedFunctionSpec<"f16divf", RetValSpec<Float16Type>, [ArgSpec<FloatType>, ArgSpec<FloatType>], "LIBC_TYPES_HAS_FLOAT16">,
+ GuardedFunctionSpec<"f16sqrt", RetValSpec<Float16Type>, [ArgSpec<DoubleType>], "LIBC_TYPES_HAS_FLOAT16">,
GuardedFunctionSpec<"f16sqrtf", RetValSpec<Float16Type>, [ArgSpec<FloatType>], "LIBC_TYPES_HAS_FLOAT16">,
]
>;
diff --git a/libc/src/__support/FPUtil/generic/CMakeLists.txt b/libc/src/__support/FPUtil/generic/CMakeLists.txt
index 33b2564bfa087..2c386e1cae098 100644
--- a/libc/src/__support/FPUtil/generic/CMakeLists.txt
+++ b/libc/src/__support/FPUtil/generic/CMakeLists.txt
@@ -8,6 +8,7 @@ add_header_library(
libc.src.__support.common
libc.src.__support.CPP.bit
libc.src.__support.CPP.type_traits
+ libc.src.__support.FPUtil.dyadic_float
libc.src.__support.FPUtil.fenv_impl
libc.src.__support.FPUtil.fp_bits
libc.src.__support.FPUtil.rounding_mode
diff --git a/libc/src/__support/FPUtil/generic/sqrt.h b/libc/src/__support/FPUtil/generic/sqrt.h
index d6e894fdfe021..e9cd3f47eef27 100644
--- a/libc/src/__support/FPUtil/generic/sqrt.h
+++ b/libc/src/__support/FPUtil/generic/sqrt.h
@@ -14,7 +14,7 @@
#include "src/__support/CPP/type_traits.h"
#include "src/__support/FPUtil/FEnvImpl.h"
#include "src/__support/FPUtil/FPBits.h"
-#include "src/__support/FPUtil/rounding_mode.h"
+#include "src/__support/FPUtil/dyadic_float.h"
#include "src/__support/common.h"
#include "src/__support/uint128.h"
@@ -78,16 +78,14 @@ sqrt(InType x) {
return x86::sqrt(x);
} else {
// IEEE floating points formats.
- using OutFPBits = typename fputil::FPBits<OutType>;
- using OutStorageType = typename OutFPBits::StorageType;
- using InFPBits = typename fputil::FPBits<InType>;
+ using OutFPBits = FPBits<OutType>;
+ using InFPBits = FPBits<InType>;
using InStorageType = typename InFPBits::StorageType;
+ using DyadicFloat =
+ DyadicFloat<cpp::bit_ceil(static_cast<size_t>(InFPBits::STORAGE_LEN))>;
+
constexpr InStorageType ONE = InStorageType(1) << InFPBits::FRACTION_LEN;
constexpr auto FLT_NAN = OutFPBits::quiet_nan().get_val();
- constexpr int EXTRA_FRACTION_LEN =
- InFPBits::FRACTION_LEN - OutFPBits::FRACTION_LEN;
- constexpr InStorageType EXTRA_FRACTION_MASK =
- (InStorageType(1) << EXTRA_FRACTION_LEN) - 1;
InFPBits bits(x);
@@ -146,91 +144,19 @@ sqrt(InType x) {
}
// We compute one more iteration in order to round correctly.
- bool lsb = (y & (InStorageType(1) << EXTRA_FRACTION_LEN)) !=
- 0; // Least significant bit
- bool rb = false; // Round bit
r <<= 2;
- InStorageType tmp = (y << 2) + 1;
+ y <<= 2;
+ InStorageType tmp = y + 1;
if (r >= tmp) {
r -= tmp;
- rb = true;
- }
-
- bool sticky = false;
-
- if constexpr (EXTRA_FRACTION_LEN > 0) {
- sticky = rb || (y & EXTRA_FRACTION_MASK) != 0;
- rb = (y & (InStorageType(1) << (EXTRA_FRACTION_LEN - 1))) != 0;
- }
-
- // Remove hidden bit and append the exponent field.
- x_exp = ((x_exp >> 1) + OutFPBits::EXP_BIAS);
-
- OutStorageType y_out = static_cast<OutStorageType>(
- ((y - ONE) >> EXTRA_FRACTION_LEN) |
- (static_cast<OutStorageType>(x_exp) << OutFPBits::FRACTION_LEN));
-
- if constexpr (EXTRA_FRACTION_LEN > 0) {
- if (x_exp >= OutFPBits::MAX_BIASED_EXPONENT) {
- switch (quick_get_round()) {
- case FE_TONEAREST:
- case FE_UPWARD:
- return OutFPBits::inf().get_val();
- default:
- return OutFPBits::max_normal().get_val();
- }
- }
-
- if (x_exp <
- -OutFPBits::EXP_BIAS - OutFPBits::SIG_LEN + EXTRA_FRACTION_LEN) {
- switch (quick_get_round()) {
- case FE_UPWARD:
- return OutFPBits::min_subnormal().get_val();
- default:
- return OutType(0.0);
- }
- }
-
- if (x_exp <= 0) {
- int underflow_extra_fraction_len = EXTRA_FRACTION_LEN - x_exp + 1;
- InStorageType underflow_extra_fraction_mask =
- (InStorageType(1) << underflow_extra_fraction_len) - 1;
-
- rb = (y & (InStorageType(1) << (underflow_extra_fraction_len - 1))) !=
- 0;
- OutStorageType subnormal_mant =
- static_cast<OutStorageType>(y >> underflow_extra_fraction_len);
- lsb = (subnormal_mant & 1) != 0;
- sticky = sticky || (y & underflow_extra_fraction_mask) != 0;
-
- switch (quick_get_round()) {
- case FE_TONEAREST:
- if (rb && (lsb || sticky))
- ++subnormal_mant;
- break;
- case FE_UPWARD:
- if (rb || sticky)
- ++subnormal_mant;
- break;
- }
-
- return cpp::bit_cast<OutType>(subnormal_mant);
- }
- }
-
- switch (quick_get_round()) {
- case FE_TONEAREST:
- // Round to nearest, ties to even
- if (rb && (lsb || (r != 0)))
- ++y_out;
- break;
- case FE_UPWARD:
- if (rb || (r != 0) || sticky)
- ++y_out;
- break;
+ // Rounding bit.
+ y |= 1 << 1;
}
+ // Sticky bit.
+ y |= r != 0;
- return cpp::bit_cast<OutType>(y_out);
+ DyadicFloat yd(Sign::POS, (x_exp >> 1) - 2 - InFPBits::FRACTION_LEN, y);
+ return yd.template as<OutType, /*ShouldSignalExceptions=*/true>();
}
}
}
diff --git a/libc/src/math/CMakeLists.txt b/libc/src/math/CMakeLists.txt
index 711cbf8bbfdca..f407b300696e3 100644
--- a/libc/src/math/CMakeLists.txt
+++ b/libc/src/math/CMakeLists.txt
@@ -103,6 +103,7 @@ add_math_entrypoint_object(f16divf)
add_math_entrypoint_object(f16fmaf)
+add_math_entrypoint_object(f16sqrt)
add_math_entrypoint_object(f16sqrtf)
add_math_entrypoint_object(fabs)
diff --git a/libc/src/math/f16sqrt.h b/libc/src/math/f16sqrt.h
new file mode 100644
index 0000000000000..f1134ac5ee2b9
--- /dev/null
+++ b/libc/src/math/f16sqrt.h
@@ -0,0 +1,20 @@
+//===-- Implementation header for f16sqrt -----------------------*- 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_F16SQRT_H
+#define LLVM_LIBC_SRC_MATH_F16SQRT_H
+
+#include "src/__support/macros/properties/types.h"
+
+namespace LIBC_NAMESPACE {
+
+float16 f16sqrt(double x);
+
+} // namespace LIBC_NAMESPACE
+
+#endif // LLVM_LIBC_SRC_MATH_F16SQRT_H
diff --git a/libc/src/math/generic/CMakeLists.txt b/libc/src/math/generic/CMakeLists.txt
index fc2024c89b5df..98d0340d5fa89 100644
--- a/libc/src/math/generic/CMakeLists.txt
+++ b/libc/src/math/generic/CMakeLists.txt
@@ -3757,6 +3757,19 @@ add_entrypoint_object(
-O3
)
+add_entrypoint_object(
+ f16sqrt
+ SRCS
+ f16sqrt.cpp
+ HDRS
+ ../f16sqrt.h
+ DEPENDS
+ libc.src.__support.macros.properties.types
+ libc.src.__support.FPUtil.sqrt
+ COMPILE_OPTIONS
+ -O3
+)
+
add_entrypoint_object(
f16sqrtf
SRCS
diff --git a/libc/src/math/generic/f16sqrt.cpp b/libc/src/math/generic/f16sqrt.cpp
new file mode 100644
index 0000000000000..9d5f081f63315
--- /dev/null
+++ b/libc/src/math/generic/f16sqrt.cpp
@@ -0,0 +1,19 @@
+//===-- Implementation of f16sqrt 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/f16sqrt.h"
+#include "src/__support/FPUtil/sqrt.h"
+#include "src/__support/common.h"
+
+namespace LIBC_NAMESPACE {
+
+LLVM_LIBC_FUNCTION(float16, f16sqrt, (double x)) {
+ return fputil::sqrt<float16>(x);
+}
+
+} // namespace LIBC_NAMESPACE
diff --git a/libc/test/src/math/CMakeLists.txt b/libc/test/src/math/CMakeLists.txt
index ba588662f469e..83ad3b033961e 100644
--- a/libc/test/src/math/CMakeLists.txt
+++ b/libc/test/src/math/CMakeLists.txt
@@ -1247,9 +1247,10 @@ add_fp_unittest(
libc-math-unittests
SRCS
sqrtf_test.cpp
+ HDRS
+ SqrtTest.h
DEPENDS
libc.src.math.sqrtf
- libc.src.__support.FPUtil.fp_bits
)
add_fp_unittest(
@@ -1259,9 +1260,10 @@ add_fp_unittest(
libc-math-unittests
SRCS
sqrt_test.cpp
+ HDRS
+ SqrtTest.h
DEPENDS
libc.src.math.sqrt
- libc.src.__support.FPUtil.fp_bits
)
add_fp_unittest(
@@ -1271,9 +1273,10 @@ add_fp_unittest(
libc-math-unittests
SRCS
sqrtl_test.cpp
+ HDRS
+ SqrtTest.h
DEPENDS
libc.src.math.sqrtl
- libc.src.__support.FPUtil.fp_bits
)
add_fp_unittest(
@@ -1283,9 +1286,10 @@ add_fp_unittest(
libc-math-unittests
SRCS
generic_sqrtf_test.cpp
+ HDRS
+ SqrtTest.h
DEPENDS
libc.src.math.sqrtf
- libc.src.__support.FPUtil.fp_bits
libc.src.__support.FPUtil.generic.sqrt
COMPILE_OPTIONS
-O3
@@ -1298,9 +1302,10 @@ add_fp_unittest(
libc-math-unittests
SRCS
generic_sqrt_test.cpp
+ HDRS
+ SqrtTest.h
DEPENDS
libc.src.math.sqrt
- libc.src.__support.FPUtil.fp_bits
libc.src.__support.FPUtil.generic.sqrt
COMPILE_OPTIONS
-O3
@@ -1313,9 +1318,10 @@ add_fp_unittest(
libc-math-unittests
SRCS
generic_sqrtl_test.cpp
+ HDRS
+ SqrtTest.h
DEPENDS
libc.src.math.sqrtl
- libc.src.__support.FPUtil.fp_bits
libc.src.__support.FPUtil.generic.sqrt
COMPILE_OPTIONS
-O3
@@ -1903,6 +1909,19 @@ add_fp_unittest(
libc.src.math.f16divf
)
+add_fp_unittest(
+ f16sqrt_test
+ NEED_MPFR
+ SUITE
+ libc-math-unittests
+ SRCS
+ f16sqrt_test.cpp
+ HDRS
+ SqrtTest.h
+ DEPENDS
+ libc.src.math.f16sqrt
+)
+
add_fp_unittest(
f16fmaf_test
NEED_MPFR
diff --git a/libc/test/src/math/SqrtTest.h b/libc/test/src/math/SqrtTest.h
index 1c422e201bb23..770cc94b3b940 100644
--- a/libc/test/src/math/SqrtTest.h
+++ b/libc/test/src/math/SqrtTest.h
@@ -6,51 +6,36 @@
//
//===----------------------------------------------------------------------===//
-#include "src/__support/CPP/bit.h"
#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "hdr/math_macros.h"
-
namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
-template <typename T>
+template <typename OutType, typename InType>
class SqrtTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
- DECLARE_SPECIAL_CONSTANTS(T)
+ DECLARE_SPECIAL_CONSTANTS(InType)
static constexpr StorageType HIDDEN_BIT =
- StorageType(1) << LIBC_NAMESPACE::fputil::FPBits<T>::FRACTION_LEN;
+ StorageType(1) << LIBC_NAMESPACE::fputil::FPBits<InType>::FRACTION_LEN;
public:
- typedef T (*SqrtFunc)(T);
-
- void test_special_numbers(SqrtFunc func) {
- ASSERT_FP_EQ(aNaN, func(aNaN));
- ASSERT_FP_EQ(inf, func(inf));
- ASSERT_FP_EQ(aNaN, func(neg_inf));
- ASSERT_FP_EQ(0.0, func(0.0));
- ASSERT_FP_EQ(-0.0, func(-0.0));
- ASSERT_FP_EQ(aNaN, func(T(-1.0)));
- ASSERT_FP_EQ(T(1.0), func(T(1.0)));
- ASSERT_FP_EQ(T(2.0), func(T(4.0)));
- ASSERT_FP_EQ(T(3.0), func(T(9.0)));
- }
+ using SqrtFunc = OutType (*)(InType);
void test_denormal_values(SqrtFunc func) {
for (StorageType mant = 1; mant < HIDDEN_BIT; mant <<= 1) {
- FPBits denormal(T(0.0));
+ FPBits denormal(zero);
denormal.set_mantissa(mant);
- T x = denormal.get_val();
+ InType x = denormal.get_val();
EXPECT_MPFR_MATCH_ALL_ROUNDING(mpfr::Operation::Sqrt, x, func(x), 0.5);
}
constexpr StorageType COUNT = 200'001;
constexpr StorageType STEP = HIDDEN_BIT / COUNT;
for (StorageType i = 0, v = 0; i <= COUNT; ++i, v += STEP) {
- T x = LIBC_NAMESPACE::cpp::bit_cast<T>(v);
+ InType x = FPBits(i).get_val();
EXPECT_MPFR_MATCH_ALL_ROUNDING(mpfr::Operation::Sqrt, x, func(x), 0.5);
}
}
@@ -59,17 +44,21 @@ class SqrtTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
constexpr StorageType COUNT = 200'001;
constexpr StorageType STEP = STORAGE_MAX / COUNT;
for (StorageType i = 0, v = 0; i <= COUNT; ++i, v += STEP) {
- T x = LIBC_NAMESPACE::cpp::bit_cast<T>(v);
- if (isnan(x) || (x < 0)) {
+ FPBits x_bits(v);
+ InType x = x_bits.get_val();
+ if (x_bits.is_nan() || (x < 0))
continue;
- }
EXPECT_MPFR_MATCH_ALL_ROUNDING(mpfr::Operation::Sqrt, x, func(x), 0.5);
}
}
};
#define LIST_SQRT_TESTS(T, func) \
- using LlvmLibcSqrtTest = SqrtTest<T>; \
- TEST_F(LlvmLibcSqrtTest, SpecialNumbers) { test_special_numbers(&func); } \
+ using LlvmLibcSqrtTest = SqrtTest<T, T>; \
+ TEST_F(LlvmLibcSqrtTest, DenormalValues) { test_denormal_values(&func); } \
+ TEST_F(LlvmLibcSqrtTest, NormalRange) { test_normal_range(&func); }
+
+#define LIST_NARROWING_SQRT_TESTS(OutType, InType, func) \
+ using LlvmLibcSqrtTest = SqrtTest<OutType, InType>; \
TEST_F(LlvmLibcSqrtTest, DenormalValues) { test_denormal_values(&func); } \
TEST_F(LlvmLibcSqrtTest, NormalRange) { test_normal_range(&func); }
diff --git a/libc/test/src/math/f16sqrt_test.cpp b/libc/test/src/math/f16sqrt_test.cpp
new file mode 100644
index 0000000000000..759b388ad3b3d
--- /dev/null
+++ b/libc/test/src/math/f16sqrt_test.cpp
@@ -0,0 +1,13 @@
+//===-- Unittests for f16sqrt ---------------------------------------------===//
+//
+// 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 "SqrtTest.h"
+
+#include "src/math/f16sqrt.h"
+
+LIST_NARROWING_SQRT_TESTS(float16, double, LIBC_NAMESPACE::f16sqrt)
diff --git a/libc/test/src/math/smoke/CMakeLists.txt b/libc/test/src/math/smoke/CMakeLists.txt
index ee99fb96a52ce..3ee201b36a0dc 100644
--- a/libc/test/src/math/smoke/CMakeLists.txt
+++ b/libc/test/src/math/smoke/CMakeLists.txt
@@ -3656,6 +3656,18 @@ add_fp_unittest(
libc.src.math.f16fmaf
)
+add_fp_unittest(
+ f16sqrt_test
+ SUITE
+ libc-math-smoke-tests
+ SRCS
+ f16sqrt_test.cpp
+ HDRS
+ SqrtTest.h
+ DEPENDS
+ libc.src.math.f16sqrt
+)
+
add_fp_unittest(
f16sqrtf_test
SUITE
diff --git a/libc/test/src/math/smoke/f16sqrt_test.cpp b/libc/test/src/math/smoke/f16sqrt_test.cpp
new file mode 100644
index 0000000000000..759b388ad3b3d
--- /dev/null
+++ b/libc/test/src/math/smoke/f16sqrt_test.cpp
@@ -0,0 +1,13 @@
+//===-- Unittests for f16sqrt ---------------------------------------------===//
+//
+// 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 "SqrtTest.h"
+
+#include "src/math/f16sqrt.h"
+
+LIST_NARROWING_SQRT_TESTS(float16, double, LIBC_NAMESPACE::f16sqrt)
diff --git a/libc/utils/MPFRWrapper/MPFRUtils.cpp b/libc/utils/MPFRWrapper/MPFRUtils.cpp
index 521c2658b327a..5bab62588afcb 100644
--- a/libc/utils/MPFRWrapper/MPFRUtils.cpp
+++ b/libc/utils/MPFRWrapper/MPFRUtils.cpp
@@ -810,6 +810,9 @@ template void explain_unary_operation_single_output_error(Operation op, float16,
template void explain_unary_operation_single_output_error(Operation op, float,
float16, double,
RoundingMode);
+template void explain_unary_operation_single_output_error(Operation op, double,
+ float16, double,
+ RoundingMode);
#endif
template <typename T>
@@ -1003,6 +1006,8 @@ template bool compare_unary_operation_single_output(Operation, float16, float16,
double, RoundingMode);
template bool compare_unary_operation_single_output(Operation, float, float16,
double, RoundingMode);
+template bool compare_unary_operation_single_output(Operation, double, float16,
+ double, RoundingMode);
#endif
template <typename T>
>From 436f115b857f3651b7ee305f5afc7e1e83a04511 Mon Sep 17 00:00:00 2001
From: OverMighty <its.overmighty at gmail.com>
Date: Tue, 25 Jun 2024 16:17:52 +0200
Subject: [PATCH 2/3] [libc][math][c23] Add f16sqrtf128 C23 math function
---
libc/config/linux/aarch64/entrypoints.txt | 7 +++++++
libc/config/linux/x86_64/entrypoints.txt | 7 +++++++
libc/docs/math/index.rst | 2 +-
libc/spec/stdc.td | 1 +
libc/src/math/CMakeLists.txt | 1 +
libc/src/math/f16sqrtf128.h | 20 +++++++++++++++++++
libc/src/math/generic/CMakeLists.txt | 13 ++++++++++++
libc/src/math/generic/f16sqrtf128.cpp | 19 ++++++++++++++++++
libc/test/src/math/smoke/CMakeLists.txt | 12 +++++++++++
libc/test/src/math/smoke/f16sqrtf128_test.cpp | 13 ++++++++++++
10 files changed, 94 insertions(+), 1 deletion(-)
create mode 100644 libc/src/math/f16sqrtf128.h
create mode 100644 libc/src/math/generic/f16sqrtf128.cpp
create mode 100644 libc/test/src/math/smoke/f16sqrtf128_test.cpp
diff --git a/libc/config/linux/aarch64/entrypoints.txt b/libc/config/linux/aarch64/entrypoints.txt
index e606b82747873..663b2191b1170 100644
--- a/libc/config/linux/aarch64/entrypoints.txt
+++ b/libc/config/linux/aarch64/entrypoints.txt
@@ -559,6 +559,13 @@ if(LIBC_TYPES_HAS_FLOAT16)
libc.src.math.ufromfpf16
libc.src.math.ufromfpxf16
)
+
+ if(LIBC_TYPES_HAS_FLOAT128)
+ list(APPEND TARGET_LIBM_ENTRYPOINTS
+ # math.h C23 mixed _Float16 and _Float128 entrypoints
+ libc.src.math.f16sqrtf128
+ )
+ endif()
endif()
if(LIBC_TYPES_HAS_FLOAT128)
diff --git a/libc/config/linux/x86_64/entrypoints.txt b/libc/config/linux/x86_64/entrypoints.txt
index dfb8fabaf383a..d9a61d294c278 100644
--- a/libc/config/linux/x86_64/entrypoints.txt
+++ b/libc/config/linux/x86_64/entrypoints.txt
@@ -588,6 +588,13 @@ if(LIBC_TYPES_HAS_FLOAT16)
libc.src.math.ufromfpf16
libc.src.math.ufromfpxf16
)
+
+ if(LIBC_TYPES_HAS_FLOAT128)
+ list(APPEND TARGET_LIBM_ENTRYPOINTS
+ # math.h C23 mixed _Float16 and _Float128 entrypoints
+ libc.src.math.f16sqrtf128
+ )
+ endif()
endif()
if(LIBC_TYPES_HAS_FLOAT128)
diff --git a/libc/docs/math/index.rst b/libc/docs/math/index.rst
index 1e4862e05ea6e..5769b9cba4dd8 100644
--- a/libc/docs/math/index.rst
+++ b/libc/docs/math/index.rst
@@ -292,7 +292,7 @@ Higher Math Functions
+-----------+------------------+-----------------+------------------------+----------------------+------------------------+------------------------+----------------------------+
| fma | |check| | |check| | | | | 7.12.13.1 | F.10.10.1 |
+-----------+------------------+-----------------+------------------------+----------------------+------------------------+------------------------+----------------------------+
-| f16sqrt | |check| | |check| | | N/A | | 7.12.14.6 | F.10.11 |
+| f16sqrt | |check| | |check| | | N/A | |check| | 7.12.14.6 | F.10.11 |
+-----------+------------------+-----------------+------------------------+----------------------+------------------------+------------------------+----------------------------+
| fsqrt | N/A | | | N/A | | 7.12.14.6 | F.10.11 |
+-----------+------------------+-----------------+------------------------+----------------------+------------------------+------------------------+----------------------------+
diff --git a/libc/spec/stdc.td b/libc/spec/stdc.td
index 7448c9ec4711a..271e08b3bf39c 100644
--- a/libc/spec/stdc.td
+++ b/libc/spec/stdc.td
@@ -730,6 +730,7 @@ def StdC : StandardSpec<"stdc"> {
GuardedFunctionSpec<"f16sqrt", RetValSpec<Float16Type>, [ArgSpec<DoubleType>], "LIBC_TYPES_HAS_FLOAT16">,
GuardedFunctionSpec<"f16sqrtf", RetValSpec<Float16Type>, [ArgSpec<FloatType>], "LIBC_TYPES_HAS_FLOAT16">,
+ GuardedFunctionSpec<"f16sqrtf128", RetValSpec<Float16Type>, [ArgSpec<Float128Type>], "LIBC_TYPES_HAS_FLOAT16_AND_FLOAT128">,
]
>;
diff --git a/libc/src/math/CMakeLists.txt b/libc/src/math/CMakeLists.txt
index f407b300696e3..e2cd38192da95 100644
--- a/libc/src/math/CMakeLists.txt
+++ b/libc/src/math/CMakeLists.txt
@@ -105,6 +105,7 @@ add_math_entrypoint_object(f16fmaf)
add_math_entrypoint_object(f16sqrt)
add_math_entrypoint_object(f16sqrtf)
+add_math_entrypoint_object(f16sqrtf128)
add_math_entrypoint_object(fabs)
add_math_entrypoint_object(fabsf)
diff --git a/libc/src/math/f16sqrtf128.h b/libc/src/math/f16sqrtf128.h
new file mode 100644
index 0000000000000..61a6ce9ea5a5d
--- /dev/null
+++ b/libc/src/math/f16sqrtf128.h
@@ -0,0 +1,20 @@
+//===-- Implementation header for f16sqrtf128 -------------------*- 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_F16SQRTF128_H
+#define LLVM_LIBC_SRC_MATH_F16SQRTF128_H
+
+#include "src/__support/macros/properties/types.h"
+
+namespace LIBC_NAMESPACE {
+
+float16 f16sqrtf128(float128 x);
+
+} // namespace LIBC_NAMESPACE
+
+#endif // LLVM_LIBC_SRC_MATH_F16SQRTF128_H
diff --git a/libc/src/math/generic/CMakeLists.txt b/libc/src/math/generic/CMakeLists.txt
index 98d0340d5fa89..d0753c741ca1b 100644
--- a/libc/src/math/generic/CMakeLists.txt
+++ b/libc/src/math/generic/CMakeLists.txt
@@ -3782,3 +3782,16 @@ add_entrypoint_object(
COMPILE_OPTIONS
-O3
)
+
+add_entrypoint_object(
+ f16sqrtf128
+ SRCS
+ f16sqrtf128.cpp
+ HDRS
+ ../f16sqrtf128.h
+ DEPENDS
+ libc.src.__support.macros.properties.types
+ libc.src.__support.FPUtil.sqrt
+ COMPILE_OPTIONS
+ -O3
+)
diff --git a/libc/src/math/generic/f16sqrtf128.cpp b/libc/src/math/generic/f16sqrtf128.cpp
new file mode 100644
index 0000000000000..11a1e8252788e
--- /dev/null
+++ b/libc/src/math/generic/f16sqrtf128.cpp
@@ -0,0 +1,19 @@
+//===-- Implementation of f16sqrtf128 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/f16sqrtf128.h"
+#include "src/__support/FPUtil/sqrt.h"
+#include "src/__support/common.h"
+
+namespace LIBC_NAMESPACE {
+
+LLVM_LIBC_FUNCTION(float16, f16sqrtf128, (float128 x)) {
+ return fputil::sqrt<float16>(x);
+}
+
+} // namespace LIBC_NAMESPACE
diff --git a/libc/test/src/math/smoke/CMakeLists.txt b/libc/test/src/math/smoke/CMakeLists.txt
index 3ee201b36a0dc..cbfd03080dd1f 100644
--- a/libc/test/src/math/smoke/CMakeLists.txt
+++ b/libc/test/src/math/smoke/CMakeLists.txt
@@ -3680,6 +3680,18 @@ add_fp_unittest(
libc.src.math.f16sqrtf
)
+add_fp_unittest(
+ f16sqrtf128_test
+ SUITE
+ libc-math-smoke-tests
+ SRCS
+ f16sqrtf128_test.cpp
+ HDRS
+ SqrtTest.h
+ DEPENDS
+ libc.src.math.f16sqrtf128
+)
+
add_fp_unittest(
sin_test
SUITE
diff --git a/libc/test/src/math/smoke/f16sqrtf128_test.cpp b/libc/test/src/math/smoke/f16sqrtf128_test.cpp
new file mode 100644
index 0000000000000..31c994860dcd8
--- /dev/null
+++ b/libc/test/src/math/smoke/f16sqrtf128_test.cpp
@@ -0,0 +1,13 @@
+//===-- Unittests for f16sqrtf128 -----------------------------------------===//
+//
+// 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 "SqrtTest.h"
+
+#include "src/math/f16sqrtf128.h"
+
+LIST_NARROWING_SQRT_TESTS(float16, float128, LIBC_NAMESPACE::f16sqrtf128)
>From ecf43157d82eb0af782aa0d694b7d62f287fe952 Mon Sep 17 00:00:00 2001
From: OverMighty <its.overmighty at gmail.com>
Date: Tue, 25 Jun 2024 16:22:51 +0200
Subject: [PATCH 3/3] [libc][math][c23] Add f16sqrtl C23 math function
---
libc/config/linux/aarch64/entrypoints.txt | 1 +
libc/config/linux/x86_64/entrypoints.txt | 1 +
libc/docs/math/index.rst | 2 +-
libc/spec/stdc.td | 1 +
libc/src/math/CMakeLists.txt | 1 +
libc/src/math/f16sqrtl.h | 20 ++++++++++++++++++++
libc/src/math/generic/CMakeLists.txt | 13 +++++++++++++
libc/src/math/generic/f16sqrtl.cpp | 19 +++++++++++++++++++
libc/test/src/math/CMakeLists.txt | 13 +++++++++++++
libc/test/src/math/f16sqrtl_test.cpp | 13 +++++++++++++
libc/test/src/math/smoke/CMakeLists.txt | 12 ++++++++++++
libc/test/src/math/smoke/f16sqrtl_test.cpp | 13 +++++++++++++
libc/utils/MPFRWrapper/MPFRUtils.cpp | 6 ++++++
13 files changed, 114 insertions(+), 1 deletion(-)
create mode 100644 libc/src/math/f16sqrtl.h
create mode 100644 libc/src/math/generic/f16sqrtl.cpp
create mode 100644 libc/test/src/math/f16sqrtl_test.cpp
create mode 100644 libc/test/src/math/smoke/f16sqrtl_test.cpp
diff --git a/libc/config/linux/aarch64/entrypoints.txt b/libc/config/linux/aarch64/entrypoints.txt
index 663b2191b1170..ce74653091b0d 100644
--- a/libc/config/linux/aarch64/entrypoints.txt
+++ b/libc/config/linux/aarch64/entrypoints.txt
@@ -509,6 +509,7 @@ if(LIBC_TYPES_HAS_FLOAT16)
libc.src.math.f16fmaf
libc.src.math.f16sqrt
libc.src.math.f16sqrtf
+ libc.src.math.f16sqrtl
libc.src.math.fabsf16
libc.src.math.fdimf16
libc.src.math.floorf16
diff --git a/libc/config/linux/x86_64/entrypoints.txt b/libc/config/linux/x86_64/entrypoints.txt
index d9a61d294c278..62383676ef16a 100644
--- a/libc/config/linux/x86_64/entrypoints.txt
+++ b/libc/config/linux/x86_64/entrypoints.txt
@@ -540,6 +540,7 @@ if(LIBC_TYPES_HAS_FLOAT16)
libc.src.math.f16fmaf
libc.src.math.f16sqrt
libc.src.math.f16sqrtf
+ libc.src.math.f16sqrtl
libc.src.math.fabsf16
libc.src.math.fdimf16
libc.src.math.floorf16
diff --git a/libc/docs/math/index.rst b/libc/docs/math/index.rst
index 5769b9cba4dd8..a96ec59cfcfd9 100644
--- a/libc/docs/math/index.rst
+++ b/libc/docs/math/index.rst
@@ -292,7 +292,7 @@ Higher Math Functions
+-----------+------------------+-----------------+------------------------+----------------------+------------------------+------------------------+----------------------------+
| fma | |check| | |check| | | | | 7.12.13.1 | F.10.10.1 |
+-----------+------------------+-----------------+------------------------+----------------------+------------------------+------------------------+----------------------------+
-| f16sqrt | |check| | |check| | | N/A | |check| | 7.12.14.6 | F.10.11 |
+| f16sqrt | |check| | |check| | |check| | N/A | |check| | 7.12.14.6 | F.10.11 |
+-----------+------------------+-----------------+------------------------+----------------------+------------------------+------------------------+----------------------------+
| fsqrt | N/A | | | N/A | | 7.12.14.6 | F.10.11 |
+-----------+------------------+-----------------+------------------------+----------------------+------------------------+------------------------+----------------------------+
diff --git a/libc/spec/stdc.td b/libc/spec/stdc.td
index 271e08b3bf39c..ba9d7716cf358 100644
--- a/libc/spec/stdc.td
+++ b/libc/spec/stdc.td
@@ -730,6 +730,7 @@ def StdC : StandardSpec<"stdc"> {
GuardedFunctionSpec<"f16sqrt", RetValSpec<Float16Type>, [ArgSpec<DoubleType>], "LIBC_TYPES_HAS_FLOAT16">,
GuardedFunctionSpec<"f16sqrtf", RetValSpec<Float16Type>, [ArgSpec<FloatType>], "LIBC_TYPES_HAS_FLOAT16">,
+ GuardedFunctionSpec<"f16sqrtl", RetValSpec<Float16Type>, [ArgSpec<LongDoubleType>], "LIBC_TYPES_HAS_FLOAT16">,
GuardedFunctionSpec<"f16sqrtf128", RetValSpec<Float16Type>, [ArgSpec<Float128Type>], "LIBC_TYPES_HAS_FLOAT16_AND_FLOAT128">,
]
>;
diff --git a/libc/src/math/CMakeLists.txt b/libc/src/math/CMakeLists.txt
index e2cd38192da95..d914e642fd609 100644
--- a/libc/src/math/CMakeLists.txt
+++ b/libc/src/math/CMakeLists.txt
@@ -105,6 +105,7 @@ add_math_entrypoint_object(f16fmaf)
add_math_entrypoint_object(f16sqrt)
add_math_entrypoint_object(f16sqrtf)
+add_math_entrypoint_object(f16sqrtl)
add_math_entrypoint_object(f16sqrtf128)
add_math_entrypoint_object(fabs)
diff --git a/libc/src/math/f16sqrtl.h b/libc/src/math/f16sqrtl.h
new file mode 100644
index 0000000000000..fd3c55fc95f32
--- /dev/null
+++ b/libc/src/math/f16sqrtl.h
@@ -0,0 +1,20 @@
+//===-- Implementation header for f16sqrtl ----------------------*- 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_F16SQRTL_H
+#define LLVM_LIBC_SRC_MATH_F16SQRTL_H
+
+#include "src/__support/macros/properties/types.h"
+
+namespace LIBC_NAMESPACE {
+
+float16 f16sqrtl(long double x);
+
+} // namespace LIBC_NAMESPACE
+
+#endif // LLVM_LIBC_SRC_MATH_F16SQRTL_H
diff --git a/libc/src/math/generic/CMakeLists.txt b/libc/src/math/generic/CMakeLists.txt
index d0753c741ca1b..2ea3ed0dc4d74 100644
--- a/libc/src/math/generic/CMakeLists.txt
+++ b/libc/src/math/generic/CMakeLists.txt
@@ -3783,6 +3783,19 @@ add_entrypoint_object(
-O3
)
+add_entrypoint_object(
+ f16sqrtl
+ SRCS
+ f16sqrtl.cpp
+ HDRS
+ ../f16sqrtl.h
+ DEPENDS
+ libc.src.__support.macros.properties.types
+ libc.src.__support.FPUtil.sqrt
+ COMPILE_OPTIONS
+ -O3
+)
+
add_entrypoint_object(
f16sqrtf128
SRCS
diff --git a/libc/src/math/generic/f16sqrtl.cpp b/libc/src/math/generic/f16sqrtl.cpp
new file mode 100644
index 0000000000000..2aaac9a780f66
--- /dev/null
+++ b/libc/src/math/generic/f16sqrtl.cpp
@@ -0,0 +1,19 @@
+//===-- Implementation of f16sqrtl 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/f16sqrtl.h"
+#include "src/__support/FPUtil/sqrt.h"
+#include "src/__support/common.h"
+
+namespace LIBC_NAMESPACE {
+
+LLVM_LIBC_FUNCTION(float16, f16sqrtl, (long double x)) {
+ return fputil::sqrt<float16>(x);
+}
+
+} // namespace LIBC_NAMESPACE
diff --git a/libc/test/src/math/CMakeLists.txt b/libc/test/src/math/CMakeLists.txt
index 83ad3b033961e..5d0ae871363ff 100644
--- a/libc/test/src/math/CMakeLists.txt
+++ b/libc/test/src/math/CMakeLists.txt
@@ -1922,6 +1922,19 @@ add_fp_unittest(
libc.src.math.f16sqrt
)
+add_fp_unittest(
+ f16sqrtl_test
+ NEED_MPFR
+ SUITE
+ libc-math-unittests
+ SRCS
+ f16sqrtl_test.cpp
+ HDRS
+ SqrtTest.h
+ DEPENDS
+ libc.src.math.f16sqrtl
+)
+
add_fp_unittest(
f16fmaf_test
NEED_MPFR
diff --git a/libc/test/src/math/f16sqrtl_test.cpp b/libc/test/src/math/f16sqrtl_test.cpp
new file mode 100644
index 0000000000000..4e069bc8dbffd
--- /dev/null
+++ b/libc/test/src/math/f16sqrtl_test.cpp
@@ -0,0 +1,13 @@
+//===-- Unittests for f16sqrtl --------------------------------------------===//
+//
+// 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 "SqrtTest.h"
+
+#include "src/math/f16sqrtl.h"
+
+LIST_NARROWING_SQRT_TESTS(float16, long double, LIBC_NAMESPACE::f16sqrtl)
diff --git a/libc/test/src/math/smoke/CMakeLists.txt b/libc/test/src/math/smoke/CMakeLists.txt
index cbfd03080dd1f..1ac5b0c573f96 100644
--- a/libc/test/src/math/smoke/CMakeLists.txt
+++ b/libc/test/src/math/smoke/CMakeLists.txt
@@ -3680,6 +3680,18 @@ add_fp_unittest(
libc.src.math.f16sqrtf
)
+add_fp_unittest(
+ f16sqrtl_test
+ SUITE
+ libc-math-smoke-tests
+ SRCS
+ f16sqrtl_test.cpp
+ HDRS
+ SqrtTest.h
+ DEPENDS
+ libc.src.math.f16sqrtl
+)
+
add_fp_unittest(
f16sqrtf128_test
SUITE
diff --git a/libc/test/src/math/smoke/f16sqrtl_test.cpp b/libc/test/src/math/smoke/f16sqrtl_test.cpp
new file mode 100644
index 0000000000000..4e069bc8dbffd
--- /dev/null
+++ b/libc/test/src/math/smoke/f16sqrtl_test.cpp
@@ -0,0 +1,13 @@
+//===-- Unittests for f16sqrtl --------------------------------------------===//
+//
+// 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 "SqrtTest.h"
+
+#include "src/math/f16sqrtl.h"
+
+LIST_NARROWING_SQRT_TESTS(float16, long double, LIBC_NAMESPACE::f16sqrtl)
diff --git a/libc/utils/MPFRWrapper/MPFRUtils.cpp b/libc/utils/MPFRWrapper/MPFRUtils.cpp
index 5bab62588afcb..7af6ccd5e12a5 100644
--- a/libc/utils/MPFRWrapper/MPFRUtils.cpp
+++ b/libc/utils/MPFRWrapper/MPFRUtils.cpp
@@ -813,6 +813,9 @@ template void explain_unary_operation_single_output_error(Operation op, float,
template void explain_unary_operation_single_output_error(Operation op, double,
float16, double,
RoundingMode);
+template void explain_unary_operation_single_output_error(Operation op,
+ long double, float16,
+ double, RoundingMode);
#endif
template <typename T>
@@ -1008,6 +1011,9 @@ template bool compare_unary_operation_single_output(Operation, float, float16,
double, RoundingMode);
template bool compare_unary_operation_single_output(Operation, double, float16,
double, RoundingMode);
+template bool compare_unary_operation_single_output(Operation, long double,
+ float16, double,
+ RoundingMode);
#endif
template <typename T>
More information about the libc-commits
mailing list