This is an archive of the discontinued LLVM Phabricator instance.

Differential D152487

[libc][NFC] fix constants not marked constexpr
ClosedPublic

Authored by michaelrj on Jun 8 2023, 4:40 PM.

Details

Reviewers
None
Commits
rG4b8543f33fa2: [libc][NFC] fix constants not marked constexpr
Summary

The constants in the ryu constant tables were not marked constexpr,
only static const. This caused problems when compiling with GCC.

Diff Detail

Event Timeline

michaelrj created this revision.Jun 8 2023, 4:40 PM
Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptJun 8 2023, 4:40 PM
Herald added a subscriber: libc-commits. · View Herald Transcript
michaelrj requested review of this revision.Jun 8 2023, 4:40 PM
Harbormaster completed remote builds in B237626: Diff 529777.Jun 8 2023, 4:41 PM
michaelrj added a comment.Jun 8 2023, 4:42 PM

Noting for anyone looking after the fact: The changes to the long double table are identical to the ones made to the smaller table.

This revision was not accepted when it landed; it landed in state Needs Review.Jun 8 2023, 4:43 PM
This revision was landed with ongoing or failed builds.
Closed by commit rG4b8543f33fa2: [libc][NFC] fix constants not marked constexpr (authored by michaelrj). · Explain Why
This revision was automatically updated to reflect the committed changes.
michaelrj added a commit: rG4b8543f33fa2: [libc][NFC] fix constants not marked constexpr.

Revision Contents

PathSize
libc/
src/
__support/
10 lines
10 lines

Diff 529778

libc/src/__support/ryu_constants.h

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show All 11 Lines
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
constexpr size_t TABLE_SHIFT_CONST = 120; constexpr size_t TABLE_SHIFT_CONST = 120;
constexpr size_t IDX_SIZE = 16; constexpr size_t IDX_SIZE = 16;
constexpr size_t MID_INT_SIZE = 192; constexpr size_t MID_INT_SIZE = 192;
static const uint16_t POW10_OFFSET[64] = { constexpr uint16_t POW10_OFFSET[64] = {
0, 2, 5, 8, 12, 16, 21, 26, 32, 39, 46, 54, 62, 0, 2, 5, 8, 12, 16, 21, 26, 32, 39, 46, 54, 62,
71, 80, 90, 100, 111, 122, 134, 146, 159, 173, 187, 202, 217, 71, 80, 90, 100, 111, 122, 134, 146, 159, 173, 187, 202, 217,
233, 249, 266, 283, 301, 319, 338, 357, 377, 397, 418, 440, 462, 233, 249, 266, 283, 301, 319, 338, 357, 377, 397, 418, 440, 462,
485, 508, 532, 556, 581, 606, 632, 658, 685, 712, 740, 769, 798, 485, 508, 532, 556, 581, 606, 632, 658, 685, 712, 740, 769, 798,
828, 858, 889, 920, 952, 984, 1017, 1050, 1084, 1118, 1153, 1188}; 828, 858, 889, 920, 952, 984, 1017, 1050, 1084, 1118, 1153, 1188};
static const uint64_t POW10_SPLIT[1224][3] = { constexpr uint64_t POW10_SPLIT[1224][3] = {
{1u, 72057594037927936u, 0u}, {1u, 72057594037927936u, 0u},
{699646928636035157u, 72057594u, 0u}, {699646928636035157u, 72057594u, 0u},
{1u, 0u, 256u}, {1u, 0u, 256u},
{11902091922964236229u, 4722366482869u, 0u}, {11902091922964236229u, 4722366482869u, 0u},
{6760415703743915872u, 4722u, 0u}, {6760415703743915872u, 4722u, 0u},
{1u, 0u, 16777216u}, {1u, 0u, 16777216u},
{13369850649504950658u, 309485009821345068u, 0u}, {13369850649504950658u, 309485009821345068u, 0u},
{15151142278969419334u, 309485009u, 0u}, {15151142278969419334u, 309485009u, 0u},
▲ Show 20 Lines • Show All 1,210 Lines • ▼ Show 20 Lines
{690976506652396830u, 333989628642975695u, 140250490600u}, {690976506652396830u, 333989628642975695u, 140250490600u},
{12281570945595192074u, 4620735991403939438u, 54673209484u}, {12281570945595192074u, 4620735991403939438u, 54673209484u},
{12592957291365552899u, 12418523063962801200u, 219086071862u}, {12592957291365552899u, 12418523063962801200u, 219086071862u},
{13595807339013970272u, 1587745622680169418u, 10715u}, {13595807339013970272u, 1587745622680169418u, 10715u},
{9698096389749839992u, 197658450495420u, 0u}, {9698096389749839992u, 197658450495420u, 0u},
{8310173728816391804u, 197658u, 0u}, {8310173728816391804u, 197658u, 0u},
}; };
static const uint16_t POW10_OFFSET_2[69] = { constexpr uint16_t POW10_OFFSET_2[69] = {
0, 2, 6, 12, 20, 29, 40, 52, 66, 80, 95, 112, 0, 2, 6, 12, 20, 29, 40, 52, 66, 80, 95, 112,
130, 150, 170, 192, 215, 240, 265, 292, 320, 350, 381, 413, 130, 150, 170, 192, 215, 240, 265, 292, 320, 350, 381, 413,
446, 480, 516, 552, 590, 629, 670, 712, 755, 799, 845, 892, 446, 480, 516, 552, 590, 629, 670, 712, 755, 799, 845, 892,
940, 989, 1040, 1092, 1145, 1199, 1254, 1311, 1369, 1428, 1488, 1550, 940, 989, 1040, 1092, 1145, 1199, 1254, 1311, 1369, 1428, 1488, 1550,
1613, 1678, 1743, 1810, 1878, 1947, 2017, 2088, 2161, 2235, 2311, 2387, 1613, 1678, 1743, 1810, 1878, 1947, 2017, 2088, 2161, 2235, 2311, 2387,
2465, 2544, 2625, 2706, 2789, 2873, 2959, 3046, 3133}; 2465, 2544, 2625, 2706, 2789, 2873, 2959, 3046, 3133};
static const uint8_t MIN_BLOCK_2[69] = { constexpr uint8_t MIN_BLOCK_2[69] = {
0, 0, 0, 0, 0, 0, 1, 1, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 0, 0, 0, 0, 0, 0, 1, 1, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7,
7, 8, 8, 9, 9, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15, 16, 16, 7, 8, 8, 9, 9, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15, 16, 16,
17, 17, 18, 19, 19, 20, 20, 21, 21, 22, 22, 23, 23, 24, 24, 25, 26, 26, 17, 17, 18, 19, 19, 20, 20, 21, 21, 22, 22, 23, 23, 24, 24, 25, 26, 26,
27, 27, 28, 28, 29, 29, 30, 30, 31, 31, 32, 32, 33, 34, 0}; 27, 27, 28, 28, 29, 29, 30, 30, 31, 31, 32, 32, 33, 34, 0};
static const uint64_t POW10_SPLIT_2[3133][3] = { constexpr uint64_t POW10_SPLIT_2[3133][3] = {
{0u, 0u, 3906250u}, {0u, 0u, 3906250u},
{0u, 0u, 202000000000u}, {0u, 0u, 202000000000u},
{0u, 11153727427136454656u, 59u}, {0u, 11153727427136454656u, 59u},
{0u, 7205759403792793600u, 59604644775u}, {0u, 7205759403792793600u, 59604644775u},
{0u, 0u, 167390625000u}, {0u, 0u, 167390625000u},
{0u, 0u, 232000000000u}, {0u, 0u, 232000000000u},
{0u, 16777216000000000u, 0u}, {0u, 16777216000000000u, 0u},
{0u, 12945425605062557696u, 909494u}, {0u, 12945425605062557696u, 909494u},
▲ Show 20 Lines • Show All 3,128 Lines • Show Last 20 Lines

libc/src/__support/ryu_long_double_constants.h

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show All 11 Lines
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
constexpr size_t TABLE_SHIFT_CONST = 120; constexpr size_t TABLE_SHIFT_CONST = 120;
constexpr size_t IDX_SIZE = 128; constexpr size_t IDX_SIZE = 128;
constexpr size_t MID_INT_SIZE = (256 + 64); constexpr size_t MID_INT_SIZE = (256 + 64);
static const uint32_t POW10_OFFSET[] = { constexpr uint32_t POW10_OFFSET[] = {
0, 4, 13, 26, 43, 64, 90, 120, 154, 193, 236, 0, 4, 13, 26, 43, 64, 90, 120, 154, 193, 236,
283, 334, 390, 450, 514, 582, 655, 732, 813, 899, 989, 283, 334, 390, 450, 514, 582, 655, 732, 813, 899, 989,
1083, 1181, 1284, 1391, 1502, 1618, 1738, 1862, 1990, 2123, 2260, 1083, 1181, 1284, 1391, 1502, 1618, 1738, 1862, 1990, 2123, 2260,
2401, 2547, 2697, 2851, 3009, 3172, 3339, 3510, 3686, 3866, 4050, 2401, 2547, 2697, 2851, 3009, 3172, 3339, 3510, 3686, 3866, 4050,
4238, 4431, 4628, 4829, 5034, 5244, 5458, 5676, 5899, 6126, 6357, 4238, 4431, 4628, 4829, 5034, 5244, 5458, 5676, 5899, 6126, 6357,
6592, 6832, 7076, 7324, 7577, 7834, 8095, 8360, 8630, 8904, 9182, 6592, 6832, 7076, 7324, 7577, 7834, 8095, 8360, 8630, 8904, 9182,
9465, 9752, 10043, 10338, 10638, 10942, 11250, 11563, 11880, 12201, 12526, 9465, 9752, 10043, 10338, 10638, 10942, 11250, 11563, 11880, 12201, 12526,
12856, 13190, 13528, 13871, 14218, 14569, 14924, 15284, 15648, 16016, 16388, 12856, 13190, 13528, 13871, 14218, 14569, 14924, 15284, 15648, 16016, 16388,
16765, 17146, 17531, 17921, 18315, 18713, 19115, 19522, 19933, 20348, 20768, 16765, 17146, 17531, 17921, 18315, 18713, 19115, 19522, 19933, 20348, 20768,
21192, 21620, 22052, 22489, 22930, 23375, 23825, 24279, 24737, 25199, 25666, 21192, 21620, 22052, 22489, 22930, 23375, 23825, 24279, 24737, 25199, 25666,
26137, 26612, 27092, 27576, 28064, 28556, 29053, 29554, 30059, 30568, 31082, 26137, 26612, 27092, 27576, 28064, 28556, 29053, 29554, 30059, 30568, 31082,
31600, 32122, 32649, 33180, 33715, 34254, 34798, 35346}; 31600, 32122, 32649, 33180, 33715, 34254, 34798, 35346};
static const uint32_t POW10_OFFSET_2[130] = { constexpr uint32_t POW10_OFFSET_2[130] = {
0, 15, 44, 83, 131, 190, 259, 338, 426, 524, 633, 0, 15, 44, 83, 131, 190, 259, 338, 426, 524, 633,
751, 879, 1017, 1166, 1324, 1492, 1670, 1858, 2056, 2264, 2482, 751, 879, 1017, 1166, 1324, 1492, 1670, 1858, 2056, 2264, 2482,
2709, 2947, 3195, 3453, 3720, 3997, 4285, 4582, 4889, 5206, 5534, 2709, 2947, 3195, 3453, 3720, 3997, 4285, 4582, 4889, 5206, 5534,
5871, 6218, 6575, 6941, 7318, 7705, 8102, 8508, 8925, 9352, 9788, 5871, 6218, 6575, 6941, 7318, 7705, 8102, 8508, 8925, 9352, 9788,
10234, 10690, 11157, 11633, 12119, 12615, 13122, 13638, 14164, 14700, 15245, 10234, 10690, 11157, 11633, 12119, 12615, 13122, 13638, 14164, 14700, 15245,
15801, 16367, 16943, 17528, 18124, 18730, 19345, 19970, 20605, 21251, 21906, 15801, 16367, 16943, 17528, 18124, 18730, 19345, 19970, 20605, 21251, 21906,
22571, 23246, 23931, 24626, 25331, 26046, 26770, 27505, 28250, 29004, 29768, 22571, 23246, 23931, 24626, 25331, 26046, 26770, 27505, 28250, 29004, 29768,
30543, 31328, 32122, 32926, 33740, 34565, 35399, 36243, 37097, 37961, 38835, 30543, 31328, 32122, 32926, 33740, 34565, 35399, 36243, 37097, 37961, 38835,
39719, 40613, 41516, 42430, 43354, 44287, 45230, 46184, 47148, 48121, 49104, 39719, 40613, 41516, 42430, 43354, 44287, 45230, 46184, 47148, 48121, 49104,
50097, 51100, 52113, 53136, 54169, 55212, 56265, 57328, 58400, 59482, 60575, 50097, 51100, 52113, 53136, 54169, 55212, 56265, 57328, 58400, 59482, 60575,
61678, 62790, 63912, 65045, 66188, 67340, 68502, 69674, 70856, 72048, 73250, 61678, 62790, 63912, 65045, 66188, 67340, 68502, 69674, 70856, 72048, 73250,
74462, 75684, 76916, 78158, 79409, 80670, 81942, 83224, 84515}; 74462, 75684, 76916, 78158, 79409, 80670, 81942, 83224, 84515};
static const uint16_t MIN_BLOCK_2[130] = { constexpr uint16_t MIN_BLOCK_2[130] = {
0, 0, 4, 9, 13, 17, 21, 26, 30, 34, 39, 43, 47, 51, 56, 0, 0, 4, 9, 13, 17, 21, 26, 30, 34, 39, 43, 47, 51, 56,
60, 64, 68, 73, 77, 81, 86, 90, 94, 98, 103, 107, 111, 116, 120, 60, 64, 68, 73, 77, 81, 86, 90, 94, 98, 103, 107, 111, 116, 120,
124, 128, 133, 137, 141, 146, 150, 154, 158, 163, 167, 171, 176, 180, 184, 124, 128, 133, 137, 141, 146, 150, 154, 158, 163, 167, 171, 176, 180, 184,
188, 193, 197, 201, 205, 210, 214, 218, 223, 227, 231, 235, 240, 244, 248, 188, 193, 197, 201, 205, 210, 214, 218, 223, 227, 231, 235, 240, 244, 248,
253, 257, 261, 265, 270, 274, 278, 283, 287, 291, 295, 300, 304, 308, 313, 253, 257, 261, 265, 270, 274, 278, 283, 287, 291, 295, 300, 304, 308, 313,
317, 321, 325, 330, 334, 338, 342, 347, 351, 355, 360, 364, 368, 372, 377, 317, 321, 325, 330, 334, 338, 342, 347, 351, 355, 360, 364, 368, 372, 377,
381, 385, 390, 394, 398, 402, 407, 411, 415, 420, 424, 428, 432, 437, 441, 381, 385, 390, 394, 398, 402, 407, 411, 415, 420, 424, 428, 432, 437, 441,
445, 450, 454, 458, 462, 467, 471, 475, 479, 484, 488, 492, 497, 501, 505, 445, 450, 454, 458, 462, 467, 471, 475, 479, 484, 488, 492, 497, 501, 505,
509, 514, 518, 522, 527, 531, 535, 539, 544, 0}; 509, 514, 518, 522, 527, 531, 535, 539, 544, 0};
static const uint64_t POW10_SPLIT[][5] = { constexpr uint64_t POW10_SPLIT[][5] = {
{1u, 72057594037927936u, 0u, 0u, 0u}, {1u, 72057594037927936u, 0u, 0u, 0u},
{699646928636035157u, 72057594u, 0u, 0u, 0u}, {699646928636035157u, 72057594u, 0u, 0u, 0u},
{1329227995784915873u, 0u, 0u, 0u, 0u}, {1329227995784915873u, 0u, 0u, 0u, 0u},
{1329227996u, 0u, 0u, 0u, 0u}, {1329227996u, 0u, 0u, 0u, 0u},
{1u, 0u, 0u, 72057594037927936u, 0u}, {1u, 0u, 0u, 72057594037927936u, 0u},
{17296309485351745867u, 5171444645924616994u, 699646928636035156u, 72057594u, 0u}, {17296309485351745867u, 5171444645924616994u, 699646928636035156u, 72057594u, 0u},
{16598859101615853088u, 16672297533003297785u, 1329227995784915872u, 0u, 0u}, {16598859101615853088u, 16672297533003297785u, 1329227995784915872u, 0u, 0u},
{7469952526870444257u, 14479142226848862514u, 1329227995u, 0u, 0u}, {7469952526870444257u, 14479142226848862514u, 1329227995u, 0u, 0u},
▲ Show 20 Lines • Show All 35,332 Lines • ▼ Show 20 Lines
{6127226634742215672u, 453596799571981527u, 13657447771365u, 0u, 0u}, {6127226634742215672u, 453596799571981527u, 13657447771365u, 0u, 0u},
{3804776868493412674u, 8259923774144183340u, 13657u, 0u, 0u}, {3804776868493412674u, 8259923774144183340u, 13657u, 0u, 0u},
{9050028945829595853u, 251935443738425u, 0u, 0u, 0u}, {9050028945829595853u, 251935443738425u, 0u, 0u, 0u},
{8185529170695989288u, 251935u, 0u, 0u, 0u}, {8185529170695989288u, 251935u, 0u, 0u, 0u},
{4647388653739187u, 0u, 0u, 0u, 0u}, {4647388653739187u, 0u, 0u, 0u, 0u},
{4647389u, 0u, 0u, 0u, 0u}, {4647389u, 0u, 0u, 0u, 0u},
}; };
static const uint64_t POW10_SPLIT_2[][5] = { constexpr uint64_t POW10_SPLIT_2[][5] = {
{0u, 0u, 3906250u, 0u, 0u}, {0u, 0u, 3906250u, 0u, 0u},
{0u, 0u, 3906250000000000u, 0u, 0u}, {0u, 0u, 3906250000000000u, 0u, 0u},
{0u, 0u, 4368439412768899072u, 211758u, 0u}, {0u, 0u, 4368439412768899072u, 211758u, 0u},
{0u, 0u, 1563676642168012800u, 211758236813575u, 0u}, {0u, 0u, 1563676642168012800u, 211758236813575u, 0u},
{0u, 0u, 11532349341402398720u, 8061591463141767016u, 11479u}, {0u, 0u, 11532349341402398720u, 8061591463141767016u, 11479u},
{0u, 0u, 9048364970084925440u, 16628725344207857142u, 3425998u}, {0u, 0u, 9048364970084925440u, 16628725344207857142u, 3425998u},
{0u, 0u, 16609275425742389248u, 3555541870038531535u, 3007507u}, {0u, 0u, 16609275425742389248u, 3555541870038531535u, 3007507u},
{0u, 0u, 0u, 18316647450161853665u, 1340060u}, {0u, 0u, 0u, 18316647450161853665u, 1340060u},
▲ Show 20 Lines • Show All 65,527 Lines • Show Last 20 Lines