From b7832a2510455011edcdf0c981a0cd1af82f66b8 Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Tue, 18 May 2021 02:10:30 +0200 Subject: [PATCH] Cherry-pick https://github.com/facebook/zstd/pull/2653 --- zstd/compress/zstd_compress.c | 2 +- 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 typedef __m128i ZSTD_Vec128;