Skip to content

Commit 73a4c9b

Browse files
MSVC doesn't have a way to force sse3 / sse3 / sse4.x arch
Update config detection accordingly, and as a side effect make it explicit that we require SSE2 during testing. Fix #878
1 parent 75b043b commit 73a4c9b

2 files changed

Lines changed: 15 additions & 6 deletions

File tree

‎.github/workflows/windows.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- x86
1919
- x64
2020
sys:
21-
- { set: SSE, flags: "" }
21+
- { set: SSE, flags: "/arch:SSE2" }
2222
- { set: AVX, flags: "/arch:AVX" }
2323
- { set: AVX2, flags: "/arch:AVX2" }
2424
- { set: AVX512, flags: "/arch:AVX512" }

‎include/xsimd/config/xsimd_config.hpp‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -289,45 +289,54 @@
289289
#ifdef _MSC_VER
290290

291291
#if XSIMD_WITH_AVX512
292+
292293
#undef XSIMD_WITH_AVX2
293294
#define XSIMD_WITH_AVX2 1
295+
294296
#endif
295297

296298
#if XSIMD_WITH_AVX2
299+
297300
#undef XSIMD_WITH_AVX
298301
#define XSIMD_WITH_AVX 1
302+
299303
#undef XSIMD_WITH_FMA3_AVX
300304
#define XSIMD_WITH_FMA3_AVX 1
305+
301306
#undef XSIMD_WITH_FMA3_AVX2
302307
#define XSIMD_WITH_FMA3_AVX2 1
308+
303309
#endif
304310

305311
#if XSIMD_WITH_AVX
306-
#undef XSIMD_WITH_SSE4_2
307-
#define XSIMD_WITH_SSE4_2 1
308-
#endif
309312

310-
#if !defined(__clang__) && (defined(_M_X64) || (defined(_M_IX86_FP) && _M_IX86_FP >= 2))
311313
#undef XSIMD_WITH_SSE4_2
312314
#define XSIMD_WITH_SSE4_2 1
315+
313316
#endif
314317

315318
#if XSIMD_WITH_SSE4_2
319+
316320
#undef XSIMD_WITH_SSE4_1
317321
#define XSIMD_WITH_SSE4_1 1
322+
318323
#endif
319324

320325
#if XSIMD_WITH_SSE4_1
326+
321327
#undef XSIMD_WITH_SSSE3
322328
#define XSIMD_WITH_SSSE3 1
329+
323330
#endif
324331

325332
#if XSIMD_WITH_SSSE3
333+
326334
#undef XSIMD_WITH_SSE3
327335
#define XSIMD_WITH_SSE3 1
336+
328337
#endif
329338

330-
#if XSIMD_WITH_SSE3 || (defined(_M_IX86_FP) && _M_IX86_FP >= 2)
339+
#if XSIMD_WITH_SSE3 || defined(_M_AMD64) || defined(_M_X64) || (defined(_M_IX86_FP) && _M_IX86_FP >= 2)
331340
#undef XSIMD_WITH_SSE2
332341
#define XSIMD_WITH_SSE2 1
333342
#endif

0 commit comments

Comments
 (0)