diff options
| author | Bartosz Taudul <wolf@nereid.pl> | 2021-05-18 03:10:30 +0300 |
|---|---|---|
| committer | Bartosz Taudul <wolf@nereid.pl> | 2021-05-18 03:10:30 +0300 |
| commit | b7832a2510455011edcdf0c981a0cd1af82f66b8 (patch) | |
| tree | 408d814b7a8d36a29d91fd05d0922c0fd786a7e7 /zstd | |
| parent | 2544a91c6bae7103f07fdb2956bdbbd935808236 (diff) | |
Cherry-pick https://github.com/facebook/zstd/pull/2653
Diffstat (limited to 'zstd')
| -rw-r--r-- | zstd/compress/zstd_compress.c | 2 | ||||
| -rw-r--r-- | zstd/compress/zstd_lazy.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/zstd/compress/zstd_compress.c b/zstd/compress/zstd_compress.c index b7ee2980..584678f7 100644 --- a/zstd/compress/zstd_compress.c +++ b/zstd/compress/zstd_compress.c @@ -222,7 +222,7 @@ static int ZSTD_rowMatchFinderUsed(const ZSTD_strategy strategy, const ZSTD_useR /* Returns row matchfinder usage enum given an initial mode and cParams */ static ZSTD_useRowMatchFinderMode_e ZSTD_resolveRowMatchFinderMode(ZSTD_useRowMatchFinderMode_e mode, const ZSTD_compressionParameters* const cParams) { -#if !defined(ZSTD_NO_INTRINSICS) && (defined(__SSE2__) || defined(__ARM_NEON)) +#if !defined(ZSTD_NO_INTRINSICS) && (defined(__SSE2__) || defined(_M_AMD64) || defined(__ARM_NEON)) int const kHasSIMD128 = 1; #else int const kHasSIMD128 = 0; diff --git a/zstd/compress/zstd_lazy.c b/zstd/compress/zstd_lazy.c index 0769fe82..417910a0 100644 --- a/zstd/compress/zstd_lazy.c +++ b/zstd/compress/zstd_lazy.c @@ -873,7 +873,7 @@ FORCE_INLINE_TEMPLATE size_t ZSTD_HcFindBestMatch_extDict_selectMLS ( typedef U32 ZSTD_VecMask; /* Clarifies when we are interacting with a U32 representing a mask of matches */ -#if !defined(ZSTD_NO_INTRINSICS) && defined(__SSE2__) /* SIMD SSE version */ +#if !defined(ZSTD_NO_INTRINSICS) && (defined(__SSE2__) || defined(_M_AMD64)) /* SIMD SSE version */ #include <emmintrin.h> typedef __m128i ZSTD_Vec128; |