External/fmt
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor proposed intel fix.

Browse Source 
Moved variable out of function to avoid specialization on Float.  Made it a separate function that is called from format_float.
This commit is contained in:
Greg Sjaardema 2023-09-20 12:27:08 -06:00 committed by GitHub
parent 1de436ed57
commit 4c346e97e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/fmt/format.h
View File

@ -3258,14 +3258,11 @@ FMT_CONSTEXPR20 void format_hexfloat(Float value, int precision,
format_hexfloat(static_cast<double>(value), precision, specs, buf); format_hexfloat(static_cast<double>(value), precision, specs, buf);
} }
template <typename Float> FMT_CONSTEXPR uint32_t fractional_part_rounding_threshold(int index) {
FMT_CONSTEXPR20 auto format_float(Float value, int precision, float_specs specs,
buffer<char>& buf) -> int {
// For checking rounding thresholds. // For checking rounding thresholds.
// The kth entry is chosen to be the smallest integer such that the // The kth entry is chosen to be the smallest integer such that the
// upper 32-bits of 10^(k+1) times it is strictly bigger than 5 * 10^k. // upper 32-bits of 10^(k+1) times it is strictly bigger than 5 * 10^k.
static constexpr uint32_t fractional_part_rounding_thresholds[8] = { constexpr uint32_t thresholds[8] = {
2576980378U, // ceil(2^31 + 2^32/10^1) 2576980378U, // ceil(2^31 + 2^32/10^1)
2190433321U, // ceil(2^31 + 2^32/10^2) 2190433321U, // ceil(2^31 + 2^32/10^2)
2151778616U, // ceil(2^31 + 2^32/10^3) 2151778616U, // ceil(2^31 + 2^32/10^3)
@ -3275,6 +3272,12 @@ FMT_CONSTEXPR20 auto format_float(Float value, int precision, float_specs specs,
2147484078U, // ceil(2^31 + 2^32/10^7) 2147484078U, // ceil(2^31 + 2^32/10^7)
2147483691U // ceil(2^31 + 2^32/10^8) 2147483691U // ceil(2^31 + 2^32/10^8)
}; };
return thresholds[index];
}
template <typename Float>
FMT_CONSTEXPR20 auto format_float(Float value, int precision, float_specs specs,
buffer<char>& buf) -> int {
// float is passed as double to reduce the number of instantiations. // float is passed as double to reduce the number of instantiations.
static_assert(!std::is_same<Float, float>::value, ""); static_assert(!std::is_same<Float, float>::value, "");
@ -3479,7 +3482,7 @@ FMT_CONSTEXPR20 auto format_float(Float value, int precision, float_specs specs,
uint32_t fractional_part = static_cast<uint32_t>(prod); uint32_t fractional_part = static_cast<uint32_t>(prod);
should_round_up = fractional_part >= should_round_up = fractional_part >=
fractional_part_rounding_thresholds fractional_part_rounding_thresholds
[8 - number_of_digits_to_print] || (8 - number_of_digits_to_print) ||
((fractional_part >> 31) & ((fractional_part >> 31) &
((digits & 1) | (second_third_subsegments != 0) | ((digits & 1) | (second_third_subsegments != 0) |
has_more_segments)) != 0; has_more_segments)) != 0;
@ -3519,7 +3522,7 @@ FMT_CONSTEXPR20 auto format_float(Float value, int precision, float_specs specs,
uint32_t fractional_part = static_cast<uint32_t>(prod); uint32_t fractional_part = static_cast<uint32_t>(prod);
should_round_up = fractional_part >= should_round_up = fractional_part >=
fractional_part_rounding_thresholds fractional_part_rounding_thresholds
[8 - number_of_digits_to_print] || (8 - number_of_digits_to_print) ||
((fractional_part >> 31) & ((fractional_part >> 31) &
((digits & 1) | (third_subsegment != 0) | ((digits & 1) | (third_subsegment != 0) |
has_more_segments)) != 0; has_more_segments)) != 0;