##############################################################################
# Cache line size detection
##############################################################################
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*)")
+if(CMAKE_CROSSCOMPILING)
+ message(STATUS "Cross-compiling - cache line size detection disabled")
+ set(VPP_LOG2_CACHE_LINE_SIZE 6)
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*)")
file(READ "/proc/cpuinfo" cpuinfo)
string(REPLACE "\n" ";" cpuinfo ${cpuinfo})
foreach(l ${cpuinfo})
string(STRIP ${value} value)
if(${name} STREQUAL "CPU implementer")
set(CPU_IMPLEMENTER ${value})
- endif()
+ endif()
if(${name} STREQUAL "CPU part")
set(CPU_PART ${value})
- endif()
+ endif()
endforeach()
- # Implementer 0x0a1 - Cavium
- # Part 0x0a1 - ThunderX
- if (${CPU_IMPLEMENTER} STREQUAL "0x43" AND ${CPU_PART} STREQUAL "0x0a1")
- set(VPP_LOG2_CACHE_LINE_SIZE 7)
+ # Implementer 0x43 - Cavium
+ # Part 0x0af - ThunderX2 is 64B, rest all are 128B
+ if (${CPU_IMPLEMENTER} STREQUAL "0x43")
+ if (${CPU_PART} STREQUAL "0x0af")
+ set(VPP_LOG2_CACHE_LINE_SIZE 6)
+ else()
+ set(VPP_LOG2_CACHE_LINE_SIZE 7)
+ endif()
else()
- set(VPP_LOG2_CACHE_LINE_SIZE 6)
+ set(VPP_LOG2_CACHE_LINE_SIZE 6)
endif()
math(EXPR VPP_CACHE_LINE_SIZE "1 << ${VPP_LOG2_CACHE_LINE_SIZE}")
message(STATUS "ARM AArch64 CPU implementer ${CPU_IMPLEMENTER} part ${CPU_PART} cacheline size ${VPP_CACHE_LINE_SIZE}")
##############################################################################
if(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*")
set(CMAKE_C_FLAGS "-march=corei7 -mtune=corei7-avx ${CMAKE_C_FLAGS}")
- set(VPP_LIB_DIR_NAME lib64)
check_c_compiler_flag("-march=core-avx2" compiler_flag_march_core_avx2)
if(compiler_flag_march_core_avx2)
list(APPEND MARCH_VARIANTS "avx2\;-march=core-avx2 -mtune=core-avx2")
endif()
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*)")
set(CMAKE_C_FLAGS "-march=armv8-a+crc ${CMAKE_C_FLAGS}")
- set(VPP_LIB_DIR_NAME lib64)
-else()
- set(VPP_LIB_DIR_NAME lib)
+ check_c_compiler_flag("-march=armv8-a+crc+crypto -mtune=qdf24xx" compiler_flag_march_core_qdf24xx)
+ if(compiler_flag_march_core_qdf24xx)
+ list(APPEND MARCH_VARIANTS "qdf24xx\;-march=armv8-a+crc+crypto -DCLIB_N_PREFETCHES=8")
+ endif()
+ check_c_compiler_flag("-march=armv8.1-a+crc+crypto -mtune=thunderx2t99" compiler_flag_march_thunderx2t99)
+ if(compiler_flag_march_thunderx2t99)
+ if (CMAKE_C_COMPILER_VERSION VERSION_GREATER 7.3)
+ list(APPEND MARCH_VARIANTS "thunderx2t99\;-march=armv8.1-a+crc+crypto -mtune=thunderx2t99 -DCLIB_N_PREFETCHES=8")
+ else()
+ list(APPEND MARCH_VARIANTS "thunderx2t99\;-march=armv8.1-a+crc+crypto -DCLIB_N_PREFETCHES=8")
+ endif()
+ endif()
+ check_c_compiler_flag("-march=armv8-a+crc+crypto -mtune=cortex-a72" compiler_flag_march_cortexa72)
+ if(compiler_flag_march_cortexa72)
+ list(APPEND MARCH_VARIANTS "cortexa72\;-march=armv8-a+crc+crypto -mtune=cortex-a72 -DCLIB_N_PREFETCHES=6")
+ endif()
endif()
macro(vpp_library_set_multiarch_sources lib)
set(l ${lib}_${VARIANT})
add_library(${l} OBJECT ${ARGN})
set_target_properties(${l} PROPERTIES POSITION_INDEPENDENT_CODE ON)
- target_compile_options(${l} PUBLIC "-DCLIB_MARCH_VARIANT=${VARIANT}")
+ target_compile_options(${l} PUBLIC "-DCLIB_MARCH_VARIANT=${VARIANT}" -Wall -fno-common)
separate_arguments(VARIANT_FLAGS)
target_compile_options(${l} PUBLIC ${VARIANT_FLAGS})
target_sources(${lib} PRIVATE $<TARGET_OBJECTS:${l}>)