fmtlib/fmt
1
0
Fork 1
mirror of https://github.com/fmtlib/fmt.git synced 2025-07-30 02:37:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use correct intrinsics for count_digits

Browse Source
This commit is contained in:
Victor Zverovich
2015-02-20 08:49:06 -08:00
parent 939193be21
commit 27e0bf72c0
1 changed files with 34 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
format.h
View File

@ -43,12 +43,30 @@
#if _SECURE_SCL #if _SECURE_SCL
# include <iterator> # include <iterator>
#endif #endif
#ifdef _MSC_VER #ifdef _MSC_VER
# include <intrin.h> // _BitScanForward, _BitScanForward64 # include <intrin.h> // _BitScanReverse, _BitScanReverse64
# pragma intrinsic(_BitScanForward)
namespace fmt {
namespace internal {
# pragma intrinsic(_BitScanReverse)
# ifdef _WIN64 # ifdef _WIN64
# pragma intrinsic(_BitScanForward64) # pragma intrinsic(_BitScanReverse64)
inline uint32_t builtin_clzll(uint64_t n) {
unsigned long r = 0;
_BitScanReverse64(&r, x);
return 63 - r;
}
# define FMT_BUILTIN_CLZLL(n) fmt::internal::builtin_clzll(n)
# endif # endif
inline uint32_t builtin_clz(uint32_t x) {
unsigned long r = 0;
_BitScanReverse(&r, x);
return 31 - r;
}
# define FMT_BUILTIN_CLZ(n) fmt::internal::builtin_clz(n)
}
}
#endif #endif
#ifdef __GNUC__ #ifdef __GNUC__
@ -546,44 +564,31 @@ struct BasicData {
typedef BasicData<> Data; typedef BasicData<> Data;
#if _MSC_VER #if FMT_GCC_VERSION >= 400 || FMT_HAS_BUILTIN(__builtin_clz)
# ifdef _WIN64 # define FMT_BUILTIN_CLZ(n) __builtin_clzll(n)
# define FMT_EFFICIENT_COUNT_DIGITS #endif
inline unsigned count_digits(uint64_t n) {
uint32_t index; #if FMT_GCC_VERSION >= 400 || FMT_HAS_BUILTIN(__builtin_clzll)
assert(__BitScanForward64(&index, n | 1)); # define FMT_BUILTIN_CLZLL(n) __builtin_clzll(n)
unsigned t = (64 - index) * 1233 >> 12; #endif
return t - (n < Data::POWERS_OF_10_64[t]) + 1;
} #ifdef FMT_BUILTIN_CLZLL
# endif
inline unsigned count_digits(uint32_t n) {
uint32_t index;
assert(__BitScanForward(&index, n | 1));
unsigned t = (32 - index) * 1233 >> 12;
return t - (n < Data::POWERS_OF_10_32[t]) + 1;
}
#elif FMT_GCC_VERSION >= 400 || defined __clang__
# if FMT_HAS_BUILTIN(__builtin_clzll)
# define FMT_EFFICIENT_COUNT_DIGITS
// Returns the number of decimal digits in n. Leading zeros are not counted // Returns the number of decimal digits in n. Leading zeros are not counted
// except for n == 0 in which case count_digits returns 1. // except for n == 0 in which case count_digits returns 1.
inline unsigned count_digits(uint64_t n) { inline unsigned count_digits(uint64_t n) {
// Based on http://graphics.stanford.edu/~seander/bithacks.html#IntegerLog10 // Based on http://graphics.stanford.edu/~seander/bithacks.html#IntegerLog10
// and the benchmark https://github.com/localvoid/cxx-benchmark-count-digits. // and the benchmark https://github.com/localvoid/cxx-benchmark-count-digits.
unsigned t = (64 - __builtin_clzll(n | 1)) * 1233 >> 12; unsigned t = (64 - FMT_BUILTIN_CLZLL(n | 1)) * 1233 >> 12;
return t - (n < Data::POWERS_OF_10_64[t]) + 1; return t - (n < Data::POWERS_OF_10_64[t]) + 1;
} }
# endif # ifdef FMT_BUILTIN_CLZ
# if FMT_HAS_BUILTIN(__builtin_clz)
// Optional version of count_digits for better performance on 32-bit platforms. // Optional version of count_digits for better performance on 32-bit platforms.
inline unsigned count_digits(uint32_t n) { inline unsigned count_digits(uint32_t n) {
uint32_t t = (32 - __builtin_clz(n | 1)) * 1233 >> 12; uint32_t t = (32 - FMT_BUILTIN_CLZ(n | 1)) * 1233 >> 12;
return t - (n < Data::POWERS_OF_10_32[t]) + 1; return t - (n < Data::POWERS_OF_10_32[t]) + 1;
} }
# endif # endif
#endif #else
#ifndef FMT_EFFICIENT_COUNT_DIGITS
// Fallback version of count_digits used when __builtin_clz is not available. // Fallback version of count_digits used when __builtin_clz is not available.
inline unsigned count_digits(uint64_t n) { inline unsigned count_digits(uint64_t n) {
unsigned count = 1; unsigned count = 1;