Skip to content

Commit 08f6fe7

Browse files
committed
Explicitly specify SIMD, MULTI_MODULE, and their unsupported running modes.
1 parent 5fbc247 commit 08f6fe7

File tree

2 files changed

+24
-4
lines changed

2 files changed

+24
-4
lines changed

.github/workflows/compilation_on_android_ubuntu.yml

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,10 @@ jobs:
185185
# SIMD only on JIT/AOT/fast interpreter mode
186186
- make_options_run_mode: $CLASSIC_INTERP_BUILD_OPTIONS
187187
make_options_feature: "-DWAMR_BUILD_SIMD=1"
188+
- make_options_run_mode: $FAST_JIT_BUILD_OPTIONS
189+
make_options_feature: "-DWAMR_BUILD_SIMD=1"
190+
- make_options_run_mode: $MULTI_TIER_JIT_BUILD_OPTIONS
191+
make_options_feature: "-DWAMR_BUILD_SIMD=1"
188192
# DEBUG_INTERP only on CLASSIC INTERP mode
189193
- make_options_run_mode: $AOT_BUILD_OPTIONS
190194
make_options_feature: "-DWAMR_BUILD_DEBUG_INTERP=1"
@@ -265,15 +269,16 @@ jobs:
265269
# android does not support WAMR_BUILD_SHARED in its CMakeLists.txt.
266270
- make_options_feature: "-DWAMR_BUILD_SHARED=1"
267271
platform: android
268-
# classic interp mode doesn't support SIMD
269-
- make_options_run_mode: $CLASSIC_INTERP_BUILD_OPTIONS
270-
make_options_feature: "-DWAMR_BUILD_SIMD=1"
271272
include:
272273
- os: ubuntu-22.04
273274
llvm_cache_key: ${{ needs.build_llvm_libraries_on_ubuntu_2204.outputs.cache_key }}
274275
# classic interp mode doesn't support SIMD
275276
- make_options_run_mode: $CLASSIC_INTERP_BUILD_OPTIONS
276277
make_options_feature: "-DWAMR_BUILD_SIMD=0"
278+
- make_options_run_mode: $FAST_JIT_BUILD_OPTIONS
279+
make_options_feature: "-DWAMR_BUILD_SIMD=0"
280+
- make_options_run_mode: $MULTI_TIER_JIT_BUILD_OPTIONS
281+
make_options_feature: "-DWAMR_BUILD_SIMD=0"
277282
steps:
278283
- name: checkout
279284
uses: actions/checkout@v5
@@ -445,6 +450,18 @@ jobs:
445450
include:
446451
- os: ubuntu-22.04
447452
llvm_cache_key: ${{ needs.build_llvm_libraries_on_ubuntu_2204.outputs.cache_key }}
453+
# classic interp and fast jit mode doesn't support SIMD
454+
- make_options_run_mode: $CLASSIC_INTERP_BUILD_OPTIONS
455+
make_options_feature: "-DWAMR_BUILD_SIMD=0"
456+
- make_options_run_mode: $FAST_JIT_BUILD_OPTIONS
457+
make_options_feature: "-DWAMR_BUILD_SIMD=0 -DWAMR_BUILD_MULTI_MODULE=0"
458+
- make_options_run_mode: $MULTI_TIER_JIT_BUILD_OPTIONS
459+
make_options_feature: "-DWAMR_BUILD_SIMD=0 -DWAMR_BUILD_MULTI_MODULE=0"
460+
# MULTI_MODULE only on INTERP mode and AOT mode
461+
- make_options_run_mode: $LLVM_LAZY_JIT_BUILD_OPTIONS
462+
make_options_feature: "-DWAMR_BUILD_MULTI_MODULE=0"
463+
- make_options_run_mode: $LLVM_EAGER_JIT_BUILD_OPTIONS
464+
make_options_feature: "-DWAMR_BUILD_MULTI_MODULE=0"
448465

449466
steps:
450467
- name: checkout

samples/wasm-c-api/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,12 @@ if(NOT DEFINED WAMR_BUILD_JIT)
6666
set(WAMR_BUILD_JIT 0)
6767
endif()
6868

69+
if(NOT DEFINED WAMR_BUILD_MULTI_MODULE)
70+
set(WAMR_BUILD_MULTI_MODULE 1)
71+
endif()
72+
6973
set(WAMR_BUILD_LIBC_BUILTIN 1)
7074
set(WAMR_BUILD_LIBC_WASI 0)
71-
set(WAMR_BUILD_MULTI_MODULE 1)
7275
set(WAMR_BUILD_DUMP_CALL_STACK 1)
7376
set(WAMR_BUILD_REF_TYPES 1)
7477

0 commit comments

Comments
 (0)