[libc-commits] [libc] 6fb7f3a - [lib][NFC] Split the floating point util functions into multiple files.
Siva Chandra Reddy via libc-commits
libc-commits at lists.llvm.org
Mon Jun 15 23:14:44 PDT 2020
Author: Siva Chandra Reddy
Date: 2020-06-15T23:12:00-07:00
New Revision: 6fb7f3a3cf69e322b6792a7059c198c9cf4802ac
URL: https://github.com/llvm/llvm-project/commit/6fb7f3a3cf69e322b6792a7059c198c9cf4802ac
DIFF: https://github.com/llvm/llvm-project/commit/6fb7f3a3cf69e322b6792a7059c198c9cf4802ac.diff
LOG: [lib][NFC] Split the floating point util functions into multiple files.
The grouping now reflects the grouping on cppreference.com.
Added:
libc/utils/FPUtil/BasicOperations.h
libc/utils/FPUtil/ClassificationFunctions.h
libc/utils/FPUtil/NearestIntegerOperations.h
Modified:
libc/src/math/ceil.cpp
libc/src/math/ceilf.cpp
libc/src/math/fabs.cpp
libc/src/math/fabsf.cpp
libc/src/math/floor.cpp
libc/src/math/floorf.cpp
libc/src/math/round.cpp
libc/src/math/roundf.cpp
libc/src/math/trunc.cpp
libc/src/math/truncf.cpp
libc/test/src/math/cosf_test.cpp
libc/test/src/math/exp2f_test.cpp
libc/test/src/math/expf_test.cpp
libc/test/src/math/frexp_test.cpp
libc/test/src/math/frexpf_test.cpp
libc/test/src/math/modf_test.cpp
libc/test/src/math/modff_test.cpp
libc/test/src/math/sincosf_test.cpp
libc/test/src/math/sinf_test.cpp
libc/utils/FPUtil/FloatOperations.h
libc/utils/FPUtil/ManipulationFunctions.h
Removed:
################################################################################
diff --git a/libc/src/math/ceil.cpp b/libc/src/math/ceil.cpp
index c9af520d1f1f..06ef903655a8 100644
--- a/libc/src/math/ceil.cpp
+++ b/libc/src/math/ceil.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/__support/common.h"
-#include "utils/FPUtil/FloatOperations.h"
+#include "utils/FPUtil/NearestIntegerOperations.h"
namespace __llvm_libc {
diff --git a/libc/src/math/ceilf.cpp b/libc/src/math/ceilf.cpp
index 2d2fb90c47fd..d44e27336439 100644
--- a/libc/src/math/ceilf.cpp
+++ b/libc/src/math/ceilf.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/__support/common.h"
-#include "utils/FPUtil/FloatOperations.h"
+#include "utils/FPUtil/NearestIntegerOperations.h"
namespace __llvm_libc {
diff --git a/libc/src/math/fabs.cpp b/libc/src/math/fabs.cpp
index 15c60e88eb72..ff78f1b16872 100644
--- a/libc/src/math/fabs.cpp
+++ b/libc/src/math/fabs.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/__support/common.h"
-#include "utils/FPUtil/FloatOperations.h"
+#include "utils/FPUtil/BasicOperations.h"
namespace __llvm_libc {
diff --git a/libc/src/math/fabsf.cpp b/libc/src/math/fabsf.cpp
index dd2b055ed0dd..9aa1419f0aaf 100644
--- a/libc/src/math/fabsf.cpp
+++ b/libc/src/math/fabsf.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/__support/common.h"
-#include "utils/FPUtil/FloatOperations.h"
+#include "utils/FPUtil/BasicOperations.h"
namespace __llvm_libc {
diff --git a/libc/src/math/floor.cpp b/libc/src/math/floor.cpp
index b2d5f872b453..cc2fde50e816 100644
--- a/libc/src/math/floor.cpp
+++ b/libc/src/math/floor.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/__support/common.h"
-#include "utils/FPUtil/FloatOperations.h"
+#include "utils/FPUtil/NearestIntegerOperations.h"
namespace __llvm_libc {
diff --git a/libc/src/math/floorf.cpp b/libc/src/math/floorf.cpp
index 397602eacf98..e220ab470e3e 100644
--- a/libc/src/math/floorf.cpp
+++ b/libc/src/math/floorf.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/__support/common.h"
-#include "utils/FPUtil/FloatOperations.h"
+#include "utils/FPUtil/NearestIntegerOperations.h"
namespace __llvm_libc {
diff --git a/libc/src/math/round.cpp b/libc/src/math/round.cpp
index 0a6e54871005..44a1119ae559 100644
--- a/libc/src/math/round.cpp
+++ b/libc/src/math/round.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/__support/common.h"
-#include "utils/FPUtil/FloatOperations.h"
+#include "utils/FPUtil/NearestIntegerOperations.h"
namespace __llvm_libc {
diff --git a/libc/src/math/roundf.cpp b/libc/src/math/roundf.cpp
index bdfcd0a3499c..8cbb3155fa4d 100644
--- a/libc/src/math/roundf.cpp
+++ b/libc/src/math/roundf.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/__support/common.h"
-#include "utils/FPUtil/FloatOperations.h"
+#include "utils/FPUtil/NearestIntegerOperations.h"
namespace __llvm_libc {
diff --git a/libc/src/math/trunc.cpp b/libc/src/math/trunc.cpp
index 7e42fe47d2e7..0749e114e274 100644
--- a/libc/src/math/trunc.cpp
+++ b/libc/src/math/trunc.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/__support/common.h"
-#include "utils/FPUtil/FloatOperations.h"
+#include "utils/FPUtil/NearestIntegerOperations.h"
namespace __llvm_libc {
diff --git a/libc/src/math/truncf.cpp b/libc/src/math/truncf.cpp
index c567865f7227..03725718c88d 100644
--- a/libc/src/math/truncf.cpp
+++ b/libc/src/math/truncf.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/__support/common.h"
-#include "utils/FPUtil/FloatOperations.h"
+#include "utils/FPUtil/NearestIntegerOperations.h"
namespace __llvm_libc {
diff --git a/libc/test/src/math/cosf_test.cpp b/libc/test/src/math/cosf_test.cpp
index 3ba0fcd1cd98..ac6020e1a8f6 100644
--- a/libc/test/src/math/cosf_test.cpp
+++ b/libc/test/src/math/cosf_test.cpp
@@ -13,6 +13,7 @@
#include "test/src/math/sdcomp26094.h"
#include "utils/CPP/Array.h"
#include "utils/FPUtil/BitPatterns.h"
+#include "utils/FPUtil/ClassificationFunctions.h"
#include "utils/FPUtil/FloatOperations.h"
#include "utils/FPUtil/FloatProperties.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
diff --git a/libc/test/src/math/exp2f_test.cpp b/libc/test/src/math/exp2f_test.cpp
index c900ec669544..fe9955f4cde4 100644
--- a/libc/test/src/math/exp2f_test.cpp
+++ b/libc/test/src/math/exp2f_test.cpp
@@ -11,6 +11,7 @@
#include "src/errno/llvmlibc_errno.h"
#include "src/math/exp2f.h"
#include "utils/FPUtil/BitPatterns.h"
+#include "utils/FPUtil/ClassificationFunctions.h"
#include "utils/FPUtil/FloatOperations.h"
#include "utils/FPUtil/FloatProperties.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
diff --git a/libc/test/src/math/expf_test.cpp b/libc/test/src/math/expf_test.cpp
index c99058dbf6e5..577f5e40d82b 100644
--- a/libc/test/src/math/expf_test.cpp
+++ b/libc/test/src/math/expf_test.cpp
@@ -11,6 +11,7 @@
#include "src/errno/llvmlibc_errno.h"
#include "src/math/expf.h"
#include "utils/FPUtil/BitPatterns.h"
+#include "utils/FPUtil/ClassificationFunctions.h"
#include "utils/FPUtil/FloatOperations.h"
#include "utils/FPUtil/FloatProperties.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
diff --git a/libc/test/src/math/frexp_test.cpp b/libc/test/src/math/frexp_test.cpp
index a7fb953fb4fb..f828d515a688 100644
--- a/libc/test/src/math/frexp_test.cpp
+++ b/libc/test/src/math/frexp_test.cpp
@@ -8,7 +8,9 @@
#include "include/math.h"
#include "src/math/frexp.h"
+#include "utils/FPUtil/BasicOperations.h"
#include "utils/FPUtil/BitPatterns.h"
+#include "utils/FPUtil/ClassificationFunctions.h"
#include "utils/FPUtil/FloatOperations.h"
#include "utils/FPUtil/FloatProperties.h"
#include "utils/UnitTest/Test.h"
diff --git a/libc/test/src/math/frexpf_test.cpp b/libc/test/src/math/frexpf_test.cpp
index d90532b63436..e15f384ea28b 100644
--- a/libc/test/src/math/frexpf_test.cpp
+++ b/libc/test/src/math/frexpf_test.cpp
@@ -9,7 +9,9 @@
#include "include/math.h"
#include "src/math/frexpf.h"
+#include "utils/FPUtil/BasicOperations.h"
#include "utils/FPUtil/BitPatterns.h"
+#include "utils/FPUtil/ClassificationFunctions.h"
#include "utils/FPUtil/FloatOperations.h"
#include "utils/FPUtil/FloatProperties.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
diff --git a/libc/test/src/math/modf_test.cpp b/libc/test/src/math/modf_test.cpp
index fa4436d64151..774ad8b63f86 100644
--- a/libc/test/src/math/modf_test.cpp
+++ b/libc/test/src/math/modf_test.cpp
@@ -8,9 +8,11 @@
#include "include/math.h"
#include "src/math/modf.h"
+#include "utils/FPUtil/BasicOperations.h"
#include "utils/FPUtil/BitPatterns.h"
#include "utils/FPUtil/FloatOperations.h"
#include "utils/FPUtil/FloatProperties.h"
+#include "utils/FPUtil/NearestIntegerOperations.h"
#include "utils/UnitTest/Test.h"
using __llvm_libc::fputil::valueAsBits;
diff --git a/libc/test/src/math/modff_test.cpp b/libc/test/src/math/modff_test.cpp
index db3b7c801212..fbd3b86f163a 100644
--- a/libc/test/src/math/modff_test.cpp
+++ b/libc/test/src/math/modff_test.cpp
@@ -9,9 +9,11 @@
#include "include/math.h"
#include "src/math/modff.h"
+#include "utils/FPUtil/BasicOperations.h"
#include "utils/FPUtil/BitPatterns.h"
#include "utils/FPUtil/FloatOperations.h"
#include "utils/FPUtil/FloatProperties.h"
+#include "utils/FPUtil/NearestIntegerOperations.h"
#include "utils/UnitTest/Test.h"
using __llvm_libc::fputil::valueAsBits;
diff --git a/libc/test/src/math/sincosf_test.cpp b/libc/test/src/math/sincosf_test.cpp
index 66b247aeb0af..2211ef1dc6e2 100644
--- a/libc/test/src/math/sincosf_test.cpp
+++ b/libc/test/src/math/sincosf_test.cpp
@@ -13,6 +13,7 @@
#include "test/src/math/sdcomp26094.h"
#include "utils/CPP/Array.h"
#include "utils/FPUtil/BitPatterns.h"
+#include "utils/FPUtil/ClassificationFunctions.h"
#include "utils/FPUtil/FloatOperations.h"
#include "utils/FPUtil/FloatProperties.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
diff --git a/libc/test/src/math/sinf_test.cpp b/libc/test/src/math/sinf_test.cpp
index 115359baf0ce..17c66712fd02 100644
--- a/libc/test/src/math/sinf_test.cpp
+++ b/libc/test/src/math/sinf_test.cpp
@@ -13,6 +13,7 @@
#include "test/src/math/sdcomp26094.h"
#include "utils/CPP/Array.h"
#include "utils/FPUtil/BitPatterns.h"
+#include "utils/FPUtil/ClassificationFunctions.h"
#include "utils/FPUtil/FloatOperations.h"
#include "utils/FPUtil/FloatProperties.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
diff --git a/libc/utils/FPUtil/BasicOperations.h b/libc/utils/FPUtil/BasicOperations.h
new file mode 100644
index 000000000000..d5c7004f8bc9
--- /dev/null
+++ b/libc/utils/FPUtil/BasicOperations.h
@@ -0,0 +1,21 @@
+//===-- Basic operations on floating point numbers --------------*- 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
+//
+//===----------------------------------------------------------------------===//
+
+#include "FloatOperations.h"
+
+namespace __llvm_libc {
+namespace fputil {
+
+template <typename T,
+ cpp::EnableIfType<cpp::IsFloatingPointType<T>::Value, int> = 0>
+static inline T abs(T x) {
+ return valueFromBits(absBits(x));
+}
+
+} // namespace fputil
+} // namespace __llvm_libc
diff --git a/libc/utils/FPUtil/ClassificationFunctions.h b/libc/utils/FPUtil/ClassificationFunctions.h
new file mode 100644
index 000000000000..a80e349291cd
--- /dev/null
+++ b/libc/utils/FPUtil/ClassificationFunctions.h
@@ -0,0 +1,90 @@
+//===-- Floating point classification functions -----------------*- 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_UTILS_FPUTIL_CLASSIFICATION_FUNCTIONS_H
+#define LLVM_LIBC_UTILS_FPUTIL_CLASSIFICATION_FUNCTIONS_H
+
+#include "BitPatterns.h"
+#include "FloatOperations.h"
+#include "FloatProperties.h"
+
+#include "utils/CPP/TypeTraits.h"
+
+namespace __llvm_libc {
+namespace fputil {
+
+template <typename BitsType> static inline bool bitsAreInf(BitsType bits) {
+ using FPType = typename FloatType<BitsType>::Type;
+ return ((bits & BitPatterns<FPType>::inf) == BitPatterns<FPType>::inf) &&
+ ((bits & FloatProperties<FPType>::mantissaMask) == 0);
+}
+
+// Return true if x is infinity (positive or negative.)
+template <typename T,
+ cpp::EnableIfType<cpp::IsFloatingPointType<T>::Value, int> = 0>
+static inline bool isInf(T x) {
+ return bitsAreInf(valueAsBits(x));
+}
+
+template <typename BitsType> static inline bool bitsAreNaN(BitsType bits) {
+ using FPType = typename FloatType<BitsType>::Type;
+ return ((bits & BitPatterns<FPType>::inf) == BitPatterns<FPType>::inf) &&
+ ((bits & FloatProperties<FPType>::mantissaMask) != 0);
+}
+
+// Return true if x is a NAN (quiet or signalling.)
+template <typename T,
+ cpp::EnableIfType<cpp::IsFloatingPointType<T>::Value, int> = 0>
+static inline bool isNaN(T x) {
+ return bitsAreNaN(valueAsBits(x));
+}
+
+template <typename BitsType> static inline bool bitsAreInfOrNaN(BitsType bits) {
+ using FPType = typename FloatType<BitsType>::Type;
+ return (bits & BitPatterns<FPType>::inf) == BitPatterns<FPType>::inf;
+}
+
+template <typename BitsType> static inline bool bitsAreZero(BitsType bits) {
+ using FPType = typename FloatType<BitsType>::Type;
+ return (bits == BitPatterns<FPType>::zero) ||
+ (bits == BitPatterns<FPType>::negZero);
+}
+
+// Return true if x is any kind of NaN or infinity.
+template <typename T,
+ cpp::EnableIfType<cpp::IsFloatingPointType<T>::Value, int> = 0>
+static inline bool isInfOrNaN(T x) {
+ return bitsAreInfOrNaN(valueAsBits(x));
+}
+
+// Return true if x is a quiet NAN.
+template <typename T,
+ cpp::EnableIfType<cpp::IsFloatingPointType<T>::Value, int> = 0>
+static inline bool isQuietNaN(T x) {
+ using Properties = FloatProperties<T>;
+ using BitsType = typename FloatProperties<T>::BitsType;
+ BitsType bits = valueAsBits(x);
+ return ((bits & BitPatterns<T>::inf) == BitPatterns<T>::inf) &&
+ ((bits & Properties::quietNaNMask) != 0);
+}
+
+// Return true if x is a quiet NAN with sign bit set.
+template <typename T,
+ cpp::EnableIfType<cpp::IsFloatingPointType<T>::Value, int> = 0>
+static inline bool isNegativeQuietNaN(T x) {
+ using Properties = FloatProperties<T>;
+ using BitsType = typename FloatProperties<T>::BitsType;
+ BitsType bits = valueAsBits(x);
+ return ((bits & BitPatterns<T>::negInf) == BitPatterns<T>::negInf) &&
+ ((bits & Properties::quietNaNMask) != 0);
+}
+
+} // namespace fputil
+} // namespace __llvm_libc
+
+#endif // LLVM_LIBC_UTILS_FPUTIL_CLASSIFICATION_FUNCTIONS_H
diff --git a/libc/utils/FPUtil/FloatOperations.h b/libc/utils/FPUtil/FloatOperations.h
index b599aad37f41..0739548f567d 100644
--- a/libc/utils/FPUtil/FloatOperations.h
+++ b/libc/utils/FPUtil/FloatOperations.h
@@ -57,222 +57,6 @@ static inline int getExponent(T x) {
return getExponentFromBits(valueAsBits(x));
}
-template <typename BitsType> static inline bool bitsAreInf(BitsType bits) {
- using FPType = typename FloatType<BitsType>::Type;
- return ((bits & BitPatterns<FPType>::inf) == BitPatterns<FPType>::inf) &&
- ((bits & FloatProperties<FPType>::mantissaMask) == 0);
-}
-
-// Return true if x is infinity (positive or negative.)
-template <typename T,
- cpp::EnableIfType<cpp::IsFloatingPointType<T>::Value, int> = 0>
-static inline bool isInf(T x) {
- return bitsAreInf(valueAsBits(x));
-}
-
-template <typename BitsType> static inline bool bitsAreNaN(BitsType bits) {
- using FPType = typename FloatType<BitsType>::Type;
- return ((bits & BitPatterns<FPType>::inf) == BitPatterns<FPType>::inf) &&
- ((bits & FloatProperties<FPType>::mantissaMask) != 0);
-}
-
-// Return true if x is a NAN (quiet or signalling.)
-template <typename T,
- cpp::EnableIfType<cpp::IsFloatingPointType<T>::Value, int> = 0>
-static inline bool isNaN(T x) {
- return bitsAreNaN(valueAsBits(x));
-}
-
-template <typename BitsType> static inline bool bitsAreInfOrNaN(BitsType bits) {
- using FPType = typename FloatType<BitsType>::Type;
- return (bits & BitPatterns<FPType>::inf) == BitPatterns<FPType>::inf;
-}
-
-template <typename BitsType> static inline bool bitsAreZero(BitsType bits) {
- using FPType = typename FloatType<BitsType>::Type;
- return (bits == BitPatterns<FPType>::zero) ||
- (bits == BitPatterns<FPType>::negZero);
-}
-
-// Return true if x is any kind of NaN or infinity.
-template <typename T,
- cpp::EnableIfType<cpp::IsFloatingPointType<T>::Value, int> = 0>
-static inline bool isInfOrNaN(T x) {
- return bitsAreInfOrNaN(valueAsBits(x));
-}
-
-// Return true if x is a quiet NAN.
-template <typename T,
- cpp::EnableIfType<cpp::IsFloatingPointType<T>::Value, int> = 0>
-static inline bool isQuietNaN(T x) {
- using Properties = FloatProperties<T>;
- using BitsType = typename FloatProperties<T>::BitsType;
- BitsType bits = valueAsBits(x);
- return ((bits & BitPatterns<T>::inf) == BitPatterns<T>::inf) &&
- ((bits & Properties::quietNaNMask) != 0);
-}
-
-// Return true if x is a quiet NAN with sign bit set.
-template <typename T,
- cpp::EnableIfType<cpp::IsFloatingPointType<T>::Value, int> = 0>
-static inline bool isNegativeQuietNaN(T x) {
- using Properties = FloatProperties<T>;
- using BitsType = typename FloatProperties<T>::BitsType;
- BitsType bits = valueAsBits(x);
- return ((bits & BitPatterns<T>::negInf) == BitPatterns<T>::negInf) &&
- ((bits & Properties::quietNaNMask) != 0);
-}
-
-// Return the absolute value of x.
-template <typename T,
- cpp::EnableIfType<cpp::IsFloatingPointType<T>::Value, int> = 0>
-static inline T abs(T x) {
- return valueFromBits(absBits(x));
-}
-
-// Return the trucated value of x. If x is non-negative, then the return value
-// is greatest integer less than or equal to x. Otherwise, return the smallest
-// integer greater than or equal to x. That is, return the integer value rounded
-// toward zero.
-template <typename T,
- cpp::EnableIfType<cpp::IsFloatingPointType<T>::Value, int> = 0>
-static inline T trunc(T x) {
- using Properties = FloatProperties<T>;
- using BitsType = typename FloatProperties<T>::BitsType;
-
- BitsType bits = valueAsBits(x);
-
- // If x is infinity, NaN or zero, return it.
- if (bitsAreInfOrNaN(bits) || bitsAreZero(bits))
- return x;
-
- int exponent = getExponentFromBits(bits);
-
- // If the exponent is greater than the most negative mantissa
- // exponent, then x is already an integer.
- if (exponent >= static_cast<int>(Properties::mantissaWidth))
- return x;
-
- // If the exponent is such that abs(x) is less than 1, then return 0.
- if (exponent <= -1) {
- if (Properties::signMask & bits)
- return T(-0.0);
- else
- return T(0.0);
- }
-
- uint32_t trimSize = Properties::mantissaWidth - exponent;
- return valueFromBits((bits >> trimSize) << trimSize);
-}
-
-template <typename T,
- cpp::EnableIfType<cpp::IsFloatingPointType<T>::Value, int> = 0>
-static inline T ceil(T x) {
- using Properties = FloatProperties<T>;
- using BitsType = typename FloatProperties<T>::BitsType;
-
- BitsType bits = valueAsBits(x);
-
- // If x is infinity NaN or zero, return it.
- if (bitsAreInfOrNaN(bits) || bitsAreZero(bits))
- return x;
-
- bool isNeg = bits & Properties::signMask;
- int exponent = getExponentFromBits(bits);
-
- // If the exponent is greater than the most negative mantissa
- // exponent, then x is already an integer.
- if (exponent >= static_cast<int>(Properties::mantissaWidth))
- return x;
-
- if (exponent <= -1) {
- if (isNeg)
- return T(-0.0);
- else
- return T(1.0);
- }
-
- uint32_t trimSize = Properties::mantissaWidth - exponent;
- // If x is already an integer, return it.
- if ((bits << (Properties::bitWidth - trimSize)) == 0)
- return x;
-
- BitsType truncBits = (bits >> trimSize) << trimSize;
- T truncValue = valueFromBits(truncBits);
-
- // If x is negative, the ceil operation is equivalent to the trunc operation.
- if (isNeg)
- return truncValue;
-
- return truncValue + T(1.0);
-}
-
-template <typename T,
- cpp::EnableIfType<cpp::IsFloatingPointType<T>::Value, int> = 0>
-static inline T floor(T x) {
- auto bits = valueAsBits(x);
- if (FloatProperties<T>::signMask & bits) {
- return -ceil(-x);
- } else {
- return trunc(x);
- }
-}
-
-template <typename T,
- cpp::EnableIfType<cpp::IsFloatingPointType<T>::Value, int> = 0>
-static inline T round(T x) {
- using Properties = FloatProperties<T>;
- using BitsType = typename FloatProperties<T>::BitsType;
-
- BitsType bits = valueAsBits(x);
-
- // If x is infinity, NaN or zero, return it.
- if (bitsAreInfOrNaN(bits) || bitsAreZero(bits))
- return x;
-
- bool isNeg = bits & Properties::signMask;
- int exponent = getExponentFromBits(bits);
-
- // If the exponent is greater than the most negative mantissa
- // exponent, then x is already an integer.
- if (exponent >= static_cast<int>(Properties::mantissaWidth))
- return x;
-
- if (exponent == -1) {
- // Absolute value of x is greater than equal to 0.5 but less than 1.
- if (isNeg)
- return T(-1.0);
- else
- return T(1.0);
- }
-
- if (exponent <= -2) {
- // Absolute value of x is less than 0.5.
- if (isNeg)
- return T(-0.0);
- else
- return T(0.0);
- }
-
- uint32_t trimSize = Properties::mantissaWidth - exponent;
- // If x is already an integer, return it.
- if ((bits << (Properties::bitWidth - trimSize)) == 0)
- return x;
-
- BitsType truncBits = (bits >> trimSize) << trimSize;
- T truncValue = valueFromBits(truncBits);
-
- if ((bits & (BitsType(1) << (trimSize - 1))) == 0) {
- // Franctional part is less than 0.5 so round value is the
- // same as the trunc value.
- return truncValue;
- }
-
- if (isNeg)
- return truncValue - T(1.0);
- else
- return truncValue + T(1.0);
-}
} // namespace fputil
} // namespace __llvm_libc
diff --git a/libc/utils/FPUtil/ManipulationFunctions.h b/libc/utils/FPUtil/ManipulationFunctions.h
index a59c0a7e4cf9..b1e06f708b2f 100644
--- a/libc/utils/FPUtil/ManipulationFunctions.h
+++ b/libc/utils/FPUtil/ManipulationFunctions.h
@@ -1,4 +1,4 @@
-//===-- Common operations on floating point numbers -------------*- C++ -*-===//
+//===-- Floating-point manipulation functions -------------------*- C++ -*-===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
@@ -7,8 +7,10 @@
//===----------------------------------------------------------------------===//
#include "BitPatterns.h"
+#include "ClassificationFunctions.h"
#include "FloatOperations.h"
#include "FloatProperties.h"
+#include "NearestIntegerOperations.h"
#include "utils/CPP/TypeTraits.h"
diff --git a/libc/utils/FPUtil/NearestIntegerOperations.h b/libc/utils/FPUtil/NearestIntegerOperations.h
new file mode 100644
index 000000000000..7f93de670112
--- /dev/null
+++ b/libc/utils/FPUtil/NearestIntegerOperations.h
@@ -0,0 +1,164 @@
+//===-- Nearest integer floating-point operations ---------------*- 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_UTILS_FPUTIL_NEAREST_INTEGER_OPERATIONS_H
+#define LLVM_LIBC_UTILS_FPUTIL_NEAREST_INTEGER_OPERATIONS_H
+
+#include "ClassificationFunctions.h"
+#include "FloatOperations.h"
+#include "FloatProperties.h"
+
+#include "utils/CPP/TypeTraits.h"
+
+namespace __llvm_libc {
+namespace fputil {
+
+template <typename T,
+ cpp::EnableIfType<cpp::IsFloatingPointType<T>::Value, int> = 0>
+static inline T trunc(T x) {
+ using Properties = FloatProperties<T>;
+ using BitsType = typename FloatProperties<T>::BitsType;
+
+ BitsType bits = valueAsBits(x);
+
+ // If x is infinity, NaN or zero, return it.
+ if (bitsAreInfOrNaN(bits) || bitsAreZero(bits))
+ return x;
+
+ int exponent = getExponentFromBits(bits);
+
+ // If the exponent is greater than the most negative mantissa
+ // exponent, then x is already an integer.
+ if (exponent >= static_cast<int>(Properties::mantissaWidth))
+ return x;
+
+ // If the exponent is such that abs(x) is less than 1, then return 0.
+ if (exponent <= -1) {
+ if (Properties::signMask & bits)
+ return T(-0.0);
+ else
+ return T(0.0);
+ }
+
+ uint32_t trimSize = Properties::mantissaWidth - exponent;
+ return valueFromBits((bits >> trimSize) << trimSize);
+}
+
+template <typename T,
+ cpp::EnableIfType<cpp::IsFloatingPointType<T>::Value, int> = 0>
+static inline T ceil(T x) {
+ using Properties = FloatProperties<T>;
+ using BitsType = typename FloatProperties<T>::BitsType;
+
+ BitsType bits = valueAsBits(x);
+
+ // If x is infinity NaN or zero, return it.
+ if (bitsAreInfOrNaN(bits) || bitsAreZero(bits))
+ return x;
+
+ bool isNeg = bits & Properties::signMask;
+ int exponent = getExponentFromBits(bits);
+
+ // If the exponent is greater than the most negative mantissa
+ // exponent, then x is already an integer.
+ if (exponent >= static_cast<int>(Properties::mantissaWidth))
+ return x;
+
+ if (exponent <= -1) {
+ if (isNeg)
+ return T(-0.0);
+ else
+ return T(1.0);
+ }
+
+ uint32_t trimSize = Properties::mantissaWidth - exponent;
+ // If x is already an integer, return it.
+ if ((bits << (Properties::bitWidth - trimSize)) == 0)
+ return x;
+
+ BitsType truncBits = (bits >> trimSize) << trimSize;
+ T truncValue = valueFromBits(truncBits);
+
+ // If x is negative, the ceil operation is equivalent to the trunc operation.
+ if (isNeg)
+ return truncValue;
+
+ return truncValue + T(1.0);
+}
+
+template <typename T,
+ cpp::EnableIfType<cpp::IsFloatingPointType<T>::Value, int> = 0>
+static inline T floor(T x) {
+ auto bits = valueAsBits(x);
+ if (FloatProperties<T>::signMask & bits) {
+ return -ceil(-x);
+ } else {
+ return trunc(x);
+ }
+}
+
+template <typename T,
+ cpp::EnableIfType<cpp::IsFloatingPointType<T>::Value, int> = 0>
+static inline T round(T x) {
+ using Properties = FloatProperties<T>;
+ using BitsType = typename FloatProperties<T>::BitsType;
+
+ BitsType bits = valueAsBits(x);
+
+ // If x is infinity, NaN or zero, return it.
+ if (bitsAreInfOrNaN(bits) || bitsAreZero(bits))
+ return x;
+
+ bool isNeg = bits & Properties::signMask;
+ int exponent = getExponentFromBits(bits);
+
+ // If the exponent is greater than the most negative mantissa
+ // exponent, then x is already an integer.
+ if (exponent >= static_cast<int>(Properties::mantissaWidth))
+ return x;
+
+ if (exponent == -1) {
+ // Absolute value of x is greater than equal to 0.5 but less than 1.
+ if (isNeg)
+ return T(-1.0);
+ else
+ return T(1.0);
+ }
+
+ if (exponent <= -2) {
+ // Absolute value of x is less than 0.5.
+ if (isNeg)
+ return T(-0.0);
+ else
+ return T(0.0);
+ }
+
+ uint32_t trimSize = Properties::mantissaWidth - exponent;
+ // If x is already an integer, return it.
+ if ((bits << (Properties::bitWidth - trimSize)) == 0)
+ return x;
+
+ BitsType truncBits = (bits >> trimSize) << trimSize;
+ T truncValue = valueFromBits(truncBits);
+
+ if ((bits & (BitsType(1) << (trimSize - 1))) == 0) {
+ // Franctional part is less than 0.5 so round value is the
+ // same as the trunc value.
+ return truncValue;
+ }
+
+ if (isNeg)
+ return truncValue - T(1.0);
+ else
+ return truncValue + T(1.0);
+}
+
+} // namespace fputil
+} // namespace __llvm_libc
+
+#endif // LLVM_LIBC_UTILS_FPUTIL_NEAREST_INTEGER_OPERATIONS_H
More information about the libc-commits
mailing list