pr changes

Author: dor-forer

cmake/x86_64InstructionFlags.cmake

@@ -3,73 +3,71 @@
 
 include(CheckCXXCompilerFlag)
 
-if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "(x86_64)|(AMD64|amd64)|(^i.86$)")
-	# build SSE/AVX* code only on x64 processors.
-	# Check that the compiler supports instructions flag.
-	# This will add the relevant flag both the the space selector and the optimization.
-	CHECK_CXX_COMPILER_FLAG(-mavx512vl CXX_AVX512VL)
-	CHECK_CXX_COMPILER_FLAG(-mavx512bf16 CXX_AVX512BF16)
-	CHECK_CXX_COMPILER_FLAG(-mavx512bw CXX_AVX512BW)
-	CHECK_CXX_COMPILER_FLAG(-mavx512vbmi2 CXX_AVX512VBMI2)
-	CHECK_CXX_COMPILER_FLAG(-mavx512fp16 CXX_AVX512FP16)
-	CHECK_CXX_COMPILER_FLAG(-mavx512f CXX_AVX512F)
-	CHECK_CXX_COMPILER_FLAG(-mavx512vnni CXX_AVX512VNNI)
-	CHECK_CXX_COMPILER_FLAG(-mavx2 CXX_AVX2)
-	CHECK_CXX_COMPILER_FLAG(-mavx CXX_AVX)
-	CHECK_CXX_COMPILER_FLAG(-mf16c CXX_F16C)
-	CHECK_CXX_COMPILER_FLAG(-mfma CXX_FMA)
-	CHECK_CXX_COMPILER_FLAG(-msse3 CXX_SSE3)
-	CHECK_CXX_COMPILER_FLAG(-msse CXX_SSE)
+# build SSE/AVX* code only on x64 processors.
+# Check that the compiler supports instructions flag.
+# This will add the relevant flag both the the space selector and the optimization.
+CHECK_CXX_COMPILER_FLAG(-mavx512vl CXX_AVX512VL)
+CHECK_CXX_COMPILER_FLAG(-mavx512bf16 CXX_AVX512BF16)
+CHECK_CXX_COMPILER_FLAG(-mavx512bw CXX_AVX512BW)
+CHECK_CXX_COMPILER_FLAG(-mavx512vbmi2 CXX_AVX512VBMI2)
+CHECK_CXX_COMPILER_FLAG(-mavx512fp16 CXX_AVX512FP16)
+CHECK_CXX_COMPILER_FLAG(-mavx512f CXX_AVX512F)
+CHECK_CXX_COMPILER_FLAG(-mavx512vnni CXX_AVX512VNNI)
+CHECK_CXX_COMPILER_FLAG(-mavx2 CXX_AVX2)
+CHECK_CXX_COMPILER_FLAG(-mavx CXX_AVX)
+CHECK_CXX_COMPILER_FLAG(-mf16c CXX_F16C)
+CHECK_CXX_COMPILER_FLAG(-mfma CXX_FMA)
+CHECK_CXX_COMPILER_FLAG(-msse3 CXX_SSE3)
+CHECK_CXX_COMPILER_FLAG(-msse CXX_SSE)
 
-	# Turn off AVX512BF16 on Ubuntu 18.04 as it is not supported by its binutils assembler version.
-	if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-		execute_process(COMMAND lsb_release -rs
-					OUTPUT_VARIABLE UBUNTU_VERSION
-					OUTPUT_STRIP_TRAILING_WHITESPACE)
+# Turn off AVX512BF16 on Ubuntu 18.04 as it is not supported by its binutils assembler version.
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+	execute_process(COMMAND lsb_release -rs
+				OUTPUT_VARIABLE UBUNTU_VERSION
+				OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-		if("${UBUNTU_VERSION}" STREQUAL "18.04")
-			message(STATUS "Compiling on Ubuntu 18.04, turning off CXX_AVX512BF16 flag.")
-			set(CXX_AVX512BF16 FALSE)
-		endif()
+	if("${UBUNTU_VERSION}" STREQUAL "18.04")
+		message(STATUS "Compiling on Ubuntu 18.04, turning off CXX_AVX512BF16 flag.")
+		set(CXX_AVX512BF16 FALSE)
 	endif()
+endif()
 
-	if(CXX_AVX512VL AND CXX_AVX512BF16)
-		add_compile_definitions(OPT_AVX512_BF16_VL)
-	endif()
+if(CXX_AVX512VL AND CXX_AVX512BF16)
+	add_compile_definitions(OPT_AVX512_BF16_VL)
+endif()
 
-	if(CXX_AVX512VL AND CXX_AVX512FP16)
-		add_compile_definitions(OPT_AVX512_FP16_VL)
-	endif()
+if(CXX_AVX512VL AND CXX_AVX512FP16)
+	add_compile_definitions(OPT_AVX512_FP16_VL)
+endif()
 
-	if(CXX_AVX512F)
-		add_compile_definitions(OPT_AVX512F)
-	endif()
+if(CXX_AVX512F)
+	add_compile_definitions(OPT_AVX512F)
+endif()
 
-	if(CXX_AVX512BW AND CXX_AVX512VBMI2)
-		add_compile_definitions(OPT_AVX512_BW_VBMI2)
-	endif()
+if(CXX_AVX512BW AND CXX_AVX512VBMI2)
+	add_compile_definitions(OPT_AVX512_BW_VBMI2)
+endif()
 
-	if(CXX_AVX512F AND CXX_AVX512BW AND CXX_AVX512VL AND CXX_AVX512VNNI)
-		add_compile_definitions(OPT_AVX512_F_BW_VL_VNNI)
-	endif()
+if(CXX_AVX512F AND CXX_AVX512BW AND CXX_AVX512VL AND CXX_AVX512VNNI)
+	add_compile_definitions(OPT_AVX512_F_BW_VL_VNNI)
+endif()
 
-	if(CXX_F16C AND CXX_FMA AND CXX_AVX)
-		add_compile_definitions(OPT_F16C)
-	endif()
+if(CXX_F16C AND CXX_FMA AND CXX_AVX)
+	add_compile_definitions(OPT_F16C)
+endif()
 
-	if(CXX_AVX2)
-		add_compile_definitions(OPT_AVX2)
-	endif()
+if(CXX_AVX2)
+	add_compile_definitions(OPT_AVX2)
+endif()
 
-	if(CXX_AVX)
-		add_compile_definitions(OPT_AVX)
-	endif()
+if(CXX_AVX)
+	add_compile_definitions(OPT_AVX)
+endif()
 
-	if(CXX_SSE3)
-		add_compile_definitions(OPT_SSE3)
-	endif()
+if(CXX_SSE3)
+	add_compile_definitions(OPT_SSE3)
+endif()
 
-	if(CXX_SSE)
-		add_compile_definitions(OPT_SSE)
-	endif()
+if(CXX_SSE)
+	add_compile_definitions(OPT_SSE)
 endif()

tests/benchmark/CMakeLists.txt

@@ -25,7 +25,7 @@ foreach(benchmark IN ITEMS ${BENCHMARKS})
 	target_link_libraries(bm_${benchmark} VectorSimilarity benchmark::benchmark)
 endforeach()
 
-if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "aarch64")
+if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "(aarch64)|(arm64)|(ARM64)|(armv8)|(armv9)")
 	message(STATUS "Enabling Arm Performance Libraries integration")
 	include(${root}/cmake/aarch64InstructionFlags.cmake)
 	add_compile_definitions(BENCHMARK_ARCH=arm64)