Port from x86 intrinsics to CPU native ones using SIMDe

Obsoletes: microsoft#136 Fixes: microsoft#134 Fixes: microsoft#316 Blocked-by: simd-everywhere/simde#961
pabs3 · Mar 1, 2023 · f7685f4 · f7685f4
1 parent 3e75b18
commit f7685f4
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/AnnService/CMakeLists.txt b/AnnService/CMakeLists.txt
@@ -34,7 +34,8 @@ add_library (DistanceUtils STATIC
     )
 
 if(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
-    target_compile_options(DistanceUtils PRIVATE -mavx2 -mavx -msse -msse2 -mavx512f -mavx512bw -mavx512dq -fPIC)
+    target_compile_options(DistanceUtils PRIVATE -fPIC -fopenmp-simd -O3)
+    target_compile_definitions(DistanceUtils PRIVATE SIMDE_ENABLE_NATIVE_ALIASES SIMDE_ENABLE_OPENMP)
 endif()
 
 add_library (SPTAGLib SHARED ${SRC_FILES} ${HDR_FILES})

diff --git a/AnnService/inc/Core/Common/InstructionUtils.h b/AnnService/inc/Core/Common/InstructionUtils.h
@@ -8,8 +8,24 @@
 
 #ifndef _MSC_VER
 #include <cpuid.h>
-#include <xmmintrin.h>
-#include <immintrin.h>
+#include <simde/x86/sse.h>
+#include <simde/x86/avx.h>
+#include <simde/x86/avx2.h>
+#include <simde/x86/avx512.h>
+
+// FIXME: remove when SIMDe supports these:
+//        https://github.com/simd-everywhere/simde/issues/961
+#ifndef __mmask32
+#define __mmask32 simde__mmask32
+#endif
+
+#ifndef __mmask64
+#define __mmask64 simde__mmask64
+#endif
+
+#ifndef _mm512_setzero_ps
+#define _mm512_setzero_ps simde_mm512_setzero_ps
+#endif
 
 void cpuid(int info[4], int InfoType);