Add --interpreter flag and HOST_PLATFORM to test infrastructure

Distinguish host OS from target platform in test_wamr.sh so that
cross-compilation targets can skip the native build_iwasm step and
pass a pre-built iwasm binary path to the spec test runner.

Author: androm3da

tests/wamr-test-suites/spec-test-script/all.py

@@ -58,6 +58,7 @@ def get_iwasm_cmd(platform: str) -> str:
     "AARCH64_VFP",
     "ARMV7",
     "ARMV7_VFP",
+    "HEXAGON",
     "RISCV32",
     "RISCV32_ILP32F",
     "RISCV32_ILP32D",
@@ -598,9 +599,20 @@ def main():
     )
     parser.add_argument('--no-pty', action='store_true',
         help="Use direct pipes instead of pseudo-tty")
+    parser.add_argument(
+        "--interpreter",
+        default="",
+        dest="interpreter",
+        help="Specify the iwasm interpreter path (overrides the default)",
+    )
 
     options = parser.parse_args()
 
+    # Override global IWASM_CMD if --interpreter is specified
+    global IWASM_CMD
+    if options.interpreter:
+        IWASM_CMD = options.interpreter
+
     # Convert target to lower case for internal use, e.g. X86_64 -> x86_64
     # target is always exist, so no need to check it
     options.target = options.target.lower()

tests/wamr-test-suites/spec-test-script/runtest.py

@@ -62,6 +62,7 @@
     "riscv64_lp64f": ["--target=riscv64", "--target-abi=lp64f", "--cpu=generic-rv64", "--cpu-features=+m,+a,+c,+f", "--size-level=1"],
     "riscv64_lp64d": ["--target=riscv64", "--target-abi=lp64d", "--cpu=generic-rv64", "--cpu-features=+m,+a,+c,+f,+d", "--size-level=1"],
     "xtensa": ["--target=xtensa"],
+    "hexagon": ["--target=hexagon"],
 }
 
 # AOT compilation options mapping for XIP mode

tests/wamr-test-suites/test_wamr.sh

@@ -20,7 +20,7 @@ function help()
     echo "                                     unit|wamr_compiler)"
     echo "-m set compile target of iwasm(x86_64|x86_32|armv7|armv7_vfp|thumbv7|thumbv7_vfp|"
     echo "                               riscv32|riscv32_ilp32f|riscv32_ilp32d|riscv64|"
-    echo "                               riscv64_lp64f|riscv64_lp64d|aarch64|aarch64_vfp)"
+    echo "                               riscv64_lp64f|riscv64_lp64d|aarch64|aarch64_vfp|hexagon)"
     echo "-t set compile type of iwasm(classic-interp|fast-interp|jit|aot|fast-jit|multi-tier-jit)"
     echo "-M enable multi module feature"
     echo "-p enable multi thread feature"
@@ -83,14 +83,16 @@ else
     PLATFORM=$(uname -s | tr A-Z a-z)
     PYTHON_EXE=python3
 fi
+HOST_PLATFORM=${PLATFORM}
 PARALLELISM=0
 ENABLE_QEMU=0
 QEMU_FIRMWARE=""
 WAMRC_CMD=""
 # prod/testsuite-all branch
 WASI_TESTSUITE_COMMIT="ee807fc551978490bf1c277059aabfa1e589a6c2"
 TARGET_LIST=("AARCH64" "AARCH64_VFP" "ARMV7" "ARMV7_VFP" "THUMBV7" "THUMBV7_VFP" \
-             "RISCV32" "RISCV32_ILP32F" "RISCV32_ILP32D" "RISCV64" "RISCV64_LP64F" "RISCV64_LP64D" "XTENSA")
+             "RISCV32" "RISCV32_ILP32F" "RISCV32_ILP32D" "RISCV64" "RISCV64_LP64F" "RISCV64_LP64D" \
+             "HEXAGON" "XTENSA")
 REQUIREMENT_NAME=""
 # Initialize an empty array for subrequirement IDs
 SUBREQUIREMENT_IDS=()
@@ -380,7 +382,7 @@ function sightglass_test()
 function setup_wabt()
 {
     # please sync with .github/actions/install-wasi-sdk-wabt/action.yml
-    case ${PLATFORM} in
+    case ${HOST_PLATFORM} in
         cosmopolitan)
             ;;
         linux)
@@ -396,7 +398,7 @@ function setup_wabt()
             WABT_VERSION=1.0.37
             ;;
         *)
-            echo "wabt platform for ${PLATFORM} in unknown"
+            echo "wabt platform for ${HOST_PLATFORM} in unknown"
             exit 1
             ;;
     esac
@@ -603,6 +605,11 @@ function spec_test()
     # set the current running target
     ARGS_FOR_SPEC_TEST+="-m ${TARGET} "
 
+    # For cross-compilation targets, pass the iwasm path explicitly
+    if [[ "${TARGET_LIST[*]}" =~ "${TARGET}" ]]; then
+        ARGS_FOR_SPEC_TEST+="--interpreter ${IWASM_CMD} "
+    fi
+
     # require warmc only in aot mode
     if [[ $1 == 'aot' ]]; then
         ARGS_FOR_SPEC_TEST+="-t "
@@ -637,7 +644,7 @@ function spec_test()
         ARGS_FOR_SPEC_TEST+="--qemu-firmware ${QEMU_FIRMWARE} "
     fi
 
-    if [[ ${PLATFORM} == "windows" ]]; then
+    if [[ ${HOST_PLATFORM} == "windows" ]]; then
         ARGS_FOR_SPEC_TEST+="--no-pty "
     fi
 
@@ -831,7 +838,7 @@ function build_iwasm_with_cfg()
         exit 1
     fi
 
-    if [[ ${PLATFORM} == "cosmopolitan" ]]; then
+    if [[ ${HOST_PLATFORM} == "cosmopolitan" ]]; then
         # convert from APE to ELF so it can be ran easier
         # HACK: link to linux so tests work when platform is detected by uname
         cp iwasm.com iwasm \
@@ -1124,7 +1131,7 @@ function trigger()
             "classic-interp")
                 # classic-interp
                 BUILD_FLAGS="$CLASSIC_INTERP_COMPILE_FLAGS $EXTRA_COMPILE_FLAGS"
-                if [[ ${ENABLE_QEMU} == 0 ]]; then
+                if [[ ${ENABLE_QEMU} == 0 ]] && ! [[ "${TARGET_LIST[*]}" =~ "${TARGET}" ]]; then
                     build_iwasm_with_cfg $BUILD_FLAGS
                 fi
                 for suite in "${TEST_CASE_ARR[@]}"; do
@@ -1136,7 +1143,7 @@ function trigger()
             "fast-interp")
                 # fast-interp
                 BUILD_FLAGS="$FAST_INTERP_COMPILE_FLAGS $EXTRA_COMPILE_FLAGS"
-                if [[ ${ENABLE_QEMU} == 0 ]]; then
+                if [[ ${ENABLE_QEMU} == 0 ]] && ! [[ "${TARGET_LIST[*]}" =~ "${TARGET}" ]]; then
                     build_iwasm_with_cfg $BUILD_FLAGS
                 fi
                 for suite in "${TEST_CASE_ARR[@]}"; do
@@ -1167,7 +1174,7 @@ function trigger()
                 echo "work in aot mode"
                 # aot
                 BUILD_FLAGS="$AOT_COMPILE_FLAGS $EXTRA_COMPILE_FLAGS"
-                if [[ ${ENABLE_QEMU} == 0 ]]; then
+                if [[ ${ENABLE_QEMU} == 0 ]] && ! [[ "${TARGET_LIST[*]}" =~ "${TARGET}" ]]; then
                     build_iwasm_with_cfg $BUILD_FLAGS
                 fi
                 if [ -z "${WAMRC_CMD}" ]; then