erasure-code: Remove duplicate of isa-l files

There are two copies of isa-l. While one is a git submodule the other was a static copy from an older version. This change helps with removing the duplicate and maintain a single copy. This is also upgrading isa-l used by (src/erasure-code/isa/isa-l) from v2.14 to v2.16.0 Signed-off-by: Ganesh Mahalingam <[email protected]>
zmc · May 31, 2017 · 371d45d · 371d45d
1 parent 3d7a3d7
commit 371d45d
Show file tree

Hide file tree

Showing 49 changed files with 46 additions and 21,131 deletions.
diff --git a/src/.gitignore b/src/.gitignore
@@ -1,3 +1,4 @@
 # local directory specific entries
 /.git_version
 /ceph_ver.h
+/gf_vect_dot_prod_avx2.o
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -115,8 +115,8 @@ else(no_yasm)
       message(STATUS " we are not x32")
       set(HAVE_GOOD_YASM_ELF64 1)
       execute_process(COMMAND yasm -f elf64 -i
-        ${CMAKE_SOURCE_DIR}/src/erasure-code/isa/isa-l/include/
-        ${CMAKE_SOURCE_DIR}/src/erasure-code/isa/isa-l/erasure_code/gf_vect_dot_prod_avx2.asm.s
+        ${CMAKE_SOURCE_DIR}/src/isa-l/include/
+        ${CMAKE_SOURCE_DIR}/src/isa-l/erasure_code/gf_vect_dot_prod_avx2.asm
         -o /dev/null
         RESULT_VARIABLE rc
         OUTPUT_QUIET)

diff --git a/src/erasure-code/isa/CMakeLists.txt b/src/erasure-code/isa/CMakeLists.txt
@@ -1,49 +1,49 @@
 # ISA
-
-include_directories(isa-l/include)
+set(isal_src_dir ${CMAKE_SOURCE_DIR}/src/isa-l)
+include_directories(${isal_src_dir}/include)
 
 set(isa_srcs
-  isa-l/erasure_code/ec_base.c
-  isa-l/erasure_code/gf_2vect_dot_prod_sse.asm.s
-  isa-l/erasure_code/gf_3vect_dot_prod_sse.asm.s
-  isa-l/erasure_code/gf_4vect_dot_prod_sse.asm.s
-  isa-l/erasure_code/gf_5vect_dot_prod_sse.asm.s
-  isa-l/erasure_code/gf_6vect_dot_prod_sse.asm.s
-  isa-l/erasure_code/gf_vect_dot_prod_sse.asm.s
-  isa-l/erasure_code/gf_2vect_mad_avx2.asm.s
-  isa-l/erasure_code/gf_3vect_mad_avx2.asm.s
-  isa-l/erasure_code/gf_4vect_mad_avx2.asm.s
-  isa-l/erasure_code/gf_5vect_mad_avx2.asm.s
-  isa-l/erasure_code/gf_6vect_mad_avx2.asm.s
-  isa-l/erasure_code/gf_vect_mad_avx2.asm.s
-  isa-l/erasure_code/ec_highlevel_func.c
-  isa-l/erasure_code/gf_2vect_mad_avx.asm.s
-  isa-l/erasure_code/gf_3vect_mad_avx.asm.s
-  isa-l/erasure_code/gf_4vect_mad_avx.asm.s
-  isa-l/erasure_code/gf_5vect_mad_avx.asm.s
-  isa-l/erasure_code/gf_6vect_mad_avx.asm.s
-  isa-l/erasure_code/gf_vect_mad_avx.asm.s
-  isa-l/erasure_code/ec_multibinary.asm.s
-  isa-l/erasure_code/gf_2vect_mad_sse.asm.s
-  isa-l/erasure_code/gf_3vect_mad_sse.asm.s
-  isa-l/erasure_code/gf_4vect_mad_sse.asm.s
-  isa-l/erasure_code/gf_5vect_mad_sse.asm.s
-  isa-l/erasure_code/gf_6vect_mad_sse.asm.s
-  isa-l/erasure_code/gf_vect_mad_sse.asm.s
-  isa-l/erasure_code/gf_2vect_dot_prod_avx2.asm.s
-  isa-l/erasure_code/gf_3vect_dot_prod_avx2.asm.s
-  isa-l/erasure_code/gf_4vect_dot_prod_avx2.asm.s
-  isa-l/erasure_code/gf_5vect_dot_prod_avx2.asm.s
-  isa-l/erasure_code/gf_6vect_dot_prod_avx2.asm.s
-  isa-l/erasure_code/gf_vect_dot_prod_avx2.asm.s
-  isa-l/erasure_code/gf_vect_mul_avx.asm.s
-  isa-l/erasure_code/gf_2vect_dot_prod_avx.asm.s
-  isa-l/erasure_code/gf_3vect_dot_prod_avx.asm.s
-  isa-l/erasure_code/gf_4vect_dot_prod_avx.asm.s
-  isa-l/erasure_code/gf_5vect_dot_prod_avx.asm.s
-  isa-l/erasure_code/gf_6vect_dot_prod_avx.asm.s
-  isa-l/erasure_code/gf_vect_dot_prod_avx.asm.s
-  isa-l/erasure_code/gf_vect_mul_sse.asm.s
+  ${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
   ErasureCodeIsa.cc
   ErasureCodeIsaTableCache.cc
   ErasureCodePluginIsa.cc