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

Refine opcode br_table for classic interpreter (#1112)

Browse Source 
Refine opcode br_table for classic interpreter as there may be a lot of
leb128 decoding when the br count is big:
1. Use the bytecode itself to store the decoded leb br depths if each
    decoded depth can be stored with one byte
2. Create br_table cache to store the decode leb br depths if the decoded
    depth cannot be stored with one byte
After the optimization, the class interpreter can access the br depths array
with index, no need to decode the leb128 again.

And fix function record_fast_op() return value unchecked issue in source
debugging feature.
This commit is contained in:
Wenyong Huang 2022-04-23 19:15:55 +08:00 committed by GitHub
parent 5f8d1428d5
commit adaaf348ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 292 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
core/iwasm/compilation/aot_compiler.c
View File

@ -276,8 +276,13 @@ aot_compile_func(AOTCompContext *comp_ctx, uint32 func_index)
aot_set_last_error("allocate memory failed."); aot_set_last_error("allocate memory failed.");
goto fail; goto fail;
} }
#if WASM_ENABLE_FAST_INTERP != 0
for (i = 0; i <= br_count; i++) for (i = 0; i <= br_count; i++)
read_leb_uint32(frame_ip, frame_ip_end, br_depths[i]); read_leb_uint32(frame_ip, frame_ip_end, br_depths[i]);
#else
for (i = 0; i <= br_count; i++)
br_depths[i] = *frame_ip++;
#endif
if (!aot_compile_op_br_table(comp_ctx, func_ctx, br_depths, if (!aot_compile_op_br_table(comp_ctx, func_ctx, br_depths,
br_count, &frame_ip)) { br_count, &frame_ip)) {
@ -288,6 +293,35 @@ aot_compile_func(AOTCompContext *comp_ctx, uint32 func_index)
wasm_runtime_free(br_depths); wasm_runtime_free(br_depths);
break; break;
#if WASM_ENABLE_FAST_INTERP == 0
case EXT_OP_BR_TABLE_CACHE:
{
BrTableCache *node = bh_list_first_elem(
comp_ctx->comp_data->wasm_module->br_table_cache_list);
BrTableCache *node_next;
uint8 *p_opcode = frame_ip - 1;
read_leb_uint32(frame_ip, frame_ip_end, br_count);
while (node) {
node_next = bh_list_elem_next(node);
if (node->br_table_op_addr == p_opcode) {
br_depths = node->br_depths;
if (!aot_compile_op_br_table(comp_ctx, func_ctx,
br_depths, br_count,
&frame_ip)) {
return false;
}
break;
}
node = node_next;
}
bh_assert(node);
break;
}
#endif
case WASM_OP_RETURN: case WASM_OP_RETURN:
if (!aot_compile_op_return(comp_ctx, func_ctx, &frame_ip)) if (!aot_compile_op_return(comp_ctx, func_ctx, &frame_ip))
return false; return false;

13
core/iwasm/interpreter/wasm.h
View File

@ -319,6 +319,14 @@ typedef struct StringNode {
char *str; char *str;
} StringNode, *StringList; } StringNode, *StringList;
typedef struct BrTableCache {
struct BrTableCache *next;
/* Address of br_table opcode */
uint8 *br_table_op_addr;
uint32 br_count;
uint32 br_depths[1];
} BrTableCache;
#if WASM_ENABLE_DEBUG_INTERP != 0 #if WASM_ENABLE_DEBUG_INTERP != 0
typedef struct WASMFastOPCodeNode { typedef struct WASMFastOPCodeNode {
struct WASMFastOPCodeNode *next; struct WASMFastOPCodeNode *next;
@ -326,6 +334,7 @@ typedef struct WASMFastOPCodeNode {
uint8 orig_op; uint8 orig_op;
} WASMFastOPCodeNode; } WASMFastOPCodeNode;
#endif #endif
struct WASMModule { struct WASMModule {
/* Module type, for module loaded from WASM bytecode binary, /* Module type, for module loaded from WASM bytecode binary,
this field is Wasm_Module_Bytecode; this field is Wasm_Module_Bytecode;
@ -403,6 +412,10 @@ struct WASMModule {
bool possible_memory_grow; bool possible_memory_grow;
StringList const_str_list; StringList const_str_list;
#if WASM_ENABLE_FAST_INTERP == 0
bh_list br_table_cache_list_head;
bh_list *br_table_cache_list;
#endif
#if WASM_ENABLE_LIBC_WASI != 0 #if WASM_ENABLE_LIBC_WASI != 0
WASIArguments wasi_args; WASIArguments wasi_args;

27
core/iwasm/interpreter/wasm_interp_classic.c
View File

@ -1199,12 +1199,33 @@ wasm_interp_call_func_bytecode(WASMModuleInstance *module,
lidx = POP_I32(); lidx = POP_I32();
if (lidx > count) if (lidx > count)
lidx = count; lidx = count;
for (i = 0; i < lidx; i++) depth = frame_ip[lidx];
skip_leb(frame_ip);
read_leb_uint32(frame_ip, frame_ip_end, depth);
goto label_pop_csp_n; goto label_pop_csp_n;
} }
HANDLE_OP(EXT_OP_BR_TABLE_CACHE)
{
BrTableCache *node =
bh_list_first_elem(module->module->br_table_cache_list);
BrTableCache *node_next;
#if WASM_ENABLE_THREAD_MGR != 0
CHECK_SUSPEND_FLAGS();
#endif
lidx = POP_I32();
while (node) {
node_next = bh_list_elem_next(node);
if (node->br_table_op_addr == frame_ip - 1) {
depth = node->br_depths[lidx];
goto label_pop_csp_n;
}
node = node_next;
}
bh_assert(0);
HANDLE_OP_END();
}
HANDLE_OP(WASM_OP_RETURN) HANDLE_OP(WASM_OP_RETURN)
{ {
frame_sp -= cur_func->ret_cell_num; frame_sp -= cur_func->ret_cell_num;

1
core/iwasm/interpreter/wasm_interp_fast.c
View File

@ -3539,6 +3539,7 @@ wasm_interp_call_func_bytecode(WASMModuleInstance *module,
HANDLE_OP(EXT_OP_BLOCK) HANDLE_OP(EXT_OP_BLOCK)
HANDLE_OP(EXT_OP_LOOP) HANDLE_OP(EXT_OP_LOOP)
HANDLE_OP(EXT_OP_IF) HANDLE_OP(EXT_OP_IF)
HANDLE_OP(EXT_OP_BR_TABLE_CACHE)
{ {
wasm_set_exception(module, "unsupported opcode"); wasm_set_exception(module, "unsupported opcode");
goto got_exception; goto got_exception;

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

@ -3245,6 +3245,9 @@ create_module(char *error_buf, uint32 error_buf_size)
{ {
WASMModule *module = WASMModule *module =
loader_malloc(sizeof(WASMModule), error_buf, error_buf_size); loader_malloc(sizeof(WASMModule), error_buf, error_buf_size);
#if WASM_ENABLE_FAST_INTERP == 0
bh_list_status ret;
#endif
if (!module) { if (!module) {
return NULL; return NULL;
@ -3255,6 +3258,13 @@ create_module(char *error_buf, uint32 error_buf_size)
/* Set start_function to -1, means no start function */ /* Set start_function to -1, means no start function */
module->start_function = (uint32)-1; module->start_function = (uint32)-1;
#if WASM_ENABLE_FAST_INTERP == 0
module->br_table_cache_list = &module->br_table_cache_list_head;
ret = bh_list_init(module->br_table_cache_list);
bh_assert(ret == BH_LIST_SUCCESS);
(void)ret;
#endif
#if WASM_ENABLE_MULTI_MODULE != 0 #if WASM_ENABLE_MULTI_MODULE != 0
module->import_module_list = &module->import_module_list_head; module->import_module_list = &module->import_module_list_head;
#endif #endif
@ -3269,16 +3279,18 @@ create_module(char *error_buf, uint32 error_buf_size)
} }
#if WASM_ENABLE_DEBUG_INTERP != 0 #if WASM_ENABLE_DEBUG_INTERP != 0
static void static bool
record_fast_op(WASMModule *module, uint8 *pos, uint8 orig_op) record_fast_op(WASMModule *module, uint8 *pos, uint8 orig_op, char *error_buf,
uint32 error_buf_size)
{ {
WASMFastOPCodeNode *fast_op = WASMFastOPCodeNode *fast_op =
loader_malloc(sizeof(WASMFastOPCodeNode), NULL, 0); loader_malloc(sizeof(WASMFastOPCodeNode), error_buf, error_buf_size);
if (fast_op) { if (fast_op) {
fast_op->offset = pos - module->load_addr; fast_op->offset = pos - module->load_addr;
fast_op->orig_op = orig_op; fast_op->orig_op = orig_op;
bh_list_insert(&module->fast_opcode_list, fast_op); bh_list_insert(&module->fast_opcode_list, fast_op);
} }
return fast_op ? true : false;
} }
#endif #endif
@ -3695,6 +3707,18 @@ wasm_loader_unload(WASMModule *module)
} }
} }
#if WASM_ENABLE_FAST_INTERP == 0
if (module->br_table_cache_list) {
BrTableCache *node = bh_list_first_elem(module->br_table_cache_list);
BrTableCache *node_next;
while (node) {
node_next = bh_list_elem_next(node);
wasm_runtime_free(node);
node = node_next;
}
}
#endif
#if WASM_ENABLE_MULTI_MODULE != 0 #if WASM_ENABLE_MULTI_MODULE != 0
/* just release the sub module list */ /* just release the sub module list */
if (module->import_module_list) { if (module->import_module_list) {
@ -3854,10 +3878,24 @@ wasm_loader_find_block_addr(WASMExecEnv *exec_env, BlockAddr *block_addr_cache,
case WASM_OP_BR_TABLE: case WASM_OP_BR_TABLE:
read_leb_uint32(p, p_end, count); /* lable num */ read_leb_uint32(p, p_end, count); /* lable num */
#if WASM_ENABLE_FAST_INTERP != 0
for (i = 0; i <= count; i++) /* lableidxs */ for (i = 0; i <= count; i++) /* lableidxs */
skip_leb_uint32(p, p_end); skip_leb_uint32(p, p_end);
#else
p += count + 1;
while (*p == WASM_OP_NOP)
p++;
#endif
break; break;
#if WASM_ENABLE_FAST_INTERP == 0
case EXT_OP_BR_TABLE_CACHE:
read_leb_uint32(p, p_end, count); /* lable num */
while (*p == WASM_OP_NOP)
p++;
break;
#endif
case WASM_OP_RETURN: case WASM_OP_RETURN:
break; break;
@ -6529,7 +6567,10 @@ re_scan:
* the block quickly. * the block quickly.
*/ */
#if WASM_ENABLE_DEBUG_INTERP != 0 #if WASM_ENABLE_DEBUG_INTERP != 0
record_fast_op(module, p_org, *p_org); if (!record_fast_op(module, p_org, *p_org, error_buf,
error_buf_size)) {
goto fail;
}
#endif #endif
*p_org = EXT_OP_BLOCK + (opcode - WASM_OP_BLOCK); *p_org = EXT_OP_BLOCK + (opcode - WASM_OP_BLOCK);
#endif #endif
@ -6778,6 +6819,13 @@ re_scan:
{ {
uint8 *ret_types = NULL; uint8 *ret_types = NULL;
uint32 ret_count = 0; uint32 ret_count = 0;
#if WASM_ENABLE_FAST_INTERP == 0
uint8 *p_depth_begin, *p_depth;
uint32 depth, j;
BrTableCache *br_table_cache = NULL;
p_org = p - 1;
#endif
read_leb_uint32(p, p_end, count); read_leb_uint32(p, p_end, count);
#if WASM_ENABLE_FAST_INTERP != 0 #if WASM_ENABLE_FAST_INTERP != 0
@ -6785,6 +6833,9 @@ re_scan:
#endif #endif
POP_I32(); POP_I32();
#if WASM_ENABLE_FAST_INTERP == 0
p_depth_begin = p_depth = p;
#endif
for (i = 0; i <= count; i++) { for (i = 0; i <= count; i++) {
if (!(frame_csp_tmp = if (!(frame_csp_tmp =
check_branch_block(loader_ctx, &p, p_end, check_branch_block(loader_ctx, &p, p_end,
@ -6818,7 +6869,56 @@ re_scan:
goto fail; goto fail;
} }
} }
#if WASM_ENABLE_FAST_INTERP == 0
depth = (uint32)(loader_ctx->frame_csp - 1 - frame_csp_tmp);
if (br_table_cache) {
br_table_cache->br_depths[i] = depth;
} }
else {
if (depth > 255) {
/* The depth cannot be stored in one byte,
create br_table cache to store each depth */
#if WASM_ENABLE_DEBUG_INTERP != 0
if (!record_fast_op(module, p_org, *p_org,
error_buf, error_buf_size)) {
goto fail;
}
#endif
if (!(br_table_cache = loader_malloc(
offsetof(BrTableCache, br_depths)
+ sizeof(uint32)
* (uint64)(count + 1),
error_buf, error_buf_size))) {
goto fail;
}
*p_org = EXT_OP_BR_TABLE_CACHE;
br_table_cache->br_table_op_addr = p_org;
br_table_cache->br_count = count;
/* Copy previous depths which are one byte */
for (j = 0; j < i; j++) {
br_table_cache->br_depths[j] = p_depth_begin[j];
}
br_table_cache->br_depths[i] = depth;
bh_list_insert(module->br_table_cache_list,
br_table_cache);
}
else {
/* The depth can be stored in one byte, use the
byte of the leb to store it */
*p_depth++ = (uint8)depth;
}
}
#endif
}
#if WASM_ENABLE_FAST_INTERP == 0
/* Set the tailing bytes to nop */
if (br_table_cache)
p_depth = p_depth_begin;
while (p_depth < p)
*p_depth++ = WASM_OP_NOP;
#endif
RESET_STACK(); RESET_STACK();
SET_CUR_BLOCK_STACK_POLYMORPHIC_STATE(true); SET_CUR_BLOCK_STACK_POLYMORPHIC_STATE(true);
@ -7563,7 +7663,10 @@ re_scan:
if (global_type == VALUE_TYPE_I64 if (global_type == VALUE_TYPE_I64
|| global_type == VALUE_TYPE_F64) { || global_type == VALUE_TYPE_F64) {
#if WASM_ENABLE_DEBUG_INTERP != 0 #if WASM_ENABLE_DEBUG_INTERP != 0
record_fast_op(module, p_org, *p_org); if (!record_fast_op(module, p_org, *p_org, error_buf,
error_buf_size)) {
goto fail;
}
#endif #endif
*p_org = WASM_OP_GET_GLOBAL_64; *p_org = WASM_OP_GET_GLOBAL_64;
} }
@ -7617,14 +7720,20 @@ re_scan:
if (global_type == VALUE_TYPE_I64 if (global_type == VALUE_TYPE_I64
|| global_type == VALUE_TYPE_F64) { || global_type == VALUE_TYPE_F64) {
#if WASM_ENABLE_DEBUG_INTERP != 0 #if WASM_ENABLE_DEBUG_INTERP != 0
record_fast_op(module, p_org, *p_org); if (!record_fast_op(module, p_org, *p_org, error_buf,
error_buf_size)) {
goto fail;
}
#endif #endif
*p_org = WASM_OP_SET_GLOBAL_64; *p_org = WASM_OP_SET_GLOBAL_64;
} }
else if (module->aux_stack_size > 0 else if (module->aux_stack_size > 0
&& global_idx == module->aux_stack_top_global_index) { && global_idx == module->aux_stack_top_global_index) {
#if WASM_ENABLE_DEBUG_INTERP != 0 #if WASM_ENABLE_DEBUG_INTERP != 0
record_fast_op(module, p_org, *p_org); if (!record_fast_op(module, p_org, *p_org, error_buf,
error_buf_size)) {
goto fail;
}
#endif #endif
*p_org = WASM_OP_SET_GLOBAL_AUX_STACK; *p_org = WASM_OP_SET_GLOBAL_AUX_STACK;
} }

95
core/iwasm/interpreter/wasm_mini_loader.c
View File

@ -2151,6 +2151,9 @@ create_module(char *error_buf, uint32 error_buf_size)
{ {
WASMModule *module = WASMModule *module =
loader_malloc(sizeof(WASMModule), error_buf, error_buf_size); loader_malloc(sizeof(WASMModule), error_buf, error_buf_size);
#if WASM_ENABLE_FAST_INTERP == 0
bh_list_status ret;
#endif
if (!module) { if (!module) {
return NULL; return NULL;
@ -2161,6 +2164,13 @@ create_module(char *error_buf, uint32 error_buf_size)
/* Set start_function to -1, means no start function */ /* Set start_function to -1, means no start function */
module->start_function = (uint32)-1; module->start_function = (uint32)-1;
#if WASM_ENABLE_FAST_INTERP == 0
module->br_table_cache_list = &module->br_table_cache_list_head;
ret = bh_list_init(module->br_table_cache_list);
bh_assert(ret == BH_LIST_SUCCESS);
(void)ret;
#endif
return module; return module;
} }
@ -2432,6 +2442,18 @@ wasm_loader_unload(WASMModule *module)
} }
} }
#if WASM_ENABLE_FAST_INTERP == 0
if (module->br_table_cache_list) {
BrTableCache *node = bh_list_first_elem(module->br_table_cache_list);
BrTableCache *node_next;
while (node) {
node_next = bh_list_elem_next(node);
wasm_runtime_free(node);
node = node_next;
}
}
#endif
wasm_runtime_free(module); wasm_runtime_free(module);
} }
@ -2557,10 +2579,24 @@ wasm_loader_find_block_addr(WASMExecEnv *exec_env, BlockAddr *block_addr_cache,
case WASM_OP_BR_TABLE: case WASM_OP_BR_TABLE:
read_leb_uint32(p, p_end, count); /* lable num */ read_leb_uint32(p, p_end, count); /* lable num */
#if WASM_ENABLE_FAST_INTERP != 0
for (i = 0; i <= count; i++) /* lableidxs */ for (i = 0; i <= count; i++) /* lableidxs */
skip_leb_uint32(p, p_end); skip_leb_uint32(p, p_end);
#else
p += count + 1;
while (*p == WASM_OP_NOP)
p++;
#endif
break; break;
#if WASM_ENABLE_FAST_INTERP == 0
case EXT_OP_BR_TABLE_CACHE:
read_leb_uint32(p, p_end, count); /* lable num */
while (*p == WASM_OP_NOP)
p++;
break;
#endif
case WASM_OP_RETURN: case WASM_OP_RETURN:
break; break;
@ -5149,6 +5185,13 @@ re_scan:
{ {
uint8 *ret_types = NULL; uint8 *ret_types = NULL;
uint32 ret_count = 0; uint32 ret_count = 0;
#if WASM_ENABLE_FAST_INTERP == 0
uint8 *p_depth_begin, *p_depth;
uint32 depth, j;
BrTableCache *br_table_cache = NULL;
p_org = p - 1;
#endif
read_leb_uint32(p, p_end, count); read_leb_uint32(p, p_end, count);
#if WASM_ENABLE_FAST_INTERP != 0 #if WASM_ENABLE_FAST_INTERP != 0
@ -5156,12 +5199,64 @@ re_scan:
#endif #endif
POP_I32(); POP_I32();
#if WASM_ENABLE_FAST_INTERP == 0
p_depth_begin = p_depth = p;
#endif
for (i = 0; i <= count; i++) { for (i = 0; i <= count; i++) {
if (!(frame_csp_tmp = if (!(frame_csp_tmp =
check_branch_block(loader_ctx, &p, p_end, check_branch_block(loader_ctx, &p, p_end,
error_buf, error_buf_size))) error_buf, error_buf_size)))
goto fail; goto fail;
#if WASM_ENABLE_FAST_INTERP == 0
depth = (uint32)(loader_ctx->frame_csp - 1 - frame_csp_tmp);
if (br_table_cache) {
br_table_cache->br_depths[i] = depth;
} }
else {
if (depth > 255) {
/* The depth cannot be stored in one byte,
create br_table cache to store each depth */
#if WASM_ENABLE_DEBUG_INTERP != 0
if (!record_fast_op(module, p_org, *p_org,
error_buf, error_buf_size)) {
goto fail;
}
#endif
if (!(br_table_cache = loader_malloc(
offsetof(BrTableCache, br_depths)
+ sizeof(uint32)
* (uint64)(count + 1),
error_buf, error_buf_size))) {
goto fail;
}
*p_org = EXT_OP_BR_TABLE_CACHE;
br_table_cache->br_table_op_addr = p_org;
br_table_cache->br_count = count;
/* Copy previous depths which are one byte */
for (j = 0; j < i; j++) {
br_table_cache->br_depths[j] = p_depth_begin[j];
}
br_table_cache->br_depths[i] = depth;
bh_list_insert(module->br_table_cache_list,
br_table_cache);
}
else {
/* The depth can be stored in one byte, use the
byte of the leb to store it */
*p_depth++ = (uint8)depth;
}
}
#endif
}
#if WASM_ENABLE_FAST_INTERP == 0
/* Set the tailing bytes to nop */
if (br_table_cache)
p_depth = p_depth_begin;
while (p_depth < p)
*p_depth++ = WASM_OP_NOP;
#endif
RESET_STACK(); RESET_STACK();
SET_CUR_BLOCK_STACK_POLYMORPHIC_STATE(true); SET_CUR_BLOCK_STACK_POLYMORPHIC_STATE(true);

6
core/iwasm/interpreter/wasm_opcode.h
View File

@ -266,9 +266,10 @@ typedef enum WASMOpcode {
EXT_OP_BLOCK = 0xd3, /* block with blocktype */ EXT_OP_BLOCK = 0xd3, /* block with blocktype */
EXT_OP_LOOP = 0xd4, /* loop with blocktype */ EXT_OP_LOOP = 0xd4, /* loop with blocktype */
EXT_OP_IF = 0xd5, /* if with blocktype */ EXT_OP_IF = 0xd5, /* if with blocktype */
EXT_OP_BR_TABLE_CACHE = 0xd6, /* br_table from cache */
#if WASM_ENABLE_DEBUG_INTERP != 0 #if WASM_ENABLE_DEBUG_INTERP != 0
DEBUG_OP_BREAK = 0xd6, /* debug break point */ DEBUG_OP_BREAK = 0xd7, /* debug break point */
#endif #endif
/* Post-MVP extend op prefix */ /* Post-MVP extend op prefix */
@ -675,7 +676,7 @@ typedef enum WASMAtomicEXTOpcode {
#if WASM_ENABLE_DEBUG_INTERP != 0 #if WASM_ENABLE_DEBUG_INTERP != 0
#define DEF_DEBUG_BREAK_HANDLE(_name) \ #define DEF_DEBUG_BREAK_HANDLE(_name) \
_name[DEBUG_OP_BREAK] = HANDLE_OPCODE(DEBUG_OP_BREAK); /* 0xd6 */ _name[DEBUG_OP_BREAK] = HANDLE_OPCODE(DEBUG_OP_BREAK); /* 0xd7 */
#else #else
#define DEF_DEBUG_BREAK_HANDLE(_name) #define DEF_DEBUG_BREAK_HANDLE(_name)
#endif #endif
@ -901,6 +902,7 @@ typedef enum WASMAtomicEXTOpcode {
HANDLE_OPCODE(EXT_OP_BLOCK), /* 0xd3 */ \ HANDLE_OPCODE(EXT_OP_BLOCK), /* 0xd3 */ \
HANDLE_OPCODE(EXT_OP_LOOP), /* 0xd4 */ \ HANDLE_OPCODE(EXT_OP_LOOP), /* 0xd4 */ \
HANDLE_OPCODE(EXT_OP_IF), /* 0xd5 */ \ HANDLE_OPCODE(EXT_OP_IF), /* 0xd5 */ \
HANDLE_OPCODE(EXT_OP_BR_TABLE_CACHE), /* 0xd6 */ \
}; \ }; \
do { \ do { \
_name[WASM_OP_MISC_PREFIX] = \ _name[WASM_OP_MISC_PREFIX] = \