Port from x86 intrinsics to CPU native ones using SIMDe

Obsoletes: microsoft#136 Fixes: microsoft#134 Fixes: microsoft#316 Enabled-by: simd-everywhere/simde#961
planetscale · Mar 14, 2024 · 0a94b62 · 0a94b62
1 parent b25ca47
commit 0a94b62
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/AnnService/CMakeLists.txt b/AnnService/CMakeLists.txt
@@ -47,7 +47,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()
 
 find_package(TBB REQUIRED)

diff --git a/AnnService/inc/Core/Common/InstructionUtils.h b/AnnService/inc/Core/Common/InstructionUtils.h
@@ -10,8 +10,11 @@
 
 #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>
+SIMDE_DISABLE_UNWANTED_DIAGNOSTICS
 
 void cpuid(int info[4], int InfoType);