From 67c33a29e38843f4045f57eb1120077275f4810d Mon Sep 17 00:00:00 2001 From: Huang Qi Date: Mon, 19 Aug 2024 09:52:38 +0800 Subject: [PATCH] CI: Enable XIP spectest for RISCV32 ILP32F (#3727) --- .github/workflows/spec_test_on_nuttx.yml | 4 ---- tests/wamr-test-suites/spec-test-script/runtest.py | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/spec_test_on_nuttx.yml b/.github/workflows/spec_test_on_nuttx.yml index 059e5fbe..f2e59ba6 100644 --- a/.github/workflows/spec_test_on_nuttx.yml +++ b/.github/workflows/spec_test_on_nuttx.yml @@ -125,10 +125,6 @@ jobs: - target_config: { config: "boards/risc-v/qemu-rv/rv-virt/configs/nsh64" } wamr_test_option: { mode: "-t aot -X" } - # XIP is not fully supported yet on RISCV32 ILP32F, some relocations can not be resolved - - target_config: { config: "boards/risc-v/qemu-rv/rv-virt/configs/nsh", fpu_type: "fp" } - wamr_test_option: { mode: "-t aot -X" } - # Our xtensa environment doesn't have enough memory - target_config: { target: "xtensa" } wamr_feature_option: { mode: "-G" } diff --git a/tests/wamr-test-suites/spec-test-script/runtest.py b/tests/wamr-test-suites/spec-test-script/runtest.py index 011578fc..291718b6 100755 --- a/tests/wamr-test-suites/spec-test-script/runtest.py +++ b/tests/wamr-test-suites/spec-test-script/runtest.py @@ -65,7 +65,8 @@ aot_target_options_map = { # AOT compilation options mapping for XIP mode aot_target_options_map_xip = { # avoid l32r relocations for xtensa - "xtensa": ["--mllvm=-mtext-section-literals"] + "xtensa": ["--mllvm=-mtext-section-literals"], + "riscv32_ilp32f": ["--enable-builtin-intrinsics=i64.common,f64.common,f32.const,f64.const,f64xi32,f64xi64,f64_promote_f32,f32_demote_f64"], } def debug(data):