Skip to content

runtest.py: Normallize option handling for XIP mode #3722

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 16, 2024
Merged

runtest.py: Normallize option handling for XIP mode #3722

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions tests/wamr-test-suites/spec-test-script/runtest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,12 @@
"xtensa": ["--target=xtensa"],
}

# AOT compilation options mapping for XIP mode
aot_target_options_map_xip = {
# avoid l32r relocations for xtensa
"xtensa": ["--mllvm=-mtext-section-literals"]
}

def debug(data):
if debug_file:
debug_file.write(data)
Expand Down Expand Up @@ -1122,10 +1128,8 @@ def compile_wasm_to_aot(wasm_tempfile, aot_tempfile, runner, opts, r, output = '

if opts.xip:
cmd.append("--xip")

# avoid l32r relocations for xtensa
if opts.target == "xtensa":
cmd.append("--mllvm=-mtext-section-literals")
if test_target in aot_target_options_map_xip:
cmd += aot_target_options_map_xip[test_target]

if opts.multi_thread:
cmd.append("--enable-multi-thread")
Expand Down Expand Up @@ -1308,8 +1312,8 @@ def test_assert_with_exception(form, wast_tempfile, wasm_tempfile, aot_tempfile,
if test_aot:
aot_tempfile = create_tmp_file(".aot")
# could be potientially compiled to aot
# with the future following call test_assert_xxx,
# add them to temp_file_repo now even if no actual following file,
# with the future following call test_assert_xxx,
# add them to temp_file_repo now even if no actual following file,
# it will be simple ignore during final deletion if not exist
prefix = wasm_tempfile.split(".wasm")[0]
temp_file_repo.append(prefix + ".aot")
Expand Down Expand Up @@ -1436,8 +1440,8 @@ def test_assert_with_exception(form, wast_tempfile, wasm_tempfile, aot_tempfile,
if test_aot:
r = compile_wasm_to_aot(temp_files[1], temp_files[2], True, opts, r)
# could be potientially compiled to aot
# with the future following call test_assert_xxx,
# add them to temp_file_repo now even if no actual following file,
# with the future following call test_assert_xxx,
# add them to temp_file_repo now even if no actual following file,
# it will be simple ignore during final deletion if not exist
prefix = temp_files[1].split(".wasm")[0]
temp_file_repo.append(prefix + ".aot")
Expand Down
Loading