Skip to content

Commit 808b7d2

Browse files
gchateletgchatelet
authored
[libc][NFC] rename LONG_DOUBLE_IS_DOUBLE into LIBC_LONG_DOUBLE_IS_FLOAT64 (llvm#73948)
1 parent 85184b4 commit 808b7d2

File tree

10 files changed

+36
-38
lines changed

10 files changed

+36
-38
lines changed

‎libc/src/__support/FPUtil/generic/sqrt.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ LIBC_INLINE void normalize(int &exponent,
4343
mantissa <<= shift;
4444
}
4545

46-
#ifdef LONG_DOUBLE_IS_DOUBLE
46+
#ifdef LIBC_LONG_DOUBLE_IS_FLOAT64
4747
template <>
4848
LIBC_INLINE void normalize<long double>(int &exponent, uint64_t &mantissa) {
4949
normalize<double>(exponent, mantissa);

‎libc/src/__support/FPUtil/x86_64/sqrt.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ template <> LIBC_INLINE double sqrt<double>(double x) {
3333
return result;
3434
}
3535

36-
#ifdef LONG_DOUBLE_IS_DOUBLE
36+
#ifdef LIBC_LONG_DOUBLE_IS_FLOAT64
3737
template <> LIBC_INLINE long double sqrt<long double>(long double x) {
3838
long double result;
3939
__asm__ __volatile__("sqrtsd %x1, %x0" : "=x"(result) : "x"(x));

‎libc/src/__support/float_to_string.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,7 @@ class FloatToString {
602602
}
603603
};
604604

605-
#ifndef LONG_DOUBLE_IS_DOUBLE
605+
#ifndef LIBC_LONG_DOUBLE_IS_FLOAT64
606606
// --------------------------- LONG DOUBLE FUNCTIONS ---------------------------
607607

608608
template <>
@@ -754,7 +754,7 @@ FloatToString<long double>::get_negative_block(int block_index) {
754754
}
755755
}
756756

757-
#endif // LONG_DOUBLE_IS_DOUBLE
757+
#endif // LIBC_LONG_DOUBLE_IS_FLOAT64
758758

759759
} // namespace LIBC_NAMESPACE
760760

‎libc/src/__support/macros/properties/float.h

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,9 @@
1919
#include <float.h> // LDBL_MANT_DIG
2020

2121
// 'long double' properties.
22-
#if (LDBL_MANT_DIG == DBL_MANT_DIG)
23-
// TODO: Replace with LIBC_LONG_DOUBLE_IS_DOUBLE
24-
#define LONG_DOUBLE_IS_DOUBLE
25-
#endif
26-
#if (LDBL_MANT_DIG == 64)
22+
#if (LDBL_MANT_DIG == 53)
23+
#define LIBC_LONG_DOUBLE_IS_FLOAT64
24+
#elif (LDBL_MANT_DIG == 64)
2725
// TODO: Replace with LIBC_LONG_DOUBLE_IS_X86_BIN80
2826
#define SPECIAL_X86_LONG_DOUBLE
2927
#elif (LDBL_MANT_DIG == 113)

‎libc/src/__support/str_to_float.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ eisel_lemire(ExpandedFloat<T> init_num,
221221
return output;
222222
}
223223

224-
#if !defined(LONG_DOUBLE_IS_DOUBLE)
224+
#if !defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
225225
template <>
226226
LIBC_INLINE cpp::optional<ExpandedFloat<long double>>
227227
eisel_lemire<long double>(ExpandedFloat<long double> init_num,
@@ -516,7 +516,7 @@ template <> class ClingerConsts<double> {
516516
static constexpr double MAX_EXACT_INT = 9007199254740991.0;
517517
};
518518

519-
#if defined(LONG_DOUBLE_IS_DOUBLE)
519+
#if defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
520520
template <> class ClingerConsts<long double> {
521521
public:
522522
static constexpr long double POWERS_OF_TEN_ARRAY[] = {

‎libc/test/src/__support/FPUtil/fpbits_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ TEST(LlvmLibcFPBitsTest, X86LongDoubleType) {
213213
}
214214
#else
215215
TEST(LlvmLibcFPBitsTest, LongDoubleType) {
216-
#if defined(LONG_DOUBLE_IS_DOUBLE)
216+
#if defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
217217
return; // The tests for the "double" type cover for this case.
218218
#else
219219
using LongDoubleBits = FPBits<long double>;

‎libc/test/src/__support/str_to_float_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ TEST(LlvmLibcStrToFloatTest, SimpleDecimalConversionExtraTypes) {
279279
EXPECT_EQ(double_result.error, 0);
280280
}
281281

282-
#if defined(LONG_DOUBLE_IS_DOUBLE)
282+
#if defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
283283
TEST_F(LlvmLibcStrToFloatTest, EiselLemireFloat64AsLongDouble) {
284284
eisel_lemire_test<long double>(123, 0, 0x1EC00000000000, 1029);
285285
}

‎libc/test/src/stdio/sprintf_test.cpp

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatHexExpConv) {
644644
written = LIBC_NAMESPACE::sprintf(buff, "%La", 0.1L);
645645
#if defined(SPECIAL_X86_LONG_DOUBLE)
646646
ASSERT_STREQ_LEN(written, buff, "0xc.ccccccccccccccdp-7");
647-
#elif defined(LONG_DOUBLE_IS_DOUBLE)
647+
#elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
648648
ASSERT_STREQ_LEN(written, buff, "0x1.999999999999ap-4");
649649
#else // 128 bit long double
650650
ASSERT_STREQ_LEN(written, buff, "0x1.999999999999999999999999999ap-4");
@@ -653,7 +653,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatHexExpConv) {
653653
written = LIBC_NAMESPACE::sprintf(buff, "%La", 1.0e1000L);
654654
#if defined(SPECIAL_X86_LONG_DOUBLE)
655655
ASSERT_STREQ_LEN(written, buff, "0xf.38db1f9dd3dac05p+3318");
656-
#elif defined(LONG_DOUBLE_IS_DOUBLE)
656+
#elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
657657
ASSERT_STREQ_LEN(written, buff, "inf");
658658
#else // 128 bit long double
659659
ASSERT_STREQ_LEN(written, buff, "0x1.e71b63f3ba7b580af1a52d2a7379p+3321");
@@ -662,7 +662,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatHexExpConv) {
662662
written = LIBC_NAMESPACE::sprintf(buff, "%La", 1.0e-1000L);
663663
#if defined(SPECIAL_X86_LONG_DOUBLE)
664664
ASSERT_STREQ_LEN(written, buff, "0x8.68a9188a89e1467p-3325");
665-
#elif defined(LONG_DOUBLE_IS_DOUBLE)
665+
#elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
666666
ASSERT_STREQ_LEN(written, buff, "0x0p+0");
667667
#else // 128 bit long double
668668
ASSERT_STREQ_LEN(written, buff, "0x1.0d152311513c28ce202627c06ec2p-3322");
@@ -768,7 +768,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatHexExpConv) {
768768
written = LIBC_NAMESPACE::sprintf(buff, "%.1La", 0.1L);
769769
#if defined(SPECIAL_X86_LONG_DOUBLE)
770770
ASSERT_STREQ_LEN(written, buff, "0xc.dp-7");
771-
#elif defined(LONG_DOUBLE_IS_DOUBLE)
771+
#elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
772772
ASSERT_STREQ_LEN(written, buff, "0x1.ap-4");
773773
#else // 128 bit long double
774774
ASSERT_STREQ_LEN(written, buff, "0x1.ap-4");
@@ -777,7 +777,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatHexExpConv) {
777777
written = LIBC_NAMESPACE::sprintf(buff, "%.1La", 0xf.fffffffffffffffp16380L);
778778
#if defined(SPECIAL_X86_LONG_DOUBLE)
779779
ASSERT_STREQ_LEN(written, buff, "0x1.0p+16384");
780-
#elif defined(LONG_DOUBLE_IS_DOUBLE)
780+
#elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
781781
ASSERT_STREQ_LEN(written, buff, "inf");
782782
#else // 128 bit long double
783783
ASSERT_STREQ_LEN(written, buff, "0x2.0p+16383");
@@ -1024,14 +1024,14 @@ TEST_F(LlvmLibcSPrintfTest, FloatDecimalConv) {
10241024

10251025
// Some float128 systems (specifically the ones used for aarch64 buildbots)
10261026
// don't respect signs for long double NaNs.
1027-
#if defined(SPECIAL_X86_LONG_DOUBLE) || defined(LONG_DOUBLE_IS_DOUBLE)
1027+
#if defined(SPECIAL_X86_LONG_DOUBLE) || defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
10281028
written = LIBC_NAMESPACE::sprintf(buff, "%LF", -ld_nan);
10291029
ASSERT_STREQ_LEN(written, buff, "-NAN");
10301030
#endif
10311031

10321032
// Length Modifier Tests.
10331033

1034-
// TODO(michaelrj): Add tests for LONG_DOUBLE_IS_DOUBLE and 128 bit long
1034+
// TODO(michaelrj): Add tests for LIBC_LONG_DOUBLE_IS_FLOAT64 and 128 bit long
10351035
// double systems.
10361036
// TODO(michaelrj): Fix the tests to only depend on the digits the long double
10371037
// is accurate for.
@@ -1333,7 +1333,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatDecimalConv) {
13331333
written = LIBC_NAMESPACE::sprintf(buff, "%La", 0.1L);
13341334
#if defined(SPECIAL_X86_LONG_DOUBLE)
13351335
ASSERT_STREQ_LEN(written, buff, "0xc.ccccccccccccccdp-7");
1336-
#elif defined(LONG_DOUBLE_IS_DOUBLE)
1336+
#elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
13371337
ASSERT_STREQ_LEN(written, buff, "0x1.999999999999ap-4");
13381338
#else // 128 bit long double
13391339
ASSERT_STREQ_LEN(written, buff, "0x1.999999999999999999999999999ap-4");
@@ -1342,7 +1342,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatDecimalConv) {
13421342
written = LIBC_NAMESPACE::sprintf(buff, "%La", 1.0e1000L);
13431343
#if defined(SPECIAL_X86_LONG_DOUBLE)
13441344
ASSERT_STREQ_LEN(written, buff, "0xf.38db1f9dd3dac05p+3318");
1345-
#elif defined(LONG_DOUBLE_IS_DOUBLE)
1345+
#elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
13461346
ASSERT_STREQ_LEN(written, buff, "inf");
13471347
#else // 128 bit long double
13481348
ASSERT_STREQ_LEN(written, buff, "0x1.e71b63f3ba7b580af1a52d2a7379p+3321");
@@ -1351,7 +1351,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatDecimalConv) {
13511351
written = LIBC_NAMESPACE::sprintf(buff, "%La", 1.0e-1000L);
13521352
#if defined(SPECIAL_X86_LONG_DOUBLE)
13531353
ASSERT_STREQ_LEN(written, buff, "0x8.68a9188a89e1467p-3325");
1354-
#elif defined(LONG_DOUBLE_IS_DOUBLE)
1354+
#elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
13551355
ASSERT_STREQ_LEN(written, buff, "0x0p+0");
13561356
#else // 128 bit long double
13571357
ASSERT_STREQ_LEN(written, buff, "0x1.0d152311513c28ce202627c06ec2p-3322");
@@ -1550,7 +1550,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatDecimalConv) {
15501550
written = LIBC_NAMESPACE::sprintf(buff, "%.1La", 0.1L);
15511551
#if defined(SPECIAL_X86_LONG_DOUBLE)
15521552
ASSERT_STREQ_LEN(written, buff, "0xc.dp-7");
1553-
#elif defined(LONG_DOUBLE_IS_DOUBLE)
1553+
#elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
15541554
ASSERT_STREQ_LEN(written, buff, "0x1.ap-4");
15551555
#else // 128 bit long double
15561556
ASSERT_STREQ_LEN(written, buff, "0x1.ap-4");
@@ -1559,7 +1559,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatDecimalConv) {
15591559
written = LIBC_NAMESPACE::sprintf(buff, "%.1La",
15601560
0xf.fffffffffffffffp16380L); #if defined(SPECIAL_X86_LONG_DOUBLE)
15611561
ASSERT_STREQ_LEN(written, buff, "0x1.0p+16384");
1562-
#elif defined(LONG_DOUBLE_IS_DOUBLE)
1562+
#elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
15631563
ASSERT_STREQ_LEN(written, buff, "inf");
15641564
#else // 128 bit long double
15651565
ASSERT_STREQ_LEN(written, buff, "0x2.0p+16383");
@@ -1977,7 +1977,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatExponentConv) {
19771977
written = LIBC_NAMESPACE::sprintf(buff, "%La", 0.1L);
19781978
#if defined(SPECIAL_X86_LONG_DOUBLE)
19791979
ASSERT_STREQ_LEN(written, buff, "0xc.ccccccccccccccdp-7");
1980-
#elif defined(LONG_DOUBLE_IS_DOUBLE)
1980+
#elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
19811981
ASSERT_STREQ_LEN(written, buff, "0x1.999999999999ap-4");
19821982
#else // 128 bit long double
19831983
ASSERT_STREQ_LEN(written, buff, "0x1.999999999999999999999999999ap-4");
@@ -1986,7 +1986,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatExponentConv) {
19861986
written = LIBC_NAMESPACE::sprintf(buff, "%La", 1.0e1000L);
19871987
#if defined(SPECIAL_X86_LONG_DOUBLE)
19881988
ASSERT_STREQ_LEN(written, buff, "0xf.38db1f9dd3dac05p+3318");
1989-
#elif defined(LONG_DOUBLE_IS_DOUBLE)
1989+
#elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
19901990
ASSERT_STREQ_LEN(written, buff, "inf");
19911991
#else // 128 bit long double
19921992
ASSERT_STREQ_LEN(written, buff, "0x1.e71b63f3ba7b580af1a52d2a7379p+3321");
@@ -1995,7 +1995,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatExponentConv) {
19951995
written = LIBC_NAMESPACE::sprintf(buff, "%La", 1.0e-1000L);
19961996
#if defined(SPECIAL_X86_LONG_DOUBLE)
19971997
ASSERT_STREQ_LEN(written, buff, "0x8.68a9188a89e1467p-3325");
1998-
#elif defined(LONG_DOUBLE_IS_DOUBLE)
1998+
#elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
19991999
ASSERT_STREQ_LEN(written, buff, "0x0p+0");
20002000
#else // 128 bit long double
20012001
ASSERT_STREQ_LEN(written, buff, "0x1.0d152311513c28ce202627c06ec2p-3322");
@@ -2173,7 +2173,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatExponentConv) {
21732173
written = LIBC_NAMESPACE::sprintf(buff, "%.1La", 0.1L);
21742174
#if defined(SPECIAL_X86_LONG_DOUBLE)
21752175
ASSERT_STREQ_LEN(written, buff, "0xc.dp-7");
2176-
#elif defined(LONG_DOUBLE_IS_DOUBLE)
2176+
#elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
21772177
ASSERT_STREQ_LEN(written, buff, "0x1.ap-4");
21782178
#else // 128 bit long double
21792179
ASSERT_STREQ_LEN(written, buff, "0x1.ap-4");
@@ -2182,7 +2182,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatExponentConv) {
21822182
written = LIBC_NAMESPACE::sprintf(buff, "%.1La",
21832183
0xf.fffffffffffffffp16380L); #if defined(SPECIAL_X86_LONG_DOUBLE)
21842184
ASSERT_STREQ_LEN(written, buff, "0x1.0p+16384");
2185-
#elif defined(LONG_DOUBLE_IS_DOUBLE)
2185+
#elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
21862186
ASSERT_STREQ_LEN(written, buff, "inf");
21872187
#else // 128 bit long double
21882188
ASSERT_STREQ_LEN(written, buff, "0x2.0p+16383");
@@ -2616,7 +2616,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatAutoConv) {
26162616
written = LIBC_NAMESPACE::sprintf(buff, "%La", 0.1L);
26172617
#if defined(SPECIAL_X86_LONG_DOUBLE)
26182618
ASSERT_STREQ_LEN(written, buff, "0xc.ccccccccccccccdp-7");
2619-
#elif defined(LONG_DOUBLE_IS_DOUBLE)
2619+
#elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
26202620
ASSERT_STREQ_LEN(written, buff, "0x1.999999999999ap-4");
26212621
#else // 128 bit long double
26222622
ASSERT_STREQ_LEN(written, buff, "0x1.999999999999999999999999999ap-4");
@@ -2625,7 +2625,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatAutoConv) {
26252625
written = LIBC_NAMESPACE::sprintf(buff, "%La", 1.0e1000L);
26262626
#if defined(SPECIAL_X86_LONG_DOUBLE)
26272627
ASSERT_STREQ_LEN(written, buff, "0xf.38db1f9dd3dac05p+3318");
2628-
#elif defined(LONG_DOUBLE_IS_DOUBLE)
2628+
#elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
26292629
ASSERT_STREQ_LEN(written, buff, "inf");
26302630
#else // 128 bit long double
26312631
ASSERT_STREQ_LEN(written, buff, "0x1.e71b63f3ba7b580af1a52d2a7379p+3321");
@@ -2634,7 +2634,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatAutoConv) {
26342634
written = LIBC_NAMESPACE::sprintf(buff, "%La", 1.0e-1000L);
26352635
#if defined(SPECIAL_X86_LONG_DOUBLE)
26362636
ASSERT_STREQ_LEN(written, buff, "0x8.68a9188a89e1467p-3325");
2637-
#elif defined(LONG_DOUBLE_IS_DOUBLE)
2637+
#elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
26382638
ASSERT_STREQ_LEN(written, buff, "0x0p+0");
26392639
#else // 128 bit long double
26402640
ASSERT_STREQ_LEN(written, buff, "0x1.0d152311513c28ce202627c06ec2p-3322");
@@ -2822,7 +2822,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatAutoConv) {
28222822
written = LIBC_NAMESPACE::sprintf(buff, "%.1La", 0.1L);
28232823
#if defined(SPECIAL_X86_LONG_DOUBLE)
28242824
ASSERT_STREQ_LEN(written, buff, "0xc.dp-7");
2825-
#elif defined(LONG_DOUBLE_IS_DOUBLE)
2825+
#elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
28262826
ASSERT_STREQ_LEN(written, buff, "0x1.ap-4");
28272827
#else // 128 bit long double
28282828
ASSERT_STREQ_LEN(written, buff, "0x1.ap-4");
@@ -2831,7 +2831,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatAutoConv) {
28312831
written = LIBC_NAMESPACE::sprintf(buff, "%.1La",
28322832
0xf.fffffffffffffffp16380L); #if defined(SPECIAL_X86_LONG_DOUBLE)
28332833
ASSERT_STREQ_LEN(written, buff, "0x1.0p+16384");
2834-
#elif defined(LONG_DOUBLE_IS_DOUBLE)
2834+
#elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
28352835
ASSERT_STREQ_LEN(written, buff, "inf");
28362836
#else // 128 bit long double
28372837
ASSERT_STREQ_LEN(written, buff, "0x2.0p+16383");

‎libc/test/src/stdio/sscanf_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ TEST(LlvmLibcSScanfTest, FloatConvLengthModifier) {
322322
EXPECT_EQ(ret_val, 1);
323323
// 1e600 may be larger than the maximum long double (if long double is double).
324324
// In that case both of these should be evaluated as inf.
325-
#ifdef LONG_DOUBLE_IS_DOUBLE
325+
#ifdef LIBC_LONG_DOUBLE_IS_FLOAT64
326326
EXPECT_FP_EQ(ld_result, d_inf);
327327
#else
328328
EXPECT_FP_EQ(ld_result, 1.0e600L);

‎libc/test/src/stdlib/strtold_test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <limits.h>
1717
#include <stddef.h>
1818

19-
#if defined(LONG_DOUBLE_IS_DOUBLE)
19+
#if defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
2020
#define SELECT_CONST(val, _, __) val
2121
#elif defined(SPECIAL_X86_LONG_DOUBLE)
2222
#define SELECT_CONST(_, val, __) val
@@ -26,7 +26,7 @@
2626

2727
class LlvmLibcStrToLDTest : public LIBC_NAMESPACE::testing::Test {
2828
public:
29-
#if defined(LONG_DOUBLE_IS_DOUBLE)
29+
#if defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
3030
void run_test(const char *inputString, const ptrdiff_t expectedStrLen,
3131
const uint64_t expectedRawData, const int expectedErrno = 0)
3232
#else

0 commit comments

Comments
 (0)