CI: Add JIT architecture test

The JIT architecture test enables "ARCH_TEST" feature, and the build
process of Sail RISC-V model is removed from the GitHub Actions.

Author: vacantron

.ci/common.sh

@@ -2,7 +2,7 @@
 check_platform()
 {
     MACHINE_TYPE=`uname -m`
-    if [ ${MACHINE_TYPE} != 'x86_64' ]; then
+    if [ ${MACHINE_TYPE} != 'x86_64' ] && [ ${MACHINE_TYPE} != 'aarch64' ]; then
         exit 1
     fi
 

.ci/riscv-tests.sh

@@ -17,8 +17,17 @@ make distclean
 # necessary. We need to investigate why full 4 GiB memory access is required
 # for this purpose, although the emulator can run all selected benchmarks with
 # much smaller memory mapping regions.
-make ENABLE_EXT_M=1 ENABLE_EXT_A=1 ENABLE_EXT_F=1 ENABLE_EXT_C=1 \
+make ENABLE_ARCH_TEST=1 ENABLE_EXT_M=1 ENABLE_EXT_A=1 ENABLE_EXT_F=1 ENABLE_EXT_C=1 \
      ENABLE_Zicsr=1 ENABLE_Zifencei=1 ENABLE_FULL4G=1 $PARALLEL
-make arch-test RISCV_DEVICE=IMAFCZicsrZifencei $PARALLEL || exit 1
-make arch-test RISCV_DEVICE=FCZicsr $PARALLEL || exit 1
-make arch-test RISCV_DEVICE=IMZbaZbbZbcZbs $PARALLEL || exit 1
+make arch-test RISCV_DEVICE=IMAFCZicsrZifencei HW_DATA_MISALIGN=1 $PARALLEL || exit 1
+make arch-test RISCV_DEVICE=FCZicsr HW_DATA_MISALIGN=1 $PARALLEL || exit 1
+make arch-test RISCV_DEVICE=IMZbaZbbZbcZbs HW_DATA_MISALIGN=1 $PARALLEL || exit 1
+
+# Rebuild with JIT
+# Do not run the architecture test with "Zicsr" extension. It ignores
+# the hardware misalignment (hw_data_misaligned_support) option.
+make distclean
+make ENABLE_ARCH_TEST=1 ENABLE_JIT=1 ENABLE_T2C=0 \
+     ENABLE_EXT_M=1 ENABLE_EXT_A=1 ENABLE_EXT_F=1 ENABLE_EXT_C=1 \
+     ENABLE_Zicsr=1 ENABLE_Zifencei=1 ENABLE_FULL4G=1 $PARALLEL
+make arch-test RISCV_DEVICE=IMC HW_DATA_MISALIGN=0 $PARALLEL || exit 1

.ci/riscv-toolchain-install.sh

@@ -11,7 +11,12 @@ mkdir -p toolchain
 if [[ "$#" == "0" ]] || [[ "$1" != "riscv-collab" ]]; then
     GCC_VER=14.2.0-2
     TOOLCHAIN_REPO=https://github.com/xpack-dev-tools/riscv-none-elf-gcc-xpack
-    TOOLCHAIN_URL=${TOOLCHAIN_REPO}/releases/download/v${GCC_VER}/xpack-riscv-none-elf-gcc-${GCC_VER}-linux-x64.tar.gz
+
+    if [[ ${MACHINE_TYPE} == "x86_64" ]]; then
+        TOOLCHAIN_URL=${TOOLCHAIN_REPO}/releases/download/v${GCC_VER}/xpack-riscv-none-elf-gcc-${GCC_VER}-linux-x64.tar.gz
+    elif [[ ${MACHINE_TYPE} == "aarch64" ]]; then
+        TOOLCHAIN_URL=${TOOLCHAIN_REPO}/releases/download/v${GCC_VER}/xpack-riscv-none-elf-gcc-${GCC_VER}-linux-arm64.tar.gz
+    fi
 else
     UBUNTU_VER=`lsb_release -r | cut -f2`
     GCC_VER=2024.11.22

.github/workflows/build-artifact.yml

@@ -110,7 +110,6 @@ jobs:
           sudo apt-get update -q -y
           sudo apt-get upgrade -q -y
           sudo apt-get install -q -y gcc-multilib g++-multilib
-          sudo apt-get install -q -y opam build-essential libgmp-dev z3 pkg-config zlib1g-dev
           .ci/riscv-toolchain-install.sh
           echo "$PWD/toolchain/bin" >> $GITHUB_PATH
       - name: Build binaries
@@ -120,19 +119,6 @@ jobs:
           mv build/sha1sum-linux-x86-softfp /tmp
           mv build/sha1sum-riscv32 /tmp
           mv build/linux-x86-softfp build/riscv32 /tmp/rv32emu-prebuilt
-      - name: Build Sail model
-        run: |
-          cd /tmp
-          opam init -y --disable-sandboxing
-          opam switch create ocaml-base-compiler.4.06.1
-          opam install sail -y
-          eval $(opam config env)
-          git clone https://github.com/riscv/sail-riscv.git
-          cd sail-riscv
-          git checkout 9547a30bf84572c458476591b569a95f5232c1c7
-          ARCH=RV32 make -j
-          mkdir -p /tmp/rv32emu-prebuilt/sail_cSim
-          mv c_emulator/riscv_sim_RV32 /tmp/rv32emu-prebuilt/sail_cSim
       - name: Create tarball
         run: |
           cd /tmp

.github/workflows/main.yml

@@ -142,6 +142,12 @@ jobs:
             .ci/boot-linux.sh
             make ENABLE_SYSTEM=1 clean
       if: ${{ always() }}
+    - name: Architecture test
+      env:
+        CC: ${{ steps.install_cc.outputs.cc }}
+      run: |
+            .ci/riscv-tests.sh
+      if: ${{ always() }}
 
   host-arm64:
     needs: [detect-code-related-file-changes]
@@ -161,7 +167,7 @@ jobs:
         # No 'sudo' is available
         install: |
           apt-get update -q -y
-          apt-get install -q -y git build-essential libsdl2-dev libsdl2-mixer-dev lsb-release wget software-properties-common gnupg bc
+          apt-get install -q -y git build-essential libsdl2-dev libsdl2-mixer-dev lsb-release wget software-properties-common gnupg bc python3 python3-pip
           git config --global --add safe.directory ${{ github.workspace }}
           git config --global --add safe.directory ${{ github.workspace }}/src/softfloat
           git config --global --add safe.directory ${{ github.workspace }}/src/mini-gdbstub
@@ -176,6 +182,8 @@ jobs:
           make ENABLE_JIT=1 clean && make ENABLE_EXT_A=0 ENABLE_JIT=1 check -j$(nproc)
           make ENABLE_JIT=1 clean && make ENABLE_EXT_F=0 ENABLE_JIT=1 check -j$(nproc)
           make ENABLE_JIT=1 clean && make ENABLE_EXT_C=0 ENABLE_JIT=1 check -j$(nproc)
+          .ci/riscv-toolchain-install.sh && export PATH=$PWD/toolchain/bin:$PATH
+          .ci/riscv-tests.sh
 
   coding-style:
     needs: [detect-code-related-file-changes]
@@ -212,21 +220,6 @@ jobs:
       run: |
           make ENABLE_JIT=1 distclean && scan-build-18 -v -o ~/scan-build --status-bugs --use-cc=clang-18 --force-analyze-debug-code --show-description -analyzer-config stable-report-filename=true -enable-checker valist,nullability make ENABLE_EXT_F=0 ENABLE_SDL=0 ENABLE_JIT=1
 
-  compliance-test:
-    needs: [detect-code-related-file-changes]
-    if: needs.detect-code-related-file-changes.outputs.has_code_related_changes == 'true'
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - name: install-dependencies
-      run: |
-            .ci/riscv-toolchain-install.sh
-      shell: bash
-    - name: architectural test
-      run: |
-            .ci/riscv-tests.sh
-      shell: bash
-
   # https://docs.docker.com/build/ci/github-actions/multi-platform/
   docker-hub-build-and-publish:
     needs: [detect-code-related-file-changes]

Makefile

@@ -58,6 +58,9 @@ CFLAGS += -DMEM_SIZE=0x$(REAL_MEM_SIZE) -DDTB_SIZE=0x$(REAL_DTB_SIZE) -DINITRD_S
 endif
 endif
 
+ENABLE_ARCH_TEST ?= 0
+$(call set-feature, ARCH_TEST)
+
 # Enable link-time optimization (LTO)
 ENABLE_LTO ?= 1
 ifeq ($(call has, LTO), 1)

mk/artifact.mk

@@ -39,6 +39,8 @@ SHELL_HACK := $(shell mkdir -p $(BIN_DIR)/linux-x86-softfp $(BIN_DIR)/riscv32 $(
 ifeq ($(call has, PREBUILT), 1)
 ifeq ($(call has, SYSTEM), 1)
   LATEST_RELEASE := $(shell wget -q https://api.github.com/repos/sysprog21/rv32emu-prebuilt/releases -O- | grep '"tag_name"' | grep "Linux-Image" | head -n 1 | sed -E 's/.*"tag_name": "([^"]+)".*/\1/')
+else ifeq ($(call has, ARCH_TEST), 1)
+  LATEST_RELEASE := $(shell wget -q https://api.github.com/repos/sysprog21/rv32emu-prebuilt/releases -O- | grep '"tag_name"' | grep "sail" | head -n 1 | sed -E 's/.*"tag_name": "([^"]+)".*/\1/')
 else
   LATEST_RELEASE := $(shell wget -q https://api.github.com/repos/sysprog21/rv32emu-prebuilt/releases -O- | grep '"tag_name"' | grep "ELF" | head -n 1 | sed -E 's/.*"tag_name": "([^"]+)".*/\1/')
 endif
@@ -67,6 +69,14 @@ ifeq ($(call has, SYSTEM), 1)
 	))
 
 	$(Q)$(eval RV32EMU_PREBUILT_TARBALL := rv32emu-linux-image-prebuilt.tar.gz)
+else ifeq ($(call has, ARCH_TEST), 1)
+	$(Q)$(eval PREBUILT_SAIL_FILENAME := $(shell cat $(BIN_DIR)/rv32emu-prebuilt-sail-$(HOST_PLATFORM).sha | awk '{  print $$2 };'))
+
+	$(Q)$(eval $(foreach FILE,$(PREBUILT_SAIL_FILENAME), \
+	    $(call verify,$(shell grep -w $(FILE) $(BIN_DIR)/rv32emu-prebuilt-sail-$(HOST_PLATFORM).sha | awk '{ print $$1 };'),$(BIN_DIR)/$(FILE),RES) \
+	))
+
+	$(Q)$(eval RV32EMU_PREBUILT_TARBALL := rv32emu-prebuilt-sail-$(HOST_PLATFORM))
 else
 	$(Q)$(eval PREBUILT_X86_FILENAME := $(shell cat $(BIN_DIR)/sha1sum-linux-x86-softfp | awk '{  print $$2 };'))
 	$(Q)$(eval PREBUILT_RV32_FILENAME := $(shell cat $(BIN_DIR)/sha1sum-riscv32 | awk '{ print $$2 };'))
@@ -81,12 +91,21 @@ else
 	$(Q)$(eval RV32EMU_PREBUILT_TARBALL := rv32emu-prebuilt.tar.gz)
 endif
 
+ifeq ($(call has, ARCH_TEST), 1)
 	$(Q)if [ "$(RES)" = "1" ]; then \
-	    $(PRINTF) "\n$(YELLOW)SHA-1 verification fails! Re-fetching prebuilt binaries from \"rv32emu-prebuilt\" ...\n$(NO_COLOR)"; \
+	    $(PRINTF) "\n$(YELLOW)SHA-1 verification failed! Re-fetching prebuilt binaries from \"rv32emu-prebuilt\" ...\n$(NO_COLOR)"; \
+	    wget -q --show-progress https://github.com/sysprog21/rv32emu-prebuilt/releases/download/$(LATEST_RELEASE)/$(RV32EMU_PREBUILT_TARBALL) -O build/$(RV32EMU_PREBUILT_TARBALL);\
+	else \
+	    $(call notice, [OK]); \
+	fi
+else
+	$(Q)if [ "$(RES)" = "1" ]; then \
+	    $(PRINTF) "\n$(YELLOW)SHA-1 verification failed! Re-fetching prebuilt binaries from \"rv32emu-prebuilt\" ...\n$(NO_COLOR)"; \
 	    wget -q --show-progress https://github.com/sysprog21/rv32emu-prebuilt/releases/download/$(LATEST_RELEASE)/$(RV32EMU_PREBUILT_TARBALL) -O- | tar -C build --strip-components=1 -xz; \
 	else \
 	    $(call notice, [OK]); \
 	fi
+endif
 else
 ifeq ($(call has, SYSTEM), 1)
 	$(Q)(cd $(BIN_DIR) && $(SHA1SUM) linux-image/Image >> sha1sum-linux-image)
@@ -127,10 +146,12 @@ endif
 
 fetch-checksum:
 ifeq ($(call has, PREBUILT), 1)
-	$(Q)$(PRINTF) "Fetching SHA-1 of prebuilt binaries ... "
+	$(Q)$(PRINTF) "Fetching SHA-1 of prebuilt binaries ...\n"
 ifeq ($(call has, SYSTEM), 1)
 	$(Q)wget -q -O $(BIN_DIR)/sha1sum-linux-image https://github.com/sysprog21/rv32emu-prebuilt/releases/download/$(LATEST_RELEASE)/sha1sum-linux-image
 	$(Q)$(call notice, [OK])
+else ifeq ($(call has, ARCH_TEST), 1)
+	$(Q)wget -q -O $(BIN_DIR)/rv32emu-prebuilt-sail-$(HOST_PLATFORM).sha https://github.com/sysprog21/rv32emu-prebuilt/releases/download/$(LATEST_RELEASE)/rv32emu-prebuilt-sail-$(HOST_PLATFORM).sha
 else
 	$(Q)wget -q -O $(BIN_DIR)/sha1sum-linux-x86-softfp https://github.com/sysprog21/rv32emu-prebuilt/releases/download/$(LATEST_RELEASE)/sha1sum-linux-x86-softfp
 	$(Q)wget -q -O $(BIN_DIR)/sha1sum-riscv32 https://github.com/sysprog21/rv32emu-prebuilt/releases/download/$(LATEST_RELEASE)/sha1sum-riscv32

mk/common.mk

@@ -5,6 +5,15 @@ else
     PRINTF = env printf
 endif
 
+UNAME_M := $(shell uname -m)
+ifeq ($(UNAME_M),x86_64)
+    HOST_PLATFORM := x86
+else ifeq ($(UNAME_M),aarch64)
+    HOST_PLATFORM := aarch64
+else
+    $(error Unsupported platform.)
+endif
+
 # Control the build verbosity
 # 'make V=1' equals to 'make VERBOSE=1'
 ifeq ("$(origin V)", "command line")

mk/riscv-arch-test.mk

@@ -20,8 +20,9 @@ ifeq ($(CROSS_COMPILE),)
 	$(error GNU Toolchain for RISC-V is required to build architecture tests. Please check package installation)
 endif
 	git submodule update --init $(dir $(ARCH_TEST_DIR))
-	$(Q)cp $(OUT)/sail_cSim/riscv_sim_RV32 tests/arch-test-target/sail_cSim/riscv_sim_RV32
-	$(Q)python3 -B $(RISCV_TARGET)/setup.py --riscv_device=$(RISCV_DEVICE)
+	$(Q)cp $(OUT)/rv32emu-prebuilt-sail-$(HOST_PLATFORM) tests/arch-test-target/sail_cSim/riscv_sim_RV32
+	$(Q)chmod +x tests/arch-test-target/sail_cSim/riscv_sim_RV32
+	$(Q)python3 -B $(RISCV_TARGET)/setup.py --riscv_device=$(RISCV_DEVICE) --hw_data_misalign=$(HW_DATA_MISALIGN)
 	$(Q)riscof run --work-dir=$(WORK) \
 			--config=$(RISCV_TARGET)/config.ini \
 			--suite=$(ARCH_TEST_SUITE) \

src/emulate.c

@@ -955,7 +955,7 @@ static block_t *block_find_or_translate(riscv_t *rv)
     return next_blk;
 }
 
-#if RV32_HAS(JIT)
+#if RV32_HAS(JIT) && !RV32_HAS(ARCH_TEST)
 static bool runtime_profiler(riscv_t *rv, block_t *block)
 {
     /* Based on our observations, a significant number of true hotspots are
@@ -1105,7 +1105,11 @@ void rv_step(void *arg)
             prev = NULL;
             continue;
         } /* check if the execution path is potential hotspot */
-        if (block->translatable && runtime_profiler(rv, block)) {
+        if (block->translatable
+#if !RV32_HAS(ARCH_TEST)
+            && runtime_profiler(rv, block)
+#endif
+        ) {
             jit_translate(rv, block);
             ((exec_block_func_t) state->buf)(
                 rv, (uintptr_t) (state->buf + block->offset));