Added 8-digit optimizations to big endian.

This commit is contained in:
Alex Huszagh 2021-05-23 21:47:40 -05:00
parent 3fb44a80c7
commit 49ca5d855e

View File

@ -14,6 +14,34 @@ namespace fast_float {
// able to optimize it well. // able to optimize it well.
fastfloat_really_inline bool is_integer(char c) noexcept { return c >= '0' && c <= '9'; } fastfloat_really_inline bool is_integer(char c) noexcept { return c >= '0' && c <= '9'; }
fastfloat_really_inline uint64_t byteswap(uint64_t val) {
return (val & 0xFF00000000000000) >> 56
| (val & 0x00FF000000000000) >> 40
| (val & 0x0000FF0000000000) >> 24
| (val & 0x000000FF00000000) >> 8
| (val & 0x00000000FF000000) << 8
| (val & 0x0000000000FF0000) << 24
| (val & 0x000000000000FF00) << 40
| (val & 0x00000000000000FF) << 56;
}
fastfloat_really_inline uint64_t read_u64(const char *chars) {
uint64_t val;
::memcpy(&val, chars, sizeof(uint64_t));
#if FASTFLOAT_IS_BIG_ENDIAN == 1
// Need to read as-if the number was in little-endian order.
val = byteswap(val);
#endif
return val;
}
fastfloat_really_inline void write_u64(uint8_t *chars, uint64_t val) {
#if FASTFLOAT_IS_BIG_ENDIAN == 1
// Need to read as-if the number was in little-endian order.
val = byteswap(val);
#endif
::memcpy(chars, &val, sizeof(uint64_t));
}
// credit @aqrit // credit @aqrit
fastfloat_really_inline uint32_t parse_eight_digits_unrolled(uint64_t val) { fastfloat_really_inline uint32_t parse_eight_digits_unrolled(uint64_t val) {
@ -27,21 +55,17 @@ fastfloat_really_inline uint32_t parse_eight_digits_unrolled(uint64_t val) {
} }
fastfloat_really_inline uint32_t parse_eight_digits_unrolled(const char *chars) noexcept { fastfloat_really_inline uint32_t parse_eight_digits_unrolled(const char *chars) noexcept {
uint64_t val; return parse_eight_digits_unrolled(read_u64(chars));
::memcpy(&val, chars, sizeof(uint64_t));
return parse_eight_digits_unrolled(val);
} }
// credit @aqrit // credit @aqrit
fastfloat_really_inline bool is_made_of_eight_digits_fast(uint64_t val) noexcept { fastfloat_really_inline bool is_made_of_eight_digits_fast(uint64_t val) noexcept {
return !((((val + 0x4646464646464646) | (val - 0x3030303030303030)) & return !((((val + 0x4646464646464646) | (val - 0x3030303030303030)) &
0x8080808080808080)); 0x8080808080808080));
} }
fastfloat_really_inline bool is_made_of_eight_digits_fast(const char *chars) noexcept { fastfloat_really_inline bool is_made_of_eight_digits_fast(const char *chars) noexcept {
uint64_t val; return is_made_of_eight_digits_fast(read_u64(chars));
::memcpy(&val, chars, 8);
return is_made_of_eight_digits_fast(val);
} }
struct parsed_number_string { struct parsed_number_string {
@ -87,17 +111,15 @@ parsed_number_string parse_number_string(const char *p, const char *pend, chars_
int64_t exponent = 0; int64_t exponent = 0;
if ((p != pend) && (*p == '.')) { if ((p != pend) && (*p == '.')) {
++p; ++p;
#if FASTFLOAT_IS_BIG_ENDIAN == 0 // Fast approach only tested under little endian systems
// Fast approach only tested under little endian systems if ((p + 8 <= pend) && is_made_of_eight_digits_fast(p)) {
i = i * 100000000 + parse_eight_digits_unrolled(p); // in rare cases, this will overflow, but that's ok
p += 8;
if ((p + 8 <= pend) && is_made_of_eight_digits_fast(p)) { if ((p + 8 <= pend) && is_made_of_eight_digits_fast(p)) {
i = i * 100000000 + parse_eight_digits_unrolled(p); // in rare cases, this will overflow, but that's ok i = i * 100000000 + parse_eight_digits_unrolled(p); // in rare cases, this will overflow, but that's ok
p += 8; p += 8;
if ((p + 8 <= pend) && is_made_of_eight_digits_fast(p)) {
i = i * 100000000 + parse_eight_digits_unrolled(p); // in rare cases, this will overflow, but that's ok
p += 8;
}
} }
#endif }
while ((p != pend) && is_integer(*p)) { while ((p != pend) && is_integer(*p)) {
uint8_t digit = uint8_t(*p - '0'); uint8_t digit = uint8_t(*p - '0');
++p; ++p;
@ -225,20 +247,17 @@ fastfloat_really_inline decimal parse_decimal(const char *p, const char *pend) n
++p; ++p;
} }
} }
#if FASTFLOAT_IS_BIG_ENDIAN == 0
// We expect that this loop will often take the bulk of the running time // We expect that this loop will often take the bulk of the running time
// because when a value has lots of digits, these digits often // because when a value has lots of digits, these digits often
while ((p + 8 <= pend) && (answer.num_digits + 8 < max_digits)) { while ((p + 8 <= pend) && (answer.num_digits + 8 < max_digits)) {
uint64_t val; uint64_t val = read_u64(p);
::memcpy(&val, p, sizeof(uint64_t));
if(! is_made_of_eight_digits_fast(val)) { break; } if(! is_made_of_eight_digits_fast(val)) { break; }
// We have eight digits, process them in one go! // We have eight digits, process them in one go!
val -= 0x3030303030303030; val -= 0x3030303030303030;
::memcpy(answer.digits + answer.num_digits, &val, sizeof(uint64_t)); write_u64(answer.digits + answer.num_digits, val);
answer.num_digits += 8; answer.num_digits += 8;
p += 8; p += 8;
} }
#endif
while ((p != pend) && is_integer(*p)) { while ((p != pend) && is_integer(*p)) {
if (answer.num_digits < max_digits) { if (answer.num_digits < max_digits) {
answer.digits[answer.num_digits] = uint8_t(*p - '0'); answer.digits[answer.num_digits] = uint8_t(*p - '0');
@ -282,7 +301,7 @@ fastfloat_really_inline decimal parse_decimal(const char *p, const char *pend) n
uint8_t digit = uint8_t(*p - '0'); uint8_t digit = uint8_t(*p - '0');
if (exp_number < 0x10000) { if (exp_number < 0x10000) {
exp_number = 10 * exp_number + digit; exp_number = 10 * exp_number + digit;
} }
++p; ++p;
} }
answer.decimal_point += (neg_exp ? -exp_number : exp_number); answer.decimal_point += (neg_exp ? -exp_number : exp_number);