Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add NE10 to enable more neon optimization for libopus #518

Merged
merged 8 commits into from
Dec 22, 2024
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions builder/scripts.d/45-libNE10.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
#!/bin/bash

SCRIPT_REPO="https://github.com/gnattu/Ne10.git"
SCRIPT_COMMIT="545f4f18014cdbf9fb5fb1a9f5d24000200dfa8b"

ffbuild_enabled() {
[[ $TARGET == win* ]] && return -1
[[ $TARGET == *arm64 ]] && return 0
return -1
}

ffbuild_dockerbuild() {
git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" Ne10
cd Ne10

mkdir -p build && cd build

local myconf=(
-DGNULINUX_PLATFORM=ON # macOS is also "GNU Linux". This target means all unix-like target
)

if [[ $TARGET == linux* ]]; then
myconf+=(
-DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN"
)
elif [[ $TARGET == mac* ]]; then
:
else
echo "Unknown target"
return -1
fi

export NE10_LINUX_TARGET_ARCH=aarch64
cmake .. "${myconf[@]}"
make -j$(nproc)
# NE10 does not have install method, we have to copy files with shell command
cp modules/libNE10.a "$FFBUILD_PREFIX"/lib/libNE10.a
cp -R ../inc "$FFBUILD_PREFIX"/include/libNE10
}
29 changes: 29 additions & 0 deletions builder/scripts.d/50-libopus.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,38 @@ ffbuild_dockerbuild() {
return -1
fi

if [[ $TARGET == linux* || $TARGET == mac* ]] && [[ $TARGET == *arm64 ]]; then
myconf+=(
--with-NE10-libraries="$FFBUILD_PREFIX"/lib
--with-NE10-includes="$FFBUILD_PREFIX"/include/libNE10
)
fi

# reset CLFAGS because libopus may give up optimization if current CFLAGS contains value
CFLAGS_BACKUP="$CFLAGS"

# For some reason libopus will not add optimization flag, we have to set it ourselves
if [[ $TARGET == mac* ]]; then
export CFLAGS="-O3"
else
export CFLAGS="-O3 -fPIC -DPIC"
fi

./configure "${myconf[@]}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems like optimizations being completely disabled only happens on macOS builds? I don't see the !DEFINED(__OPTIMIZED__) warning on crosstool-ng builds.

Opus have this in their macOS CI:

      - name: Configure
        run: CFLAGS="-mavx -mfma -mavx2 -O2 -ffast-math" ./configure --enable-float-approx ${{ matrix.config.buildconfig }}

So maybe this will be enough for both platforms:

    # Override previously set -O(n) option and the CC's default optimization options.
    CFLAGS="$CFLAGS -O3" ./configure "${myconf[@]}"

make -j$(nproc)
make install

export CFLAGS="$CFLAGS_BACKUP"

if [[ $TARGET == *arm64 ]]; then
if [[ $TARGET == mac* ]]; then
gsed -i 's/-lopus/-lopus -lNE10/' "$FFBUILD_PREFIX"/lib/pkgconfig/opus.pc
gsed -i 's/-I${includedir}\/opus/-I${includedir}\/opus -I${includedir}\/libNE10/' "$FFBUILD_PREFIX"/lib/pkgconfig/opus.pc
else
sed -i 's/-lopus/-lopus -lNE10/' "$FFBUILD_PREFIX"/lib/pkgconfig/opus.pc
sed -i 's/-I${includedir}\/opus/-I${includedir}\/opus -I${includedir}\/libNE10/' "$FFBUILD_PREFIX"/lib/pkgconfig/opus.pc
fi
fi
}

ffbuild_configure() {
Expand Down
Loading