Skip to content

[libc] Remove specific nan payload in math functions #79165

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.

Sign up for GitHub

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 2 commits into from
Jan 29, 2024
Merged

[libc] Remove specific nan payload in math functions #79165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
38af6a6
[libc] Remove specific nan payload in math functions
gchatelet Jan 23, 2024
2fdf373
Remove last usage of `build_nan`
gchatelet Jan 29, 2024
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: 1 addition & 1 deletion libc/src/math/generic/asinf.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ LLVM_LIBC_FUNCTION(float, asinf, (float x)) {
fputil::set_errno_if_required(EDOM);
fputil::raise_except_if_required(FE_INVALID);
}
return x + FPBits::build_nan(Sign::POS, FPBits::FRACTION_MASK).get_val();
return FPBits::build_quiet_nan().get_val();
}

// Check for exceptional values
Expand Down
4 changes: 1 addition & 3 deletions libc/src/math/generic/sincosf.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,7 @@ LLVM_LIBC_FUNCTION(void, sincosf, (float x, float *sinp, float *cosp)) {
fputil::set_errno_if_required(EDOM);
fputil::raise_except_if_required(FE_INVALID);
}
*sinp =
x +
FPBits::build_nan(fputil::Sign::POS, FPBits::FRACTION_MASK).get_val();
*sinp = FPBits::build_quiet_nan().get_val();
*cosp = *sinp;
return;
}
Expand Down
4 changes: 2 additions & 2 deletions libc/test/UnitTest/FPMatcher.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ template <typename T> struct FPTest : public Test {
static constexpr T zero = FPBits::zero(Sign::POS).get_val();
static constexpr T neg_zero = FPBits::zero(Sign::NEG).get_val();
static constexpr T aNaN = FPBits::build_quiet_nan().get_val();
static constexpr T sNaN = FPBits::build_nan(Sign::POS, 1).get_val();
static constexpr T sNaN = FPBits::build_nan().get_val();
static constexpr T inf = FPBits::inf(Sign::POS).get_val();
static constexpr T neg_inf = FPBits::inf(Sign::NEG).get_val();
static constexpr T min_normal = FPBits::min_normal().get_val();
Expand Down Expand Up @@ -98,7 +98,7 @@ template <typename T> struct FPTest : public Test {
const T zero = FPBits::zero(Sign::POS).get_val(); \
const T neg_zero = FPBits::zero(Sign::NEG).get_val(); \
const T aNaN = FPBits::build_quiet_nan().get_val(); \
const T sNaN = FPBits::build_nan(Sign::POS, 1).get_val(); \
const T sNaN = FPBits::build_nan().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
17 changes: 6 additions & 11 deletions libc/test/src/__support/FPUtil/fpbits_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,8 +236,7 @@ TEST(LlvmLibcFPBitsTest, FloatType) {
"(+Infinity)");
EXPECT_STREQ(LIBC_NAMESPACE::str(FloatBits::inf(Sign::NEG)).c_str(),
"(-Infinity)");
EXPECT_STREQ(LIBC_NAMESPACE::str(FloatBits::build_nan(Sign::POS, 1)).c_str(),
"(NaN)");
EXPECT_STREQ(LIBC_NAMESPACE::str(FloatBits::build_nan()).c_str(), "(NaN)");

FloatBits zero(0.0f);
EXPECT_TRUE(zero.is_pos());
Expand Down Expand Up @@ -363,9 +362,8 @@ TEST(LlvmLibcFPBitsTest, X86LongDoubleType) {
"(+Infinity)");
EXPECT_STREQ(LIBC_NAMESPACE::str(LongDoubleBits::inf(Sign::NEG)).c_str(),
"(-Infinity)");
EXPECT_STREQ(
LIBC_NAMESPACE::str(LongDoubleBits::build_nan(Sign::POS, 1)).c_str(),
"(NaN)");
EXPECT_STREQ(LIBC_NAMESPACE::str(LongDoubleBits::build_nan()).c_str(),
"(NaN)");

LongDoubleBits zero(0.0l);
EXPECT_TRUE(zero.is_pos());
Expand Down Expand Up @@ -444,9 +442,8 @@ TEST(LlvmLibcFPBitsTest, LongDoubleType) {
"(+Infinity)");
EXPECT_STREQ(LIBC_NAMESPACE::str(LongDoubleBits::inf(Sign::NEG)).c_str(),
"(-Infinity)");
EXPECT_STREQ(
LIBC_NAMESPACE::str(LongDoubleBits::build_nan(Sign::POS, 1)).c_str(),
"(NaN)");
EXPECT_STREQ(LIBC_NAMESPACE::str(LongDoubleBits::build_nan()).c_str(),
"(NaN)");

LongDoubleBits zero(0.0l);
EXPECT_TRUE(zero.is_pos());
Expand Down Expand Up @@ -519,9 +516,7 @@ TEST(LlvmLibcFPBitsTest, Float128Type) {
"(+Infinity)");
EXPECT_STREQ(LIBC_NAMESPACE::str(Float128Bits::inf(Sign::NEG)).c_str(),
"(-Infinity)");
EXPECT_STREQ(
LIBC_NAMESPACE::str(Float128Bits::build_nan(Sign::POS, 1)).c_str(),
"(NaN)");
EXPECT_STREQ(LIBC_NAMESPACE::str(Float128Bits::build_nan()).c_str(), "(NaN)");

Float128Bits zero = Float128Bits::zero(Sign::POS);
EXPECT_TRUE(zero.is_pos());
Expand Down
25 changes: 10 additions & 15 deletions libc/test/src/stdio/sprintf_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,9 +586,8 @@ TEST(LlvmLibcSPrintfTest, OctConv) {
TEST_F(LlvmLibcSPrintfTest, FloatHexExpConv) {
ForceRoundingMode r(RoundingMode::Nearest);
double inf = LIBC_NAMESPACE::fputil::FPBits<double>::inf().get_val();
double nan = LIBC_NAMESPACE::fputil::FPBits<double>::build_nan(
LIBC_NAMESPACE::fputil::Sign::POS, 1)
.get_val();
double nan =
LIBC_NAMESPACE::fputil::FPBits<double>::build_quiet_nan().get_val();
written = LIBC_NAMESPACE::sprintf(buff, "%a", 1.0);
ASSERT_STREQ_LEN(written, buff, "0x1p+0");

Expand Down Expand Up @@ -952,14 +951,12 @@ TEST_F(LlvmLibcSPrintfTest, FloatHexExpConv) {
TEST_F(LlvmLibcSPrintfTest, FloatDecimalConv) {
ForceRoundingMode r(RoundingMode::Nearest);
double inf = LIBC_NAMESPACE::fputil::FPBits<double>::inf().get_val();
double nan = LIBC_NAMESPACE::fputil::FPBits<double>::build_nan(
LIBC_NAMESPACE::fputil::Sign::POS, 1)
.get_val();
double nan =
LIBC_NAMESPACE::fputil::FPBits<double>::build_quiet_nan().get_val();
long double ld_inf =
LIBC_NAMESPACE::fputil::FPBits<long double>::inf().get_val();
long double ld_nan = LIBC_NAMESPACE::fputil::FPBits<long double>::build_nan(
LIBC_NAMESPACE::fputil::Sign::POS, 1)
.get_val();
long double ld_nan =
LIBC_NAMESPACE::fputil::FPBits<long double>::build_quiet_nan().get_val();

char big_buff[10000]; // Used for long doubles and other extremely wide
// numbers.
Expand Down Expand Up @@ -1808,9 +1805,8 @@ TEST_F(LlvmLibcSPrintfTest, FloatDecimalLongDoubleConv) {
TEST_F(LlvmLibcSPrintfTest, FloatExponentConv) {
ForceRoundingMode r(RoundingMode::Nearest);
double inf = LIBC_NAMESPACE::fputil::FPBits<double>::inf().get_val();
double nan = LIBC_NAMESPACE::fputil::FPBits<double>::build_nan(
LIBC_NAMESPACE::fputil::Sign::POS, 1)
.get_val();
double nan =
LIBC_NAMESPACE::fputil::FPBits<double>::build_quiet_nan().get_val();

written = LIBC_NAMESPACE::sprintf(buff, "%e", 1.0);
ASSERT_STREQ_LEN(written, buff, "1.000000e+00");
Expand Down Expand Up @@ -2417,9 +2413,8 @@ TEST_F(LlvmLibcSPrintfTest, FloatExponentLongDoubleConv) {
TEST_F(LlvmLibcSPrintfTest, FloatAutoConv) {
ForceRoundingMode r(RoundingMode::Nearest);
double inf = LIBC_NAMESPACE::fputil::FPBits<double>::inf().get_val();
double nan = LIBC_NAMESPACE::fputil::FPBits<double>::build_nan(
LIBC_NAMESPACE::fputil::Sign::POS, 1)
.get_val();
double nan =
LIBC_NAMESPACE::fputil::FPBits<double>::build_quiet_nan().get_val();

written = LIBC_NAMESPACE::sprintf(buff, "%g", 1.0);
ASSERT_STREQ_LEN(written, buff, "1");
Expand Down
15 changes: 6 additions & 9 deletions libc/test/src/stdio/sscanf_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,9 +231,8 @@ TEST(LlvmLibcSScanfTest, FloatConvSimple) {
float result = 0;

float inf = LIBC_NAMESPACE::fputil::FPBits<float>::inf().get_val();
float nan = LIBC_NAMESPACE::fputil::FPBits<float>::build_nan(
LIBC_NAMESPACE::fputil::Sign::POS, 1)
.get_val();
float nan =
LIBC_NAMESPACE::fputil::FPBits<float>::build_quiet_nan().get_val();

ret_val = LIBC_NAMESPACE::sscanf("123", "%f", &result);
EXPECT_EQ(ret_val, 1);
Expand Down Expand Up @@ -297,9 +296,8 @@ TEST(LlvmLibcSScanfTest, FloatConvLengthModifier) {
long double ld_result = 0;

double d_inf = LIBC_NAMESPACE::fputil::FPBits<double>::inf().get_val();
long double ld_nan = LIBC_NAMESPACE::fputil::FPBits<long double>::build_nan(
LIBC_NAMESPACE::fputil::Sign::POS, 1)
.get_val();
long double ld_nan =
LIBC_NAMESPACE::fputil::FPBits<long double>::build_quiet_nan().get_val();

ret_val = LIBC_NAMESPACE::sscanf("123", "%lf", &d_result);
EXPECT_EQ(ret_val, 1);
Expand Down Expand Up @@ -395,9 +393,8 @@ TEST(LlvmLibcSScanfTest, FloatConvComplexParsing) {
float result = 0;

float inf = LIBC_NAMESPACE::fputil::FPBits<float>::inf().get_val();
float nan = LIBC_NAMESPACE::fputil::FPBits<float>::build_nan(
LIBC_NAMESPACE::fputil::Sign::POS, 1)
.get_val();
float nan =
LIBC_NAMESPACE::fputil::FPBits<float>::build_quiet_nan().get_val();

ret_val = LIBC_NAMESPACE::sscanf("0x1.0e3", "%f", &result);
EXPECT_EQ(ret_val, 1);
Expand Down