christoph/wamr
1
Fork 0
Code Releases Activity

Enable aot compiler with llvm-14/15 (#1252)

Browse Source 
Enable aot compiler and jit based on llvm-14.0 and llvm-15.0git,
replace LLVMBuildLoad/LLVMBuildInBoundsGEP/LLVMBuildCall with
LLVMBuildLoad2/LLVMBuildInBoundsGEP2/LLVMBuildCall2, and pass
them with related types, so as to meet the requirements of opaque
pointers.

And fix several compilation errors for llvm-14.0/15.0git.

Most spec cases and standalone cases are tested.
This commit is contained in:
Wenyong Huang
2022-06-28 14:53:01 +08:00
committed by GitHub
parent 2746d29751
commit 5e238322c2
12 changed files with 431 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/iwasm/compilation/aot_emit_variable.c
View File

@ -33,17 +33,20 @@ aot_compile_op_get_local(AOTCompContext *comp_ctx, AOTFuncContext *func_ctx,
char name[32];
LLVMValueRef value;
AOTValue *aot_value_top;
uint8 local_type;
CHECK_LOCAL(local_idx);
local_type = get_local_type(func_ctx, local_idx);
snprintf(name, sizeof(name), "%s%d%s", "local", local_idx, "#");
if (!(value = LLVMBuildLoad(comp_ctx->builder, func_ctx->locals[local_idx],
name))) {
if (!(value = LLVMBuildLoad2(comp_ctx->builder, TO_LLVM_TYPE(local_type),
func_ctx->locals[local_idx], name))) {
aot_set_last_error("llvm build load fail");
return false;
}
PUSH(value, get_local_type(func_ctx, local_idx));
PUSH(value, local_type);
aot_value_top =
func_ctx->block_stack.block_list_end->value_stack.value_list_end;
@ -134,9 +137,9 @@ compile_global(AOTCompContext *comp_ctx, AOTFuncContext *func_ctx,
}
offset = I32_CONST(global_offset);
if (!(global_ptr =
LLVMBuildInBoundsGEP(comp_ctx->builder, func_ctx->aot_inst,
&offset, 1, "global_ptr_tmp"))) {
if (!(global_ptr = LLVMBuildInBoundsGEP2(comp_ctx->builder, INT8_TYPE,
func_ctx->aot_inst, &offset, 1,
"global_ptr_tmp"))) {
aot_set_last_error("llvm build in bounds gep failed.");
return false;
}
@ -172,7 +175,8 @@ compile_global(AOTCompContext *comp_ctx, AOTFuncContext *func_ctx,
if (!is_set) {
if (!(global =
LLVMBuildLoad(comp_ctx->builder, global_ptr, "global"))) {
LLVMBuildLoad2(comp_ctx->builder, TO_LLVM_TYPE(global_type),
global_ptr, "global"))) {
aot_set_last_error("llvm build load failed.");
return false;
}