Skip to content

Commit a16c0ae

Browse files
authored
Merge pull request #4125 from jammar1/mrshnja/wamr-ci-simd-interp
Enable fast-interpreter SIMD tests on CI
2 parents 7ba7509 + 05a25df commit a16c0ae

File tree

4 files changed

+8
-11
lines changed

4 files changed

+8
-11
lines changed

.github/workflows/compilation_on_android_ubuntu.yml

+3-6
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ jobs:
158158
"-DWAMR_BUILD_PERF_PROFILING=1",
159159
"-DWAMR_BUILD_REF_TYPES=1",
160160
"-DWAMR_BUILD_SIMD=1",
161+
"-DWAMR_BUILD_LIB_SIMDE=1",
161162
"-DWAMR_BUILD_TAIL_CALL=1",
162163
"-DWAMR_DISABLE_HW_BOUND_CHECK=1",
163164
"-DWAMR_BUILD_MEMORY64=1",
@@ -178,11 +179,9 @@ jobs:
178179
make_options_feature: "-DWAMR_BUILD_MULTI_MODULE=1"
179180
- make_options_run_mode: $MULTI_TIER_JIT_BUILD_OPTIONS
180181
make_options_feature: "-DWAMR_BUILD_MULTI_MODULE=1"
181-
# SIMD only on JIT/AOT mode
182+
# SIMD only on JIT/AOT/fast interpreter mode
182183
- make_options_run_mode: $CLASSIC_INTERP_BUILD_OPTIONS
183184
make_options_feature: "-DWAMR_BUILD_SIMD=1"
184-
- make_options_run_mode: $FAST_INTERP_BUILD_OPTIONS
185-
make_options_feature: "-DWAMR_BUILD_SIMD=1"
186185
# DEBUG_INTERP only on CLASSIC INTERP mode
187186
- make_options_run_mode: $AOT_BUILD_OPTIONS
188187
make_options_feature: "-DWAMR_BUILD_DEBUG_INTERP=1"
@@ -649,11 +648,9 @@ jobs:
649648
test_option: $WAMR_COMPILER_TEST_OPTIONS
650649
exclude:
651650
# incompatible modes and features
652-
# classic-interp and fast-interp don't support simd
651+
# classic-interp doesn't support simd
653652
- running_mode: "classic-interp"
654653
test_option: $SIMD_TEST_OPTIONS
655-
- running_mode: "fast-interp"
656-
test_option: $SIMD_TEST_OPTIONS
657654
# llvm jit doesn't support multi module
658655
- running_mode: "jit"
659656
test_option: $MULTI_MODULES_TEST_OPTIONS

.github/workflows/compilation_on_sgx.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797
"-DWAMR_BUILD_PERF_PROFILING=1",
9898
"-DWAMR_BUILD_REF_TYPES=1",
9999
# doesn't support
100-
# "-DWAMR_BUILD_SIMD=1",
100+
"-DWAMR_BUILD_SIMD=0",
101101
"-DWAMR_BUILD_TAIL_CALL=1",
102102
"-DWAMR_DISABLE_HW_BOUND_CHECK=1",
103103
"-DWAMR_BUILD_SGX_IPFS=1",

build-scripts/runtime_lib.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ if (WAMR_BUILD_LIB_RATS EQUAL 1)
156156
endif ()
157157

158158
if (WAMR_BUILD_SIMD EQUAL 1 AND WAMR_BUILD_FAST_INTERP EQUAL 1)
159-
if (NOT (WAMR_BUILD_TARGET MATCHES "AARCH64.*" OR WAMR_BUILD_TARGET MATCHES "ARM.*"))
160-
message(STATUS "SIMDe doesnt support platform " ${WAMR_BUILD_TARGET})
159+
if (WAMR_BUILD_PLATFORM STREQUAL "windows")
160+
message(STATUS "SIMDe doesnt support platform " ${WAMR_BUILD_PLATFORM})
161161
set(WAMR_BUILD_SIMDE 0)
162162
else()
163163
include (${IWASM_DIR}/libraries/simde/simde.cmake)

tests/wamr-test-suites/test_wamr.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -913,8 +913,8 @@ function do_execute_in_running_mode()
913913
fi
914914

915915
if [[ ${ENABLE_SIMD} -eq 1 ]]; then
916-
if [[ "${RUNNING_MODE}" != "jit" && "${RUNNING_MODE}" != "aot" ]]; then
917-
echo "support simd in llvm-jit mode and aot mode"
916+
if [[ "${RUNNING_MODE}" != "jit" && "${RUNNING_MODE}" != "aot" && "${RUNNING_MODE}" != "fast-interp" ]]; then
917+
echo "support simd in llvm-jit, aot and fast-interp mode"
918918
return 0;
919919
fi
920920
fi

0 commit comments

Comments
 (0)