diff options
| author | Clinton Ingram <clinton.ingram@outlook.com> | 2020-03-19 03:57:56 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-19 11:57:56 +0100 |
| commit | 924b2b2b9dc54005edbcd85a1b872330948cdd9e (patch) | |
| tree | be1ecf9203013101199ed44de74f38ee36f2153a /c/enc | |
| parent | 0503d8b7668cdf38092a249684ba5dc13f02a359 (diff) | |
| download | brotli-924b2b2b9dc54005edbcd85a1b872330948cdd9e.zip brotli-924b2b2b9dc54005edbcd85a1b872330948cdd9e.tar.gz brotli-924b2b2b9dc54005edbcd85a1b872330948cdd9e.tar.bz2 | |
Move TZCNT and BSR intrinsics to platform.h, add MSVC versions (#636)
Diffstat (limited to 'c/enc')
| -rw-r--r-- | c/enc/fast_log.h | 6 | ||||
| -rw-r--r-- | c/enc/find_match_length.h | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/c/enc/fast_log.h b/c/enc/fast_log.h index b1268e0..eca58e8 100644 --- a/c/enc/fast_log.h +++ b/c/enc/fast_log.h @@ -19,10 +19,8 @@ extern "C" { #endif static BROTLI_INLINE uint32_t Log2FloorNonZero(size_t n) { - /* TODO: generalize and move to platform.h */ -#if BROTLI_GNUC_HAS_BUILTIN(__builtin_clz, 3, 4, 0) || \ - BROTLI_INTEL_VERSION_CHECK(16, 0, 0) - return 31u ^ (uint32_t)__builtin_clz((uint32_t)n); +#if defined(BROTLI_BSR32) + return BROTLI_BSR32((uint32_t)n); #else uint32_t result = 0; while (n >>= 1) result++; diff --git a/c/enc/find_match_length.h b/c/enc/find_match_length.h index bc428cf..f8853a7 100644 --- a/c/enc/find_match_length.h +++ b/c/enc/find_match_length.h @@ -17,8 +17,7 @@ extern "C" { #endif /* Separate implementation for little-endian 64-bit targets, for speed. */ -#if defined(__GNUC__) && defined(_LP64) && defined(BROTLI_LITTLE_ENDIAN) - +#if defined(BROTLI_TZCNT64) && BROTLI_64_BITS && BROTLI_LITTLE_ENDIAN static BROTLI_INLINE size_t FindMatchLengthWithLimit(const uint8_t* s1, const uint8_t* s2, size_t limit) { @@ -32,7 +31,7 @@ static BROTLI_INLINE size_t FindMatchLengthWithLimit(const uint8_t* s1, } else { uint64_t x = BROTLI_UNALIGNED_LOAD64LE(s2) ^ BROTLI_UNALIGNED_LOAD64LE(s1 + matched); - size_t matching_bits = (size_t)__builtin_ctzll(x); + size_t matching_bits = (size_t)BROTLI_TZCNT64(x); matched += matching_bits >> 3; return matched; } |