Merge branch 'main' into other_encs

This commit is contained in:
2024-04-10 15:19:57 -05:00
3 changed files with 42 additions and 15 deletions

View File

@@ -63,13 +63,17 @@ uname -srmpio >> "$LOG"
CPU_PROD=$(sudo lshw | grep "product" | head -1 | cut -d ':' -f2) CPU_PROD=$(sudo lshw | grep "product" | head -1 | cut -d ':' -f2)
echo "CPU product:$CPU_PROD with $THREADS threads" >> $LOG echo "CPU product:$CPU_PROD with $THREADS threads" >> $LOG
# Find versions of files # Find versions of libs
cd /usr/local/lib || exit LDD_TEXT="$BENCHMARK_DIR/ldd.txt"
SVTAV1_VER=$(basename "$(find . -mindepth 1 ! -type l | grep "libSvtAv1Enc.so")") ldd $(which ffmpeg) > "$LDD_TEXT"
RAV1E_VER=$(basename "$(find . -mindepth 1 ! -type l | grep "librav1e.so")") get_version() {
AOM_VER=$(basename "$(find . -mindepth 1 ! -type l | grep "libaom.so")") cat "$LDD_TEXT" | grep "$1" | cut -d' ' -f3 | xargs readlink
VMAF_VER=$(basename "$(find . -mindepth 1 ! -type l | grep "libvmaf.so")") }
DAV1D_VER=$(basename "$(find . -mindepth 1 ! -type l | grep "libdav1d.so")") SVTAV1_VER=$(get_version "libSvtAv1Enc")
RAV1E_VER=$(get_version "librav1e")
AOM_VER=$(get_version "libaom")
VMAF_VER=$(get_version "libvmaf")
DAV1D_VER=$(get_version "libdav1d")
cd "$BASE_DIR" || exit cd "$BASE_DIR" || exit
echo -e "$SVTAV1_VER $RAV1E_VER $AOM_VER $VMAF_VER $DAV1D_VER" >> "$LOG" echo -e "$SVTAV1_VER $RAV1E_VER $AOM_VER $VMAF_VER $DAV1D_VER" >> "$LOG"

View File

@@ -96,6 +96,8 @@ mkdir build_svt.user
cd build_svt.user || exit cd build_svt.user || exit
make clean make clean
cmake .. -DCMAKE_BUILD_TYPE=Release -DSVT_AV1_LTO=ON \ cmake .. -DCMAKE_BUILD_TYPE=Release -DSVT_AV1_LTO=ON \
-DENABLE_AVX512=ON -DBUILD_TESTING=OFF \
-DCOVERAGE=OFF \
-DCMAKE_C_FLAGS="-O${OPT_LVL} $COMP_FLAGS" \ -DCMAKE_C_FLAGS="-O${OPT_LVL} $COMP_FLAGS" \
-DCMAKE_CXX_FLAGS="-O${OPT_LVL} $COMP_FLAGS" || exit -DCMAKE_CXX_FLAGS="-O${OPT_LVL} $COMP_FLAGS" || exit
make -j "$(nproc)" || exit make -j "$(nproc)" || exit

View File

@@ -1,15 +1,36 @@
#!/bin/bash #!/bin/bash
PKG_MNG="apt-get" COMMON_DEP_NAMES="autoconf automake cmake libtool pkg-config bc texinfo \
wget nasm yasm time python3 meson doxygen xxd jq lshw gnuplot curl \
clang valgrind ccache gawk"
sudo "$PKG_MNG" update APT_DEP_NAMES="build-essential git-core g++-12 libass-dev libfreetype6-dev \
sudo "$PKG_MNG" upgrade -qy libsdl2-dev libva-dev libvdpau-dev gcc-12 libvorbis-dev libxcb1-dev \
libxcb-shm0-dev libxcb-xfixes0-dev zlib1g-dev libssl-dev ninja-build \
gobjc++ python3-pip mawk"
sudo "$PKG_MNG" install autoconf automake build-essential cmake git-core g++-12 \ PACMAN_DEP_NAMES="base-devel ninja python-pip"
libass-dev libfreetype6-dev libsdl2-dev libtool libva-dev libvdpau-dev gcc-12 \
libvorbis-dev libxcb1-dev libxcb-shm0-dev libxcb-xfixes0-dev pkg-config bc libnuma-dev \ USING_NALA=$(type nala > /dev/null; echo $?)
texinfo wget zlib1g-dev nasm yasm libssl-dev time python3 meson ninja-build gobjc++ \ USING_APT=$(type apt > /dev/null; echo $?)
doxygen xxd jq lshw gnuplot python3-pip curl clang valgrind ccache gawk mawk -y || exit 1 USING_PACMAN=$(type pacman > /dev/null; echo $?)
if [[ "$USING_NALA" == "0" ]]; then
# if nala fails, try apt
USING_APT="1"
echo "Installing with nala"
sudo nala update
sudo nala install -y $COMMON_DEP_NAMES $APT_DEP_NAMES || USING_APT="0"
fi
if [[ "$USING_APT" == "0" ]]; then
echo "Installing with apt"
sudo apt-get update
sudo apt-get install -y $COMMON_DEP_NAMES $APT_DEP_NAMES || exit 1
fi
if [[ "$USING_PACMAN" == "0" ]]; then
echo "Installing with pacman"
sudo pacman -S $COMMON_DEP_NAMES $PACMAN_DEP_NAMES --noconfirm || exit 1
fi
curl https://sh.rustup.rs -sSf | sh -s -- -y curl https://sh.rustup.rs -sSf | sh -s -- -y
source "$HOME/.cargo/env" source "$HOME/.cargo/env"