Skip to content

Commit 791e801

Browse files
committed
In regression tests, use llvm-jit and fast-jit
to replace multi-tier-jit + running mode. Multi-tier-jit contains both fast-jit and llvm-jit. Fast-jit doesn't support SIMD, but llvm-jit does. So, should multi-tier-jit support SIMD? My answer is NO. - The regular form of multi-tier-jit uses fast-jit as tier1 and llvm-jit as tier2. Therefore, if fast-jit doesn't support SIMD, the entire multi-tier doesn't support SIMD either. - `--fast-jit` and `--llvm-jit` of multi-tier-jit should adhere to the global limitations of multi-tier-jit.
1 parent d735d8f commit 791e801

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

tests/regression/ba-issues/build_wamr.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,16 @@ build_iwasm "-DWAMR_BUILD_GC=1 -DWAMR_BUILD_AOT=1 -DWAMR_BUILD_FAST_INTERP=1 -DW
4848
# build llvm-jit iwasm for testing llvm-jit
4949
build_iwasm "-DWAMR_BUILD_REF_TYPES=1 -DWAMR_BUILD_JIT=1" "llvm-jit"
5050

51-
# build multi-tier-jit iwasm for testing classic-interp, fast-jit, llvm-jit and multi-tier-jit
52-
build_iwasm "-DWAMR_BUILD_REF_TYPES=1 -DWAMR_BUILD_SIMD=0 -DWAMR_BUILD_FAST_JIT=1 -DWAMR_BUILD_JIT=1" "multi-tier-jit"
51+
# build fast-jit iwasm for testing fast-jit
52+
build_iwasm "-DWAMR_BUILD_REF_TYPES=1 -DWAMR_BUILD_FAST_JIT=1 -DWAMR_BUILD_SIMD=0" "fast-jit"
5353

5454
# build default iwasm for testing fast-interp and AOT with libc-wasi disabled
5555
build_iwasm "-DWAMR_BUILD_REF_TYPES=1 -DWAMR_BUILD_AOT=1 -DWAMR_BUILD_FAST_INTERP=1 -DWAMR_BUILD_LIBC_WASI=0" "default-wasi-disabled"
5656

5757
# build llvm-jit iwasm for testing llvm-jit with libc-wasi disabled
5858
build_iwasm "-DWAMR_BUILD_REF_TYPES=1 -DWAMR_BUILD_JIT=1 -DWAMR_BUILD_LIBC_WASI=0" "llvm-jit-wasi-disabled"
5959

60-
# build multi-tier-jit iwasm for testing classic-interp, fast-jit, llvm-jit and multi-tier-jit with libc-wasi disabled
61-
build_iwasm "-DWAMR_BUILD_REF_TYPES=1 -DWAMR_BUILD_SIMD=0-DWAMR_BUILD_FAST_JIT=1 -DWAMR_BUILD_JIT=1 -DWAMR_BUILD_LIBC_WASI=0" "multi-tier-jit-wasi-disabled"
60+
# build fast-jit iwasm for testing fast-jit with libc-wasi disabled
61+
build_iwasm "-DWAMR_BUILD_REF_TYPES=1 -DWAMR_BUILD_FAST_JIT=1 -DWAMR_BUILD_SIMD=0 -DWAMR_BUILD_LIBC_WASI=0" "fast-jit-wasi-disabled"
6262

6363
# TODO: add more version of iwasm, for example, sgx version

tests/regression/ba-issues/running_config.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
"ids": [
106106
2965
107107
],
108-
"runtime": "iwasm-multi-tier-jit-wasi-disabled",
108+
"runtime": "iwasm-fast-jit-wasi-disabled",
109109
"file": "i64.shl_75.wasm",
110110
"mode": "fast-jit",
111111
"options": "--heap-size=0 -f to_test",
@@ -124,7 +124,7 @@
124124
2963,
125125
2962
126126
],
127-
"runtime": "iwasm-multi-tier-jit-wasi-disabled",
127+
"runtime": "iwasm-fast-jit-wasi-disabled",
128128
"file": "*.wasm",
129129
"mode": "fast-jit",
130130
"options": "--heap-size=0 -f to_test",
@@ -143,7 +143,7 @@
143143
2959,
144144
2958
145145
],
146-
"runtime": "iwasm-multi-tier-jit-wasi-disabled",
146+
"runtime": "iwasm-fast-jit-wasi-disabled",
147147
"file": "*.wasm",
148148
"mode": "fast-jit",
149149
"options": "--heap-size=0 -f to_test",
@@ -191,7 +191,7 @@
191191
"ids": [
192192
2954
193193
],
194-
"runtime": "iwasm-multi-tier-jit-wasi-disabled",
194+
"runtime": "iwasm-llvm-jit-wasi-disabled",
195195
"file": "iwasm_jit_unexpected_exception_stack_underflow.wasm",
196196
"mode": "llvm-jit",
197197
"options": "--heap-size=0 -f to_test",
@@ -240,7 +240,7 @@
240240
"ids": [
241241
2950
242242
],
243-
"runtime": "iwasm-multi-tier-jit-wasi-disabled",
243+
"runtime": "iwasm-fast-jit-wasi-disabled",
244244
"file": "iwasm_fast_jit_unexpected_moob.wasm",
245245
"mode": "fast-jit",
246246
"options": "--heap-size=0 -f to_test",
@@ -257,7 +257,7 @@
257257
2949,
258258
2944
259259
],
260-
"runtime": "iwasm-multi-tier-jit-wasi-disabled",
260+
"runtime": "iwasm-fast-jit-wasi-disabled",
261261
"file": "*.wasm",
262262
"mode": "fast-jit",
263263
"options": "--heap-size=0 -f to_test",
@@ -322,7 +322,7 @@
322322
"ids": [
323323
3020
324324
],
325-
"runtime": "iwasm-multi-tier-jit-wasi-disabled",
325+
"runtime": "iwasm-fast-jit-wasi-disabled",
326326
"file": "all_wamr_memory.init_no_exception2.wasm",
327327
"mode": "fast-jit",
328328
"options": "--heap-size=0 -f to_test",
@@ -338,7 +338,7 @@
338338
"ids": [
339339
3021
340340
],
341-
"runtime": "iwasm-multi-tier-jit-wasi-disabled",
341+
"runtime": "iwasm-fast-jit-wasi-disabled",
342342
"file": "all_wamr_table.init_no_exception.wasm",
343343
"mode": "fast-jit",
344344
"options": "--heap-size=0 -f to_test",
@@ -354,7 +354,7 @@
354354
"ids": [
355355
3023
356356
],
357-
"runtime": "iwasm-multi-tier-jit-wasi-disabled",
357+
"runtime": "iwasm-fast-jit-wasi-disabled",
358358
"file": "all_wamr_table.init_no_exception2.wasm",
359359
"mode": "fast-jit",
360360
"options": "--heap-size=0 -f to_test",
@@ -594,7 +594,7 @@
594594
"ids": [
595595
2943
596596
],
597-
"runtime": "iwasm-multi-tier-jit-wasi-disabled",
597+
"runtime": "iwasm-llvm-jit-wasi-disabled",
598598
"file": "iwasm_jit_timeout.wasm",
599599
"mode": "llvm-jit",
600600
"options": " --heap-size=0 -f to_test",
@@ -610,7 +610,7 @@
610610
"ids": [
611611
2942
612612
],
613-
"runtime": "iwasm-multi-tier-jit-wasi-disabled",
613+
"runtime": "iwasm-llvm-jit-wasi-disabled",
614614
"file": "iwasm_jit_without_exception.wasm",
615615
"mode": "llvm-jit",
616616
"options": " --heap-size=0 -f to_test",
@@ -626,7 +626,7 @@
626626
"ids": [
627627
2931
628628
],
629-
"runtime": "iwasm-multi-tier-jit",
629+
"runtime": "iwasm-fast-jit",
630630
"file": "case.wasm",
631631
"mode": "fast-jit",
632632
"options": "",
@@ -642,7 +642,7 @@
642642
"ids": [
643643
2897
644644
],
645-
"runtime": "iwasm-multi-tier-jit",
645+
"runtime": "iwasm-llvm-jit",
646646
"file": "test.wasm",
647647
"mode": "llvm-jit",
648648
"options": "",
@@ -940,7 +940,7 @@
940940
"ids": [
941941
2759
942942
],
943-
"runtime": "iwasm-multi-tier-jit",
943+
"runtime": "iwasm-fast-jit",
944944
"file": "case.wasm",
945945
"mode": "fast-jit",
946946
"options": "",
@@ -956,7 +956,7 @@
956956
"ids": [
957957
2732
958958
],
959-
"runtime": "iwasm-multi-tier-jit",
959+
"runtime": "iwasm-llvm-jit",
960960
"file": "filea9.wasm",
961961
"mode": "llvm-jit",
962962
"options": "--heap-size=0 -f main",
@@ -1144,7 +1144,7 @@
11441144
"ids": [
11451145
2710
11461146
],
1147-
"runtime": "iwasm-multi-tier-jit",
1147+
"runtime": "iwasm-fast-jit",
11481148
"file": "t.wasm",
11491149
"mode": "fast-jit",
11501150
"options": "",

0 commit comments

Comments
 (0)