Skip to content

[libc][math][c23] Add {totalorder,totalordermag}f16 C23 math functions #95014

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions libc/config/linux/aarch64/entrypoints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -539,6 +539,8 @@ if(LIBC_TYPES_HAS_FLOAT16)
libc.src.math.rintf16
libc.src.math.roundf16
libc.src.math.roundevenf16
libc.src.math.totalorderf16
libc.src.math.totalordermagf16
libc.src.math.truncf16
libc.src.math.ufromfpf16
libc.src.math.ufromfpxf16
Expand Down
2 changes: 2 additions & 0 deletions libc/config/linux/x86_64/entrypoints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -569,6 +569,8 @@ if(LIBC_TYPES_HAS_FLOAT16)
libc.src.math.rintf16
libc.src.math.roundf16
libc.src.math.roundevenf16
libc.src.math.totalorderf16
libc.src.math.totalordermagf16
libc.src.math.truncf16
libc.src.math.ufromfpf16
libc.src.math.ufromfpxf16
Expand Down
4 changes: 2 additions & 2 deletions libc/docs/c23.rst
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ Additions:
* rsqrt*
* __STDC_IEC_60559_DFP__ functions (_Decimal32, _Decimal64, _Decimal128)
* compoundn*
* totalorder*
* totalordermag*
* totalorder* |check|
* totalordermag* |check|
* getpayload*
* setpayload*
* iscannonical
Expand Down
4 changes: 4 additions & 0 deletions libc/docs/math/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,10 @@ Basic Operations
+------------------+------------------+-----------------+------------------------+----------------------+------------------------+------------------------+----------------------------+
| scalbn | |check| | |check| | |check| | | |check| | 7.12.6.19 | F.10.3.19 |
+------------------+------------------+-----------------+------------------------+----------------------+------------------------+------------------------+----------------------------+
| totalorder | | | | |check| | | F.10.12.1 | N/A |
+------------------+------------------+-----------------+------------------------+----------------------+------------------------+------------------------+----------------------------+
| totalordermag | | | | |check| | | F.10.12.2 | N/A |
+------------------+------------------+-----------------+------------------------+----------------------+------------------------+------------------------+----------------------------+
| trunc | |check| | |check| | |check| | |check| | |check| | 7.12.9.9 | F.10.6.9 |
+------------------+------------------+-----------------+------------------------+----------------------+------------------------+------------------------+----------------------------+
| ufromfp | |check| | |check| | |check| | |check| | |check| | 7.12.9.10 | F.10.6.10 |
Expand Down
4 changes: 4 additions & 0 deletions libc/spec/stdc.td
Original file line number Diff line number Diff line change
Expand Up @@ -708,6 +708,10 @@ def StdC : StandardSpec<"stdc"> {
FunctionSpec<"canonicalizel", RetValSpec<IntType>, [ArgSpec<LongDoubleType>, ArgSpec<LongDoubleType>]>,
GuardedFunctionSpec<"canonicalizef16", RetValSpec<IntType>, [ArgSpec<Float16Type>, ArgSpec<Float16Type>], "LIBC_TYPES_HAS_FLOAT16">,
GuardedFunctionSpec<"canonicalizef128", RetValSpec<IntType>, [ArgSpec<Float128Type>, ArgSpec<Float128Type>], "LIBC_TYPES_HAS_FLOAT128">,

GuardedFunctionSpec<"totalorderf16", RetValSpec<IntType>, [ArgSpec<Float16Ptr>, ArgSpec<Float16Ptr>], "LIBC_TYPES_HAS_FLOAT16">,

GuardedFunctionSpec<"totalordermagf16", RetValSpec<IntType>, [ArgSpec<Float16Ptr>, ArgSpec<Float16Ptr>], "LIBC_TYPES_HAS_FLOAT16">,
]
>;

Expand Down
25 changes: 25 additions & 0 deletions libc/src/__support/FPUtil/BasicOperations.h
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,31 @@ LIBC_INLINE int canonicalize(T &cx, const T &x) {
return 0;
}

template <typename T>
LIBC_INLINE cpp::enable_if_t<cpp::is_floating_point_v<T>, bool>
totalorder(T x, T y) {
using FPBits = FPBits<T>;
FPBits x_bits(x);
FPBits y_bits(y);

using StorageType = typename FPBits::StorageType;
StorageType x_u = x_bits.uintval();
StorageType y_u = y_bits.uintval();

using signed_t = cpp::make_signed_t<StorageType>;
signed_t x_signed = static_cast<signed_t>(x_u);
signed_t y_signed = static_cast<signed_t>(y_u);

bool both_neg = (x_u & y_u & FPBits::SIGN_MASK) != 0;
return x_signed == y_signed || ((x_signed <= y_signed) != both_neg);
}

template <typename T>
LIBC_INLINE cpp::enable_if_t<cpp::is_floating_point_v<T>, bool>
totalordermag(T x, T y) {
return FPBits<T>(x).abs().uintval() <= FPBits<T>(y).abs().uintval();
}

} // namespace fputil
} // namespace LIBC_NAMESPACE

Expand Down
4 changes: 4 additions & 0 deletions libc/src/math/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,10 @@ add_math_entrypoint_object(tanhf)
add_math_entrypoint_object(tgamma)
add_math_entrypoint_object(tgammaf)

add_math_entrypoint_object(totalorderf16)

add_math_entrypoint_object(totalordermagf16)

add_math_entrypoint_object(trunc)
add_math_entrypoint_object(truncf)
add_math_entrypoint_object(truncl)
Expand Down
24 changes: 24 additions & 0 deletions libc/src/math/generic/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3551,3 +3551,27 @@ add_entrypoint_object(
COMPILE_OPTIONS
-O3
)

add_entrypoint_object(
totalorderf16
SRCS
totalorderf16.cpp
HDRS
../totalorderf16.h
DEPENDS
libc.src.__support.FPUtil.basic_operations
COMPILE_OPTIONS
-O3
)

add_entrypoint_object(
totalordermagf16
SRCS
totalordermagf16.cpp
HDRS
../totalordermagf16.h
DEPENDS
libc.src.__support.FPUtil.basic_operations
COMPILE_OPTIONS
-O3
)
19 changes: 19 additions & 0 deletions libc/src/math/generic/totalorderf16.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
//===-- Implementation of totalorderf16 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/totalorderf16.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"

namespace LIBC_NAMESPACE {

LLVM_LIBC_FUNCTION(int, totalorderf16, (const float16 *x, const float16 *y)) {
return static_cast<int>(fputil::totalorder(*x, *y));
}

} // namespace LIBC_NAMESPACE
20 changes: 20 additions & 0 deletions libc/src/math/generic/totalordermagf16.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
//===-- Implementation of totalordermagf16 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/totalordermagf16.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"

namespace LIBC_NAMESPACE {

LLVM_LIBC_FUNCTION(int, totalordermagf16,
(const float16 *x, const float16 *y)) {
return static_cast<int>(fputil::totalordermag(*x, *y));
}

} // namespace LIBC_NAMESPACE
20 changes: 20 additions & 0 deletions libc/src/math/totalorderf16.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
//===-- Implementation header for totalorderf16 -----------------*- 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_TOTALORDERF16_H
#define LLVM_LIBC_SRC_MATH_TOTALORDERF16_H

#include "src/__support/macros/properties/types.h"

namespace LIBC_NAMESPACE {

int totalorderf16(const float16 *x, const float16 *y);

} // namespace LIBC_NAMESPACE

#endif // LLVM_LIBC_SRC_MATH_TOTALORDERF16_H
20 changes: 20 additions & 0 deletions libc/src/math/totalordermagf16.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
//===-- Implementation header for totalordermagf16 --------------*- 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_TOTALORDERMAGF16_H
#define LLVM_LIBC_SRC_MATH_TOTALORDERMAGF16_H

#include "src/__support/macros/properties/types.h"

namespace LIBC_NAMESPACE {

int totalordermagf16(const float16 *x, const float16 *y);

} // namespace LIBC_NAMESPACE

#endif // LLVM_LIBC_SRC_MATH_TOTALORDERMAGF16_H
6 changes: 4 additions & 2 deletions libc/test/UnitTest/FPMatcher.h
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,10 @@ template <typename T> struct FPTest : public Test {
LIBC_NAMESPACE::cpp::numeric_limits<StorageType>::max(); \
const T zero = FPBits::zero(Sign::POS).get_val(); \
const T neg_zero = FPBits::zero(Sign::NEG).get_val(); \
const T aNaN = FPBits::quiet_nan().get_val(); \
const T sNaN = FPBits::signaling_nan().get_val(); \
const T aNaN = FPBits::quiet_nan(Sign::POS).get_val(); \
const T neg_aNaN = FPBits::quiet_nan(Sign::NEG).get_val(); \
const T sNaN = FPBits::signaling_nan(Sign::POS).get_val(); \
const T neg_sNaN = FPBits::signaling_nan(Sign::NEG).get_val(); \
const T inf = FPBits::inf(Sign::POS).get_val(); \
const T neg_inf = FPBits::inf(Sign::NEG).get_val(); \
const T min_normal = FPBits::min_normal().get_val(); \
Expand Down
24 changes: 24 additions & 0 deletions libc/test/src/math/smoke/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3509,3 +3509,27 @@ add_fp_unittest(
libc.src.math.powf
libc.src.__support.FPUtil.fp_bits
)

add_fp_unittest(
totalorderf16_test
SUITE
libc-math-smoke-tests
SRCS
totalorderf16_test.cpp
HDRS
TotalOrderTest.h
DEPENDS
libc.src.math.totalorderf16
)

add_fp_unittest(
totalordermagf16_test
SUITE
libc-math-smoke-tests
SRCS
totalordermagf16_test.cpp
HDRS
TotalOrderMagTest.h
DEPENDS
libc.src.math.totalordermagf16
)
142 changes: 142 additions & 0 deletions libc/test/src/math/smoke/TotalOrderMagTest.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
//===-- Utility class to test flavors of totalordermag ----------*- C++ -*-===//
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I omitted the word "different" in "test [different] flavors", unlike usual, so that -*- C++ -*- can fit.

//
// 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 LIBC_TEST_SRC_MATH_SMOKE_TOTALORDERMAGTEST_H
#define LIBC_TEST_SRC_MATH_SMOKE_TOTALORDERMAGTEST_H

#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"

template <typename T>
class TotalOrderMagTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {

DECLARE_SPECIAL_CONSTANTS(T)

public:
typedef int (*TotalOrderMagFunc)(const T *, const T *);

bool funcWrapper(TotalOrderMagFunc func, T x, T y) {
return func(&x, &y) != 0;
}

void testXLesserThanY(TotalOrderMagFunc func) {
EXPECT_TRUE(funcWrapper(func, neg_inf, inf));

EXPECT_TRUE(funcWrapper(func, T(0.0), T(0.1)));
EXPECT_TRUE(funcWrapper(func, T(0.0), T(123.38)));

EXPECT_FALSE(funcWrapper(func, T(-0.1), T(0.0)));
EXPECT_FALSE(funcWrapper(func, T(-123.38), T(0.0)));

EXPECT_TRUE(funcWrapper(func, T(-0.1), T(0.1)));
EXPECT_TRUE(funcWrapper(func, T(-123.38), T(123.38)));
}

void testXGreaterThanY(TotalOrderMagFunc func) {
EXPECT_TRUE(funcWrapper(func, inf, neg_inf));

EXPECT_TRUE(funcWrapper(func, T(0.0), T(-0.1)));
EXPECT_TRUE(funcWrapper(func, T(0.0), T(-123.38)));

EXPECT_FALSE(funcWrapper(func, T(0.1), T(0.0)));
EXPECT_FALSE(funcWrapper(func, T(123.38), T(0.0)));

EXPECT_TRUE(funcWrapper(func, T(0.1), T(-0.1)));
EXPECT_TRUE(funcWrapper(func, T(123.38), T(-123.38)));
}

void testXEqualToY(TotalOrderMagFunc func) {
EXPECT_TRUE(funcWrapper(func, inf, inf));
EXPECT_TRUE(funcWrapper(func, neg_inf, neg_inf));

EXPECT_TRUE(funcWrapper(func, T(-0.0), T(0.0)));
EXPECT_TRUE(funcWrapper(func, T(0.0), T(-0.0)));

EXPECT_TRUE(funcWrapper(func, T(0.0), T(0.0)));
EXPECT_TRUE(funcWrapper(func, T(-0.0), T(-0.0)));
EXPECT_TRUE(funcWrapper(func, T(0.1), T(0.1)));
EXPECT_TRUE(funcWrapper(func, T(-0.1), T(-0.1)));
EXPECT_TRUE(funcWrapper(func, T(123.38), T(123.38)));
EXPECT_TRUE(funcWrapper(func, T(-123.38), T(-123.38)));
}

void testSingleNaN(TotalOrderMagFunc func) {
EXPECT_FALSE(funcWrapper(func, neg_aNaN, T(0.0)));
EXPECT_FALSE(funcWrapper(func, neg_aNaN, T(0.1)));
EXPECT_FALSE(funcWrapper(func, neg_aNaN, T(123.38)));

EXPECT_TRUE(funcWrapper(func, T(0.0), neg_aNaN));
EXPECT_TRUE(funcWrapper(func, T(0.1), neg_aNaN));
EXPECT_TRUE(funcWrapper(func, T(123.38), neg_aNaN));

EXPECT_TRUE(funcWrapper(func, T(0.0), aNaN));
EXPECT_TRUE(funcWrapper(func, T(0.1), aNaN));
EXPECT_TRUE(funcWrapper(func, T(123.38), aNaN));

EXPECT_FALSE(funcWrapper(func, aNaN, T(0.0)));
EXPECT_FALSE(funcWrapper(func, aNaN, T(0.1)));
EXPECT_FALSE(funcWrapper(func, aNaN, T(123.38)));
}

void testNaNSigns(TotalOrderMagFunc func) {
EXPECT_TRUE(funcWrapper(func, neg_aNaN, aNaN));
EXPECT_FALSE(funcWrapper(func, neg_aNaN, sNaN));
EXPECT_TRUE(funcWrapper(func, neg_sNaN, aNaN));
EXPECT_TRUE(funcWrapper(func, neg_sNaN, sNaN));

EXPECT_TRUE(funcWrapper(func, aNaN, neg_aNaN));
EXPECT_FALSE(funcWrapper(func, aNaN, neg_sNaN));
EXPECT_TRUE(funcWrapper(func, sNaN, neg_aNaN));
EXPECT_TRUE(funcWrapper(func, sNaN, neg_sNaN));
}

void testQuietVsSignalingNaN(TotalOrderMagFunc func) {
EXPECT_FALSE(funcWrapper(func, neg_aNaN, neg_sNaN));
EXPECT_TRUE(funcWrapper(func, neg_sNaN, neg_aNaN));
EXPECT_TRUE(funcWrapper(func, sNaN, aNaN));
EXPECT_FALSE(funcWrapper(func, aNaN, sNaN));
}

void testNaNPayloads(TotalOrderMagFunc func) {
T qnan_123 = FPBits::quiet_nan(Sign::POS, 0x123).get_val();
T neg_qnan_123 = FPBits::quiet_nan(Sign::NEG, 0x123).get_val();
T snan_123 = FPBits::signaling_nan(Sign::POS, 0x123).get_val();
T neg_snan_123 = FPBits::signaling_nan(Sign::NEG, 0x123).get_val();
Comment on lines +107 to +110
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't really know if I'm supposed to keep these variable names in snake_case, including the nan part, or write NaN instead.

Also, why do the tests use camelCase for member function names?


EXPECT_TRUE(funcWrapper(func, aNaN, aNaN));
EXPECT_TRUE(funcWrapper(func, sNaN, sNaN));
EXPECT_TRUE(funcWrapper(func, aNaN, qnan_123));
EXPECT_TRUE(funcWrapper(func, sNaN, snan_123));
EXPECT_FALSE(funcWrapper(func, qnan_123, aNaN));
EXPECT_FALSE(funcWrapper(func, snan_123, sNaN));

EXPECT_TRUE(funcWrapper(func, neg_aNaN, neg_aNaN));
EXPECT_TRUE(funcWrapper(func, neg_sNaN, neg_sNaN));
EXPECT_TRUE(funcWrapper(func, neg_aNaN, neg_qnan_123));
EXPECT_TRUE(funcWrapper(func, neg_sNaN, neg_snan_123));
EXPECT_FALSE(funcWrapper(func, neg_qnan_123, neg_aNaN));
EXPECT_FALSE(funcWrapper(func, neg_snan_123, neg_sNaN));
}
};

#define LIST_TOTALORDERMAG_TESTS(T, func) \
using LlvmLibcTotalOrderMagTest = TotalOrderMagTestTemplate<T>; \
TEST_F(LlvmLibcTotalOrderMagTest, XLesserThanY) { testXLesserThanY(&func); } \
TEST_F(LlvmLibcTotalOrderMagTest, XGreaterThanY) { \
testXGreaterThanY(&func); \
} \
TEST_F(LlvmLibcTotalOrderMagTest, XEqualToY) { testXEqualToY(&func); } \
TEST_F(LlvmLibcTotalOrderMagTest, SingleNaN) { testSingleNaN(&func); } \
TEST_F(LlvmLibcTotalOrderMagTest, NaNSigns) { testNaNSigns(&func); } \
TEST_F(LlvmLibcTotalOrderMagTest, QuietVsSignalingNaN) { \
testQuietVsSignalingNaN(&func); \
} \
TEST_F(LlvmLibcTotalOrderMagTest, NaNPayloads) { testNaNPayloads(&func); }

#endif // LIBC_TEST_SRC_MATH_SMOKE_TOTALORDERMAGTEST_H
Loading
Loading