Skip to content

Implement the first few SIMD opcodes for fast interpreter (v128.const, v128.any_true) #3818

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 27, 2024
Merged

Implement the first few SIMD opcodes for fast interpreter (v128.const, v128.any_true) #3818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
733c3f1
Implement SIMD support for fast interpreter in the loader
loganek Sep 26, 2024
b249ee8
Implement the first few SIMD opcodes (v128.any_true, v128.const) in t…
loganek Sep 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions core/iwasm/common/wasm_runtime_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ extern "C" {
do { \
*(int64 *)(addr) = (int64)(value); \
} while (0)
#define PUT_V128_TO_ADDR(addr, value) \
do { \
*(V128 *)(addr) = (value); \
} while (0)
#define PUT_F64_TO_ADDR(addr, value) \
do { \
*(float64 *)(addr) = (float64)(value); \
Expand All @@ -49,6 +53,7 @@ extern "C" {
#define GET_I64_FROM_ADDR(addr) (*(int64 *)(addr))
#define GET_F64_FROM_ADDR(addr) (*(float64 *)(addr))
#define GET_REF_FROM_ADDR(addr) (*(void **)(addr))
#define GET_V128_FROM_ADDR(addr) (*(V128 *)(addr))

/* For STORE opcodes */
#define STORE_I64 PUT_I64_TO_ADDR
Expand Down Expand Up @@ -83,6 +88,15 @@ STORE_U8(void *addr, uint8_t value)

#else /* WASM_CPU_SUPPORTS_UNALIGNED_ADDR_ACCESS != 0 */

#define PUT_V128_TO_ADDR(addr, value) \
do { \
uint32 *addr_u32 = (uint32 *)(addr); \
addr_u32[0] = (value).i32x4[0]; \
addr_u32[1] = (value).i32x4[1]; \
addr_u32[2] = (value).i32x4[2]; \
addr_u32[3] = (value).i32x4[3]; \
} while (0)

#define PUT_I64_TO_ADDR(addr, value) \
do { \
uint32 *addr_u32 = (uint32 *)(addr); \
Expand Down Expand Up @@ -124,6 +138,17 @@ STORE_U8(void *addr, uint8_t value)
} while (0)
#endif

static inline V128
GET_V128_FROM_ADDR(uint32 *addr)
{
V128 ret;
ret.i32x4[0] = addr[0];
ret.i32x4[1] = addr[1];
ret.i32x4[2] = addr[2];
ret.i32x4[3] = addr[3];
return ret;
}
Copy link
Contributor

@wenyongh wenyongh Sep 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not very sure why the CIs can run successfully, but I think that V128 may be undeclared in many targets/platforms when WASM_CPU_SUPPORTS_UNALIGNED_ADDR_ACCESS is 0, and compilation error may be reported, so here how about wrapping this function with #if WASM_ENABLE_SIMD != 0 .. #endif?

Copy link
Collaborator Author

@loganek loganek Sep 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

V128 is unconditionally declared in the wasm.h file so I don't think there's a need for that extra ifdef.

Copy link
Contributor

@wenyongh wenyongh Sep 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, got it, I wrongly thought that it is the type v128 which is defined in wasm_runtime_common.c to support wasm_runtime_invoke_native, and is defined only when SIMD is enabled.


static inline int64
GET_I64_FROM_ADDR(uint32 *addr)
{
Expand Down
32 changes: 32 additions & 0 deletions core/iwasm/interpreter/wasm_interp_fast.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,6 +433,8 @@ wasm_interp_get_frame_ref(WASMInterpFrame *frame)
(type) GET_I64_FROM_ADDR(frame_lp + *(int16 *)(frame_ip + off))
#define GET_OPERAND_F64(type, off) \
(type) GET_F64_FROM_ADDR(frame_lp + *(int16 *)(frame_ip + off))
#define GET_OPERAND_V128(off) \
GET_V128_FROM_ADDR(frame_lp + *(int16 *)(frame_ip + off))
#define GET_OPERAND_REF(type, off) \
(type) GET_REF_FROM_ADDR(frame_lp + *(int16 *)(frame_ip + off))

Expand Down Expand Up @@ -5642,7 +5644,37 @@ wasm_interp_call_func_bytecode(WASMModuleInstance *module,
#endif
goto call_func_from_entry;
}
#if WASM_ENABLE_SIMD != 0
HANDLE_OP(WASM_OP_SIMD_PREFIX)
{
GET_OPCODE();

switch (opcode) {
case SIMD_v128_const:
{
uint8 *orig_ip = frame_ip;

frame_ip += sizeof(V128);
addr_ret = GET_OFFSET();

PUT_V128_TO_ADDR(frame_lp + addr_ret, *(V128 *)orig_ip);
break;
}
case SIMD_v128_any_true:
{
V128 value = GET_OPERAND_V128(0);
frame_ip += 2;
addr_ret = GET_OFFSET();
frame_lp[addr_ret] =
value.i64x2[0] != 0 || value.i64x2[1] != 0;
break;
}
default:
wasm_set_exception(module, "unsupported SIMD opcode");
}
HANDLE_OP_END();
}
#endif
HANDLE_OP(WASM_OP_CALL)
{
#if WASM_ENABLE_THREAD_MGR != 0
Expand Down
63 changes: 48 additions & 15 deletions core/iwasm/interpreter/wasm_loader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,8 @@ is_byte_a_type(uint8 type)
}

#if WASM_ENABLE_SIMD != 0
#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)
static V128
read_i8x16(uint8 *p_buf, char *error_buf, uint32 error_buf_size)
{
Expand All @@ -320,7 +321,8 @@ read_i8x16(uint8 *p_buf, char *error_buf, uint32 error_buf_size)

return result;
}
#endif /* end of (WASM_ENABLE_WAMR_COMPILER != 0) || (WASM_ENABLE_JIT != 0) */
#endif /* end of (WASM_ENABLE_WAMR_COMPILER != 0) || (WASM_ENABLE_JIT != 0) || \
(WASM_ENABLE_FAST_INTERP != 0) */
#endif /* end of WASM_ENABLE_SIMD */

static void *
Expand Down Expand Up @@ -707,7 +709,8 @@ load_init_expr(WASMModule *module, const uint8 **p_buf, const uint8 *buf_end,
goto fail;
break;
#if WASM_ENABLE_SIMD != 0
#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)
/* v128.const */
case INIT_EXPR_TYPE_V128_CONST:
{
Expand Down Expand Up @@ -736,7 +739,8 @@ load_init_expr(WASMModule *module, const uint8 **p_buf, const uint8 *buf_end,
#endif
break;
}
#endif /* end of (WASM_ENABLE_WAMR_COMPILER != 0) || (WASM_ENABLE_JIT != 0) */
#endif /* end of (WASM_ENABLE_WAMR_COMPILER != 0) || (WASM_ENABLE_JIT != 0) || \
(WASM_ENABLE_FAST_INTERP != 0) */
#endif /* end of WASM_ENABLE_SIMD */

#if WASM_ENABLE_REF_TYPES != 0 || WASM_ENABLE_GC != 0
Expand Down Expand Up @@ -4105,7 +4109,8 @@ load_export_section(const uint8 *buf, const uint8 *buf_end, WASMModule *module,
return false;
}
#if WASM_ENABLE_SIMD != 0
#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)
/* TODO: check func type, if it has v128 param or result,
report error */
#endif
Expand Down Expand Up @@ -7566,7 +7571,8 @@ wasm_loader_find_block_addr(WASMExecEnv *exec_env, BlockAddr *block_addr_cache,
}

#if WASM_ENABLE_SIMD != 0
#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)
case WASM_OP_SIMD_PREFIX:
{
uint32 opcode1;
Expand Down Expand Up @@ -7659,7 +7665,8 @@ wasm_loader_find_block_addr(WASMExecEnv *exec_env, BlockAddr *block_addr_cache,
}
break;
}
#endif /* end of (WASM_ENABLE_WAMR_COMPILER != 0) || (WASM_ENABLE_JIT != 0) */
#endif /* end of (WASM_ENABLE_WAMR_COMPILER != 0) || (WASM_ENABLE_JIT != 0) || \
(WASM_ENABLE_FAST_INTERP != 0) */
#endif /* end of WASM_ENABLE_SIMD */

#if WASM_ENABLE_SHARED_MEMORY != 0
Expand Down Expand Up @@ -9903,7 +9910,8 @@ check_memory_access_align(uint8 opcode, uint32 align, char *error_buf,
}

#if WASM_ENABLE_SIMD != 0
#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)
static bool
check_simd_memory_access_align(uint8 opcode, uint32 align, char *error_buf,
uint32 error_buf_size)
Expand Down Expand Up @@ -12120,10 +12128,20 @@ wasm_loader_prepare_bytecode(WASMModule *module, WASMFunction *func,
#endif
}
#if WASM_ENABLE_SIMD != 0
#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)
else if (*(loader_ctx->frame_ref - 1) == VALUE_TYPE_V128) {
loader_ctx->frame_ref -= 4;
loader_ctx->stack_cell_num -= 4;
#if WASM_ENABLE_FAST_INTERP != 0
skip_label();
loader_ctx->frame_offset -= 4;
if ((*(loader_ctx->frame_offset)
> loader_ctx->start_dynamic_offset)
&& (*(loader_ctx->frame_offset)
< loader_ctx->max_dynamic_offset))
loader_ctx->dynamic_offset -= 4;
#endif
}
#endif
#endif
Expand Down Expand Up @@ -12210,10 +12228,12 @@ wasm_loader_prepare_bytecode(WASMModule *module, WASMFunction *func,
#endif /* end of WASM_ENABLE_FAST_INTERP */
break;
#if WASM_ENABLE_SIMD != 0
#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)
case VALUE_TYPE_V128:
break;
#endif /* (WASM_ENABLE_WAMR_COMPILER != 0) || (WASM_ENABLE_JIT != 0) */
#endif /* (WASM_ENABLE_WAMR_COMPILER != 0) || (WASM_ENABLE_JIT != 0) || \
(WASM_ENABLE_FAST_INTERP != 0) */
#endif /* WASM_ENABLE_SIMD != 0 */
default:
{
Expand Down Expand Up @@ -12308,8 +12328,9 @@ wasm_loader_prepare_bytecode(WASMModule *module, WASMFunction *func,
uint8 opcode_tmp = WASM_OP_SELECT;

if (type == VALUE_TYPE_V128) {
#if (WASM_ENABLE_SIMD == 0) \
|| ((WASM_ENABLE_WAMR_COMPILER == 0) && (WASM_ENABLE_JIT == 0))
#if (WASM_ENABLE_SIMD == 0) \
|| ((WASM_ENABLE_WAMR_COMPILER == 0) && (WASM_ENABLE_JIT == 0) \
&& (WASM_ENABLE_FAST_INTERP == 0))
set_error_buf(error_buf, error_buf_size,
"SIMD v128 type isn't supported");
goto fail;
Expand Down Expand Up @@ -14870,7 +14891,8 @@ wasm_loader_prepare_bytecode(WASMModule *module, WASMFunction *func,
}

#if WASM_ENABLE_SIMD != 0
#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)
case WASM_OP_SIMD_PREFIX:
{
uint32 opcode1;
Expand All @@ -14882,6 +14904,10 @@ wasm_loader_prepare_bytecode(WASMModule *module, WASMFunction *func,

read_leb_uint32(p, p_end, opcode1);

#if WASM_ENABLE_FAST_INTERP != 0
emit_byte(loader_ctx, opcode1);
#endif

/* follow the order of enum WASMSimdEXTOpcode in wasm_opcode.h
*/
switch (opcode1) {
Expand Down Expand Up @@ -14938,7 +14964,13 @@ wasm_loader_prepare_bytecode(WASMModule *module, WASMFunction *func,
/* basic operation */
case SIMD_v128_const:
{
uint64 high, low;
CHECK_BUF1(p, p_end, 16);
#if WASM_ENABLE_FAST_INTERP != 0
wasm_runtime_read_v128(p, &high, &low);
emit_uint64(loader_ctx, high);
emit_uint64(loader_ctx, low);
#endif
p += 16;
PUSH_V128();
break;
Expand Down Expand Up @@ -15524,7 +15556,8 @@ wasm_loader_prepare_bytecode(WASMModule *module, WASMFunction *func,
}
break;
}
#endif /* end of (WASM_ENABLE_WAMR_COMPILER != 0) || (WASM_ENABLE_JIT != 0) */
#endif /* end of (WASM_ENABLE_WAMR_COMPILER != 0) || (WASM_ENABLE_JIT != 0) || \
(WASM_ENABLE_FAST_INTERP != 0) */
#endif /* end of WASM_ENABLE_SIMD */

#if WASM_ENABLE_SHARED_MEMORY != 0
Expand Down
3 changes: 2 additions & 1 deletion core/iwasm/interpreter/wasm_opcode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -782,7 +782,8 @@ typedef enum WASMAtomicEXTOpcode {

#define SET_GOTO_TABLE_ELEM(opcode) [opcode] = HANDLE_OPCODE(opcode)

#if WASM_ENABLE_JIT != 0 && WASM_ENABLE_SIMD != 0
#if (WASM_ENABLE_JIT != 0 || WASM_ENABLE_FAST_INTERP != 0) \
&& WASM_ENABLE_SIMD != 0
#define SET_GOTO_TABLE_SIMD_PREFIX_ELEM() \
SET_GOTO_TABLE_ELEM(WASM_OP_SIMD_PREFIX),
#else
Expand Down