christoph/wamr
1
Fork 0
Code Releases Activity

Avoid initialize LLVM repeatedly (#1671)

Browse Source 
Currently we initialize and destroy LLVM environment in aot_create_comp_context
and aot_destroy_comp_context, which are called in wasm_module_load/unload,
and the latter may be invoked multiple times, which leads to duplicated LLVM
initialization/destroy and may result in unexpected behaviors.

Move the LLVM init/destroy into runtime init/destroy to resolve the issue.
This commit is contained in:
Wenyong Huang
2022-11-02 16:13:58 +08:00
committed by GitHub
parent f1f6f4a125
commit 5b144c491d
5 changed files with 68 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/iwasm/common/wasm_runtime_common.c
View File

@ -30,6 +30,9 @@
#if WASM_ENABLE_FAST_JIT != 0
#include "../fast-jit/jit_compiler.h"
#endif
#if WASM_ENABLE_JIT != 0 || WASM_ENABLE_WAMR_COMPILER != 0
#include "../compilation/aot_llvm.h"
#endif
#include "../common/wasm_c_api_internal.h"
#include "../../version.h"
@ -347,8 +350,20 @@ wasm_runtime_env_init()
}
#endif
#if WASM_ENABLE_JIT != 0 || WASM_ENABLE_WAMR_COMPILER != 0
if (!aot_compiler_init()) {
goto fail10;
}
#endif
return true;
#if WASM_ENABLE_JIT != 0 || WASM_ENABLE_WAMR_COMPILER != 0
fail10:
#if WASM_ENABLE_FAST_JIT != 0
jit_compiler_destroy();
#endif
#endif
#if WASM_ENABLE_FAST_JIT != 0
fail9:
#if WASM_ENABLE_REF_TYPES != 0
@ -438,6 +453,17 @@ wasm_runtime_destroy()
os_mutex_destroy(&registered_module_list_lock);
#endif
#if WASM_ENABLE_JIT != 0 || WASM_ENABLE_WAMR_COMPILER != 0
/* Destroy LLVM-JIT compiler after destroying the modules
* loaded by multi-module feature, since these modules may
* create backend threads to compile the wasm functions,
* which may access the LLVM resources. We wait until they
* finish the compilation to avoid accessing the destroyed
* resources in the compilation threads.
*/
aot_compiler_destroy();
#endif
#if WASM_ENABLE_FAST_JIT != 0
/* Destroy Fast-JIT compiler after destroying the modules
* loaded by multi-module feature, since the Fast JIT's