Compare commits

...

5 Commits

Author SHA1 Message Date
Liu Jia
9ac2f964d8
Merge d33b520cbf into 17be90d8f0 2025-07-10 08:09:54 +00:00
Jia Liu
d33b520cbf bug fix 2025-07-10 16:17:09 +08:00
Jia Liu
bb2ce5a4a0 Modified some macros related to SIMDE 2025-07-10 12:07:35 +08:00
Jia Liu
14b2d81219 draft fix 2025-07-08 14:38:42 +08:00
Jia Liu
182c81753e remove macro of fast interpreter when WASM_OP_SELECT_128 2025-07-08 11:22:29 +08:00
4 changed files with 6 additions and 17 deletions

View File

@ -1316,13 +1316,6 @@ aot_compile_func(AOTCompContext *comp_ctx, uint32 func_index)
return false; return false;
break; break;
#if WASM_ENABLE_SIMD != 0
case WASM_OP_SELECT_128:
if (!aot_compile_op_select(comp_ctx, func_ctx, true))
return false;
break;
#endif
#if WASM_ENABLE_REF_TYPES != 0 || WASM_ENABLE_GC != 0 #if WASM_ENABLE_REF_TYPES != 0 || WASM_ENABLE_GC != 0
case WASM_OP_SELECT_T: case WASM_OP_SELECT_T:
{ {

View File

@ -1887,7 +1887,7 @@ wasm_interp_call_func_bytecode(WASMModuleInstance *module,
} }
HANDLE_OP_END(); HANDLE_OP_END();
} }
#if WASM_ENABLE_SIMD != 0 #if WASM_ENABLE_SIMDE != 0
HANDLE_OP(WASM_OP_SELECT_128) HANDLE_OP(WASM_OP_SELECT_128)
{ {
cond = frame_lp[GET_OFFSET()]; cond = frame_lp[GET_OFFSET()];

View File

@ -7618,7 +7618,7 @@ wasm_loader_find_block_addr(WASMExecEnv *exec_env, BlockAddr *block_addr_cache,
case WASM_OP_SELECT: case WASM_OP_SELECT:
case WASM_OP_DROP_64: case WASM_OP_DROP_64:
case WASM_OP_SELECT_64: case WASM_OP_SELECT_64:
#if WASM_ENABLE_FAST_INTERP != 0 && WASM_ENABLE_SIMD != 0 #if WASM_ENABLE_SIMDE != 0
case WASM_OP_SELECT_128: case WASM_OP_SELECT_128:
#endif #endif
break; break;
@ -13143,9 +13143,7 @@ re_scan:
#if (WASM_ENABLE_WAMR_COMPILER != 0) || (WASM_ENABLE_JIT != 0) \ #if (WASM_ENABLE_WAMR_COMPILER != 0) || (WASM_ENABLE_JIT != 0) \
|| (WASM_ENABLE_FAST_INTERP != 0) || (WASM_ENABLE_FAST_INTERP != 0)
case VALUE_TYPE_V128: case VALUE_TYPE_V128:
#if WASM_ENABLE_FAST_INTERP == 0 #if WASM_ENABLE_SIMDE != 0
*(p - 1) = WASM_OP_SELECT_128;
#else
if (loader_ctx->p_code_compiled) { if (loader_ctx->p_code_compiled) {
uint8 opcode_tmp = WASM_OP_SELECT_128; uint8 opcode_tmp = WASM_OP_SELECT_128;
#if WASM_ENABLE_LABELS_AS_VALUES != 0 #if WASM_ENABLE_LABELS_AS_VALUES != 0
@ -13273,8 +13271,7 @@ re_scan:
uint8 opcode_tmp = WASM_OP_SELECT; uint8 opcode_tmp = WASM_OP_SELECT;
if (type == VALUE_TYPE_V128) { if (type == VALUE_TYPE_V128) {
#if WASM_ENABLE_JIT != 0 \ #if WASM_ENABLE_JIT != 0 || WASM_ENABLE_SIMDE != 0
|| WASM_ENABLE_FAST_INTERP != 0 && WASM_ENABLE_SIMD != 0
opcode_tmp = WASM_OP_SELECT_128; opcode_tmp = WASM_OP_SELECT_128;
#else #else
set_error_buf(error_buf, error_buf_size, set_error_buf(error_buf, error_buf_size,

View File

@ -278,8 +278,7 @@ typedef enum WASMOpcode {
DEBUG_OP_BREAK = 0xdc, /* debug break point */ DEBUG_OP_BREAK = 0xdc, /* debug break point */
#endif #endif
#if WASM_ENABLE_JIT != 0 || WASM_ENABLE_FAST_INTERP != 0 \ #if WASM_ENABLE_SIMDE != 0
|| WASM_ENABLE_WAMR_COMPILER != 0 && WASM_ENABLE_SIMD != 0
EXT_OP_SET_LOCAL_FAST_V128 = 0xdd, EXT_OP_SET_LOCAL_FAST_V128 = 0xdd,
EXT_OP_TEE_LOCAL_FAST_V128 = 0xde, EXT_OP_TEE_LOCAL_FAST_V128 = 0xde,
EXT_OP_COPY_STACK_TOP_V128 = 0xdf, EXT_OP_COPY_STACK_TOP_V128 = 0xdf,
@ -798,7 +797,7 @@ typedef enum WASMAtomicEXTOpcode {
#define SET_GOTO_TABLE_SIMD_PREFIX_ELEM() #define SET_GOTO_TABLE_SIMD_PREFIX_ELEM()
#endif #endif
#if WASM_ENABLE_SIMD != 0 && WASM_ENABLE_SIMDE != 0 #if WASM_ENABLE_SIMDE != 0
#define DEF_EXT_V128_HANDLE() \ #define DEF_EXT_V128_HANDLE() \
SET_GOTO_TABLE_ELEM(EXT_OP_SET_LOCAL_FAST_V128), /* 0xdd */ \ SET_GOTO_TABLE_ELEM(EXT_OP_SET_LOCAL_FAST_V128), /* 0xdd */ \
SET_GOTO_TABLE_ELEM(EXT_OP_TEE_LOCAL_FAST_V128), /* 0xde */ \ SET_GOTO_TABLE_ELEM(EXT_OP_TEE_LOCAL_FAST_V128), /* 0xde */ \