This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new e1ff439e638 [chore](thirdparty) update vectorscan to 5.7.11 (#29623)
e1ff439e638 is described below
commit e1ff439e638b2e6a02600182dfcea2beecebecbc
Author: Jerry Hu <mrh...@gmail.com>
AuthorDate: Sun Jan 7 11:41:26 2024 +0800
[chore](thirdparty) update vectorscan to 5.7.11 (#29623)
---
thirdparty/download-thirdparty.sh | 4 +--
thirdparty/patches/vectorscan-5.4.11.patch | 50 ++++++++++++++++++++++++++++++
thirdparty/patches/vectorscan-5.4.7.patch | 31 ------------------
thirdparty/vars.sh | 8 ++---
4 files changed, 56 insertions(+), 37 deletions(-)
diff --git a/thirdparty/download-thirdparty.sh
b/thirdparty/download-thirdparty.sh
index 9845f2d9a49..4dfa838e8b4 100755
--- a/thirdparty/download-thirdparty.sh
+++ b/thirdparty/download-thirdparty.sh
@@ -350,10 +350,10 @@ echo "Finished patching ${JEMALLOC_DORIS_SOURCE}"
# patch hyperscan
# https://github.com/intel/hyperscan/issues/292
-if [[ "${HYPERSCAN_SOURCE}" == "vectorscan-vectorscan-5.4.7" ]]; then
+if [[ "${HYPERSCAN_SOURCE}" == "vectorscan-vectorscan-5.4.11" ]]; then
cd "${TP_SOURCE_DIR}/${HYPERSCAN_SOURCE}"
if [[ ! -f "${PATCHED_MARK}" ]]; then
- patch -p0 <"${TP_PATCH_DIR}/vectorscan-5.4.7.patch"
+ patch -p1 <"${TP_PATCH_DIR}/vectorscan-5.4.11.patch"
touch "${PATCHED_MARK}"
fi
cd -
diff --git a/thirdparty/patches/vectorscan-5.4.11.patch
b/thirdparty/patches/vectorscan-5.4.11.patch
new file mode 100644
index 00000000000..e3a8127c826
--- /dev/null
+++ b/thirdparty/patches/vectorscan-5.4.11.patch
@@ -0,0 +1,50 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1db128b..1ffad0d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1196,9 +1196,9 @@ endif ()
+ add_subdirectory(util)
+ add_subdirectory(unit)
+
+-if (EXISTS ${CMAKE_SOURCE_DIR}/tools/CMakeLists.txt)
+- add_subdirectory(tools)
+-endif()
++# if (EXISTS ${CMAKE_SOURCE_DIR}/tools/CMakeLists.txt)
++# add_subdirectory(tools)
++# endif()
+ if (EXISTS ${CMAKE_SOURCE_DIR}/chimera/CMakeLists.txt AND BUILD_CHIMERA)
+ add_subdirectory(chimera)
+ endif()
+diff --git a/cmake/build_wrapper.sh b/cmake/build_wrapper.sh
+index 895610c..becfbf4 100755
+--- a/cmake/build_wrapper.sh
++++ b/cmake/build_wrapper.sh
+@@ -17,11 +17,11 @@ KEEPSYMS=$(mktemp -p /tmp keep.syms.XXXXX)
+ LIBC_SO=$("$@" --print-file-name=libc.so.6)
+ cp ${KEEPSYMS_IN} ${KEEPSYMS}
+ # get all symbols from libc and turn them into patterns
+-nm -f p -g -D ${LIBC_SO} | sed -s 's/\([^ @]*\).*/^\1$/' >> ${KEEPSYMS}
++nm -f posix -g -D ${LIBC_SO} | sed -s 's/\([^ @]*\).*/^\1$/' >> ${KEEPSYMS}
+ # build the object
+ "$@"
+ # rename the symbols in the object
+-nm -f p -g ${OUT} | cut -f1 -d' ' | grep -v -f ${KEEPSYMS} | sed -e
"s/\(.*\)/\1\ ${PREFIX}_\1/" >> ${SYMSFILE}
++nm -f posix -g ${OUT} | cut -f1 -d' ' | grep -v -f ${KEEPSYMS} | sed -e
"s/\(.*\)/\1\ ${PREFIX}_\1/" >> ${SYMSFILE}
+ if test -s ${SYMSFILE}
+ then
+ objcopy --redefine-syms=${SYMSFILE} ${OUT}
+diff --git a/src/util/arch/arm/cpuid_inline.h
b/src/util/arch/arm/cpuid_inline.h
+index f8a59af..3e28d00 100644
+--- a/src/util/arch/arm/cpuid_inline.h
++++ b/src/util/arch/arm/cpuid_inline.h
+@@ -39,6 +39,10 @@
+ #endif
+ #endif
+
++#if !defined(HWCAP2_SVE2)
++#define HWCAP2_SVE2 0
++#endif
++
+ #include "ue2common.h"
+ #include "util/arch/common/cpuid_flags.h"
+
diff --git a/thirdparty/patches/vectorscan-5.4.7.patch
b/thirdparty/patches/vectorscan-5.4.7.patch
deleted file mode 100644
index 712c11e86a8..00000000000
--- a/thirdparty/patches/vectorscan-5.4.7.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git CMakeLists.txt CMakeLists.txt
-index cb4ba80..9a106e5 100644
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -170,7 +170,7 @@ if (CMAKE_COMPILER_IS_GNUCC AND NOT CROSS_COMPILE)
-
- # arg1 might exist if using ccache
- string (STRIP "${CMAKE_C_COMPILER_ARG1}" CC_ARG1)
-- set (EXEC_ARGS ${CC_ARG1} -c -Q --help=target -${ARCH_FLAG}=native
-mtune=native)
-+ set (EXEC_ARGS ${CC_ARG1} -c -Q --help=target -mtune=native)
- execute_process(COMMAND ${CMAKE_C_COMPILER} ${EXEC_ARGS}
- OUTPUT_VARIABLE _GCC_OUTPUT)
- string(FIND "${_GCC_OUTPUT}" "${ARCH_FLAG}" POS)
-diff --git cmake/build_wrapper.sh cmake/build_wrapper.sh
-index 895610c..becfbf4 100755
---- cmake/build_wrapper.sh
-+++ cmake/build_wrapper.sh
-@@ -17,11 +17,11 @@ KEEPSYMS=$(mktemp -p /tmp keep.syms.XXXXX)
- LIBC_SO=$("$@" --print-file-name=libc.so.6)
- cp ${KEEPSYMS_IN} ${KEEPSYMS}
- # get all symbols from libc and turn them into patterns
--nm -f p -g -D ${LIBC_SO} | sed -s 's/\([^ @]*\).*/^\1$/' >> ${KEEPSYMS}
-+nm -f posix -g -D ${LIBC_SO} | sed -s 's/\([^ @]*\).*/^\1$/' >> ${KEEPSYMS}
- # build the object
- "$@"
- # rename the symbols in the object
--nm -f p -g ${OUT} | cut -f1 -d' ' | grep -v -f ${KEEPSYMS} | sed -e
"s/\(.*\)/\1\ ${PREFIX}_\1/" >> ${SYMSFILE}
-+nm -f posix -g ${OUT} | cut -f1 -d' ' | grep -v -f ${KEEPSYMS} | sed -e
"s/\(.*\)/\1\ ${PREFIX}_\1/" >> ${SYMSFILE}
- if test -s ${SYMSFILE}
- then
- objcopy --redefine-syms=${SYMSFILE} ${OUT}
diff --git a/thirdparty/vars.sh b/thirdparty/vars.sh
index 4d65efe5b45..6b726b8d34f 100644
--- a/thirdparty/vars.sh
+++ b/thirdparty/vars.sh
@@ -161,10 +161,10 @@ HYPERSCAN_MD5SUM="202f4b42f5dd4a7bb2506445e51a33b9"
MACHINE_TYPE=$(uname -m)
if [[ "${MACHINE_TYPE}" == "aarch64" || "${MACHINE_TYPE}" == 'arm64' ]]; then
echo "use vectorscan instead of hyperscan on aarch64"
-
HYPERSCAN_DOWNLOAD="https://github.com/VectorCamp/vectorscan/archive/refs/tags/vectorscan/5.4.7.tar.gz";
- HYPERSCAN_NAME=vectorscan-5.4.7.tar.gz
- HYPERSCAN_SOURCE=vectorscan-vectorscan-5.4.7
- HYPERSCAN_MD5SUM="ae924ccce79ef9bf6bf118693ae14fe5"
+
HYPERSCAN_DOWNLOAD="https://github.com/VectorCamp/vectorscan/archive/refs/tags/vectorscan/5.4.11.tar.gz";
+ HYPERSCAN_NAME=vectorscan-5.4.11.tar.gz
+ HYPERSCAN_SOURCE=vectorscan-vectorscan-5.4.11
+ HYPERSCAN_MD5SUM="e67b70403cba6c1654a9fef4fd15a2f2"
fi
# ragel (dependency for hyperscan)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
