gnh1201/wasm-micro-runtime
1
0
Fork 0
mirror of https://github.com/bytecodealliance/wasm-micro-runtime.git synced 2025-05-22 09:31:15 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fix fast jit issues and clear compile warnings (#1228)

Browse Source 
Fix i8 bool result misused as i32 reg to compare with i32 0
Fix wasm_runtime_malloc 0 size memory warning
Fix codegen i64 ROTL translation issue
Refine rotate shift operations
Clear compilation warnings of codegen
This commit is contained in:
Wenyong Huang 2022-06-16 09:55:59 +08:00 committed by GitHub
parent 5340e3c3de
commit a0e0a5fa0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 105 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
core/iwasm/fast-jit/cg/x86-64/jit_codegen_x86_64.cpp
View File

@ -325,7 +325,6 @@ jmp_from_label_to_label(x86::Assembler &a, bh_list *jmp_info_list,
* @param jmp_info_list the jmp info list
* @param label_src the index of src label
* @param op the opcode of condition operation
* @param reg_no the no of register which contains the compare results
* @param r1 the label info when condition is met
* @param r2 the label info when condition is unmet, do nonthing if VOID
* @param is_last_insn if current insn is the last insn of current block
@ -335,7 +334,7 @@ jmp_from_label_to_label(x86::Assembler &a, bh_list *jmp_info_list,
static bool
cmp_r_and_jmp_label(JitCompContext *cc, x86::Assembler &a,
bh_list *jmp_info_list, int32 label_src, COND_OP op,
int32 reg_no, JitReg r1, JitReg r2, bool is_last_insn)
JitReg r1, JitReg r2, bool is_last_insn)
{
Imm imm(INT32_MAX);
JmpInfo *node;
@ -819,7 +818,7 @@ ld_r_from_base_imm_offset_r(x86::Assembler &a, uint32 bytes_dst,
uint32 kind_dst, bool is_signed, int32 reg_no_dst,
int32 base, int32 reg_no_offset)
{
x86::Mem m(regs_i64[reg_no_dst], base, bytes_dst);
x86::Mem m(regs_i64[reg_no_offset], base, bytes_dst);
return mov_m_to_r(a, bytes_dst, kind_dst, is_signed, reg_no_dst, m);
}
@ -2149,7 +2148,11 @@ neg_r_to_r_i64(x86::Assembler &a, int32 reg_no_dst, int32 reg_no_src)
static bool
neg_imm_to_r_f32(x86::Assembler &a, int32 reg_no, float data)
{
bh_assert(0);
return false;
(void)a;
(void)reg_no;
(void)data;
}
/**
@ -2164,7 +2167,11 @@ neg_imm_to_r_f32(x86::Assembler &a, int32 reg_no, float data)
static bool
neg_r_to_r_f32(x86::Assembler &a, int32 reg_no_dst, int32 reg_no_src)
{
bh_assert(0);
return false;
(void)a;
(void)reg_no_dst;
(void)reg_no_src;
}
/**
@ -2179,7 +2186,11 @@ neg_r_to_r_f32(x86::Assembler &a, int32 reg_no_dst, int32 reg_no_src)
static bool
neg_imm_to_r_f64(x86::Assembler &a, int32 reg_no, double data)
{
bh_assert(0);
return false;
(void)a;
(void)reg_no;
(void)data;
}
/**
@ -2194,7 +2205,11 @@ neg_imm_to_r_f64(x86::Assembler &a, int32 reg_no, double data)
static bool
neg_r_to_r_f64(x86::Assembler &a, int32 reg_no_dst, int32 reg_no_src)
{
bh_assert(0);
return false;
(void)a;
(void)reg_no_dst;
(void)reg_no_src;
}
static COND_OP
@ -3727,6 +3742,11 @@ shift_imm_r_to_r_i32(x86::Assembler &a, SHIFT_OP op, int32 reg_no_dst,
/* Should have been optimized by previous lower */
bh_assert(0);
return false;
(void)a;
(void)op;
(void)reg_no_dst;
(void)data1_src;
(void)reg_no2_src;
}
/**
@ -3919,6 +3939,11 @@ shift_imm_r_to_r_i64(x86::Assembler &a, SHIFT_OP op, int32 reg_no_dst,
/* Should have been optimized by previous lower */
bh_assert(0);
return false;
(void)a;
(void)op;
(void)reg_no_dst;
(void)data1_src;
(void)reg_no2_src;
}
/**
@ -3958,7 +3983,7 @@ shift_r_imm_to_r_i64(x86::Assembler &a, SHIFT_OP op, int32 reg_no_dst,
}
case ROTL:
{
a.ror(regs_i64[reg_no_dst], imm);
a.rol(regs_i64[reg_no_dst], imm);
break;
}
case ROTR:
@ -4056,6 +4081,7 @@ cmp_imm_imm_to_r_i32(x86::Assembler &a, int32 reg_no_dst, int32 data1_src,
imm.setValue(data2_src);
a.cmp(regs_i32[REG_I32_FREE_IDX], imm);
return true;
(void)reg_no_dst;
}
/**
@ -4077,6 +4103,7 @@ cmp_imm_r_to_r_i32(x86::Assembler &a, int32 reg_no_dst, int32 data1_src,
a.mov(regs_i32[REG_I32_FREE_IDX], imm);
a.cmp(regs_i32[REG_I32_FREE_IDX], regs_i32[reg_no2_src]);
return true;
(void)reg_no_dst;
}
/**
@ -4097,6 +4124,7 @@ cmp_r_imm_to_r_i32(x86::Assembler &a, int32 reg_no_dst, int32 reg_no1_src,
Imm imm(data2_src);
a.cmp(regs_i32[reg_no1_src], imm);
return true;
(void)reg_no_dst;
}
/**
@ -4116,6 +4144,7 @@ cmp_r_r_to_r_i32(x86::Assembler &a, int32 reg_no_dst, int32 reg_no1_src,
{
a.cmp(regs_i32[reg_no1_src], regs_i32[reg_no2_src]);
return true;
(void)reg_no_dst;
}
/**
@ -4138,6 +4167,7 @@ cmp_imm_imm_to_r_i64(x86::Assembler &a, int32 reg_no_dst, int32 data1_src,
imm.setValue(data2_src);
a.cmp(regs_i64[REG_I64_FREE_IDX], imm);
return true;
(void)reg_no_dst;
}
/**
@ -4159,6 +4189,7 @@ cmp_imm_r_to_r_i64(x86::Assembler &a, int32 reg_no_dst, int64 data1_src,
a.mov(regs_i64[REG_I64_FREE_IDX], imm);
a.cmp(regs_i64[REG_I64_FREE_IDX], regs_i64[reg_no2_src]);
return true;
(void)reg_no_dst;
}
/**
@ -4187,6 +4218,7 @@ cmp_r_imm_to_r_i64(x86::Assembler &a, int32 reg_no_dst, int32 reg_no1_src,
a.cmp(regs_i64[reg_no1_src], regs_i64[REG_I64_FREE_IDX]);
}
return true;
(void)reg_no_dst;
}
/**
@ -4206,6 +4238,7 @@ cmp_r_r_to_r_i64(x86::Assembler &a, int32 reg_no_dst, int32 reg_no1_src,
{
a.cmp(regs_i64[reg_no1_src], regs_i64[reg_no2_src]);
return true;
(void)reg_no_dst;
}
/**
@ -4225,6 +4258,7 @@ cmp_r_r_to_r_f32(x86::Assembler &a, int32 reg_no_dst, int32 reg_no1_src,
{
a.comiss(regs_float[reg_no1_src], regs_float[reg_no2_src]);
return true;
(void)reg_no_dst;
}
/**
@ -4242,9 +4276,13 @@ static bool
cmp_imm_imm_to_r_f32(x86::Assembler &a, int32 reg_no_dst, float data1_src,
float data2_src)
{
/* should resolve it in frontend */
/* should have been optimized in the frontend */
bh_assert(0);
return false;
(void)a;
(void)reg_no_dst;
(void)data1_src;
(void)data2_src;
}
/**
@ -4265,6 +4303,7 @@ cmp_imm_r_to_r_f32(x86::Assembler &a, int32 reg_no_dst, float data1_src,
mov_imm_to_r_f32(a, REG_F32_FREE_IDX, data1_src);
a.comiss(regs_float[REG_F32_FREE_IDX], regs_float[reg_no2_src]);
return true;
(void)reg_no_dst;
}
/**
@ -4285,6 +4324,7 @@ cmp_r_imm_to_r_f32(x86::Assembler &a, int32 reg_no_dst, int32 reg_no1_src,
mov_imm_to_r_f32(a, REG_F32_FREE_IDX, data2_src);
a.comiss(regs_float[reg_no1_src], regs_float[REG_F32_FREE_IDX]);
return true;
(void)reg_no_dst;
}
/**
@ -4304,6 +4344,7 @@ cmp_r_r_to_r_f64(x86::Assembler &a, int32 reg_no_dst, int32 reg_no1_src,
{
a.comisd(regs_float[reg_no1_src], regs_float[reg_no2_src]);
return true;
(void)reg_no_dst;
}
/**
@ -4321,9 +4362,13 @@ static bool
cmp_imm_imm_to_r_f64(x86::Assembler &a, int32 reg_no_dst, double data1_src,
double data2_src)
{
/* should resolve it in frontend */
/* should have been optimized in the frontend */
bh_assert(0);
return false;
(void)a;
(void)reg_no_dst;
(void)data1_src;
(void)data2_src;
}
/**
@ -4344,6 +4389,7 @@ cmp_imm_r_to_r_f64(x86::Assembler &a, int32 reg_no_dst, double data1_src,
mov_imm_to_r_f64(a, REG_F64_FREE_IDX, data1_src);
a.comisd(regs_float[REG_F64_FREE_IDX], regs_float[reg_no2_src]);
return true;
(void)reg_no_dst;
}
/**
@ -4364,6 +4410,7 @@ cmp_r_imm_to_r_f64(x86::Assembler &a, int32 reg_no_dst, int32 reg_no1_src,
mov_imm_to_r_f64(a, REG_F64_FREE_IDX, data2_src);
a.comisd(regs_float[reg_no1_src], regs_float[REG_F64_FREE_IDX]);
return true;
(void)reg_no_dst;
}
/**
@ -4933,7 +4980,6 @@ bitcount_r_to_r_i64(x86::Assembler &a, BITCOUNT_OP op, int32 reg_no_dst,
#define BITCOUNT_R_R(kind, Type, type, op) \
do { \
int32 reg_no_dst; \
bool _ret = false; \
\
CHECK_EQKIND(r0, r1); \
CHECK_NCONST(r1); \
@ -5066,15 +5112,14 @@ fail:
*
* @param cc the compiler context
* @param a the assembler to emit the code
* @param reg_no the no of register which contains cmp flags of cmp result
* @param op the condition opcode to jmp
* @param offset the relative offset to jmp when the contidtion meeted
*
* @return return the next address of native code after encoded
*/
static bool
cmp_r_and_jmp_relative(JitCompContext *cc, x86::Assembler &a, int32 reg_no,
COND_OP op, int32 offset)
cmp_r_and_jmp_relative(JitCompContext *cc, x86::Assembler &a, COND_OP op,
int32 offset)
{
Imm target(INT32_MAX);
char *stream = (char *)a.code()->sectionById(0)->buffer().data()
@ -5219,8 +5264,7 @@ lower_select(JitCompContext *cc, x86::Assembler &a, COND_OP op, JitReg r0,
}
if (r3 && r0 != r3) {
if (!cmp_r_and_jmp_relative(cc, a, jit_reg_no(r1), op,
(int32)size_mov2))
if (!cmp_r_and_jmp_relative(cc, a, op, (int32)size_mov2))
return false;
a.embedDataArray(TypeId::kInt8, stream_mov2, size_mov2);
}
@ -5269,7 +5313,7 @@ lower_branch(JitCompContext *cc, x86::Assembler &a, bh_list *jmp_info_list,
int32 label_src, COND_OP op, JitReg r0, JitReg r1, JitReg r2,
bool is_last_insn)
{
int32 reg_no, label_dst;
int32 label_dst;
CHECK_NCONST(r0);
CHECK_KIND(r0, JIT_REG_KIND_I32);
@ -5287,9 +5331,8 @@ lower_branch(JitCompContext *cc, x86::Assembler &a, bh_list *jmp_info_list,
op = not_cond(op);
}
reg_no = jit_reg_no(r0);
if (!cmp_r_and_jmp_label(cc, a, jmp_info_list, label_src, op, reg_no, r1,
r2, is_last_insn))
if (!cmp_r_and_jmp_label(cc, a, jmp_info_list, label_src, op, r1, r2,
is_last_insn))
GOTO_FAIL;
return true;
@ -5444,15 +5487,12 @@ fail:
*
* @param cc the compiler context
* @param a the assembler to emit the code
* @param jmp_info_list the jmp info list
* @param label_src the index of src label
* @param insn current insn info
*
* @return true if success, false if failed
*/
static bool
lower_callnative(JitCompContext *cc, x86::Assembler &a, bh_list *jmp_info_list,
int32 label_src, JitInsn *insn)
lower_callnative(JitCompContext *cc, x86::Assembler &a, JitInsn *insn)
{
void (*func_ptr)(void);
JitReg ret_reg, func_reg, arg_reg;
@ -5460,10 +5500,7 @@ lower_callnative(JitCompContext *cc, x86::Assembler &a, bh_list *jmp_info_list,
uint8 regs_arg_idx[] = { REG_RDI_IDX, REG_RSI_IDX, REG_RDX_IDX,
REG_RCX_IDX, REG_R8_IDX, REG_R9_IDX };
Imm imm;
JmpInfo *node;
uint32 i, opnd_num;
int32 i32;
int64 i64;
uint8 integer_reg_index = 0;
uint8 floatpoint_reg_index = 0;
@ -5548,9 +5585,9 @@ lower_callnative(JitCompContext *cc, x86::Assembler &a, bh_list *jmp_info_list,
&& jit_reg_no(ret_reg) == REG_EAX_IDX)
|| (jit_reg_kind(ret_reg) == JIT_REG_KIND_I64
&& jit_reg_no(ret_reg) == REG_RAX_IDX)
|| (jit_reg_kind(ret_reg) == JIT_REG_KIND_F32
|| jit_reg_kind(ret_reg) == JIT_REG_KIND_F64
&& jit_reg_no(ret_reg) == 0));
|| ((jit_reg_kind(ret_reg) == JIT_REG_KIND_F32
|| jit_reg_kind(ret_reg) == JIT_REG_KIND_F64)
&& jit_reg_no(ret_reg) == 0));
}
return true;
@ -5603,8 +5640,7 @@ fail:
}
static bool
lower_returnbc(JitCompContext *cc, x86::Assembler &a, int32 label_src,
JitInsn *insn)
lower_returnbc(JitCompContext *cc, x86::Assembler &a, JitInsn *insn)
{
JitReg ecx_hreg = jit_reg_new(JIT_REG_KIND_I32, REG_ECX_IDX);
JitReg rcx_hreg = jit_reg_new(JIT_REG_KIND_I64, REG_RCX_IDX);
@ -5687,7 +5723,7 @@ static void
patch_jmp_info_list(JitCompContext *cc, bh_list *jmp_info_list)
{
JmpInfo *jmp_info, *jmp_info_next;
JitReg reg_src, reg_dst;
JitReg reg_dst;
char *stream;
jmp_info = (JmpInfo *)bh_list_first_elem(jmp_info_list);
@ -5695,7 +5731,6 @@ patch_jmp_info_list(JitCompContext *cc, bh_list *jmp_info_list)
while (jmp_info) {
jmp_info_next = (JmpInfo *)bh_list_elem_next(jmp_info);
reg_src = jit_reg_new(JIT_REG_KIND_L32, jmp_info->label_src);
stream = (char *)cc->jitted_addr_begin + jmp_info->offset;
if (jmp_info->type == JMP_DST_LABEL) {
@ -5893,7 +5928,7 @@ jit_codegen_gen_native(JitCompContext *cc)
JitReg r0, r1, r2, r3;
JmpInfo jmp_info_head;
bh_list *jmp_info_list = (bh_list *)&jmp_info_head;
uint32 label_index, label_num, i, j;
uint32 label_index, label_num, i;
uint32 *label_offsets = NULL, code_size;
#if CODEGEN_DUMP != 0
uint32 code_offset = 0;
@ -6324,8 +6359,7 @@ jit_codegen_gen_native(JitCompContext *cc)
}
case JIT_OP_CALLNATIVE:
if (!lower_callnative(cc, a, jmp_info_list, label_index,
insn))
if (!lower_callnative(cc, a, insn))
GOTO_FAIL;
break;
@ -6335,7 +6369,7 @@ jit_codegen_gen_native(JitCompContext *cc)
break;
case JIT_OP_RETURNBC:
if (!lower_returnbc(cc, a, label_index, insn))
if (!lower_returnbc(cc, a, insn))
GOTO_FAIL;
break;
@ -6424,12 +6458,15 @@ fail:
bool
jit_codegen_lower(JitCompContext *cc)
{
(void)cc;
return true;
}
void
jit_codegen_free_native(JitCompContext *cc)
{}
{
(void)cc;
}
void
jit_codegen_dump_native(void *begin_addr, void *end_addr)

4
core/iwasm/fast-jit/fe/jit_emit_function.c
View File

@ -167,6 +167,8 @@ jit_compile_op_call(JitCompContext *cc, uint32 func_idx, bool tail_call)
3)) {
return false;
}
/* Convert bool to uint32 */
GEN_INSN(AND, native_ret, native_ret, NEW_CONST(I32, 0xFF));
/* Check whether there is exception thrown */
GEN_INSN(CMP, cc->cmp_reg, native_ret, NEW_CONST(I32, 0));
@ -339,6 +341,8 @@ jit_compile_op_call_indirect(JitCompContext *cc, uint32 type_idx,
if (!jit_emit_callnative(cc, jit_call_indirect, native_ret, arg_regs, 6)) {
return false;
}
/* Convert bool to uint32 */
GEN_INSN(AND, native_ret, native_ret, NEW_CONST(I32, 0xFF));
/* Check whether there is exception thrown */
GEN_INSN(CMP, cc->cmp_reg, native_ret, NEW_CONST(I32, 0));

2
core/iwasm/fast-jit/fe/jit_emit_memory.c
View File

@ -507,6 +507,8 @@ jit_compile_op_memory_grow(JitCompContext *cc, uint32 mem_idx)
if (!jit_emit_callnative(cc, wasm_enlarge_memory, grow_res, args, 2)) {
goto fail;
}
/* Convert bool to uint32 */
GEN_INSN(AND, grow_res, grow_res, NEW_CONST(I32, 0xFF));
/* Check if enlarge memory success */
res = jit_cc_new_reg_I32(cc);

24
core/iwasm/fast-jit/fe/jit_emit_numberic.c
View File

@ -1050,10 +1050,14 @@ do_i64_const_shru(int64 lhs, int64 rhs)
return (uint64)lhs >> rhs;
}
typedef enum { SHL, SHRS, SHRU, ROTL, ROTR } SHIFT_OP;
static JitReg
compile_int_shift_modulo(JitCompContext *cc, JitReg rhs, bool is_i32)
compile_int_shift_modulo(JitCompContext *cc, JitReg rhs, bool is_i32,
SHIFT_OP op)
{
JitReg res;
if (jit_reg_is_const(rhs)) {
if (is_i32) {
int32 val = jit_cc_get_const_I32(cc, rhs);
@ -1067,7 +1071,12 @@ compile_int_shift_modulo(JitCompContext *cc, JitReg rhs, bool is_i32)
}
}
else {
if (is_i32) {
if (op == ROTL || op == ROTR) {
/* No need to generate AND insn as the result
is same for rotate shift */
res = rhs;
}
else if (is_i32) {
res = jit_cc_new_reg_I32(cc);
GEN_INSN(AND, res, rhs, NEW_CONST(I32, 0x1f));
}
@ -1076,6 +1085,7 @@ compile_int_shift_modulo(JitCompContext *cc, JitReg rhs, bool is_i32)
GEN_INSN(AND, res, rhs, NEW_CONST(I64, 0x3f));
}
}
return res;
}
@ -1101,7 +1111,7 @@ compile_int_shl(JitCompContext *cc, JitReg left, JitReg right, bool is_i32)
JitInsn *insn = NULL;
#endif
right = compile_int_shift_modulo(cc, right, is_i32);
right = compile_int_shift_modulo(cc, right, is_i32, SHL);
res = CHECK_AND_PROCESS_INT_CONSTS(cc, left, right, is_i32, shl);
if (res)
@ -1132,7 +1142,7 @@ compile_int_shrs(JitCompContext *cc, JitReg left, JitReg right, bool is_i32)
JitInsn *insn = NULL;
#endif
right = compile_int_shift_modulo(cc, right, is_i32);
right = compile_int_shift_modulo(cc, right, is_i32, SHRS);
res = CHECK_AND_PROCESS_INT_CONSTS(cc, left, right, is_i32, shrs);
if (res)
@ -1163,7 +1173,7 @@ compile_int_shru(JitCompContext *cc, JitReg left, JitReg right, bool is_i32)
JitInsn *insn = NULL;
#endif
right = compile_int_shift_modulo(cc, right, is_i32);
right = compile_int_shift_modulo(cc, right, is_i32, SHRU);
res = CHECK_AND_PROCESS_INT_CONSTS(cc, left, right, is_i32, shru);
if (res)
@ -1225,7 +1235,7 @@ compile_int_rotl(JitCompContext *cc, JitReg left, JitReg right, bool is_i32)
JitInsn *insn = NULL;
#endif
right = compile_int_shift_modulo(cc, right, is_i32);
right = compile_int_shift_modulo(cc, right, is_i32, ROTL);
res = CHECK_AND_PROCESS_INT_CONSTS(cc, left, right, is_i32, rotl);
if (res)
@ -1287,7 +1297,7 @@ compile_int_rotr(JitCompContext *cc, JitReg left, JitReg right, bool is_i32)
JitInsn *insn = NULL;
#endif
right = compile_int_shift_modulo(cc, right, is_i32);
right = compile_int_shift_modulo(cc, right, is_i32, ROTR);
res = CHECK_AND_PROCESS_INT_CONSTS(cc, left, right, is_i32, rotr);
if (res)

7
core/iwasm/fast-jit/jit_regalloc.c
View File

@ -22,7 +22,7 @@ typedef struct UintStack {
uint32 top;
/* Elements of the vector. */
uint16 elem[1];
uint32 elem[1];
} UintStack;
static bool
@ -424,6 +424,11 @@ collect_distances(RegallocContext *rc, JitBasicBlock *basic_block)
if (!uint_stack_push(&(rc_get_vr(rc, *regp))->distances, distance))
return -1;
/* Integer overflow check, normally it won't happen, but
we had better add the check here */
if (distance >= INT32_MAX)
return -1;
distance++;
}

7
core/iwasm/interpreter/wasm_loader.c
View File

@ -3261,9 +3261,10 @@ load_from_sections(WASMModule *module, WASMSection *sections,
#if WASM_ENABLE_FAST_JIT != 0
calculate_global_data_offset(module);
if (!(module->fast_jit_func_ptrs =
loader_malloc(sizeof(void *) * module->function_count, error_buf,
error_buf_size))) {
if (module->function_count
&& !(module->fast_jit_func_ptrs =
loader_malloc(sizeof(void *) * module->function_count,
error_buf, error_buf_size))) {
return false;
}
if (!jit_compiler_compile_all(module)) {