[0.8] Enable cpu_features for Apple silicon (#448)

* enable cpu_features code for M1

(cherry picked from commit 3a73990)

* cpu feature tag update

(cherry picked from commit 3533000)

* fix include

(cherry picked from commit 39e7a36)

* whitespace alignment

(cherry picked from commit 65eff3b)

* includes cleanup

(cherry picked from commit 8d87b46)

---------

Co-authored-by: GuyAv46 <guy.avimor@gmail.com>

Author: github-actions[bot]

cmake/cpu_features.cmake

@@ -4,6 +4,6 @@ option(CMAKE_POSITION_INDEPENDENT_CODE "" ON)
 FetchContent_Declare(
 	cpu_features
 	GIT_REPOSITORY  https://github.com/google/cpu_features.git
-	GIT_TAG  438a66e41807cd73e0c403966041b358f5eafc68
+	GIT_TAG         v0.9.0
 )
 FetchContent_MakeAvailable(cpu_features)

src/VecSim/spaces/CMakeLists.txt

@@ -6,16 +6,10 @@ add_library(VectorSimilaritySpaces_no_optimization
 )
 
 include(CheckCXXCompilerFlag)
+include(${root}/cmake/cpu_features.cmake)
 
 project(VectorSimilarity_Spaces)
 
-# TODO: Remove this once cpu_features get support for M1
-if((NOT APPLE) OR (CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64"))
-	include(${root}/cmake/cpu_features.cmake)
-else()
-	add_definitions(-DM1)
-endif()
-
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall")
 
 set(OPTIMIZATIONS "")
@@ -59,8 +53,4 @@ add_library(VectorSimilaritySpaces
 	${OPTIMIZATIONS}
 )
 
-target_link_libraries(VectorSimilaritySpaces VectorSimilaritySpaces_no_optimization)
-
-if((NOT APPLE) OR (CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64"))
-	target_link_libraries(VectorSimilaritySpaces cpu_features)
-endif()
+target_link_libraries(VectorSimilaritySpaces VectorSimilaritySpaces_no_optimization cpu_features)

src/VecSim/spaces/IP_space.cpp

@@ -6,11 +6,9 @@
 
 #include "VecSim/spaces/IP_space.h"
 #include "VecSim/spaces/IP/IP.h"
-#if defined(__x86_64__)
 #include "VecSim/spaces/functions/AVX512.h"
 #include "VecSim/spaces/functions/AVX.h"
 #include "VecSim/spaces/functions/SSE.h"
-#endif
 
 namespace spaces {
 dist_func_t<float> IP_FP32_GetDistFunc(size_t dim, const Arch_Optimization arch_opt,
@@ -25,8 +23,7 @@ dist_func_t<float> IP_FP32_GetDistFunc(size_t dim, const Arch_Optimization arch_
     if (dim < 16) {
         return ret_dist_func;
     }
-#if defined(M1)
-#elif defined(__x86_64__)
+#ifdef CPU_FEATURES_ARCH_X86_64
 
     switch (arch_opt) {
     case ARCH_OPT_AVX512_F:
@@ -70,8 +67,7 @@ dist_func_t<double> IP_FP64_GetDistFunc(size_t dim, const Arch_Optimization arch
     if (dim < 8) {
         return ret_dist_func;
     }
-#if defined(M1)
-#elif defined(__x86_64__)
+#ifdef CPU_FEATURES_ARCH_X86_64
 
     switch (arch_opt) {
     case ARCH_OPT_AVX512_F:

src/VecSim/spaces/L2_space.cpp

@@ -6,11 +6,9 @@
 
 #include "VecSim/spaces/L2_space.h"
 #include "VecSim/spaces/L2/L2.h"
-#if defined(__x86_64__)
 #include "VecSim/spaces/functions/AVX512.h"
 #include "VecSim/spaces/functions/AVX.h"
 #include "VecSim/spaces/functions/SSE.h"
-#endif
 
 namespace spaces {
 
@@ -26,8 +24,7 @@ dist_func_t<float> L2_FP32_GetDistFunc(size_t dim, const Arch_Optimization arch_
     if (dim < 16) {
         return ret_dist_func;
     }
-#if defined(M1)
-#elif defined(__x86_64__)
+#ifdef CPU_FEATURES_ARCH_X86_64
 
     switch (arch_opt) {
     case ARCH_OPT_AVX512_F:
@@ -71,8 +68,7 @@ dist_func_t<double> L2_FP64_GetDistFunc(size_t dim, const Arch_Optimization arch
     if (dim < 8) {
         return ret_dist_func;
     }
-#if defined(M1)
-#elif defined(__x86_64__)
+#ifdef CPU_FEATURES_ARCH_X86_64
 
     switch (arch_opt) {
     case ARCH_OPT_AVX512_F:

src/VecSim/spaces/space_aux.cpp

@@ -5,11 +5,6 @@
  */
 
 #include "space_aux.h"
-#if defined(M1)
-
-#elif defined(__x86_64__)
-#include "cpu_features_macros.h"
-#endif
 
 #ifdef CPU_FEATURES_ARCH_X86_64
 #include "cpuinfo_x86.h"
@@ -18,7 +13,6 @@
 Arch_Optimization getArchitectureOptimization() {
 
 #ifdef CPU_FEATURES_ARCH_X86_64
-#include "cpuinfo_x86.h"
     cpu_features::X86Features features = cpu_features::GetX86Info().features;
     if (features.avx512f) {
         return ARCH_OPT_AVX512_F;

src/VecSim/spaces/space_aux.h

@@ -5,6 +5,7 @@
  */
 
 #pragma once
+#include "cpu_features_macros.h"
 
 enum Arch_Optimization {
     ARCH_OPT_NONE,

tests/unit/test_spaces.cpp

@@ -84,10 +84,6 @@ TEST_F(SpacesTest, double_ip_no_optimization_func_test) {
     ASSERT_NEAR(dist, 0.0, 0.00000001);
 }
 
-#if defined(M1)
-
-#elif defined(__x86_64)
-#include "cpu_features_macros.h"
 #ifdef CPU_FEATURES_ARCH_X86_64
 
 using namespace spaces;
@@ -235,5 +231,3 @@ TEST_P(FP64SpacesOptimizationTest, FP64InnerProductTest) {
 INSTANTIATE_TEST_SUITE_P(FP64OptFuncs, FP64SpacesOptimizationTest, testing::Range(1UL, 8 * 2UL));
 
 #endif // CPU_FEATURES_ARCH_X86_64
-
-#endif // M1/X86_64