Cross compile for armhf and s390x architectures

Also enable parallel compilation (make -j3) and fix circular dependency
when building precompiled archives

Signed-off-by: Paul Guyot <[email protected]>

Author: pguyot

.github/workflows/build-and-test-other.yaml

@@ -70,7 +70,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        arch: ["arm32v5", "arm32v7"]
+        arch: ["arm32v5"]
 
         include:
         - arch: "arm32v5"
@@ -92,21 +92,6 @@ jobs:
             apt install -y -t stretch-backports cmake &&
             apt install -y file gcc g++ binutils make doxygen gperf zlib1g-dev libmbedtls-dev
 
-        - arch: "arm32v7"
-          platform: "arm/v7"
-          tag: "bookworm"
-          # -D_FILE_OFFSET_BITS=64 is required for making atomvm:posix_readdir/1 test work
-          # otherwise readdir will fail due to 64 bits inode numbers with 32 bit ino_t
-          cflags: "-mcpu=cortex-a7 -mfloat-abi=hard -O2 -mthumb -mthumb-interwork -D_FILE_OFFSET_BITS=64"
-          cmake_opts: "-DAVM_WARNINGS_ARE_ERRORS=ON"
-
-        # Required for testing big endian archs
-        - arch: "s390x"
-          platform: "s390x"
-          tag: "bookworm"
-          cflags: "-O2"
-          cmake_opts: "-DAVM_WARNINGS_ARE_ERRORS=ON"
-
     steps:
     - name: Checkout repo
       uses: actions/checkout@v4

.github/workflows/build-and-test.yaml

@@ -321,6 +321,36 @@ jobs:
           cmake_opts_other: "-DAVM_DISABLE_JIT=OFF"
           jit_target_arch: "aarch64"
 
+        # armhf build
+        - os: "ubuntu-24.04"
+          cc: "arm-linux-gnueabihf-gcc"
+          cxx: "arm-linux-gnueabihf-g++"
+          # -D_FILE_OFFSET_BITS=64 is required for making atomvm:posix_readdir/1 test work
+          # otherwise readdir will fail due to 64 bits inode numbers with 32 bit ino_t
+          cflags: "-mcpu=cortex-a7 -mfloat-abi=hard -O2 -mthumb -mthumb-interwork -D_FILE_OFFSET_BITS=64"
+          otp: "28"
+          elixir_version: "1.17"
+          rebar3_version: "3.24.0"
+          cmake_opts_other: "-DAVM_WARNINGS_ARE_ERRORS=ON -DCMAKE_TOOLCHAIN_FILE=${RUNNER_TEMP}/armhf_toolchain.cmake"
+          compiler_pkgs: "crossbuild-essential-armhf libc6-dbg:armhf zlib1g-dev:armhf libmbedtls-dev:armhf qemu-user qemu-user-binfmt binfmt-support"
+          arch: "armhf"
+          library-arch: arm-linux-gnueabihf
+
+        # s390x build
+        - os: "ubuntu-24.04"
+          cc: "s390x-linux-gnu-gcc"
+          cxx: "s390x-linux-gnu-g++"
+          # -D_FILE_OFFSET_BITS=64 is required for making atomvm:posix_readdir/1 test work
+          # otherwise readdir will fail due to 64 bits inode numbers with 32 bit ino_t
+          cflags: "-O2"
+          otp: "28"
+          elixir_version: "1.17"
+          rebar3_version: "3.24.0"
+          cmake_opts_other: "-DAVM_WARNINGS_ARE_ERRORS=ON -DCMAKE_TOOLCHAIN_FILE=${RUNNER_TEMP}/s390x_toolchain.cmake"
+          compiler_pkgs: "crossbuild-essential-s390x libc6-dbg:s390x zlib1g-dev:s390x libmbedtls-dev:s390x qemu-user qemu-user-binfmt binfmt-support"
+          arch: "s390x"
+          library-arch: s390x-linux-gnu
+
     env:
       ImageOS: ${{ matrix.container == 'ubuntu:20.04' && 'ubuntu20' || matrix.os == 'ubuntu-20.04' && 'ubuntu20' || matrix.os == 'ubuntu-22.04' && 'ubuntu22' || matrix.os == 'ubuntu-24.04' && 'ubuntu24' || 'ubuntu24' }}
       CC: ${{ matrix.cc }}
@@ -340,6 +370,32 @@ jobs:
       if: matrix.arch == 'i386'
       run: sudo dpkg --add-architecture i386
 
+    - name: "Setup cross compilation architecture"
+      if: matrix.library-arch != ''
+      run: |
+        sudo dpkg --add-architecture ${{ matrix.arch }}
+        cat > ${RUNNER_TEMP}/cross-compile-sources.list <<EOF
+        deb [arch=${{ matrix.arch }}] http://ports.ubuntu.com/ noble main restricted
+        deb [arch=${{ matrix.arch }}] http://ports.ubuntu.com/ noble-updates main restricted
+        deb [arch=${{ matrix.arch }}] http://ports.ubuntu.com/ noble universe
+        deb [arch=${{ matrix.arch }}] http://ports.ubuntu.com/ noble-updates universe
+        deb [arch=${{ matrix.arch }}] http://ports.ubuntu.com/ noble multiverse
+        deb [arch=${{ matrix.arch }}] http://ports.ubuntu.com/ noble-updates multiverse
+        deb [arch=${{ matrix.arch }}] http://ports.ubuntu.com/ noble-backports main restricted universe multiverse
+        EOF
+        sudo mv ${RUNNER_TEMP}/cross-compile-sources.list /etc/apt/sources.list.d/
+
+        sudo sed -i '/Types: deb/a Architectures: amd64' /etc/apt/sources.list.d/ubuntu.sources
+
+        cat > ${RUNNER_TEMP}/${{ matrix.arch }}_toolchain.cmake <<EOF
+        set(CMAKE_SYSTEM_NAME Linux)
+        set(CMAKE_C_LIBRARY_ARCHITECTURE ${{ matrix.library-arch }})
+
+        set(ZLIB_LIBRARY /usr/lib/${{ matrix.library-arch }}/libz.so)
+        set(MBEDTLS_ROOT_DIR /usr)
+        set(MBEDTLS_LIBRARIES_DIR /usr/lib/${{ matrix.library-arch }})
+        EOF
+
     - name: "APT update"
       run: sudo apt update -y
 
@@ -407,99 +463,178 @@ jobs:
 
     - name: "Build: run make"
       working-directory: build
-      run: make
+      run: make -j3
 
     - name: "Build: run dialyzer"
       working-directory: build
       run: make dialyzer
 
     # Test
-    - name: "Test: test-erlang"
+    - name: "Test: test-erlang with valgrind"
+      if: matrix.library-arch == ''
       timeout-minutes: 30
       working-directory: build
       run: |
         ulimit -c unlimited
         valgrind --error-exitcode=1 ./tests/test-erlang -s prime_smp
+
+    - name: "Test: test-erlang"
+      timeout-minutes: 10
+      working-directory: build
+      run: |
+        ulimit -c unlimited
         ./tests/test-erlang -s prime_smp
 
-    - name: "Test: test-enif"
+    - name: "Test: test-enif with valgrind"
+      if: matrix.library-arch == ''
       working-directory: build
       run: |
         ulimit -c unlimited
         valgrind --error-exitcode=1 ./tests/test-enif
+
+    - name: "Test: test-enif"
+      working-directory: build
+      run: |
+        ulimit -c unlimited
         ./tests/test-enif
 
-    - name: "Test: test-heap"
+    - name: "Test: test-heap with valgrind"
+      if: matrix.library-arch == ''
       working-directory: build
       run: |
         ulimit -c unlimited
         valgrind --error-exitcode=1 ./tests/test-heap
+
+    - name: "Test: test-heap"
+      working-directory: build
+      run: |
+        ulimit -c unlimited
         ./tests/test-heap
 
-    - name: "Test: test-mailbox"
+    - name: "Test: test-mailbox with valgrind"
+      if: matrix.library-arch == ''
       working-directory: build
       run: |
         ulimit -c unlimited
         valgrind --error-exitcode=1 ./tests/test-mailbox
+
+    - name: "Test: test-mailbox"
+      working-directory: build
+      run: |
+        ulimit -c unlimited
         ./tests/test-mailbox
 
-    - name: "Test: test-structs"
+    - name: "Test: test-structs with valgrind"
+      if: matrix.library-arch == ''
       timeout-minutes: 10
       working-directory: build
       run: |
         ulimit -c unlimited
         valgrind --error-exitcode=1 ./tests/test-structs
+
+    - name: "Test: test-structs"
+      timeout-minutes: 10
+      working-directory: build
+      run: |
+        ulimit -c unlimited
         ./tests/test-structs
 
+    - name: "Test: test_etest.avm with valgrind"
+      if: matrix.library-arch == ''
+      timeout-minutes: 5
+      working-directory: build
+      run: |
+        ulimit -c unlimited
+        valgrind ./src/AtomVM ./tests/libs/etest/test_etest.avm
+
     - name: "Test: test_etest.avm"
       timeout-minutes: 5
       working-directory: build
       run: |
         ulimit -c unlimited
         ./src/AtomVM ./tests/libs/etest/test_etest.avm
-        valgrind ./src/AtomVM ./tests/libs/etest/test_etest.avm
 
-    - name: "Test: test_estdlib.avm"
+    - name: "Test: test_estdlib.avm with valgrind"
+      if: matrix.library-arch == ''
       timeout-minutes: 30
       working-directory: build
       run: |
         ulimit -c unlimited
         valgrind --error-exitcode=1 ./src/AtomVM ./tests/libs/estdlib/test_estdlib.avm
+
+    - name: "Test: test_estdlib.avm"
+      timeout-minutes: 20
+      working-directory: build
+      run: |
+        ulimit -c unlimited
         ./src/AtomVM ./tests/libs/estdlib/test_estdlib.avm
 
-    - name: "Test: test_eavmlib.avm"
+    - name: "Test: test_eavmlib.avm with valgrind"
+      if: matrix.library-arch == ''
       timeout-minutes: 10
       working-directory: build
       run: |
         ulimit -c unlimited
         valgrind --error-exitcode=1 ./src/AtomVM ./tests/libs/eavmlib/test_eavmlib.avm
+
+    - name: "Test: test_eavmlib.avm"
+      timeout-minutes: 10
+      working-directory: build
+      run: |
+        ulimit -c unlimited
         ./src/AtomVM ./tests/libs/eavmlib/test_eavmlib.avm
 
-    - name: "Test: test_jit.avm"
+    - name: "Test: test_jit.avm with valgrind"
+      if: matrix.library-arch == '' && matrix.otp != '21' && matrix.otp != '22'
       timeout-minutes: 30
-      if: matrix.otp != '21' && matrix.otp != '22'
       working-directory: build
       run: |
         ulimit -c unlimited
         valgrind --error-exitcode=1 ./src/AtomVM tests/libs/jit/test_jit.avm
+
+    - name: "Test: test_jit.avm"
+      timeout-minutes: 20
+      if: matrix.otp != '21' && matrix.otp != '22'
+      working-directory: build
+      run: |
+        ulimit -c unlimited
         ./src/AtomVM tests/libs/jit/test_jit.avm
 
+    - name: "Test: test_alisp.avm with valgrind"
+      if: matrix.library-arch == ''
+      timeout-minutes: 20
+      working-directory: build
+      run: |
+        ulimit -c unlimited
+        valgrind --error-exitcode=1 ./src/AtomVM ./tests/libs/alisp/test_alisp.avm
+
     - name: "Test: test_alisp.avm"
       timeout-minutes: 10
       working-directory: build
       run: |
         ulimit -c unlimited
-        valgrind --error-exitcode=1 ./src/AtomVM ./tests/libs/alisp/test_alisp.avm
         ./src/AtomVM ./tests/libs/alisp/test_alisp.avm
 
+    - name: "Test: Tests.avm (Elixir) with valgrind"
+      if: matrix.library-arch == ''
+      timeout-minutes: 20
+      working-directory: build
+      run: |
+        ulimit -c unlimited
+        if command -v elixirc >/dev/null 2>&1 && command -v elixir >/dev/null 2>&1
+        then
+          valgrind --error-exitcode=1 ./src/AtomVM ./tests/libs/exavmlib/Tests.avm
+        else
+          echo "Elixir not installed, skipping Elixir tests"
+        fi
+
     - name: "Test: Tests.avm (Elixir)"
       timeout-minutes: 10
       working-directory: build
       run: |
         ulimit -c unlimited
         if command -v elixirc >/dev/null 2>&1 && command -v elixir >/dev/null 2>&1
         then
-          valgrind --error-exitcode=1 ./src/AtomVM ./tests/libs/exavmlib/Tests.avm
           ./src/AtomVM ./tests/libs/exavmlib/Tests.avm
         else
           echo "Elixir not installed, skipping Elixir tests"

CMakeModules/BuildErlang.cmake

@@ -53,10 +53,16 @@ macro(pack_archive avm_name)
         COMMENT "Packing archive ${avm_name}.avm"
         VERBATIM
     )
+    # Create emu target for source beams only
     add_custom_target(
-        ${avm_name} ALL
+        ${avm_name}_emu
         DEPENDS ${avm_name}.avm
     )
+    # Create main target (will be updated by pack_precompiled_archive if needed)
+    add_custom_target(
+        ${avm_name} ALL
+        DEPENDS ${avm_name}_emu
+    )
 endmacro()
 
 macro(pack_precompiled_archive avm_name)
@@ -110,6 +116,9 @@ macro(pack_precompiled_archive avm_name)
                 ${avm_name}_${jit_target_arch} ALL
                 DEPENDS ${avm_name}-${jit_target_arch}.avm
             )
+            # Ensure source beams are built before precompilation
+            add_dependencies(${avm_name}_${jit_target_arch} ${avm_name}_emu)
+            # Make main target depend on precompiled targets
             add_dependencies(${avm_name} ${avm_name}_${jit_target_arch})
         endforeach()
     endif()