From: Hang Li <lihang48@huawei.com>
Date: Tue, 10 Mar 2020 01:40:23 +0000 (+0800)
Subject: compressor/zlib: CMakeLists adaptation with isa-l v2.29.0
X-Git-Tag: v15.2.9~122^2~30^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=02812c97838814a99f85ebab6fcfffe5ad449650;p=ceph.git

compressor/zlib: CMakeLists adaptation with isa-l v2.29.0

Signed-off-by: Hang Li <lihang48@huawei.com>
(cherry picked from commit b51f49bfa5eaf21cf4fd95245649ec854e4a791a)
---

diff --git a/src/compressor/zlib/CMakeLists.txt b/src/compressor/zlib/CMakeLists.txt
index 51aba0834d35..346f37137ce9 100644
--- a/src/compressor/zlib/CMakeLists.txt
+++ b/src/compressor/zlib/CMakeLists.txt
@@ -4,31 +4,42 @@ if(HAVE_INTEL_SSE4_1 AND HAVE_BETTER_YASM_ELF64 AND (NOT APPLE))
 	set(zlib_sources
 	  CompressionPluginZlib.cc
 	  ZlibCompressor.cc
-	  ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/crc32_gzip.asm
-	  ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/crc32_gzip_base.c
-	  ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/detect_repeated_char.asm
-	  ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/encode_df.c
-	  ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/encode_df_04.asm
-	  ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/flatten_ll.c
-	  ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/huff_codes.c
-	  ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/hufftables_c.c
-	  ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/igzip.c
 	  ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/igzip.c
+	  ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/hufftables_c.c
 	  ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/igzip_base.c
-	  ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/igzip_body_01.asm
-	  ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/igzip_body_02.asm
-	  ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/igzip_body_04.asm
-	  ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/igzip_finish.asm
 	  ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/igzip_icf_base.c
-	  ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/igzip_icf_body_01.asm
-	  ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/igzip_icf_body_02.asm
-	  ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/igzip_icf_body_04.asm
+	  ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/adler32_base.c
+	  ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/flatten_ll.c
+	  ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/encode_df.c
+	  ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/igzip_icf_body.c
+	  ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/igzip_inflate.c
+	  ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/huff_codes.c
+	  ${CMAKE_SOURCE_DIR}/src/isa-l/crc/crc_base_aliases.c
+	  ${CMAKE_SOURCE_DIR}/src/isa-l/crc/crc_base.c
+	  ${CMAKE_SOURCE_DIR}/src/isa-l/crc/crc64_base.c
+	)
+	list(APPEND zlib_sources
+	  ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/igzip_body.asm
+	  ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/igzip_finish.asm
+	  ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/igzip_icf_body_h1_gr_bt.asm
 	  ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/igzip_icf_finish.asm
+	  ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/rfc1951_lookup.asm
+	  ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/adler32_sse.asm
+	  ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/adler32_avx2_4.asm
 	  ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/igzip_multibinary.asm
 	  ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/igzip_update_histogram_01.asm
 	  ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/igzip_update_histogram_04.asm
+	  ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/igzip_decode_block_stateless_01.asm
+	  ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/igzip_decode_block_stateless_04.asm
+	  ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/igzip_inflate_multibinary.asm
+	  ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/encode_df_04.asm
+	  ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/encode_df_06.asm
 	  ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/proc_heap.asm
-	  ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/rfc1951_lookup.asm
+	  ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/igzip_deflate_hash.asm
+	  ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/igzip_gen_icf_map_lh1_06.asm
+	  ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/igzip_gen_icf_map_lh1_04.asm
+	  ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/igzip_set_long_icf_fg_04.asm
+	  ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/igzip_set_long_icf_fg_06.asm
 	)
 else(HAVE_INTEL_SSE4_1 AND HAVE_BETTER_YASM_ELF64 AND (NOT APPLE))
 	set(zlib_sources