Move chunk_{128,256}bit_perm_idx_lut.h, chunk_permute_table.h to arch/shared.

Signed-off-by: Vladislav Shchapov <vladislav@shchapov.ru>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d0be4804c646dbc33df3135167a4768e8ecdc318..81d7b0729164a78e2a13d389778777f94adab41b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1243,7 +1243,7 @@ set(ZLIB_PUBLIC_HDRS
     ${CMAKE_CURRENT_BINARY_DIR}/zlib${SUFFIX}.h
 )
 set(ZLIB_PRIVATE_HDRS
-    arch/generic/chunk_permute_table.h
+    arch/shared/chunk_permute_table.h
     arch/generic/generic_functions.h
     adler32_p.h
     arch_functions.h

diff --git a/arch/arm/chunkset_neon.c b/arch/arm/chunkset_neon.c
index a891f10fa5a4005792bc249988e5897fa0e1dbcf..d8303b8195405d8eea2d1890d2ff5fcd8f3a57ba 100644 (file)
--- a/arch/arm/chunkset_neon.c
+++ b/arch/arm/chunkset_neon.c
@@ -8,7 +8,7 @@
 #include "zsanitizer.h"
 #include "zmemory.h"
 #include "neon_intrins.h"
-#include "arch/generic/chunk_128bit_perm_idx_lut.h"
+#include "arch/shared/chunk_128bit_perm_idx_lut.h"
 
 typedef uint8x16_t chunk_t;
 

diff --git a/arch/loongarch/chunkset_lasx.c b/arch/loongarch/chunkset_lasx.c
index 905704172d1f9e00204c5b62f7e07bb506d9e1bf..7819ec4c17cc63c56356f439a40121580c25f853 100644 (file)
--- a/arch/loongarch/chunkset_lasx.c
+++ b/arch/loongarch/chunkset_lasx.c
@@ -13,7 +13,7 @@
 #include "lasxintrin_ext.h"
 #include "lsxintrin_ext.h"
 
-#include "arch/generic/chunk_256bit_perm_idx_lut.h"
+#include "arch/shared/chunk_256bit_perm_idx_lut.h"
 
 typedef __m256i chunk_t;
 typedef __m128i halfchunk_t;

diff --git a/arch/loongarch/chunkset_lsx.c b/arch/loongarch/chunkset_lsx.c
index 23dabfba51f3e23f8a41d91c1ab847f1b33765af..9d772cade14b70ebee937d9ea03a4ea1b7f43488 100644 (file)
--- a/arch/loongarch/chunkset_lsx.c
+++ b/arch/loongarch/chunkset_lsx.c
@@ -11,7 +11,7 @@
 
 #include <lsxintrin.h>
 #include "lsxintrin_ext.h"
-#include "arch/generic/chunk_128bit_perm_idx_lut.h"
+#include "arch/shared/chunk_128bit_perm_idx_lut.h"
 
 typedef __m128i chunk_t;
 

diff --git a/arch/generic/chunk_128bit_perm_idx_lut.h b/arch/shared/chunk_128bit_perm_idx_lut.h
similarity index 100%
rename from arch/generic/chunk_128bit_perm_idx_lut.h
rename to arch/shared/chunk_128bit_perm_idx_lut.h

diff --git a/arch/generic/chunk_256bit_perm_idx_lut.h b/arch/shared/chunk_256bit_perm_idx_lut.h
similarity index 100%
rename from arch/generic/chunk_256bit_perm_idx_lut.h
rename to arch/shared/chunk_256bit_perm_idx_lut.h

diff --git a/arch/generic/chunk_permute_table.h b/arch/shared/chunk_permute_table.h
similarity index 96%
rename from arch/generic/chunk_permute_table.h
rename to arch/shared/chunk_permute_table.h
index bad66ccc774b75d67b084d523b6fcfa03d17991c..f3976b7647694c9bc98946dd748d9cc627694c6c 100644 (file)
--- a/arch/generic/chunk_permute_table.h
+++ b/arch/shared/chunk_permute_table.h
@@ -1,4 +1,4 @@
-/* chunk_permute_table.h - shared AVX/SSSE3 permutation table for use with chunkmemset family of functions.
+/* chunk_permute_table.h - shared AVX/SSSE3/NEON/LSX/LASX permutation table for use with chunkmemset family of functions.
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 

diff --git a/arch/x86/chunkset_avx2.c b/arch/x86/chunkset_avx2.c
index 3e69a7bf6657cd00f51f04983f6865927f718c39..7e9cd188ef79d6d79029d59edb52202ae7575ae6 100644 (file)
--- a/arch/x86/chunkset_avx2.c
+++ b/arch/x86/chunkset_avx2.c
@@ -8,7 +8,7 @@
 #include "zsanitizer.h"
 #include "zmemory.h"
 
-#include "arch/generic/chunk_256bit_perm_idx_lut.h"
+#include "arch/shared/chunk_256bit_perm_idx_lut.h"
 #include <immintrin.h>
 #include "x86_intrins.h"
 

diff --git a/arch/x86/chunkset_avx512.c b/arch/x86/chunkset_avx512.c
index 60450c653ba0ab4fcb200418eeb5cfd1948f18e7..fcefd0765bc28eb4fee75b503ed660ca1dd7c837 100644 (file)
--- a/arch/x86/chunkset_avx512.c
+++ b/arch/x86/chunkset_avx512.c
@@ -7,7 +7,7 @@
 #include "zbuild.h"
 #include "zmemory.h"
 
-#include "arch/generic/chunk_256bit_perm_idx_lut.h"
+#include "arch/shared/chunk_256bit_perm_idx_lut.h"
 #include <immintrin.h>
 #include "x86_intrins.h"
 

diff --git a/arch/x86/chunkset_ssse3.c b/arch/x86/chunkset_ssse3.c
index 0bef7de81185aa09a3c95ef3fc92bbd1e3b23cde..5939411e909ad1453bf4572766df901e5a551ee4 100644 (file)
--- a/arch/x86/chunkset_ssse3.c
+++ b/arch/x86/chunkset_ssse3.c
@@ -9,7 +9,7 @@
 #include "zmemory.h"
 
 #include <immintrin.h>
-#include "arch/generic/chunk_128bit_perm_idx_lut.h"
+#include "arch/shared/chunk_128bit_perm_idx_lut.h"
 
 typedef __m128i chunk_t;