Port from x86 intrinsics to CPU native ones using SIMDe

pabs3 · dbussink · commit f6de68f5cf8e · 2024-03-13T13:27:29.000+01:00
Obsoletes: microsoft#136 Fixes: microsoft#134 Fixes: microsoft#316 Enabled-by: simd-everywhere/simde#961
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);
 

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,8 @@ add_library (DistanceUtils STATIC`
`47`	`47`	`)`
`48`	`48`
`49`	`49`	`if(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")`
`50`		`- target_compile_options(DistanceUtils PRIVATE -mavx2 -mavx -msse -msse2 -mavx512f -mavx512bw -mavx512dq -fPIC)`
	`50`	`+ target_compile_options(DistanceUtils PRIVATE -fPIC -fopenmp-simd -O3)`
	`51`	`+ target_compile_definitions(DistanceUtils PRIVATE SIMDE_ENABLE_NATIVE_ALIASES SIMDE_ENABLE_OPENMP)`
`51`	`52`	`endif()`
`52`	`53`
`53`	`54`	`find_package(TBB REQUIRED)`