mirror of
https://github.com/bytecodealliance/wasm-micro-runtime.git
synced 2025-03-11 00:15:29 +00:00
Add first NEON SIMD opcode implementations to fast interpreter (#3859)
Add some implementations of SIMD opcodes using NEON instructions. Tested using: ```wast (module (import "wasi_snapshot_preview1" "proc_exit" (func $proc_exit (param i32))) (memory (export "memory") 1) (func $assert_true (param v128) local.get 0 v128.any_true i32.eqz if unreachable end ) (func $main (export "_start") i32.const 0 i32.const 32 memory.grow drop i32.const 0 v128.const i8x16 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 v128.store i32.const 0 v128.load v128.const i8x16 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 i8x16.eq call $assert_true i32.const 16 v128.const i8x16 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 v128.store i32.const 16 v128.load v128.const i8x16 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 i8x16.eq call $assert_true i32.const 0 v128.load v128.const i8x16 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 i8x16.eq call $assert_true drop i32.const 0 i32.const 1 memory.grow drop i32.const 0 i64.const 0x7F80FF017E02FE80 i64.store i32.const 0 v128.load8x8_s v128.const i16x8 127 -128 -1 1 126 2 -2 -128 i16x8.eq call $assert_true i32.const 0 i64.const 0x80FE027E01FF807F i64.store i32.const 0 v128.load8x8_u v128.const i16x8 128 254 2 126 1 255 128 127 i16x8.eq call $assert_true i32.const 0 i64.const 0x8000FFFE7FFF0001 i64.store i32.const 0 v128.load16x4_s v128.const i32x4 -32768 -2 32767 1 i32x4.eq call $assert_true i32.const 0 i64.const 0x8000FFFE7FFF0001 i64.store i32.const 0 v128.load16x4_u v128.const i32x4 32768 65534 32767 1 i32x4.eq call $assert_true i32.const 0 i64.const 0x8000000000000001 i64.store i32.const 0 v128.load32x2_s v128.const i64x2 -2147483648 1 i64x2.eq call $assert_true i32.const 0 i64.const 0x8000000000000001 i64.store i32.const 0 v128.load32x2_u v128.const i64x2 2147483648 1 i64x2.eq call $assert_true call $proc_exit ) ) ```
This commit is contained in:
parent
aceaed65cc
commit
c930c4d199
|
@ -290,6 +290,9 @@ endif ()
|
|||
if (WAMR_BUILD_LIB_RATS EQUAL 1)
|
||||
message (" Lib rats enabled")
|
||||
endif()
|
||||
if ((WAMR_BUILD_LIB_SIMDE EQUAL 1))
|
||||
message (" Lib simde enabled")
|
||||
endif()
|
||||
if (WAMR_BUILD_MINI_LOADER EQUAL 1)
|
||||
add_definitions (-DWASM_ENABLE_MINI_LOADER=1)
|
||||
message (" WASM mini loader enabled")
|
||||
|
|
|
@ -155,6 +155,10 @@ if (WAMR_BUILD_LIB_RATS EQUAL 1)
|
|||
include (${IWASM_DIR}/libraries/lib-rats/lib_rats.cmake)
|
||||
endif ()
|
||||
|
||||
if (WAMR_BUILD_LIB_SIMDE EQUAL 1)
|
||||
include (${IWASM_DIR}/libraries/simde/simde.cmake)
|
||||
endif ()
|
||||
|
||||
if (WAMR_BUILD_WASM_CACHE EQUAL 1)
|
||||
include (${WAMR_ROOT_DIR}/build-scripts/involve_boringssl.cmake)
|
||||
endif ()
|
||||
|
|
|
@ -318,6 +318,12 @@
|
|||
#define WASM_ENABLE_SIMD 0
|
||||
#endif
|
||||
|
||||
/* Disable SIMDe (used in the fast interpreter for SIMD opcodes)
|
||||
unless used elsewhere */
|
||||
#ifndef WASM_ENABLE_SIMDE
|
||||
#define WASM_ENABLE_SIMDE 0
|
||||
#endif
|
||||
|
||||
/* GC performance profiling */
|
||||
#ifndef WASM_ENABLE_GC_PERF_PROFILING
|
||||
#define WASM_ENABLE_GC_PERF_PROFILING 0
|
||||
|
|
|
@ -73,6 +73,12 @@ STORE_U8(void *addr, uint8_t value)
|
|||
*(uint8 *)addr = value;
|
||||
}
|
||||
|
||||
static inline void
|
||||
STORE_V128(void *addr, V128 value)
|
||||
{
|
||||
*(V128 *)addr = value;
|
||||
}
|
||||
|
||||
/* For LOAD opcodes */
|
||||
#define LOAD_I64(addr) (*(int64 *)(addr))
|
||||
#define LOAD_F64(addr) (*(float64 *)(addr))
|
||||
|
@ -80,6 +86,7 @@ STORE_U8(void *addr, uint8_t value)
|
|||
#define LOAD_U32(addr) (*(uint32 *)(addr))
|
||||
#define LOAD_I16(addr) (*(int16 *)(addr))
|
||||
#define LOAD_U16(addr) (*(uint16 *)(addr))
|
||||
#define LOAD_V128(addr) (*(V128 *)(addr))
|
||||
|
||||
#define STORE_PTR(addr, ptr) \
|
||||
do { \
|
||||
|
@ -264,7 +271,67 @@ STORE_U16(void *addr, uint16_t value)
|
|||
((uint8_t *)(addr))[0] = u.u8[0];
|
||||
((uint8_t *)(addr))[1] = u.u8[1];
|
||||
}
|
||||
|
||||
static inline void
|
||||
STORE_V128(void *addr, V128 value)
|
||||
{
|
||||
uintptr_t addr_ = (uintptr_t)(addr);
|
||||
union {
|
||||
V128 val;
|
||||
uint64 u64[2];
|
||||
uint32 u32[4];
|
||||
uint16 u16[8];
|
||||
uint8 u8[16];
|
||||
} u;
|
||||
|
||||
if ((addr_ & (uintptr_t)15) == 0) {
|
||||
*(V128 *)addr = value;
|
||||
}
|
||||
else {
|
||||
u.val = value;
|
||||
if ((addr_ & (uintptr_t)7) == 0) {
|
||||
((uint64 *)(addr))[0] = u.u64[0];
|
||||
((uint64 *)(addr))[1] = u.u64[1];
|
||||
}
|
||||
else {
|
||||
bh_assert((addr_ & (uintptr_t)3) == 0);
|
||||
((uint32 *)addr)[0] = u.u32[0];
|
||||
((uint32 *)addr)[1] = u.u32[1];
|
||||
((uint32 *)addr)[2] = u.u32[2];
|
||||
((uint32 *)addr)[3] = u.u32[3];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* For LOAD opcodes */
|
||||
static inline V128
|
||||
LOAD_V128(void *addr)
|
||||
{
|
||||
uintptr_t addr1 = (uintptr_t)addr;
|
||||
union {
|
||||
V128 val;
|
||||
uint64 u64[2];
|
||||
uint32 u32[4];
|
||||
uint16 u16[8];
|
||||
uint8 u8[16];
|
||||
} u;
|
||||
if ((addr1 & (uintptr_t)15) == 0)
|
||||
return *(V128 *)addr;
|
||||
|
||||
if ((addr1 & (uintptr_t)7) == 0) {
|
||||
u.u64[0] = ((uint64 *)addr)[0];
|
||||
u.u64[1] = ((uint64 *)addr)[1];
|
||||
}
|
||||
else {
|
||||
bh_assert((addr1 & (uintptr_t)3) == 0);
|
||||
u.u32[0] = ((uint32 *)addr)[0];
|
||||
u.u32[1] = ((uint32 *)addr)[1];
|
||||
u.u32[2] = ((uint32 *)addr)[2];
|
||||
u.u32[3] = ((uint32 *)addr)[3];
|
||||
}
|
||||
return u.val;
|
||||
}
|
||||
|
||||
static inline int64
|
||||
LOAD_I64(void *addr)
|
||||
{
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -15080,6 +15080,10 @@ re_scan:
|
|||
|
||||
read_leb_mem_offset(p, p_end, mem_offset); /* offset */
|
||||
|
||||
#if WASM_ENABLE_FAST_INTERP != 0
|
||||
emit_uint32(loader_ctx, mem_offset);
|
||||
#endif
|
||||
|
||||
POP_AND_PUSH(mem_offset_type, VALUE_TYPE_V128);
|
||||
#if WASM_ENABLE_JIT != 0 || WASM_ENABLE_WAMR_COMPILER != 0
|
||||
func->has_memory_operations = true;
|
||||
|
@ -15099,6 +15103,10 @@ re_scan:
|
|||
|
||||
read_leb_mem_offset(p, p_end, mem_offset); /* offset */
|
||||
|
||||
#if WASM_ENABLE_FAST_INTERP != 0
|
||||
emit_uint32(loader_ctx, mem_offset);
|
||||
#endif
|
||||
|
||||
POP_V128();
|
||||
POP_MEM_OFFSET();
|
||||
#if WASM_ENABLE_JIT != 0 || WASM_ENABLE_WAMR_COMPILER != 0
|
||||
|
@ -15128,12 +15136,17 @@ re_scan:
|
|||
|
||||
CHECK_BUF1(p, p_end, 16);
|
||||
mask = read_i8x16(p, error_buf, error_buf_size);
|
||||
p += 16;
|
||||
if (!check_simd_shuffle_mask(mask, error_buf,
|
||||
error_buf_size)) {
|
||||
goto fail;
|
||||
}
|
||||
|
||||
#if WASM_ENABLE_FAST_INTERP != 0
|
||||
uint64 high, low;
|
||||
wasm_runtime_read_v128(p, &high, &low);
|
||||
emit_uint64(loader_ctx, high);
|
||||
emit_uint64(loader_ctx, low);
|
||||
#endif
|
||||
p += 16;
|
||||
POP2_AND_PUSH(VALUE_TYPE_V128, VALUE_TYPE_V128);
|
||||
break;
|
||||
}
|
||||
|
@ -15204,7 +15217,6 @@ re_scan:
|
|||
error_buf_size)) {
|
||||
goto fail;
|
||||
}
|
||||
|
||||
if (replace[opcode1 - SIMD_i8x16_extract_lane_s]) {
|
||||
if (!(wasm_loader_pop_frame_ref(
|
||||
loader_ctx,
|
||||
|
|
|
@ -779,10 +779,10 @@ typedef enum WASMAtomicEXTOpcode {
|
|||
#else
|
||||
#define DEF_DEBUG_BREAK_HANDLE()
|
||||
#endif
|
||||
|
||||
#define SET_GOTO_TABLE_ELEM(opcode) [opcode] = HANDLE_OPCODE(opcode)
|
||||
|
||||
#if (WASM_ENABLE_JIT != 0 || WASM_ENABLE_FAST_INTERP != 0) \
|
||||
#if (WASM_ENABLE_JIT != 0 \
|
||||
|| (WASM_ENABLE_FAST_INTERP != 0 && WASM_ENABLE_SIMDE != 0)) \
|
||||
&& WASM_ENABLE_SIMD != 0
|
||||
#define SET_GOTO_TABLE_SIMD_PREFIX_ELEM() \
|
||||
SET_GOTO_TABLE_ELEM(WASM_OP_SIMD_PREFIX),
|
||||
|
|
23
core/iwasm/libraries/simde/simde.cmake
Normal file
23
core/iwasm/libraries/simde/simde.cmake
Normal file
|
@ -0,0 +1,23 @@
|
|||
# Copyright (C) 2024 Amazon Inc. All rights reserved.
|
||||
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
||||
# simde is a header only library
|
||||
|
||||
set (LIB_SIMDE_DIR ${CMAKE_CURRENT_LIST_DIR})
|
||||
|
||||
if (WAMR_BUILD_TARGET MATCHES "AARCH64.*" OR "ARM.*")
|
||||
add_definitions (-DWASM_ENABLE_SIMDE=1)
|
||||
endif ()
|
||||
|
||||
include_directories(${LIB_SIMDE_DIR} ${LIB_SIMDE_DIR}/simde)
|
||||
|
||||
include(FetchContent)
|
||||
|
||||
FetchContent_Declare(
|
||||
simde
|
||||
GIT_REPOSITORY https://github.com/simd-everywhere/simde
|
||||
GIT_TAG v0.8.2
|
||||
)
|
||||
|
||||
message("-- Fetching simde ..")
|
||||
FetchContent_MakeAvailable(simde)
|
||||
include_directories("${simde_SOURCE_DIR}")
|
Loading…
Reference in New Issue
Block a user