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

This commit is contained in:
Huang Qi 2024-08-16 11:33:51 +08:00 committed by GitHub
parent 63df2cf02d
commit a44c487632
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -62,6 +62,12 @@ aot_target_options_map = {
"xtensa": ["--target=xtensa"], "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): def debug(data):
if debug_file: if debug_file:
debug_file.write(data) debug_file.write(data)
@ -1122,10 +1128,8 @@ def compile_wasm_to_aot(wasm_tempfile, aot_tempfile, runner, opts, r, output = '
if opts.xip: if opts.xip:
cmd.append("--xip") cmd.append("--xip")
if test_target in aot_target_options_map_xip:
# avoid l32r relocations for xtensa cmd += aot_target_options_map_xip[test_target]
if opts.target == "xtensa":
cmd.append("--mllvm=-mtext-section-literals")
if opts.multi_thread: if opts.multi_thread:
cmd.append("--enable-multi-thread") cmd.append("--enable-multi-thread")
@ -1308,8 +1312,8 @@ if __name__ == "__main__":
if test_aot: if test_aot:
aot_tempfile = create_tmp_file(".aot") aot_tempfile = create_tmp_file(".aot")
# could be potientially compiled to aot # could be potientially compiled to aot
# with the future following call test_assert_xxx, # with the future following call test_assert_xxx,
# add them to temp_file_repo now even if no actual following file, # add them to temp_file_repo now even if no actual following file,
# it will be simple ignore during final deletion if not exist # it will be simple ignore during final deletion if not exist
prefix = wasm_tempfile.split(".wasm")[0] prefix = wasm_tempfile.split(".wasm")[0]
temp_file_repo.append(prefix + ".aot") temp_file_repo.append(prefix + ".aot")
@ -1436,8 +1440,8 @@ if __name__ == "__main__":
if test_aot: if test_aot:
r = compile_wasm_to_aot(temp_files[1], temp_files[2], True, opts, r) r = compile_wasm_to_aot(temp_files[1], temp_files[2], True, opts, r)
# could be potientially compiled to aot # could be potientially compiled to aot
# with the future following call test_assert_xxx, # with the future following call test_assert_xxx,
# add them to temp_file_repo now even if no actual following file, # add them to temp_file_repo now even if no actual following file,
# it will be simple ignore during final deletion if not exist # it will be simple ignore during final deletion if not exist
prefix = temp_files[1].split(".wasm")[0] prefix = temp_files[1].split(".wasm")[0]
temp_file_repo.append(prefix + ".aot") temp_file_repo.append(prefix + ".aot")