From: Hang Li <lihang48@hisilicon.com>
Date: Thu, 28 Nov 2019 11:03:21 +0000 (+0800)
Subject: erasure-code: enable isa-l EC for aarch64 platform
X-Git-Tag: v15.2.9~122^2~30^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9091b7cc32fc0d031ab44dd2640bc2dc7ec82f61;p=ceph.git

erasure-code: enable isa-l EC for aarch64 platform

add compile options to support erasure-code on aarch64
platform.

Signed-off-by: Hang Li <lihang48@hisilicon.com>
Signed-off-by: luo rixin <luorixin@huawei.com>
(cherry picked from commit 241bb59a55fa079b966d9c5c5b16eb4699b12ea0)
---

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bb4a7812d1b..2190a9b60a1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -144,7 +144,6 @@ if(HAVE_INTEL)
   endif()
 endif()
 
-
 # require c++17
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_EXTENSIONS OFF)
diff --git a/src/common/options.cc b/src/common/options.cc
index 49853ac2ac0..5918dc96a06 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -2612,7 +2612,7 @@ std::vector<Option> get_global_options() {
 
     Option("osd_erasure_code_plugins", Option::TYPE_STR, Option::LEVEL_ADVANCED)
     .set_default("jerasure lrc"
-  #ifdef HAVE_BETTER_YASM_ELF64
+  #if defined(HAVE_BETTER_YASM_ELF64) || defined(HAVE_ARMV8_SIMD)
          " isa"
   #endif
         )
diff --git a/src/erasure-code/CMakeLists.txt b/src/erasure-code/CMakeLists.txt
index bd9b00460b4..9cdc62e7dcb 100644
--- a/src/erasure-code/CMakeLists.txt
+++ b/src/erasure-code/CMakeLists.txt
@@ -22,10 +22,10 @@ add_subdirectory(lrc)
 add_subdirectory(shec)
 add_subdirectory(clay)
 
-if (HAVE_BETTER_YASM_ELF64)
+if(HAVE_BETTER_YASM_ELF64 OR HAVE_ARMV8_SIMD)
   add_subdirectory(isa)
   set(EC_ISA_LIB ec_isa)
-endif (HAVE_BETTER_YASM_ELF64)
+endif()
 
 add_library(erasure_code STATIC ErasureCodePlugin.cc)
 target_link_libraries(erasure_code ${CMAKE_DL_LIBS})
diff --git a/src/erasure-code/isa/CMakeLists.txt b/src/erasure-code/isa/CMakeLists.txt
index cc489211253..5043ac225dc 100644
--- a/src/erasure-code/isa/CMakeLists.txt
+++ b/src/erasure-code/isa/CMakeLists.txt
@@ -2,61 +2,90 @@
 set(isal_src_dir ${CMAKE_SOURCE_DIR}/src/isa-l)
 include_directories(${isal_src_dir}/include)
 
-set(isa_srcs
-  ${isal_src_dir}/erasure_code/ec_base.c
-  ${isal_src_dir}/erasure_code/gf_2vect_dot_prod_sse.asm
-  ${isal_src_dir}/erasure_code/gf_3vect_dot_prod_sse.asm
-  ${isal_src_dir}/erasure_code/gf_4vect_dot_prod_sse.asm
-  ${isal_src_dir}/erasure_code/gf_5vect_dot_prod_sse.asm
-  ${isal_src_dir}/erasure_code/gf_6vect_dot_prod_sse.asm
-  ${isal_src_dir}/erasure_code/gf_vect_dot_prod_sse.asm
-  ${isal_src_dir}/erasure_code/gf_2vect_mad_avx2.asm
-  ${isal_src_dir}/erasure_code/gf_3vect_mad_avx2.asm
-  ${isal_src_dir}/erasure_code/gf_4vect_mad_avx2.asm
-  ${isal_src_dir}/erasure_code/gf_5vect_mad_avx2.asm
-  ${isal_src_dir}/erasure_code/gf_6vect_mad_avx2.asm
-  ${isal_src_dir}/erasure_code/gf_vect_mad_avx2.asm
-  ${isal_src_dir}/erasure_code/ec_highlevel_func.c
-  ${isal_src_dir}/erasure_code/gf_2vect_mad_avx.asm
-  ${isal_src_dir}/erasure_code/gf_3vect_mad_avx.asm
-  ${isal_src_dir}/erasure_code/gf_4vect_mad_avx.asm
-  ${isal_src_dir}/erasure_code/gf_5vect_mad_avx.asm
-  ${isal_src_dir}/erasure_code/gf_6vect_mad_avx.asm
-  ${isal_src_dir}/erasure_code/gf_vect_mad_avx.asm
-  ${isal_src_dir}/erasure_code/ec_multibinary.asm
-  ${isal_src_dir}/erasure_code/gf_2vect_mad_sse.asm
-  ${isal_src_dir}/erasure_code/gf_3vect_mad_sse.asm
-  ${isal_src_dir}/erasure_code/gf_4vect_mad_sse.asm
-  ${isal_src_dir}/erasure_code/gf_5vect_mad_sse.asm
-  ${isal_src_dir}/erasure_code/gf_6vect_mad_sse.asm
-  ${isal_src_dir}/erasure_code/gf_vect_mad_sse.asm
-  ${isal_src_dir}/erasure_code/gf_2vect_dot_prod_avx2.asm
-  ${isal_src_dir}/erasure_code/gf_3vect_dot_prod_avx2.asm
-  ${isal_src_dir}/erasure_code/gf_4vect_dot_prod_avx2.asm
-  ${isal_src_dir}/erasure_code/gf_5vect_dot_prod_avx2.asm
-  ${isal_src_dir}/erasure_code/gf_6vect_dot_prod_avx2.asm
-  ${isal_src_dir}/erasure_code/gf_vect_dot_prod_avx2.asm
-  ${isal_src_dir}/erasure_code/gf_vect_mul_avx.asm
-  ${isal_src_dir}/erasure_code/gf_2vect_dot_prod_avx.asm
-  ${isal_src_dir}/erasure_code/gf_3vect_dot_prod_avx.asm
-  ${isal_src_dir}/erasure_code/gf_4vect_dot_prod_avx.asm
-  ${isal_src_dir}/erasure_code/gf_5vect_dot_prod_avx.asm
-  ${isal_src_dir}/erasure_code/gf_6vect_dot_prod_avx.asm
-  ${isal_src_dir}/erasure_code/gf_vect_dot_prod_avx.asm
-  ${isal_src_dir}/erasure_code/gf_vect_mul_sse.asm
-  ${isal_src_dir}/erasure_code/gf_2vect_dot_prod_avx512.asm
-  ${isal_src_dir}/erasure_code/gf_2vect_mad_avx512.asm
-  ${isal_src_dir}/erasure_code/gf_3vect_dot_prod_avx512.asm
-  ${isal_src_dir}/erasure_code/gf_3vect_mad_avx512.asm
-  ${isal_src_dir}/erasure_code/gf_4vect_dot_prod_avx512.asm
-  ${isal_src_dir}/erasure_code/gf_4vect_mad_avx512.asm
-  ${isal_src_dir}/erasure_code/gf_vect_dot_prod_avx512.asm
-  ${isal_src_dir}/erasure_code/gf_vect_mad_avx512.asm
-  ErasureCodeIsa.cc
-  ErasureCodeIsaTableCache.cc
-  ErasureCodePluginIsa.cc
-  xor_op.cc
-)
+if(HAVE_BETTER_YASM_ELF64)
+  set(isa_srcs
+    ${isal_src_dir}/erasure_code/ec_base.c
+    ${isal_src_dir}/erasure_code/gf_2vect_dot_prod_sse.asm
+    ${isal_src_dir}/erasure_code/gf_3vect_dot_prod_sse.asm
+    ${isal_src_dir}/erasure_code/gf_4vect_dot_prod_sse.asm
+    ${isal_src_dir}/erasure_code/gf_5vect_dot_prod_sse.asm
+    ${isal_src_dir}/erasure_code/gf_6vect_dot_prod_sse.asm
+    ${isal_src_dir}/erasure_code/gf_vect_dot_prod_sse.asm
+    ${isal_src_dir}/erasure_code/gf_2vect_mad_avx2.asm
+    ${isal_src_dir}/erasure_code/gf_3vect_mad_avx2.asm
+    ${isal_src_dir}/erasure_code/gf_4vect_mad_avx2.asm
+    ${isal_src_dir}/erasure_code/gf_5vect_mad_avx2.asm
+    ${isal_src_dir}/erasure_code/gf_6vect_mad_avx2.asm
+    ${isal_src_dir}/erasure_code/gf_vect_mad_avx2.asm
+    ${isal_src_dir}/erasure_code/ec_highlevel_func.c
+    ${isal_src_dir}/erasure_code/gf_2vect_mad_avx.asm
+    ${isal_src_dir}/erasure_code/gf_3vect_mad_avx.asm
+    ${isal_src_dir}/erasure_code/gf_4vect_mad_avx.asm
+    ${isal_src_dir}/erasure_code/gf_5vect_mad_avx.asm
+    ${isal_src_dir}/erasure_code/gf_6vect_mad_avx.asm
+    ${isal_src_dir}/erasure_code/gf_vect_mad_avx.asm
+    ${isal_src_dir}/erasure_code/ec_multibinary.asm
+    ${isal_src_dir}/erasure_code/gf_2vect_mad_sse.asm
+    ${isal_src_dir}/erasure_code/gf_3vect_mad_sse.asm
+    ${isal_src_dir}/erasure_code/gf_4vect_mad_sse.asm
+    ${isal_src_dir}/erasure_code/gf_5vect_mad_sse.asm
+    ${isal_src_dir}/erasure_code/gf_6vect_mad_sse.asm
+    ${isal_src_dir}/erasure_code/gf_vect_mad_sse.asm
+    ${isal_src_dir}/erasure_code/gf_2vect_dot_prod_avx2.asm
+    ${isal_src_dir}/erasure_code/gf_3vect_dot_prod_avx2.asm
+    ${isal_src_dir}/erasure_code/gf_4vect_dot_prod_avx2.asm
+    ${isal_src_dir}/erasure_code/gf_5vect_dot_prod_avx2.asm
+    ${isal_src_dir}/erasure_code/gf_6vect_dot_prod_avx2.asm
+    ${isal_src_dir}/erasure_code/gf_vect_dot_prod_avx2.asm
+    ${isal_src_dir}/erasure_code/gf_vect_mul_avx.asm
+    ${isal_src_dir}/erasure_code/gf_2vect_dot_prod_avx.asm
+    ${isal_src_dir}/erasure_code/gf_3vect_dot_prod_avx.asm
+    ${isal_src_dir}/erasure_code/gf_4vect_dot_prod_avx.asm
+    ${isal_src_dir}/erasure_code/gf_5vect_dot_prod_avx.asm
+    ${isal_src_dir}/erasure_code/gf_6vect_dot_prod_avx.asm
+    ${isal_src_dir}/erasure_code/gf_vect_dot_prod_avx.asm
+    ${isal_src_dir}/erasure_code/gf_vect_mul_sse.asm
+    ${isal_src_dir}/erasure_code/gf_2vect_dot_prod_avx512.asm
+    ${isal_src_dir}/erasure_code/gf_2vect_mad_avx512.asm
+    ${isal_src_dir}/erasure_code/gf_3vect_dot_prod_avx512.asm
+    ${isal_src_dir}/erasure_code/gf_3vect_mad_avx512.asm
+    ${isal_src_dir}/erasure_code/gf_4vect_dot_prod_avx512.asm
+    ${isal_src_dir}/erasure_code/gf_4vect_mad_avx512.asm
+    ${isal_src_dir}/erasure_code/gf_vect_dot_prod_avx512.asm
+    ${isal_src_dir}/erasure_code/gf_vect_mad_avx512.asm
+    ErasureCodeIsa.cc
+    ErasureCodeIsaTableCache.cc
+    ErasureCodePluginIsa.cc
+    xor_op.cc
+  )
+elseif(HAVE_ARMV8_SIMD)
+  set(isa_srcs
+    ${isal_src_dir}/erasure_code/ec_base.c
+    ${isal_src_dir}/erasure_code/aarch64/ec_aarch64_highlevel_func.c
+    ${isal_src_dir}/erasure_code/aarch64/ec_aarch64_dispatcher.c
+    ${isal_src_dir}/erasure_code/aarch64/gf_2vect_dot_prod_neon.S
+    ${isal_src_dir}/erasure_code/aarch64/gf_2vect_mad_neon.S
+    ${isal_src_dir}/erasure_code/aarch64/gf_3vect_dot_prod_neon.S
+    ${isal_src_dir}/erasure_code/aarch64/gf_3vect_mad_neon.S
+    ${isal_src_dir}/erasure_code/aarch64/gf_4vect_dot_prod_neon.S
+    ${isal_src_dir}/erasure_code/aarch64/gf_4vect_mad_neon.S
+    ${isal_src_dir}/erasure_code/aarch64/gf_5vect_dot_prod_neon.S
+    ${isal_src_dir}/erasure_code/aarch64/gf_5vect_mad_neon.S
+    ${isal_src_dir}/erasure_code/aarch64/gf_6vect_mad_neon.S
+    ${isal_src_dir}/erasure_code/aarch64/gf_vect_dot_prod_neon.S
+    ${isal_src_dir}/erasure_code/aarch64/gf_vect_mad_neon.S
+    ${isal_src_dir}/erasure_code/aarch64/gf_vect_mul_neon.S
+    ${isal_src_dir}/erasure_code/aarch64/ec_multibinary_arm.S
+    ErasureCodeIsa.cc
+    ErasureCodeIsaTableCache.cc
+    ErasureCodePluginIsa.cc
+    xor_op.cc
+  )
+  set_source_files_properties(
+    ${isal_src_dir}/erasure_code/aarch64/ec_multibinary_arm.S
+    PROPERTIES COMPILE_FLAGS "-D__ASSEMBLY__"
+  )
+endif()
 
 add_library(ec_isa SHARED
   ${isa_srcs}
diff --git a/src/include/config-h.in.cmake b/src/include/config-h.in.cmake
index 6778155640f..722c1364911 100644
--- a/src/include/config-h.in.cmake
+++ b/src/include/config-h.in.cmake
@@ -244,6 +244,9 @@
 /* yasm can also build the isa-l */
 #cmakedefine HAVE_BETTER_YASM_ELF64
 
+/* Define if isa-l is compiled for arm64 */
+#cmakedefine HAVE_ARMV8_SIMD
+
 /* Define to 1 if strerror_r returns char *. */
 #cmakedefine STRERROR_R_CHAR_P 1
 
diff --git a/src/test/erasure-code/CMakeLists.txt b/src/test/erasure-code/CMakeLists.txt
index 721f6c36750..49f12adc918 100644
--- a/src/test/erasure-code/CMakeLists.txt
+++ b/src/test/erasure-code/CMakeLists.txt
@@ -79,7 +79,7 @@ target_link_libraries(unittest_erasure_code_plugin_jerasure
 add_dependencies(unittest_erasure_code_plugin_jerasure
   ec_jerasure)
 
-if(HAVE_BETTER_YASM_ELF64)
+if(HAVE_BETTER_YASM_ELF64 OR HAVE_ARMV8_SIMD)
 
 #unittest_erasure_code_isa
 add_executable(unittest_erasure_code_isa
@@ -110,7 +110,7 @@ target_link_libraries(unittest_erasure_code_plugin_isa
   )
 add_dependencies(unittest_erasure_code_plugin_isa
   ec_isa)
-endif(HAVE_BETTER_YASM_ELF64)
+endif(HAVE_BETTER_YASM_ELF64 OR HAVE_ARMV8_SIMD)
 
 # unittest_erasure_code_lrc
 add_executable(unittest_erasure_code_lrc