Skip to content

Commit f60c3c6

Browse files
Add Multi-tier JIT tests in Ubuntu CI (bytecodealliance#1964)
1 parent 216dc43 commit f60c3c6

File tree

1 file changed

+32
-5
lines changed

1 file changed

+32
-5
lines changed

.github/workflows/compilation_on_android_ubuntu.yml

Lines changed: 32 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ env:
5353
FAST_JIT_BUILD_OPTIONS: " -DWAMR_BUILD_AOT=1 -DWAMR_BUILD_FAST_INTERP=0 -DWAMR_BUILD_INTERP=0 -DWAMR_BUILD_FAST_JIT=1 -DWAMR_BUILD_JIT=0 -DWAMR_BUILD_LAZY_JIT=0"
5454
LLVM_LAZY_JIT_BUILD_OPTIONS: " -DWAMR_BUILD_AOT=1 -DWAMR_BUILD_FAST_INTERP=0 -DWAMR_BUILD_INTERP=0 -DWAMR_BUILD_FAST_JIT=0 -DWAMR_BUILD_JIT=1 -DWAMR_BUILD_LAZY_JIT=1"
5555
LLVM_EAGER_JIT_BUILD_OPTIONS: "-DWAMR_BUILD_AOT=1 -DWAMR_BUILD_FAST_INTERP=0 -DWAMR_BUILD_INTERP=0 -DWAMR_BUILD_FAST_JIT=0 -DWAMR_BUILD_JIT=1 -DWAMR_BUILD_LAZY_JIT=0"
56+
MULTI_TIER_JIT_BUILD_OPTIONS: "-DWAMR_BUILD_AOT=1 -DWAMR_BUILD_FAST_INTERP=0 -DWAMR_BUILD_INTERP=1 -DWAMR_BUILD_FAST_JIT=1 -DWAMR_BUILD_JIT=1 -DWAMR_BUILD_LAZY_JIT=1"
5657
# For Spec Test
5758
DEFAULT_TEST_OPTIONS: "-s spec -b -P"
5859
MULTI_MODULES_TEST_OPTIONS: "-s spec -b -M -P"
@@ -128,6 +129,7 @@ jobs:
128129
$FAST_JIT_BUILD_OPTIONS,
129130
$LLVM_LAZY_JIT_BUILD_OPTIONS,
130131
$LLVM_EAGER_JIT_BUILD_OPTIONS,
132+
$MULTI_TIER_JIT_BUILD_OPTIONS,
131133
]
132134
make_options_feature: [
133135
# Features
@@ -160,6 +162,8 @@ jobs:
160162
make_options_feature: "-DWAMR_BUILD_MULTI_MODULE=1"
161163
- make_options_run_mode: $LLVM_EAGER_JIT_BUILD_OPTIONS
162164
make_options_feature: "-DWAMR_BUILD_MULTI_MODULE=1"
165+
- make_options_run_mode: $MULTI_TIER_JIT_BUILD_OPTIONS
166+
make_options_feature: "-DWAMR_BUILD_MULTI_MODULE=1"
163167
# SIMD only on JIT/AOT mode
164168
- make_options_run_mode: $CLASSIC_INTERP_BUILD_OPTIONS
165169
make_options_feature: "-DWAMR_BUILD_SIMD=1"
@@ -176,6 +180,8 @@ jobs:
176180
make_options_feature: "-DWAMR_BUILD_DEBUG_INTERP=1"
177181
- make_options_run_mode: $LLVM_EAGER_JIT_BUILD_OPTIONS
178182
make_options_feature: "-DWAMR_BUILD_DEBUG_INTERP=1"
183+
- make_options_run_mode: $MULTI_TIER_JIT_BUILD_OPTIONS
184+
make_options_feature: "-DWAMR_BUILD_DEBUG_INTERP=1"
179185
# DEBUG_AOT only on JIT/AOT mode
180186
- make_options_run_mode: $CLASSIC_INTERP_BUILD_OPTIONS
181187
make_options_feature: "-DWAMR_BUILD_DEBUG_AOT=1"
@@ -188,6 +194,8 @@ jobs:
188194
make_options_feature: "-DWAMR_BUILD_DEBUG_AOT=1"
189195
- make_options_run_mode: $LLVM_EAGER_JIT_BUILD_OPTIONS
190196
make_options_feature: "-DWAMR_BUILD_DEBUG_AOT=1"
197+
- make_options_run_mode: $MULTI_TIER_JIT_BUILD_OPTIONS
198+
make_options_feature: "-DWAMR_BUILD_DEBUG_AOT=1"
191199
# MINI_LOADER only on INTERP mode
192200
- make_options_run_mode: $AOT_BUILD_OPTIONS
193201
make_options_feature: "-DWAMR_BUILD_MINI_LOADER=1"
@@ -197,9 +205,13 @@ jobs:
197205
make_options_feature: "-DWAMR_BUILD_MINI_LOADER=1"
198206
- make_options_run_mode: $LLVM_EAGER_JIT_BUILD_OPTIONS
199207
make_options_feature: "-DWAMR_BUILD_MINI_LOADER=1"
200-
# Fast-JIT mode doesn't support android(X86-32)
208+
- make_options_run_mode: $MULTI_TIER_JIT_BUILD_OPTIONS
209+
make_options_feature: "-DWAMR_BUILD_MINI_LOADER=1"
210+
# Fast-JIT and Multi-Tier-JIT mode don't support android(X86-32)
201211
- make_options_run_mode: $FAST_JIT_BUILD_OPTIONS
202212
platform: android
213+
- make_options_run_mode: $MULTI_TIER_JIT_BUILD_OPTIONS
214+
platform: android
203215
# only test andorid on ubuntu latest
204216
- os: ubuntu-20.04
205217
platform: android
@@ -256,6 +268,7 @@ jobs:
256268
$FAST_JIT_BUILD_OPTIONS,
257269
$LLVM_LAZY_JIT_BUILD_OPTIONS,
258270
$LLVM_EAGER_JIT_BUILD_OPTIONS,
271+
$MULTI_TIER_JIT_BUILD_OPTIONS,
259272
]
260273
os: [ubuntu-20.04, ubuntu-22.04]
261274
wasi_sdk_release:
@@ -404,7 +417,14 @@ jobs:
404417
strategy:
405418
matrix:
406419
running_mode:
407-
["classic-interp", "fast-interp", "jit", "aot", "fast-jit"]
420+
[
421+
"classic-interp",
422+
"fast-interp",
423+
"jit",
424+
"aot",
425+
"fast-jit",
426+
"multi-tier-jit",
427+
]
408428
test_option:
409429
[
410430
$DEFAULT_TEST_OPTIONS,
@@ -430,26 +450,33 @@ jobs:
430450
test_option: $WASI_TEST_OPTIONS
431451
- running_mode: "jit"
432452
test_option: $MULTI_MODULES_TEST_OPTIONS
433-
# fast-jit is only tested on default mode, exclude other three
453+
# fast-jit doesn't support multi module, simd, and threads
434454
- running_mode: "fast-jit"
435455
test_option: $MULTI_MODULES_TEST_OPTIONS
436456
- running_mode: "fast-jit"
437457
test_option: $SIMD_TEST_OPTIONS
438458
- running_mode: "fast-jit"
439459
test_option: $THREADS_TEST_OPTIONS
460+
# multi-tier-jit doesn't support multi module, simd, and threads
461+
- running_mode: "multi-tier-jit"
462+
test_option: $MULTI_MODULES_TEST_OPTIONS
463+
- running_mode: "multi-tier-jit"
464+
test_option: $SIMD_TEST_OPTIONS
465+
- running_mode: "multi-tier-jit"
466+
test_option: $THREADS_TEST_OPTIONS
440467
steps:
441468
- name: checkout
442469
uses: actions/checkout@v3
443470

444471
- name: set env variable(if llvm are used)
445-
if: matrix.running_mode == 'aot' || matrix.running_mode == 'jit'
472+
if: matrix.running_mode == 'aot' || matrix.running_mode == 'jit' || matrix.running_mode == 'multi-tier-jit'
446473
run: echo "USE_LLVM=true" >> $GITHUB_ENV
447474

448475
- name: set env variable(if x86_32 test needed)
449476
if: >
450477
(matrix.test_option == '$DEFAULT_TEST_OPTIONS' || matrix.test_option == '$THREADS_TEST_OPTIONS'
451478
|| matrix.test_option == '$WASI_TEST_OPTIONS')
452-
&& matrix.running_mode != 'fast-jit' && matrix.running_mode != 'jit'
479+
&& matrix.running_mode != 'fast-jit' && matrix.running_mode != 'jit' && matrix.running_mode != 'multi-tier-jit'
453480
run: echo "TEST_ON_X86_32=true" >> $GITHUB_ENV
454481

455482
#only download llvm libraries in jit and aot mode

0 commit comments

Comments
 (0)