60787746c4PR-URL: https://github.com/nodejs/node/pull/63773 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Chemi Atlow <chemi@atlow.co.il>
256 lines
11 KiB
Diff
256 lines
11 KiB
Diff
diff --git a/third_party/zlib/CMakeLists.txt b/third_party/zlib/CMakeLists.txt
|
|
index eef01a8947dd7..b569804ace088 100644
|
|
--- a/third_party/zlib/CMakeLists.txt
|
|
+++ b/third_party/zlib/CMakeLists.txt
|
|
@@ -71,6 +71,85 @@ if(NOT ZLIB_CONF_WRITTEN)
|
|
mark_as_advanced(ZLIB_CONF_WRITTEN)
|
|
endif(NOT ZLIB_CONF_WRITTEN)
|
|
|
|
+option(ENABLE_SIMD_OPTIMIZATIONS "Enable all SIMD optimizations" OFF)
|
|
+option(ENABLE_SIMD_AVX512 "Enable SIMD AXV512 optimizations" OFF)
|
|
+option(USE_ZLIB_RABIN_KARP_HASH "Enable bitstream compatibility with canonical zlib" OFF)
|
|
+option(ENABLE_INTEL_QAT_COMPRESSION "Enable Intel Quick Assist Technology use for compression" OFF)
|
|
+option(BUILD_UNITTESTS "Enable standalone unit tests build" OFF)
|
|
+option(BUILD_MINIZIP_BIN "Enable building minzip_bin tool" OFF)
|
|
+option(BUILD_ZPIPE "Enable building zpipe tool" OFF)
|
|
+option(BUILD_MINIGZIP "Enable building minigzip tool" OFF)
|
|
+
|
|
+if (USE_ZLIB_RABIN_KARP_HASH)
|
|
+ add_definitions(-DUSE_ZLIB_RABIN_KARP_ROLLING_HASH)
|
|
+endif()
|
|
+
|
|
+# TODO(cavalcantii): add support for other OSes (e.g. Android, Fuchsia, etc)
|
|
+# and architectures (e.g. RISCV).
|
|
+if (ENABLE_SIMD_OPTIMIZATIONS)
|
|
+ # Apparently some environments (e.g. CentOS) require to explicitly link
|
|
+ # with pthread and that is required by the CPU features detection code.
|
|
+ find_package (Threads REQUIRED)
|
|
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread")
|
|
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
|
|
+
|
|
+ if (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
|
|
+ add_definitions(-DINFLATE_CHUNK_SIMD_SSE2)
|
|
+ add_definitions(-DADLER32_SIMD_SSSE3)
|
|
+ add_definitions(-DINFLATE_CHUNK_READ_64LE)
|
|
+ add_definitions(-DDEFLATE_CHUNK_WRITE_64LE)
|
|
+ add_definitions(-DCRC32_SIMD_SSE42_PCLMUL)
|
|
+ if (ENABLE_SIMD_AVX512)
|
|
+ add_definitions(-DCRC32_SIMD_AVX512_PCLMUL)
|
|
+ add_compile_options(-mvpclmulqdq -msse2 -mavx512f -mpclmul)
|
|
+ else()
|
|
+ add_compile_options(-msse4.2 -mpclmul)
|
|
+ endif()
|
|
+ add_definitions(-DDEFLATE_SLIDE_HASH_SSE2)
|
|
+ # Required by CPU features detection code.
|
|
+ add_definitions(-DX86_NOT_WINDOWS)
|
|
+ endif()
|
|
+
|
|
+ if ((CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") OR
|
|
+ (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64"))
|
|
+ add_definitions(-DINFLATE_CHUNK_SIMD_NEON)
|
|
+ add_definitions(-DADLER32_SIMD_NEON)
|
|
+ add_definitions(-DINFLATE_CHUNK_READ_64LE)
|
|
+ add_definitions(-DDEFLATE_CHUNK_WRITE_64LE)
|
|
+ add_definitions(-DCRC32_ARMV8_CRC32)
|
|
+ add_definitions(-DDEFLATE_SLIDE_HASH_NEON)
|
|
+ # Required by CPU features detection code.
|
|
+ if (APPLE)
|
|
+ add_definitions(-DARMV8_OS_MACOS)
|
|
+ endif()
|
|
+
|
|
+ if (UNIX AND NOT APPLE)
|
|
+ add_definitions(-DARMV8_OS_LINUX)
|
|
+ endif()
|
|
+
|
|
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=armv8-a+crc+crypto")
|
|
+ endif()
|
|
+
|
|
+ if (CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv64")
|
|
+ add_definitions(-DRISCV_RVV)
|
|
+ add_definitions(-DDEFLATE_SLIDE_HASH_RVV)
|
|
+ add_definitions(-DADLER32_SIMD_RVV)
|
|
+
|
|
+ # chunk_copy is required for READ64 and unconditional decode of literals.
|
|
+ add_definitions(-DINFLATE_CHUNK_GENERIC)
|
|
+ add_definitions(-DINFLATE_CHUNK_READ_64LE)
|
|
+ add_definitions(-DDEFLATE_CHUNK_WRITE_64LE)
|
|
+
|
|
+ # TODO(cavalcantii): only missing optimization is SLIDE_HASH, got port it
|
|
+ # to RISCV.
|
|
+
|
|
+ # Tested with clang-17, unaligned loads are required by read64 & chunk_copy.
|
|
+ # TODO(cavalcantii): replace internal clang flags for -munaligned-access
|
|
+ # when we have a newer compiler available.
|
|
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --target=riscv64-unknown-linux-gnu -march=rv64gcv -Xclang -target-feature -Xclang +unaligned-scalar-mem")
|
|
+ endif()
|
|
+endif()
|
|
+
|
|
#
|
|
# Check to see if we have large file support
|
|
#
|
|
@@ -154,6 +233,65 @@ if(WIN32)
|
|
set(CMAKE_DEBUG_POSTFIX "d")
|
|
endif(WIN32)
|
|
|
|
+
|
|
+#============================================================================
|
|
+# Update list of source files if optimizations were enabled
|
|
+#============================================================================
|
|
+if (ENABLE_SIMD_OPTIMIZATIONS)
|
|
+ if (CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv64")
|
|
+ message("RISCVV: Add optimizations.")
|
|
+ list(REMOVE_ITEM ZLIB_SRCS inflate.c)
|
|
+ list(APPEND ZLIB_PRIVATE_HDRS ${CMAKE_CURRENT_SOURCE_DIR}/adler32_simd.h)
|
|
+ list(APPEND ZLIB_PRIVATE_HDRS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/optimizations/chunkcopy.h)
|
|
+ list(APPEND ZLIB_PRIVATE_HDRS ${CMAKE_CURRENT_SOURCE_DIR}/cpu_features.h)
|
|
+
|
|
+ list(APPEND ZLIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/adler32_simd.c)
|
|
+ list(APPEND ZLIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/optimizations/inffast_chunk.c)
|
|
+ list(APPEND ZLIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/optimizations/inflate.c)
|
|
+ list(APPEND ZLIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/cpu_features.c)
|
|
+ else()
|
|
+ list(REMOVE_ITEM ZLIB_SRCS inflate.c)
|
|
+
|
|
+ list(APPEND ZLIB_PRIVATE_HDRS ${CMAKE_CURRENT_SOURCE_DIR}/adler32_simd.h)
|
|
+ list(APPEND ZLIB_PRIVATE_HDRS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/optimizations/chunkcopy.h)
|
|
+ list(APPEND ZLIB_PRIVATE_HDRS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/optimizations/inffast_chunk.h)
|
|
+ list(APPEND ZLIB_PRIVATE_HDRS ${CMAKE_CURRENT_SOURCE_DIR}/cpu_features.h)
|
|
+ list(APPEND ZLIB_PRIVATE_HDRS ${CMAKE_CURRENT_SOURCE_DIR}/crc32_simd.h)
|
|
+
|
|
+ list(APPEND ZLIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/adler32_simd.c)
|
|
+ list(APPEND ZLIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/optimizations/inffast_chunk.c)
|
|
+ list(APPEND ZLIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/optimizations/inflate.c)
|
|
+ list(APPEND ZLIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/cpu_features.c)
|
|
+ list(APPEND ZLIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/crc32_simd.c)
|
|
+ list(APPEND ZLIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/crc_folding.c)
|
|
+ endif()
|
|
+endif()
|
|
+
|
|
+if (ENABLE_INTEL_QAT_COMPRESSION)
|
|
+ list(APPEND ZLIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/qat/deflate_qat.cpp)
|
|
+ list(APPEND ZLIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/qat/qatzpp/io_buffers.cpp)
|
|
+ list(APPEND ZLIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/qat/qatzpp/memory.cpp)
|
|
+ list(APPEND ZLIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/qat/qatzpp/qat_buffer_list.cpp)
|
|
+ list(APPEND ZLIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/qat/qatzpp/qat.cpp)
|
|
+ list(APPEND ZLIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/qat/qatzpp/qat_instance.cpp)
|
|
+ list(APPEND ZLIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/qat/qatzpp/session.cpp)
|
|
+ list(APPEND ZLIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/qat/qatzpp/qat_task.cpp)
|
|
+
|
|
+ # TODO(gustavoa): Find a way to include the qatzpp headers without having the
|
|
+ # presubmit check throw errors.
|
|
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/contrib/qat/qatzpp)
|
|
+ add_compile_definitions(QAT_COMPRESSION_ENABLED)
|
|
+endif()
|
|
+
|
|
+if (ENABLE_INTEL_QAT_COMPRESSION)
|
|
+ target_include_directories(zlib PUBLIC ${QATZPP_INCLUDE_DIRS})
|
|
+ target_link_libraries(zlib ${QATZPP_LIBRARY})
|
|
+ target_link_libraries(zlib qat)
|
|
+ target_include_directories(zlibstatic PUBLIC ${QATZPP_INCLUDE_DIRS})
|
|
+ target_link_libraries(zlibstatic ${QATZPP_LIBRARY})
|
|
+ target_link_libraries(zlibstatic qat)
|
|
+endif()
|
|
+
|
|
if(ZLIB_BUILD_SHARED)
|
|
add_library(
|
|
zlib SHARED ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}
|
|
@@ -299,12 +437,90 @@ if(ZLIB_INSTALL)
|
|
DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
|
|
endif(ZLIB_INSTALL)
|
|
|
|
-# ============================================================================
|
|
-# Tests
|
|
-# ============================================================================
|
|
-if(ZLIB_BUILD_TESTING)
|
|
- enable_testing()
|
|
- add_subdirectory(test)
|
|
-endif(ZLIB_BUILD_TESTING)
|
|
-
|
|
-add_subdirectory(contrib)
|
|
+#============================================================================
|
|
+# Benchmarker
|
|
+#============================================================================
|
|
+enable_language(CXX)
|
|
+set(CMAKE_CXX_STANDARD 14) # workaround for older compilers (e.g. g++ 5.4).
|
|
+add_executable(zlib_bench contrib/bench/zlib_bench.cc)
|
|
+target_link_libraries(zlib_bench zlib)
|
|
+
|
|
+#============================================================================
|
|
+# Unit Tests
|
|
+#============================================================================
|
|
+if (BUILD_UNITTESTS)
|
|
+ include (ExternalProject)
|
|
+ set_directory_properties(PROPERTIES EP_PREFIX ${CMAKE_BINARY_DIR}/third_party)
|
|
+ ExternalProject_add(
|
|
+ googletest
|
|
+ GIT_REPOSITORY https://github.com/google/googletest.git
|
|
+ GIT_TAG d1467f5813f4d363cfd11aba99c4e9fe47a85e99
|
|
+ UPDATE_COMMAND ""
|
|
+ INSTALL_COMMAND ""
|
|
+ LOG_DOWNLOAD ON
|
|
+ LOG_CONFIGURE ON
|
|
+ LOG_BUILD ON
|
|
+ )
|
|
+
|
|
+ # gtest includedir
|
|
+ ExternalProject_Get_Property(googletest source_dir)
|
|
+ set(GTEST_INCLUDE_DIRS
|
|
+ ${source_dir}/googletest/include
|
|
+ ${source_dir}/googletest/include/gtest
|
|
+ )
|
|
+
|
|
+ # gtest library
|
|
+ ExternalProject_Get_Property(googletest binary_dir)
|
|
+ set(GTEST_LIBRARY_PATH ${binary_dir}/lib/${CMAKE_FIND_LIBRARY_PREFIXES}gtest.a)
|
|
+ set(GTEST_LIBRARY gtest)
|
|
+ add_library(${GTEST_LIBRARY} UNKNOWN IMPORTED)
|
|
+ set_property(TARGET ${GTEST_LIBRARY} PROPERTY IMPORTED_LOCATION ${GTEST_LIBRARY_PATH})
|
|
+ add_dependencies(${GTEST_LIBRARY} googletest)
|
|
+
|
|
+ set(UTEST_SRC
|
|
+ ${CMAKE_CURRENT_SOURCE_DIR}/contrib/tests/infcover.cc
|
|
+ ${CMAKE_CURRENT_SOURCE_DIR}/contrib/tests/infcover.h
|
|
+ ${CMAKE_CURRENT_SOURCE_DIR}/contrib/tests/utils_unittest.cc
|
|
+ ${CMAKE_CURRENT_SOURCE_DIR}/contrib/tests/standalone_test_runner.cc
|
|
+ ${CMAKE_CURRENT_SOURCE_DIR}/google/compression_utils_portable.cc
|
|
+ )
|
|
+
|
|
+ add_compile_definitions(CMAKE_STANDALONE_UNITTESTS)
|
|
+
|
|
+ add_executable(zlib_unittests ${UTEST_SRC})
|
|
+ target_include_directories(zlib_unittests PUBLIC ${GTEST_INCLUDE_DIRS})
|
|
+ target_include_directories(zlib_unittests PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/google)
|
|
+
|
|
+ target_link_libraries(zlib_unittests ${GTEST_LIBRARY})
|
|
+ target_link_libraries(zlib_unittests zlib)
|
|
+ # Needed by gtest
|
|
+ target_link_libraries(zlib_unittests pthread)
|
|
+endif()
|
|
+
|
|
+#============================================================================
|
|
+# Minizip tool
|
|
+#============================================================================
|
|
+# TODO(cavalcantii): get it working on Windows.
|
|
+if (BUILD_MINIZIP_BIN)
|
|
+ add_executable(minizip_bin contrib/minizip/minizip.c contrib/minizip/ioapi.c
|
|
+ contrib/minizip/ioapi.h contrib/minizip/unzip.c
|
|
+ contrib/minizip/unzip.h contrib/minizip/zip.c contrib/minizip/zip.h
|
|
+ contrib/minizip/ints.h contrib/minizip/skipset.h
|
|
+ )
|
|
+ target_link_libraries(minizip_bin zlib)
|
|
+endif()
|
|
+
|
|
+#============================================================================
|
|
+# zpipe tool
|
|
+#============================================================================
|
|
+if (BUILD_ZPIPE)
|
|
+ add_executable(zpipe examples/zpipe.c)
|
|
+ target_link_libraries(zpipe zlib)
|
|
+endif()
|
|
+#============================================================================
|
|
+# MiniGzip tool
|
|
+#============================================================================
|
|
+if (BUILD_MINIGZIP)
|
|
+ add_executable(minigzip_bin test/minigzip.c)
|
|
+ target_link_libraries(minigzip_bin zlib)
|
|
+endif()
|