enhance(main/clvk): enable ThinLTO
Full LTO causes CI to run out of memory. ThinLTO is next best thing.
This commit is contained in:
Jia Yuan Lo
parent
a0321c84d5
commit
9896129ef2
|
|
@ -6,6 +6,7 @@ _COMMIT=ae8f360da5059567019071ad9aba3f3545dce44d
|
|||
_COMMIT_DATE=20221126
|
||||
_COMMIT_TIME=190421
|
||||
TERMUX_PKG_VERSION="0.0.20221126.190421gae8f360d"
|
||||
TERMUX_PKG_REVISION=1
|
||||
TERMUX_PKG_SRCURL=https://github.com/kpet/clvk.git
|
||||
TERMUX_PKG_GIT_BRANCH=main
|
||||
TERMUX_PKG_BUILD_DEPENDS="vulkan-headers, vulkan-loader-android"
|
||||
|
|
@ -14,8 +15,8 @@ TERMUX_PKG_SUGGESTS="ocl-icd"
|
|||
TERMUX_PKG_HOSTBUILD=true
|
||||
TERMUX_PKG_AUTO_UPDATE=true
|
||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
|
||||
-DLLVM_TABLEGEN=$TERMUX_PKG_HOSTBUILD_DIR/bin/llvm-tblgen
|
||||
-DCLANG_TABLEGEN=$TERMUX_PKG_HOSTBUILD_DIR/bin/clang-tblgen
|
||||
-DLLVM_TABLEGEN=${TERMUX_PKG_HOSTBUILD_DIR}/bin/llvm-tblgen
|
||||
-DCLANG_TABLEGEN=${TERMUX_PKG_HOSTBUILD_DIR}/bin/clang-tblgen
|
||||
"
|
||||
|
||||
# https://github.com/kpet/clvk/blob/main/CMakeLists.txt
|
||||
|
|
@ -32,7 +33,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
|
|||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+="
|
||||
-DCLVK_BUILD_TESTS=OFF
|
||||
-DCLVK_VULKAN_IMPLEMENTATION=custom
|
||||
-DVulkan_INCLUDE_DIRS=$TERMUX_PREFIX/include
|
||||
-DVulkan_INCLUDE_DIRS=${TERMUX_PREFIX}/include
|
||||
-DVulkan_LIBRARIES=vulkan
|
||||
"
|
||||
|
||||
|
|
@ -48,52 +49,61 @@ termux_pkg_auto_update() {
|
|||
local latest_commit_date_tz latest_commit_date latest_commit_time latest_version
|
||||
local latest_commit=$(curl -s https://api.github.com/repos/kpet/clvk/commits | jq .[].sha | head -1 | sed -e 's|\"||g')
|
||||
|
||||
if [ -z "$latest_commit" ]; then
|
||||
if [[ -z "${latest_commit}" ]]; then
|
||||
echo "WARN: Unable to get latest commit from upstream. Try again later." >&2
|
||||
return 0
|
||||
fi
|
||||
|
||||
if [ "$latest_commit" = "$_COMMIT" ]; then
|
||||
echo "INFO: No update needed. Already at version '$TERMUX_PKG_VERSION'."
|
||||
if [[ "${latest_commit}" == "${_COMMIT}" ]]; then
|
||||
echo "INFO: No update needed. Already at version '${TERMUX_PKG_VERSION}'."
|
||||
return 0
|
||||
fi
|
||||
|
||||
latest_commit_date_tz=$(curl -s "https://api.github.com/repos/kpet/clvk/commits/$latest_commit" | jq .commit.committer.date | sed -e 's|\"||g')
|
||||
latest_commit_date_tz=$(curl -s "https://api.github.com/repos/kpet/clvk/commits/${latest_commit}" | jq .commit.committer.date | sed -e 's|\"||g')
|
||||
|
||||
if [ -z "$latest_commit_date_tz" ]; then
|
||||
if [[ -z "${latest_commit_date_tz}" ]]; then
|
||||
termux_error_exit "ERROR: Unable to get latest commit date info"
|
||||
fi
|
||||
|
||||
latest_commit_date=$(echo "$latest_commit_date_tz" | sed -e 's|\(.*\)T\(.*\)Z|\1|' -e 's|\-||g')
|
||||
latest_commit_time=$(echo "$latest_commit_date_tz" | sed -e 's|\(.*\)T\(.*\)Z|\2|' -e 's|\:||g')
|
||||
latest_commit_date=$(echo "${latest_commit_date_tz}" | sed -e 's|\(.*\)T\(.*\)Z|\1|' -e 's|\-||g')
|
||||
latest_commit_time=$(echo "${latest_commit_date_tz}" | sed -e 's|\(.*\)T\(.*\)Z|\2|' -e 's|\:||g')
|
||||
|
||||
# https://github.com/termux/termux-packages/issues/11827
|
||||
# really fix it by including longer date time info into versioning
|
||||
# always check this in case upstream change the version format
|
||||
latest_version="0.0.${latest_commit_date}.${latest_commit_time}g${latest_commit:0:8}"
|
||||
|
||||
if ! dpkg --compare-versions "$latest_version" gt "$TERMUX_PKG_VERSION"; then
|
||||
termux_error_exit "ERROR: Resulting latest version is not counted as update to the current version ($latest_version < $TERMUX_PKG_VERSION)"
|
||||
# rough estimate weekly push
|
||||
current_date=$(date "+%Y%m%d")
|
||||
current_date_diff=$((current_date-_COMMIT_DATE))
|
||||
if [[ "${current_date_diff}" -lt 7 ]]; then
|
||||
echo "INFO: Queuing updates after 7 days since last push, currently its ${current_date_diff}"
|
||||
return 0
|
||||
fi
|
||||
|
||||
if ! dpkg --compare-versions "${latest_version}" gt "${TERMUX_PKG_VERSION}"; then
|
||||
termux_error_exit "ERROR: Resulting latest version is not counted as update to the current version (${latest_version} < ${TERMUX_PKG_VERSION})"
|
||||
fi
|
||||
|
||||
# unlikely to happen
|
||||
if [ "$latest_commit_date" -lt "$_COMMIT_DATE" ]; then
|
||||
if [[ "${latest_commit_date}" -lt "${_COMMIT_DATE}" ]]; then
|
||||
termux_error_exit "ERROR: Upstream is older than current package version. Please report to upstream."
|
||||
elif [ "$latest_commit_date" -eq "$_COMMIT_DATE" ] && [ "$latest_commit_time" -lt "$_COMMIT_TIME" ]; then
|
||||
elif [[ "${latest_commit_date}" -eq "${_COMMIT_DATE}" ]] && [[ "${latest_commit_time}" -lt "${_COMMIT_TIME}" ]]; then
|
||||
termux_error_exit "ERROR: Upstream is older than current package version. Please report to upstream."
|
||||
fi
|
||||
|
||||
sed -i "${TERMUX_PKG_BUILDER_DIR}/build.sh" -e "s|^_COMMIT=.*|_COMMIT=${latest_commit}|"
|
||||
sed -i "${TERMUX_PKG_BUILDER_DIR}/build.sh" -e "s|^_COMMIT_DATE=.*|_COMMIT_DATE=${latest_commit_date}|"
|
||||
sed -i "${TERMUX_PKG_BUILDER_DIR}/build.sh" -e "s|^_COMMIT_TIME=.*|_COMMIT_TIME=${latest_commit_time}|"
|
||||
sed -i "${TERMUX_PKG_BUILDER_DIR}/build.sh" \
|
||||
-e "s|^_COMMIT=.*|_COMMIT=${latest_commit}|" \
|
||||
-e "s|^_COMMIT_DATE=.*|_COMMIT_DATE=${latest_commit_date}|" \
|
||||
-e "s|^_COMMIT_TIME=.*|_COMMIT_TIME=${latest_commit_time}|"
|
||||
|
||||
# maybe save a few ms as we already done version check
|
||||
termux_pkg_upgrade_version "$latest_version" --skip-version-check
|
||||
termux_pkg_upgrade_version "${latest_version}" --skip-version-check
|
||||
}
|
||||
|
||||
termux_step_post_get_source() {
|
||||
git fetch --unshallow
|
||||
git checkout $_COMMIT
|
||||
git checkout "${_COMMIT}"
|
||||
git submodule update --init --recursive
|
||||
./external/clspv/utils/fetch_sources.py --deps llvm
|
||||
}
|
||||
|
|
@ -104,32 +114,35 @@ termux_step_host_build() {
|
|||
|
||||
cmake \
|
||||
-G Ninja \
|
||||
-S "$TERMUX_PKG_SRCDIR/external/clspv/third_party/llvm/llvm" \
|
||||
-S "${TERMUX_PKG_SRCDIR}/external/clspv/third_party/llvm/llvm" \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DLLVM_ENABLE_PROJECTS=clang
|
||||
cmake \
|
||||
--build "$TERMUX_PKG_HOSTBUILD_DIR" \
|
||||
-j "$TERMUX_MAKE_PROCESSES" \
|
||||
--build "${TERMUX_PKG_HOSTBUILD_DIR}" \
|
||||
-j "${TERMUX_MAKE_PROCESSES}" \
|
||||
--target llvm-tblgen clang-tblgen
|
||||
}
|
||||
|
||||
termux_step_pre_configure() {
|
||||
export CFLAGS+=" -flto=thin"
|
||||
export CXXFLAGS+=" -flto=thin"
|
||||
|
||||
# from packages/libllvm/build.sh
|
||||
export _LLVM_DEFAULT_TARGET_TRIPLE=${CCTERMUX_HOST_PLATFORM/-/-unknown-}
|
||||
export _LLVM_TARGET_ARCH
|
||||
if [ "$TERMUX_ARCH" = arm ]; then
|
||||
if [[ "${TERMUX_ARCH}" == "arm" ]]; then
|
||||
_LLVM_TARGET_ARCH=ARM
|
||||
elif [ "$TERMUX_ARCH" = aarch64 ]; then
|
||||
elif [[ "${TERMUX_ARCH}" == "aarch64" ]]; then
|
||||
_LLVM_TARGET_ARCH=AArch64
|
||||
elif [ "$TERMUX_ARCH" = i686 ] || [ "$TERMUX_ARCH" = x86_64 ]; then
|
||||
elif [[ "${TERMUX_ARCH}" == "i686" ]] || [[ "${TERMUX_ARCH}" == "x86_64" ]]; then
|
||||
_LLVM_TARGET_ARCH=X86
|
||||
else
|
||||
termux_error_exit "Invalid arch: $TERMUX_ARCH"
|
||||
termux_error_exit "Invalid arch: ${TERMUX_ARCH}"
|
||||
fi
|
||||
|
||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DLLVM_TARGET_ARCH=$_LLVM_TARGET_ARCH"
|
||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DLLVM_TARGETS_TO_BUILD=$_LLVM_TARGET_ARCH"
|
||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DLLVM_HOST_TRIPLE=$_LLVM_DEFAULT_TARGET_TRIPLE"
|
||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DLLVM_TARGET_ARCH=${_LLVM_TARGET_ARCH}"
|
||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DLLVM_TARGETS_TO_BUILD=${_LLVM_TARGET_ARCH}"
|
||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DLLVM_HOST_TRIPLE=${_LLVM_DEFAULT_TARGET_TRIPLE}"
|
||||
|
||||
# TERMUX_DEBUG_BUILD doesnt really have somewhere in between
|
||||
#TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DCMAKE_BUILD_TYPE=RelWithDebInfo"
|
||||
|
|
@ -138,8 +151,8 @@ termux_step_pre_configure() {
|
|||
|
||||
termux_step_make_install() {
|
||||
# clvk does not have proper install rule yet
|
||||
install -Dm644 "$TERMUX_PKG_BUILDDIR/libOpenCL.so" "$TERMUX_PREFIX/lib/clvk/libOpenCL.so"
|
||||
install -Dm644 "${TERMUX_PKG_BUILDDIR}/libOpenCL.so" "${TERMUX_PREFIX}/lib/clvk/libOpenCL.so"
|
||||
|
||||
echo "$TERMUX_PREFIX/lib/clvk/libOpenCL.so" > "$TERMUX_PKG_TMPDIR/clvk.icd"
|
||||
install -Dm644 "$TERMUX_PKG_TMPDIR/clvk.icd" "$TERMUX_PREFIX/etc/OpenCL/vendors/clvk.icd"
|
||||
echo "${TERMUX_PREFIX}/lib/clvk/libOpenCL.so" > "${TERMUX_PKG_TMPDIR}/clvk.icd"
|
||||
install -Dm644 "${TERMUX_PKG_TMPDIR}/clvk.icd" "${TERMUX_PREFIX}/etc/OpenCL/vendors/clvk.icd"
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue