Thanks to visit codestin.com
Credit goes to github.com

Skip to content

feat. Add ARM support #239

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.

Sign up for GitHub

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

Merged
remiolivier-discord merged 3 commits into from
Apr 9, 2025
Merged

feat. Add ARM support #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a544adf
updating script to build aarch64 - in progress
remiolivier-discord Mar 20, 2025
8bc1023
add aarch64 compilation
remiolivier-discord Apr 9, 2025
3965e45
fix conflicts
remiolivier-discord Apr 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
108 changes: 90 additions & 18 deletions .github/workflows/deps.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ on:
workflow_dispatch:

jobs:
linux:
name: Linux
linux-amd64:
name: Linux AMD64
runs-on: ubuntu-22.04
steps:
- name: Check out repo
Expand All @@ -26,13 +26,13 @@ jobs:
- name: Install build tools
run: |
sudo apt-get update
sudo apt-get install nasm python3
sudo apt-get install -y nasm python3

- name: Build deps
run: |
echo "Starting dependency build..."
export MAKEFLAGS="-j$(nproc)"
./deps/build-deps-linux.sh
./deps/build-deps-linux.sh --arch=amd64
echo "Dependency build completed"

- run: |
Expand All @@ -53,19 +53,78 @@ jobs:
- name: Generate build info
run: |
./deps/verify_deps.py generate \
--deps-dir deps/linux \
--platform linux \
--deps-dir deps/linux/amd64 \
--platform linux-amd64 \
--commit ${{ github.sha }}

- name: Create deps archive
run: |
tar -czf deps-linux.tar.gz deps/linux/
tar -czf deps-linux-amd64.tar.gz deps/linux/amd64/

- name: Upload deps artifact
uses: actions/upload-artifact@v4
with:
name: deps-linux.tar.gz
path: deps-linux.tar.gz
name: deps-linux-amd64.tar.gz
path: deps-linux-amd64.tar.gz

linux-aarch64:
name: Linux AArch64
runs-on: ubuntu-22.04
steps:
- name: Check out repo
uses: actions/checkout@v4

- name: Install build tools
run: |
sudo sed -i -E 's|^deb ([^ ]+) (.*)$|deb [arch=amd64] \1 \2\ndeb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ \2|' /etc/apt/sources.list
sudo dpkg --add-architecture arm64
sudo apt-get update
sudo apt-get install -y cmake \
patch \
autoconf libtool nasm yasm \
python3 \
crossbuild-essential-arm64 \
g++-aarch64-linux-gnu \
gcc-aarch64-linux-gnu \
binutils-aarch64-linux-gnu

- name: Build deps
run: |
echo "Starting dependency build..."
export MAKEFLAGS="-j$(nproc)"
./deps/build-deps-linux.sh --arch=aarch64
echo "Dependency build completed"

- run: |
git status
git diff

- name: Install Go
uses: actions/setup-go@v5
with:
cache: false
go-version: "1.23"

- name: Build and test lilliput with the new deps
run: |
CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++ CGO_ENABLED=1 GOOS=linux GOARCH=arm64 go build

- name: Generate build info
run: |
./deps/verify_deps.py generate \
--deps-dir deps/linux/aarch64 \
--platform linux-aarch64 \
--commit ${{ github.sha }}

- name: Create deps archive
run: |
tar -czf deps-linux-aarch64.tar.gz deps/linux/aarch64/

- name: Upload deps artifact
uses: actions/upload-artifact@v4
with:
name: deps-linux-aarch64.tar.gz
path: deps-linux-aarch64.tar.gz

macos-15:
name: macOS 15
Expand Down Expand Up @@ -123,18 +182,24 @@ jobs:

verify:
name: Verify Build Artifacts
needs: [linux, macos-15]
needs: [linux-amd64, linux-aarch64, macos-15]
runs-on: ubuntu-latest
if: github.event_name == 'pull_request'

steps:
- name: Check out repo
uses: actions/checkout@v4

- name: Download Linux artifact
- name: Download Linux AMD64 artifact
uses: actions/download-artifact@v4
with:
name: deps-linux-amd64.tar.gz
path: .

- name: Download Linux AArch64 artifact
uses: actions/download-artifact@v4
with:
name: deps-linux.tar.gz
name: deps-linux-aarch64.tar.gz
path: .

- name: Download macOS 15 artifact
Expand All @@ -145,17 +210,24 @@ jobs:

- name: Extract artifacts
run: |
tar xzf deps-linux.tar.gz
tar xzf deps-linux-amd64.tar.gz
tar xzf deps-linux-aarch64.tar.gz
tar xzf deps-macos-15.tar.gz

- name: Verify Linux artifacts
- name: Verify Linux AMD64 artifacts
run: |
python3 ./deps/verify_deps.py verify \
--deps-dir deps/linux/amd64 \
--build-info deps/linux/amd64/build-info.json

- name: Verify Linux AArch64 artifacts
run: |
python3 ./deps/verify_deps.py verify \
--deps-dir deps/linux \
--build-info deps/linux/build-info.json
--deps-dir deps/linux/aarch64 \
--build-info deps/linux/aarch64/build-info.json

- name: Verify macOS 15 artifacts
run: |
run: |
python3 ./deps/verify_deps.py verify \
--deps-dir deps/osx \
--build-info deps/osx/build-info.json
13 changes: 6 additions & 7 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@ testdata/benchmark_out/
# generated
*.pc
*.la
deps/aom
deps/osx/bin
deps/osx/man
deps/osx/share
deps/linux/bin
deps/linux/man
deps/linux/share
deps/osx/**/bin
deps/osx/**/man
deps/osx/**/share
deps/linux/**/bin
deps/linux/**/man
deps/linux/**/share
9 changes: 6 additions & 3 deletions cgo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@ package lilliput

/*
#cgo darwin CFLAGS: -I${SRCDIR}/deps/osx/include -I${SRCDIR}/deps/osx/include/opencv4
#cgo linux CFLAGS: -msse -msse2 -msse3 -msse4.1 -msse4.2 -mavx -I${SRCDIR}/deps/linux/include -I${SRCDIR}/deps/linux/include/opencv4
#cgo linux,amd64 CFLAGS: -msse -msse2 -msse3 -msse4.1 -msse4.2 -mavx -I${SRCDIR}/deps/linux/amd64/include -I${SRCDIR}/deps/linux/amd64/include/opencv4
#cgo linux,arm64 CFLAGS: -march=armv8-a+simd+crypto -I${SRCDIR}/deps/linux/aarch64/include -I${SRCDIR}/deps/linux/aarch64/include/opencv4
#cgo CXXFLAGS: -std=c++20
#cgo darwin CXXFLAGS: -I${SRCDIR}/deps/osx/include -I${SRCDIR}/deps/osx/include/opencv4
#cgo linux CXXFLAGS: -I${SRCDIR}/deps/linux/include -I${SRCDIR}/deps/linux/include/opencv4
#cgo linux,amd64 CXXFLAGS: -I${SRCDIR}/deps/linux/amd64/include -I${SRCDIR}/deps/linux/amd64/include/opencv4
#cgo linux,arm64 CXXFLAGS: -I${SRCDIR}/deps/linux/aarch64/include -I${SRCDIR}/deps/linux/aarch64/include/opencv4
#cgo darwin LDFLAGS: -L${SRCDIR}/deps/osx/lib -L${SRCDIR}/deps/osx/lib/opencv4/3rdparty -lavif -lyuv -laom -lavformat -lavcodec -lavutil -lopencv_photo -lopencv_imgcodecs -lopencv_imgproc -lopencv_core -lbz2 -lgif -ljpeg -lpng -lswscale -lwebp -lwebpmux -lwebpdemux -lsharpyuv -lz -llibopenjp2 -littnotify -framework Accelerate -framework CoreFoundation -framework CoreMedia -framework CoreVideo -framework VideoToolbox
#cgo linux LDFLAGS: -L${SRCDIR}/deps/linux/lib -L${SRCDIR}/deps/linux/lib/opencv4/3rdparty -lavif -lyuv -laom -lavformat -lavcodec -lavutil -lopencv_photo -lopencv_imgcodecs -lopencv_imgproc -lopencv_core -lbz2 -lgif -ljpeg -lpng -lswscale -lwebp -lwebpmux -lwebpdemux -lsharpyuv -lz -llibopenjp2 -littnotify -lippiw -lippicv
#cgo linux,amd64 LDFLAGS: -L${SRCDIR}/deps/linux/amd64/lib -L${SRCDIR}/deps/linux/amd64/lib/opencv4/3rdparty -lavif -lyuv -laom -lavformat -lavcodec -lavutil -lopencv_photo -lopencv_imgcodecs -lopencv_imgproc -lopencv_core -lbz2 -lgif -ljpeg -lpng16 -lswscale -lwebp -lwebpmux -lwebpdemux -lsharpyuv -lz -llibopenjp2 -littnotify -lippiw -lippicv
#cgo linux,arm64 LDFLAGS: -L${SRCDIR}/deps/linux/aarch64/lib -L${SRCDIR}/deps/linux/aarch64/lib/opencv4/3rdparty -lavif -lyuv -laom -lavformat -lavcodec -lavutil -lopencv_photo -lopencv_imgcodecs -lopencv_imgproc -lopencv_core -lbz2 -lgif -ljpeg -lpng16 -lswscale -lwebp -lwebpmux -lwebpdemux -lsharpyuv -lz -llibopenjp2 -littnotify
void dummy() {}
*/
import "C"
Expand Down
1 change: 1 addition & 0 deletions deps/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
build/
aom/
libjpeg-turbo/
zlib/
libpng/
Expand Down
Loading
Loading