Fixed MSVC build

Author: JohanMabille

.appveyor.yml

@@ -38,7 +38,7 @@ install:
   - conda install cmake xtl -c conda-forge
   - cmake -G "NMake Makefiles" -D DOWNLOAD_GTEST=1 -D ENABLE_XTL_COMPLEX=1 -D CMAKE_INSTALL_PREFIX=%MINICONDA%\\LIBRARY -D CMAKE_BUILD_TYPE=Release .
   - nmake test_xsimd
-  - cd test
+  - cd test-refactoring
 
 build_script:
   - "%RUNTEST%"

include-refactoring/xsimd/arch/xsimd_avx2.hpp

@@ -134,7 +134,7 @@ namespace xsimd {
         case 2: return _mm256_cmpeq_epi16(self, other);
         case 4: return _mm256_cmpeq_epi32(self, other);
         case 8: return _mm256_cmpeq_epi64(self, other);
-        default: eq(self, other, avx{});
+        default: return eq(self, other, avx{});
       }
     }
 

include-refactoring/xsimd/config/xsimd_config.hpp

@@ -211,4 +211,42 @@
     #define XSIMD_WITH_NEON 0
     #define XSIMD_WITH_NEON64 0
 #endif
+
+// Workaround for MSVC compiler
+#ifdef _MSC_VER
+
+#if XSIMD_WITH_AVX512
+#define XSIMD_WITH_AVX2 1
+#endif
+
+#if XSIMD_WITH_AVX2
+#define XSIMD_WITH_AVX 1
+#endif
+
+#if XSIMD_WITH_AVX
+#define XSIMD_WITH_SSE4_2 1
+#endif
+
+#if XSIMD_WITH_SSE4_2
+#define XSIMD_WITH_SSE4_1 1
+#endif
+
+#if XSIMD_WITH_SSE4_1
+#define XSIMD_WITH_SSSE3 1
+#endif
+
+#if XSIMD_WITH_SSSE3
+#define XSIMD_WITH_SSE3 1
+#endif
+
+#if XSIMD_WITH_SSE3
+#define XSIMD_WITH_SSE2 1
+#endif
+
+#if XSIMD_WITH_SSE2
+#define XSIMD_WITH_SSE 1
+#endif
+
+#endif
+
 #endif

include-refactoring/xsimd/config/xsimd_cpuid.hpp

@@ -5,6 +5,11 @@
 #include <algorithm>
 #include <array>
 
+#if defined(_MSC_VER)
+// Contains the definition of __cpuidex
+#include <intrin.h>
+#endif
+
 #include "../types/xsimd_all_registers.hpp"
 
 namespace xsimd

include-refactoring/xsimd/types/xsimd_sse2_register.hpp

@@ -21,6 +21,19 @@ namespace xsimd
     namespace types
     {
         XSIMD_DECLARE_SIMD_REGISTER_ALIAS(sse2, sse);
+        XSIMD_DECLARE_SIMD_REGISTER(bool, sse2, __m128i);
+        XSIMD_DECLARE_SIMD_REGISTER(signed char, sse2, __m128i);
+        XSIMD_DECLARE_SIMD_REGISTER(unsigned char, sse2, __m128i);
+        XSIMD_DECLARE_SIMD_REGISTER(char, sse2, __m128i);
+        XSIMD_DECLARE_SIMD_REGISTER(unsigned short, sse2, __m128i);
+        XSIMD_DECLARE_SIMD_REGISTER(short, sse2, __m128i);
+        XSIMD_DECLARE_SIMD_REGISTER(unsigned int, sse2, __m128i);
+        XSIMD_DECLARE_SIMD_REGISTER(int, sse2, __m128i);
+        XSIMD_DECLARE_SIMD_REGISTER(unsigned long int, sse2, __m128i);
+        XSIMD_DECLARE_SIMD_REGISTER(long int, sse2, __m128i);
+        XSIMD_DECLARE_SIMD_REGISTER(unsigned long long int, sse2, __m128i);
+        XSIMD_DECLARE_SIMD_REGISTER(long long int, sse2, __m128i);
+        XSIMD_DECLARE_SIMD_REGISTER(double, sse2, __m128d);
     }
 #endif
 }

include-refactoring/xsimd/types/xsimd_sse_register.hpp

@@ -22,22 +22,7 @@ namespace xsimd
 #if XSIMD_WITH_SSE
     namespace types
     {
-
-        XSIMD_DECLARE_SIMD_REGISTER(bool, sse, __m128i);
-        XSIMD_DECLARE_SIMD_REGISTER(signed char, sse, __m128i);
-        XSIMD_DECLARE_SIMD_REGISTER(unsigned char, sse, __m128i);
-        XSIMD_DECLARE_SIMD_REGISTER(char, sse, __m128i);
-        XSIMD_DECLARE_SIMD_REGISTER(unsigned short, sse, __m128i);
-        XSIMD_DECLARE_SIMD_REGISTER(short, sse, __m128i);
-        XSIMD_DECLARE_SIMD_REGISTER(unsigned int, sse, __m128i);
-        XSIMD_DECLARE_SIMD_REGISTER(int, sse, __m128i);
-        XSIMD_DECLARE_SIMD_REGISTER(unsigned long int, sse, __m128i);
-        XSIMD_DECLARE_SIMD_REGISTER(long int, sse, __m128i);
-        XSIMD_DECLARE_SIMD_REGISTER(unsigned long long int, sse, __m128i);
-        XSIMD_DECLARE_SIMD_REGISTER(long long int, sse, __m128i);
         XSIMD_DECLARE_SIMD_REGISTER(float, sse, __m128);
-        XSIMD_DECLARE_SIMD_REGISTER(double, sse, __m128d);
-
     }
 #endif
 }

test-refactoring/CMakeLists.txt

@@ -90,7 +90,7 @@ endif()
 if(CMAKE_CXX_COMPILER_ID MATCHES MSVC)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc /MP /bigobj")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:AVX2")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244 /wd4267")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244 /wd4267 /wd4005 /wd4146 /wd4800")
     set(CMAKE_EXE_LINKER_FLAGS /MANIFEST:NO)
 endif()
 

test-refactoring/test_utils.hpp

@@ -628,7 +628,11 @@ class conversion_test_names
     template <class T>
     static std::string GetName(int)
     {
+#ifndef _MSC_VER
         return __PRETTY_FUNCTION__;
+#else
+        return "Unknown name";
+#endif
     }
 };