Rename x86 source files with instruction set version.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ecb9ac6b279f64ccb7762a97644ad9df0bc4f6cc..911bcb3fe2fe096646df1883c1500bd10d71d816 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -715,13 +715,13 @@ if(WITH_OPTIM)
             check_avx2_intrinsics()
             if(HAVE_AVX2_INTRIN)
                 add_definitions(-DX86_AVX2 -DX86_AVX2_ADLER32 -DX86_AVX_CHUNKSET)
-                set(AVX2_SRCS ${ARCHDIR}/slide_hash_avx.c)
+                set(AVX2_SRCS ${ARCHDIR}/slide_hash_avx2.c)
                 add_feature_info(AVX2_SLIDEHASH 1 "Support AVX2 optimized slide_hash, using \"${AVX2FLAG}\"")
                 list(APPEND AVX2_SRCS ${ARCHDIR}/chunkset_avx.c)
                 add_feature_info(AVX_CHUNKSET 1 "Support AVX optimized chunkset, using \"${AVX2FLAG}\"")
-                list(APPEND AVX2_SRCS ${ARCHDIR}/compare258_avx.c)
+                list(APPEND AVX2_SRCS ${ARCHDIR}/compare258_avx2.c)
                 add_feature_info(AVX2_COMPARE258 1 "Support AVX2 optimized compare258, using \"${AVX2FLAG}\"")
-                list(APPEND AVX2_SRCS ${ARCHDIR}/adler32_avx.c)
+                list(APPEND AVX2_SRCS ${ARCHDIR}/adler32_avx2.c)
                 add_feature_info(AVX2_ADLER32 1 "Support AVX2-accelerated adler32, using \"${AVX2FLAG}\"")
                 list(APPEND ZLIB_ARCH_SRCS ${AVX2_SRCS})
                 set_property(SOURCE ${AVX2_SRCS} PROPERTY COMPILE_FLAGS "${AVX2FLAG} ${NOLTOFLAG}")
@@ -772,7 +772,7 @@ if(WITH_OPTIM)
             check_sse42_intrinsics()
             if(HAVE_SSE42CRC_INLINE_ASM OR HAVE_SSE42CRC_INTRIN)
                 add_definitions(-DX86_SSE42_CRC_HASH)
-                set(SSE42_SRCS ${ARCHDIR}/insert_string_sse.c)
+                set(SSE42_SRCS ${ARCHDIR}/insert_string_sse42.c)
                 add_feature_info(SSE42_CRC 1 "Support SSE4.2 optimized CRC hash generation, using \"${SSE42FLAG}\"")
                 list(APPEND ZLIB_ARCH_SRCS ${SSE42_SRCS})
                 set_property(SOURCE ${SSE42_SRCS} PROPERTY COMPILE_FLAGS "${SSE42FLAG} ${NOLTOFLAG}")
@@ -782,7 +782,7 @@ if(WITH_OPTIM)
             endif()
             if(HAVE_SSE42CMPSTR_INTRIN)
                 add_definitions(-DX86_SSE42_CMP_STR)
-                set(SSE42_SRCS ${ARCHDIR}/compare258_sse.c)
+                set(SSE42_SRCS ${ARCHDIR}/compare258_sse42.c)
                 add_feature_info(SSE42_COMPARE258 1 "Support SSE4.2 optimized compare258, using \"${SSE42FLAG}\"")
                 list(APPEND ZLIB_ARCH_SRCS ${SSE42_SRCS})
                 set_property(SOURCE ${SSE42_SRCS} PROPERTY COMPILE_FLAGS "${SSE42FLAG} ${NOLTOFLAG}")
@@ -795,7 +795,7 @@ if(WITH_OPTIM)
             check_sse2_intrinsics()
             if(HAVE_SSE2_INTRIN)
                 add_definitions(-DX86_SSE2 -DX86_SSE2_CHUNKSET -DX86_SSE2_SLIDEHASH)
-                set(SSE2_SRCS ${ARCHDIR}/chunkset_sse.c ${ARCHDIR}/slide_hash_sse.c)
+                set(SSE2_SRCS ${ARCHDIR}/chunkset_sse2.c ${ARCHDIR}/slide_hash_sse2.c)
                 list(APPEND ZLIB_ARCH_SRCS ${SSE2_SRCS})
                 if(NOT ${ARCH} MATCHES "x86_64")
                     set_property(SOURCE ${SSE2_SRCS} PROPERTY COMPILE_FLAGS "${SSE2FLAG} ${NOLTOFLAG}")

diff --git a/arch/x86/Makefile.in b/arch/x86/Makefile.in
index 0a1dc07662c71390257ce110d9402be0124d274e..d481c0ee7d29371733f1b4675a560c3eec95e6a1 100644 (file)
--- a/arch/x86/Makefile.in
+++ b/arch/x86/Makefile.in
@@ -25,20 +25,20 @@ TOPDIR=$(SRCTOP)
 
 all: \
        x86.o x86.lo \
-       adler32_avx.o adler32_avx.lo \
+       adler32_avx2.o adler32_avx2.lo \
        adler32_avx512.o adler32_avx512.lo \
        adler32_avx512_vnni.o adler32_avx512_vnni.lo \
        adler32_sse41.o adler32_sse41.lo \
        adler32_ssse3.o adler32_ssse3.lo \
        chunkset_avx.o chunkset_avx.lo \
-       chunkset_sse.o chunkset_sse.lo \
-       compare258_avx.o compare258_avx.lo \
-       compare258_sse.o compare258_sse.lo \
-       insert_string_sse.o insert_string_sse.lo \
+       chunkset_sse2.o chunkset_sse2.lo \
+       compare258_avx2.o compare258_avx2.lo \
+       compare258_sse42.o compare258_sse42.lo \
+       insert_string_sse42.o insert_string_sse42.lo \
        crc32_fold_pclmulqdq.o crc32_fold_pclmulqdq.lo \
        crc32_fold_vpclmulqdq.o crc32_fold_vpclmulqdq.lo \
-       slide_hash_avx.o slide_hash_avx.lo \
-       slide_hash_sse.o slide_hash_sse.lo
+       slide_hash_avx2.o slide_hash_avx2.lo \
+       slide_hash_sse2.o slide_hash_sse2.lo
 
 x86.o:
        $(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/x86.c
@@ -52,29 +52,29 @@ chunkset_avx.o:
 chunkset_avx.lo:
        $(CC) $(SFLAGS) $(AVX2FLAG) $(NOLTOFLAG) -DPIC $(INCLUDES) -c -o $@ $(SRCDIR)/chunkset_avx.c
 
-chunkset_sse.o:
-       $(CC) $(CFLAGS) $(SSE2FLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/chunkset_sse.c
+chunkset_sse2.o:
+       $(CC) $(CFLAGS) $(SSE2FLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/chunkset_sse2.c
 
-chunkset_sse.lo:
-       $(CC) $(SFLAGS) $(SSE2FLAG) $(NOLTOFLAG) -DPIC $(INCLUDES) -c -o $@ $(SRCDIR)/chunkset_sse.c
+chunkset_sse2.lo:
+       $(CC) $(SFLAGS) $(SSE2FLAG) $(NOLTOFLAG) -DPIC $(INCLUDES) -c -o $@ $(SRCDIR)/chunkset_sse2.c
 
-compare258_avx.o:
-       $(CC) $(CFLAGS) $(AVX2FLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/compare258_avx.c
+compare258_avx2.o:
+       $(CC) $(CFLAGS) $(AVX2FLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/compare258_avx2.c
 
-compare258_avx.lo:
-       $(CC) $(SFLAGS) $(AVX2FLAG) $(NOLTOFLAG) -DPIC $(INCLUDES) -c -o $@ $(SRCDIR)/compare258_avx.c
+compare258_avx2.lo:
+       $(CC) $(SFLAGS) $(AVX2FLAG) $(NOLTOFLAG) -DPIC $(INCLUDES) -c -o $@ $(SRCDIR)/compare258_avx2.c
 
-compare258_sse.o:
-       $(CC) $(CFLAGS) $(SSE42FLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/compare258_sse.c
+compare258_sse42.o:
+       $(CC) $(CFLAGS) $(SSE42FLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/compare258_sse42.c
 
-compare258_sse.lo:
-       $(CC) $(SFLAGS) $(SSE42FLAG) $(NOLTOFLAG) -DPIC $(INCLUDES) -c -o $@ $(SRCDIR)/compare258_sse.c
+compare258_sse42.lo:
+       $(CC) $(SFLAGS) $(SSE42FLAG) $(NOLTOFLAG) -DPIC $(INCLUDES) -c -o $@ $(SRCDIR)/compare258_sse42.c
 
-insert_string_sse.o:
-       $(CC) $(CFLAGS) $(SSE42FLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/insert_string_sse.c
+insert_string_sse42.o:
+       $(CC) $(CFLAGS) $(SSE42FLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/insert_string_sse42.c
 
-insert_string_sse.lo:
-       $(CC) $(SFLAGS) $(SSE42FLAG) $(NOLTOFLAG) -DPIC $(INCLUDES) -c -o $@ $(SRCDIR)/insert_string_sse.c
+insert_string_sse42.lo:
+       $(CC) $(SFLAGS) $(SSE42FLAG) $(NOLTOFLAG) -DPIC $(INCLUDES) -c -o $@ $(SRCDIR)/insert_string_sse42.c
 
 crc32_fold_pclmulqdq.o:
        $(CC) $(CFLAGS) $(PCLMULFLAG) $(SSE42FLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/crc32_fold_pclmulqdq.c
@@ -88,23 +88,23 @@ crc32_fold_vpclmulqdq.o:
 crc32_fold_vpclmulqdq.lo:
        $(CC) $(SFLAGS) $(VPCLMULFLAG) $(AVX512FLAG) $(NOLTOFLAG) -DPIC $(INCLUDES) -c -o $@ $(SRCDIR)/crc32_fold_vpclmulqdq.c
 
-slide_hash_avx.o:
-       $(CC) $(CFLAGS) $(AVX2FLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/slide_hash_avx.c
+slide_hash_avx2.o:
+       $(CC) $(CFLAGS) $(AVX2FLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/slide_hash_avx2.c
 
-slide_hash_avx.lo:
-       $(CC) $(SFLAGS) $(AVX2FLAG) $(NOLTOFLAG) -DPIC $(INCLUDES) -c -o $@ $(SRCDIR)/slide_hash_avx.c
+slide_hash_avx2.lo:
+       $(CC) $(SFLAGS) $(AVX2FLAG) $(NOLTOFLAG) -DPIC $(INCLUDES) -c -o $@ $(SRCDIR)/slide_hash_avx2.c
 
-slide_hash_sse.o:
-       $(CC) $(CFLAGS) $(SSE2FLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/slide_hash_sse.c
+slide_hash_sse2.o:
+       $(CC) $(CFLAGS) $(SSE2FLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/slide_hash_sse2.c
 
-slide_hash_sse.lo:
-       $(CC) $(SFLAGS) $(SSE2FLAG) $(NOLTOFLAG) -DPIC $(INCLUDES) -c -o $@ $(SRCDIR)/slide_hash_sse.c
+slide_hash_sse2.lo:
+       $(CC) $(SFLAGS) $(SSE2FLAG) $(NOLTOFLAG) -DPIC $(INCLUDES) -c -o $@ $(SRCDIR)/slide_hash_sse2.c
 
-adler32_avx.o: $(SRCDIR)/adler32_avx.c
-       $(CC) $(CFLAGS) $(AVX2FLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/adler32_avx.c
+adler32_avx2.o: $(SRCDIR)/adler32_avx2.c
+       $(CC) $(CFLAGS) $(AVX2FLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/adler32_avx2.c
 
-adler32_avx.lo: $(SRCDIR)/adler32_avx.c
-       $(CC) $(SFLAGS) $(AVX2FLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/adler32_avx.c
+adler32_avx2.lo: $(SRCDIR)/adler32_avx2.c
+       $(CC) $(SFLAGS) $(AVX2FLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/adler32_avx2.c
 
 adler32_avx512.o: $(SRCDIR)/adler32_avx512.c
        $(CC) $(CFLAGS) $(AVX512FLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/adler32_avx512.c

diff --git a/arch/x86/adler32_avx.c b/arch/x86/adler32_avx2.c
similarity index 98%
rename from arch/x86/adler32_avx.c
rename to arch/x86/adler32_avx2.c
index f22730bb1b32b55f9e6250ef84e6cfef28a5de03..40685234706ced7cc2bb37051273381b7c70ec5e 100644 (file)
--- a/arch/x86/adler32_avx.c
+++ b/arch/x86/adler32_avx2.c
@@ -1,4 +1,4 @@
-/* adler32.c -- compute the Adler-32 checksum of a data stream
+/* adler32_avx2.c -- compute the Adler-32 checksum of a data stream
  * Copyright (C) 1995-2011 Mark Adler
  * Authors:
  *   Brian Bockelman <bockelman@gmail.com>

diff --git a/arch/x86/chunkset_sse.c b/arch/x86/chunkset_sse2.c
similarity index 94%
rename from arch/x86/chunkset_sse.c
rename to arch/x86/chunkset_sse2.c
index d38e99dad6dcddbca7bef81ff655a59efaf04cdd..577b0e2ef48916a199be0ff9b25cf727353398fb 100644 (file)
--- a/arch/x86/chunkset_sse.c
+++ b/arch/x86/chunkset_sse2.c
@@ -1,4 +1,4 @@
-/* chunkset_sse.c -- SSE inline functions to copy small data chunks.
+/* chunkset_sse2.c -- SSE2 inline functions to copy small data chunks.
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 

diff --git a/arch/x86/compare258_avx.c b/arch/x86/compare258_avx2.c
similarity index 97%
rename from arch/x86/compare258_avx.c
rename to arch/x86/compare258_avx2.c
index 4fafc4c6d66f968d90d3c8971047e1425eddb253..9aefde16a32b39cf98d08c03a0751fc0062d61b7 100644 (file)
--- a/arch/x86/compare258_avx.c
+++ b/arch/x86/compare258_avx2.c
@@ -1,4 +1,4 @@
-/* compare258_avx.c -- AVX2 version of compare258
+/* compare258_avx2.c -- AVX2 version of compare258
  * Copyright Mika T. Lindqvist  <postmaster@raasu.org>
  * For conditions of distribution and use, see copyright notice in zlib.h
  */

diff --git a/arch/x86/compare258_sse.c b/arch/x86/compare258_sse42.c
similarity index 97%
rename from arch/x86/compare258_sse.c
rename to arch/x86/compare258_sse42.c
index f0accfd83108ae1c08535ada04e07e814dc8244d..a5d568ff4f0c6cca2a39cbfdc91d02fe2cea0375 100644 (file)
--- a/arch/x86/compare258_sse.c
+++ b/arch/x86/compare258_sse42.c
@@ -1,4 +1,4 @@
-/* compare258_sse.c -- SSE4.2 version of compare258
+/* compare258_sse42.c -- SSE4.2 version of compare258
  *
  * Copyright (C) 2013 Intel Corporation. All rights reserved.
  * Authors:

diff --git a/arch/x86/insert_string_sse.c b/arch/x86/insert_string_sse42.c
similarity index 92%
rename from arch/x86/insert_string_sse.c
rename to arch/x86/insert_string_sse42.c
index b33a2c7ccbb04fa6940e8fb3ed8da4858fe269c4..6fe4c81e08b0c74164a199a453a86692deb66739 100644 (file)
--- a/arch/x86/insert_string_sse.c
+++ b/arch/x86/insert_string_sse42.c
@@ -1,4 +1,4 @@
-/* insert_string_sse.c -- insert_string integer hash variant using SSE4.2's CRC instructions
+/* insert_string_sse42.c -- insert_string integer hash variant using SSE4.2's CRC instructions
  *
  * Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h

diff --git a/arch/x86/slide_hash_avx.c b/arch/x86/slide_hash_avx2.c
similarity index 100%
rename from arch/x86/slide_hash_avx.c
rename to arch/x86/slide_hash_avx2.c

diff --git a/arch/x86/slide_hash_sse.c b/arch/x86/slide_hash_sse2.c
similarity index 100%
rename from arch/x86/slide_hash_sse.c
rename to arch/x86/slide_hash_sse2.c

diff --git a/configure b/configure
index 143bc6bf3fa388a563a2cd22523fe267834b08d1..f5fe81cbc76b0c6dae2b19db289f70dc2c755fb4 100755 (executable)
--- a/configure
+++ b/configure
@@ -1438,8 +1438,8 @@ case "${ARCH}" in
             if test ${HAVE_AVX2_INTRIN} -eq 1; then
                 CFLAGS="${CFLAGS} -DX86_AVX2 -DX86_AVX2_ADLER32 -DX86_AVX_CHUNKSET"
                 SFLAGS="${SFLAGS} -DX86_AVX2 -DX86_AVX2_ADLER32 -DX86_AVX_CHUNKSET"
-                ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} slide_hash_avx.o chunkset_avx.o compare258_avx.o adler32_avx.o"
-                ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} slide_hash_avx.lo chunkset_avx.lo compare258_avx.lo adler32_avx.lo"
+                ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} slide_hash_avx2.o chunkset_avx.o compare258_avx2.o adler32_avx2.o"
+                ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} slide_hash_avx2.lo chunkset_avx.lo compare258_avx2.lo adler32_avx2.lo"
             fi
 
             check_avx512_intrinsics
@@ -1487,16 +1487,16 @@ case "${ARCH}" in
                   SFLAGS="${SFLAGS} -DX86_SSE42_CRC_INTRIN"
                 fi
 
-                ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} insert_string_sse.o"
-                ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} insert_string_sse.lo"
+                ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} insert_string_sse42.o"
+                ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} insert_string_sse42.lo"
             fi
 
             if test ${HAVE_SSE42CMPSTR_INTRIN} -eq 1; then
                 CFLAGS="${CFLAGS} -DX86_SSE42_CMP_STR"
                 SFLAGS="${SFLAGS} -DX86_SSE42_CMP_STR"
 
-                ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} compare258_sse.o"
-                ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} compare258_sse.lo"
+                ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} compare258_sse42.o"
+                ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} compare258_sse42.lo"
             fi
 
             check_sse2_intrinsics
@@ -1504,8 +1504,8 @@ case "${ARCH}" in
             if test ${HAVE_SSE2_INTRIN} -eq 1; then
                 CFLAGS="${CFLAGS} -DX86_SSE2 -DX86_SSE2_CHUNKSET"
                 SFLAGS="${SFLAGS} -DX86_SSE2 -DX86_SSE2_CHUNKSET"
-                ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} chunkset_sse.o slide_hash_sse.o"
-                ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} chunkset_sse.lo slide_hash_sse.lo"
+                ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} chunkset_sse2.o slide_hash_sse2.o"
+                ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} chunkset_sse2.lo slide_hash_sse2.lo"
 
                 if test $forcesse2 -eq 1; then
                     CFLAGS="${CFLAGS} -DX86_NOCHECK_SSE2"

diff --git a/win32/Makefile.msc b/win32/Makefile.msc
index ef3f237ffce20ca4b192e57317df9967f55e3cbb..ff6c6963c9a47d72fd6041dd8b046a9f3343da35 100644 (file)
--- a/win32/Makefile.msc
+++ b/win32/Makefile.msc
@@ -52,10 +52,10 @@ OBJS = \
        adler32.obj \
        chunkset.obj \
        chunkset_avx.obj \
-       chunkset_sse.obj \
+       chunkset_sse2.obj \
        compare258.obj \
-       compare258_avx.obj \
-       compare258_sse.obj \
+       compare258_avx2.obj \
+       compare258_sse42.obj \
        compress.obj \
        crc32.obj \
        crc32_comb.obj \
@@ -76,10 +76,10 @@ OBJS = \
        inffast.obj \
        insert_string.obj \
        insert_string_roll.obj \
-       insert_string_sse.obj \
+       insert_string_sse42.obj \
        slide_hash.obj \
-       slide_hash_avx.obj \
-       slide_hash_sse.obj \
+       slide_hash_avx2.obj \
+       slide_hash_sse2.obj \
        trees.obj \
        uncompr.obj \
        zutil.obj \
@@ -190,7 +190,7 @@ compress.obj: $(SRCDIR)/compress.c $(SRCDIR)/zbuild.h $(SRCDIR)/zlib$(SUFFIX).h
 uncompr.obj: $(SRCDIR)/uncompr.c $(SRCDIR)/zbuild.h $(SRCDIR)/zlib$(SUFFIX).h
 chunkset.obj: $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h
 chunkset_avx.obj: $(SRCDIR)/arch/x86/chunkset_avx.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h
-chunkset_sse.obj: $(SRCDIR)/arch/x86/chunkset_sse.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h
+chunkset_sse2.obj: $(SRCDIR)/arch/x86/chunkset_sse2.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h
 crc32.obj: $(SRCDIR)/crc32.c $(SRCDIR)/zbuild.h $(SRCDIR)/zendian.h $(SRCDIR)/deflate.h $(SRCDIR)/functable.h $(SRCDIR)/crc32_tbl.h
 crc32_comb.obj: $(SRCDIR)/crc32_comb.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h $(SRCDIR)/crc32_comb_tbl.h
 crc32_fold.obj: $(SRCDIR)/crc32_fold.c $(SRCDIR)/zbuild.h
@@ -208,8 +208,8 @@ inffast.obj: $(SRCDIR)/inffast.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h $(SRCDIR)/
 inflate.obj: $(SRCDIR)/inflate.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h $(SRCDIR)/inftrees.h $(SRCDIR)/inflate.h $(SRCDIR)/inffast.h $(SRCDIR)/functable.h $(SRCDIR)/functable.h
 inftrees.obj: $(SRCDIR)/inftrees.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h $(SRCDIR)/inftrees.h
 slide_hash.obj: $(SRCDIR)/slide_hash.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h
-slide_hash_avx.obj: $(SRCDIR)/arch/x86/slide_hash_avx.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h
-slide_hash_sse.obj: $(SRCDIR)/arch/x86/slide_hash_sse.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h
+slide_hash_avx2.obj: $(SRCDIR)/arch/x86/slide_hash_avx2.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h
+slide_hash_sse2.obj: $(SRCDIR)/arch/x86/slide_hash_sse2.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h
 trees.obj: $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h $(SRCDIR)/trees_tbl.h
 zutil.obj: $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h $(SRCDIR)/zutil_p.h