ci: Add Android aarch64 build

This commit is contained in:
Macdu 2022-12-26 21:49:43 +01:00 committed by merry
parent c63c134582
commit 71aae99f49
2 changed files with 29 additions and 4 deletions

View file

@ -9,15 +9,14 @@ jobs:
build: build:
strategy: strategy:
matrix: matrix:
os: [ ubuntu-latest ] platform: [ linux, android ]
fail-fast: false fail-fast: false
runs-on: ${{matrix.os}} runs-on: ubuntu-latest
steps: steps:
- name: Install build dependencies - name: Install build dependencies
if: ${{matrix.os == 'ubuntu-latest'}}
run: > run: >
sudo apt-get update && sudo apt-get update &&
sudo apt-get install sudo apt-get install
@ -30,6 +29,7 @@ jobs:
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: Ccache - name: Ccache
if: matrix.platform == 'linux'
uses: hendrikmuhs/ccache-action@v1.2 uses: hendrikmuhs/ccache-action@v1.2
- name: Checkout ext-boost repo - name: Checkout ext-boost repo
@ -38,7 +38,8 @@ jobs:
repository: MerryMage/ext-boost repository: MerryMage/ext-boost
path: externals/ext-boost path: externals/ext-boost
- name: Configure CMake for AArch64 - name: Configure CMake for AArch64 (Linux)
if: matrix.platform == 'linux'
env: env:
CC: aarch64-linux-gnu-gcc-10 CC: aarch64-linux-gnu-gcc-10
CXX: aarch64-linux-gnu-g++-10 CXX: aarch64-linux-gnu-g++-10
@ -50,12 +51,27 @@ jobs:
-DDYNARMIC_TESTS_USE_UNICORN=0 -DDYNARMIC_TESTS_USE_UNICORN=0
-DDYNARMIC_USE_LLVM=0 -DDYNARMIC_USE_LLVM=0
-G Ninja -G Ninja
- name: Configure CMake for AArch64 (Android)
if: matrix.platform == 'android'
run: >
cmake
-B ${{github.workspace}}/build-arm64
-DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake
-DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
-DANDROID_ABI=arm64-v8a
-DANDROID_PLATFORM=29
-DBoost_INCLUDE_DIR=${{github.workspace}}/externals/ext-boost
-DDYNARMIC_TESTS_USE_UNICORN=0
-DDYNARMIC_USE_LLVM=0
-G Ninja
- name: Build AArch64 - name: Build AArch64
working-directory: ${{github.workspace}}/build-arm64 working-directory: ${{github.workspace}}/build-arm64
run: cmake --build . --config Release run: cmake --build . --config Release
- name: Configure CMake for x86_64 - name: Configure CMake for x86_64
if: matrix.platform == 'linux'
env: env:
CC: gcc-10 CC: gcc-10
CXX: g++-10 CXX: g++-10
@ -71,14 +87,17 @@ jobs:
-G Ninja -G Ninja
- name: Build x86_64 - name: Build x86_64
if: matrix.platform == 'linux'
working-directory: ${{github.workspace}}/build-x64 working-directory: ${{github.workspace}}/build-x64
run: cmake --build . --config Release run: cmake --build . --config Release
- name: Basic tests - name: Basic tests
if: matrix.platform == 'linux'
working-directory: ${{github.workspace}} working-directory: ${{github.workspace}}
run: qemu-aarch64 -L /usr/aarch64-linux-gnu ./build-arm64/tests/dynarmic_tests -d yes run: qemu-aarch64 -L /usr/aarch64-linux-gnu ./build-arm64/tests/dynarmic_tests -d yes
- name: Test against x86_64 implementation (A32, thumb) - name: Test against x86_64 implementation (A32, thumb)
if: matrix.platform == 'linux'
working-directory: ${{github.workspace}} working-directory: ${{github.workspace}}
run: | run: |
diff <(qemu-aarch64 -L /usr/aarch64-linux-gnu ./build-arm64/tests/dynarmic_test_generator thumb 42 1 100000) <(./build-x64/tests/dynarmic_test_generator thumb 42 1 100000) diff <(qemu-aarch64 -L /usr/aarch64-linux-gnu ./build-arm64/tests/dynarmic_test_generator thumb 42 1 100000) <(./build-x64/tests/dynarmic_test_generator thumb 42 1 100000)
@ -86,6 +105,7 @@ jobs:
diff <(qemu-aarch64 -L /usr/aarch64-linux-gnu ./build-arm64/tests/dynarmic_test_generator thumb 42 100 1000) <(./build-x64/tests/dynarmic_test_generator thumb 42 100 1000) diff <(qemu-aarch64 -L /usr/aarch64-linux-gnu ./build-arm64/tests/dynarmic_test_generator thumb 42 100 1000) <(./build-x64/tests/dynarmic_test_generator thumb 42 100 1000)
- name: Test against x86_64 implementation (A32, arm) - name: Test against x86_64 implementation (A32, arm)
if: matrix.platform == 'linux'
working-directory: ${{github.workspace}} working-directory: ${{github.workspace}}
run: | run: |
diff <(qemu-aarch64 -L /usr/aarch64-linux-gnu ./build-arm64/tests/dynarmic_test_generator arm 42 1 100000) <(./build-x64/tests/dynarmic_test_generator arm 42 1 100000) diff <(qemu-aarch64 -L /usr/aarch64-linux-gnu ./build-arm64/tests/dynarmic_test_generator arm 42 1 100000) <(./build-x64/tests/dynarmic_test_generator arm 42 1 100000)
@ -93,6 +113,7 @@ jobs:
diff <(qemu-aarch64 -L /usr/aarch64-linux-gnu ./build-arm64/tests/dynarmic_test_generator arm 42 100 1000) <(./build-x64/tests/dynarmic_test_generator arm 42 100 1000) diff <(qemu-aarch64 -L /usr/aarch64-linux-gnu ./build-arm64/tests/dynarmic_test_generator arm 42 100 1000) <(./build-x64/tests/dynarmic_test_generator arm 42 100 1000)
- name: Test against x86_64 implementation (A64) - name: Test against x86_64 implementation (A64)
if: matrix.platform == 'linux'
working-directory: ${{github.workspace}} working-directory: ${{github.workspace}}
run: | run: |
diff <(qemu-aarch64 -L /usr/aarch64-linux-gnu ./build-arm64/tests/dynarmic_test_generator a64 42 1 100000) <(./build-x64/tests/dynarmic_test_generator a64 42 1 100000) diff <(qemu-aarch64 -L /usr/aarch64-linux-gnu ./build-arm64/tests/dynarmic_test_generator a64 42 1 100000) <(./build-x64/tests/dynarmic_test_generator a64 42 1 100000)

View file

@ -14,6 +14,10 @@ if (NOT TARGET Catch2::Catch2)
if (DYNARMIC_TESTS) if (DYNARMIC_TESTS)
add_library(Catch2::Catch2 INTERFACE IMPORTED GLOBAL) add_library(Catch2::Catch2 INTERFACE IMPORTED GLOBAL)
target_include_directories(Catch2::Catch2 INTERFACE catch/include) target_include_directories(Catch2::Catch2 INTERFACE catch/include)
if(CMAKE_SYSTEM_NAME STREQUAL "Android")
target_link_libraries(Catch2::Catch2 INTERFACE log)
endif()
endif() endif()
endif() endif()