Import ceph 15.2.8

[ceph.git] / ceph / src / isa-l / Makefile.nmake

diff --git a/ceph/src/isa-l/Makefile.nmake b/ceph/src/isa-l/Makefile.nmake
index e3f604e620b54a6af667a25e891c38bafb496aac..ac3fcbf4e64a4846c9022fcb9cba1741f0f5953b 100644 (file)
--- a/ceph/src/isa-l/Makefile.nmake
+++ b/ceph/src/isa-l/Makefile.nmake
@@ -2,7 +2,7 @@
 #  Copyright(c) 2011-2016 Intel Corporation All rights reserved.
 #
 #  Redistribution and use in source and binary forms, with or without
-#  modification, are permitted provided that the following conditions 
+#  modification, are permitted provided that the following conditions
 #  are met:
 #    * Redistributions of source code must retain the above copyright
 #      notice, this list of conditions and the following disclaimer.
@@ -90,8 +90,11 @@ objs =  \
        bin\xor_gen_sse.obj \
        bin\crc16_t10dif_01.obj \
        bin\crc16_t10dif_by4.obj \
-       bin\crc32_gzip.obj \
+       bin\crc16_t10dif_02.obj \
+       bin\crc16_t10dif_copy_by4.obj \
+       bin\crc16_t10dif_copy_by4_02.obj \
        bin\crc32_ieee_01.obj \
+       bin\crc32_ieee_02.obj \
        bin\crc32_ieee_by4.obj \
        bin\crc32_iscsi_00.obj \
        bin\crc32_iscsi_01.obj \
@@ -104,15 +107,13 @@ objs =  \
        bin\crc64_jones_refl_by8.obj \
        bin\crc64_multibinary.obj \
        bin\crc_base.obj \
-       bin\crc32_gzip_base.obj \
+       bin\adler32_base.obj \
        bin\crc_multibinary.obj \
        bin\huff_codes.obj \
        bin\hufftables_c.obj \
        bin\igzip.obj \
        bin\igzip_base.obj \
-       bin\igzip_body_01.obj \
-       bin\igzip_body_02.obj \
-       bin\igzip_body_04.obj \
+       bin\igzip_body.obj \
        bin\igzip_decode_block_stateless_01.obj \
        bin\igzip_decode_block_stateless_04.obj \
        bin\igzip_finish.obj \
@@ -120,9 +121,7 @@ objs =  \
        bin\encode_df.obj \
        bin\encode_df_04.obj \
        bin\proc_heap.obj \
-       bin\igzip_icf_body_01.obj \
-       bin\igzip_icf_body_02.obj \
-       bin\igzip_icf_body_04.obj \
+       bin\igzip_icf_body_h1_gr_bt.obj \
        bin\igzip_icf_finish.obj \
        bin\igzip_icf_base.obj \
        bin\igzip_inflate.obj \
@@ -131,9 +130,23 @@ objs =  \
        bin\igzip_update_histogram_01.obj \
        bin\igzip_update_histogram_04.obj \
        bin\rfc1951_lookup.obj \
-       bin\detect_repeated_char.obj
+       bin\crc32_gzip_refl_by8.obj \
+       bin\crc32_gzip_refl_by8_02.obj \
+       bin\crc32_gzip_refl_by16_10.obj \
+       bin\adler32_sse.obj \
+       bin\adler32_avx2_4.obj \
+       bin\igzip_deflate_hash.obj \
+       bin\igzip_gen_icf_map_lh1_04.obj \
+       bin\igzip_gen_icf_map_lh1_06.obj \
+       bin\igzip_set_long_icf_fg_04.obj \
+       bin\igzip_set_long_icf_fg_06.obj \
+       bin\igzip_icf_body.obj \
+       bin\mem_zero_detect_avx.obj \
+       bin\mem_zero_detect_base.obj \
+       bin\mem_multibinary.obj \
+       bin\mem_zero_detect_sse.obj
 
-INCLUDES  = -I./ -Ierasure_code/ -Iraid/ -Icrc/ -Iigzip/ -Iinclude/
+INCLUDES  = -I./ -Ierasure_code/ -Iraid/ -Icrc/ -Iigzip/ -Iinclude/ -Imem/
 LINKFLAGS = /nologo
 CFLAGS   = -O2 -D NDEBUG /nologo -D_USE_MATH_DEFINES -Qstd=c99 $(INCLUDES) $(D)
 AFLAGS   = -f win64 $(INCLUDES) $(D)
@@ -147,10 +160,14 @@ dll: bin isa-l.dll
 bin: ; -mkdir $@
 
 isa-l_static.lib: $(objs)
-       lib -out:$@ $?
+       lib -out:$@ @<<
+$?
+<<
 
 isa-l.dll: $(objs)
-       link -out:$@ -dll -def:isa-l.def $?
+       link -out:$@ -dll -def:isa-l.def @<<
+$?
+<<
 
 {erasure_code}.c.obj:
        $(CC) $(CFLAGS) /c -Fo$@ $?
@@ -172,9 +189,13 @@ isa-l.dll: $(objs)
 {igzip}.asm.obj:
        $(AS) $(AFLAGS) -o $@ $?
 
+{mem}.c.obj:
+       $(CC) $(CFLAGS) /c -Fo$@ $?
+{mem}.asm.obj:
+       $(AS) $(AFLAGS) -o $@ $?
 
 # Examples
-ex = xor_example.exe crc_simple_test.exe igzip_example.exe igzip_sync_flush_example.exe
+ex = xor_example.exe crc_simple_test.exe crc64_example.exe igzip_example.exe igzip_sync_flush_example.exe
 ex: lib $(ex)
 
 $(ex): $(@B).obj
@@ -193,10 +214,12 @@ checks = \
        xor_check_test.exe \
        pq_check_test.exe \
        crc16_t10dif_test.exe \
-       crc32_ieee_test.exe \
-       crc32_iscsi_test.exe \
+       crc16_t10dif_copy_test.exe \
+       crc32_funcs_test.exe \
        crc64_funcs_test.exe \
-       igzip_rand_test.exe
+       igzip_wrapper_hdr_test.exe \
+       igzip_rand_test.exe \
+       mem_zero_detect_test.exe
 
 checks: lib $(checks)
 $(checks): $(@B).obj
@@ -217,18 +240,8 @@ $(tests): $(@B).obj
 # Performance tests
 perfs = \
        gf_vect_mul_perf.exe \
-       gf_vect_mul_sse_perf.exe \
-       gf_vect_mul_avx_perf.exe \
-       gf_vect_dot_prod_sse_perf.exe \
-       gf_vect_dot_prod_avx_perf.exe \
-       gf_2vect_dot_prod_sse_perf.exe \
-       gf_3vect_dot_prod_sse_perf.exe \
-       gf_4vect_dot_prod_sse_perf.exe \
-       gf_5vect_dot_prod_sse_perf.exe \
-       gf_6vect_dot_prod_sse_perf.exe \
        gf_vect_dot_prod_perf.exe \
        gf_vect_dot_prod_1tbl.exe \
-       gf_vect_mad_perf.exe \
        erasure_code_perf.exe \
        erasure_code_base_perf.exe \
        erasure_code_sse_perf.exe \
@@ -239,7 +252,9 @@ perfs = \
        crc32_ieee_perf.exe \
        crc32_iscsi_perf.exe \
        igzip_perf.exe \
-       igzip_sync_flush_perf.exe
+       igzip_sync_flush_perf.exe \
+       crc32_gzip_refl_perf.exe \
+       mem_zero_detect_perf.exe
 
 perfs: lib $(perfs)
 $(perfs): $(@B).obj
@@ -253,5 +268,4 @@ clean:
        -if exist isa-l.dll del isa-l.dll
 
 zlib.lib:
-igzip_inflate_perf.exe:  zlib.lib
 igzip_inflate_test.exe:  zlib.lib