Skip to content

Commit 154b2a8

Browse files
committed
Merge branch 'dorer-add-arm-support' of https://github.com/RedisAI/VectorSimilarity into dorer-add-arm-opt
2 parents f31c2a3 + fd6291e commit 154b2a8

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

cmake/aarch64InstructionFlags.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ include(CheckCXXCompilerFlag)
44
message(STATUS "Building for ARM aarch64")
55

66
# Check what compiler flags are supported
7+
CHECK_CXX_COMPILER_FLAG("-march=armv7-a+neon" CXX_ARMV7_NEON)
78
CHECK_CXX_COMPILER_FLAG("-march=armv8-a" CXX_ARMV8A)
89
CHECK_CXX_COMPILER_FLAG("-march=armv8-a+sve" CXX_SVE)
910
CHECK_CXX_COMPILER_FLAG("-march=armv9-a+sve2" CXX_SVE2)
@@ -14,7 +15,7 @@ if(CXX_SVE2)
1415
message(STATUS "Using ARMv9.0-a with SVE2 (supported by CPU)")
1516
add_compile_definitions(OPT_SVE2)
1617
endif()
17-
if (CXX_ARMV8A)
18+
if (CXX_ARMV8A OR CXX_ARMV7_NEON)
1819
add_compile_definitions(OPT_NEON)
1920
endif()
2021
if (CXX_SVE)

tests/benchmark/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ foreach(benchmark IN ITEMS ${BENCHMARKS})
2525
target_link_libraries(bm_${benchmark} VectorSimilarity benchmark::benchmark)
2626
endforeach()
2727

28-
if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "(aarch64)|(arm64)|(ARM64)|(armv8)|(armv9)")
28+
if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "(aarch64)|(arm64)|(ARM64)|(armv.*)")
2929
message(STATUS "Enabling Arm Performance Libraries integration")
3030
include(${root}/cmake/aarch64InstructionFlags.cmake)
3131
add_compile_definitions(BENCHMARK_ARCH=arm64)

0 commit comments

Comments
 (0)