X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fcmake%2Fcpu.cmake;h=20dab7bfce1b65591447d9ea7926278274f14d11;hb=2e2372117d35191a0e6c096c5f989930de6e12b1;hp=ef0393684cb75efd6f990174e52b2917bd3463d2;hpb=66bff59f7c8873e7f959e147cb69a731b4914edb;p=vpp.git

diff --git a/src/cmake/cpu.cmake b/src/cmake/cpu.cmake
index ef0393684cb..20dab7bfce1 100644
--- a/src/cmake/cpu.cmake
+++ b/src/cmake/cpu.cmake
@@ -25,17 +25,21 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*)")
     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 0x43 - Cavium
   #  Part 0x0af - ThunderX2 is 64B, rest all are 128B
-  if (${CPU_IMPLEMENTER} STREQUAL "0x43" AND ${CPU_PART} STREQUAL "0x0af")
-    set(VPP_LOG2_CACHE_LINE_SIZE 6)
+  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 7)
+      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}")
@@ -51,7 +55,6 @@ set(VPP_LOG2_CACHE_LINE_SIZE ${VPP_LOG2_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")
@@ -62,9 +65,22 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*")
   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)