Skip to content

Commit

Permalink
Resolve merge conflicts arising from main -> dev/simd_for_interp and …
Browse files Browse the repository at this point in the history 
…implement fast interpreter const offset loader support for V128
  • Loading branch information
James Marsh committed Feb 21, 2025
1 parent 2d2b173 commit 4a77d5c
Show file tree
Hide file tree
Showing 2 changed files with 105 additions and 115 deletions.
16 changes: 4 additions & 12 deletions build-scripts/config_common.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -300,11 +300,9 @@ endif ()
if (WAMR_BUILD_LIB_RATS EQUAL 1)
message (" Lib rats enabled")
endif()
<<<<<<< HEAD
if ((WAMR_BUILD_LIB_SIMDE EQUAL 1))
message (" Lib simde enabled")
endif()
=======
################## WAMR features ##################
if (WAMR_BUILD_MULTI_MODULE EQUAL 1)
add_definitions (-DWASM_ENABLE_MULTI_MODULE=1)
Expand Down Expand Up @@ -341,7 +339,6 @@ if (WAMR_BUILD_MULTI_MEMORY EQUAL 1)
add_definitions (-DWASM_ENABLE_MULTI_MEMORY=1)
set (WAMR_BUILD_DEBUG_INTERP 0)
endif ()
>>>>>>> original/main
if (WAMR_BUILD_MINI_LOADER EQUAL 1)
add_definitions (-DWASM_ENABLE_MINI_LOADER=1)
message (" WASM mini loader enabled")
Expand Down Expand Up @@ -369,19 +366,14 @@ else ()
message (" Wakeup of blocking operations enabled")
endif ()
if (WAMR_BUILD_SIMD EQUAL 1)
<<<<<<< HEAD
set(SIMD_ENABLED 0)
if (WAMR_BUILD_TARGET MATCHES "RISCV64.*")
set(WAMR_BUILD_SIMD 0)
=======
if (NOT WAMR_BUILD_TARGET MATCHES "RISCV64.*")
add_definitions (-DWASM_ENABLE_SIMD=1)
else ()
>>>>>>> original/main
message (" SIMD disabled due to not supported on target RISCV64")
elseif (WAMR_BUILD_FAST_INTERP EQUAL 1 AND WAMR_BUILD_SIMDE EQUAL 0)
set(WAMR_BUILD_SIMD 0)
message(" SIMD disabled as the simde is not built in fast interpreter mode")
endif()
if (WAMR_BUILD_FAST_INTERP EQUAL 1 AND WAMR_BUILD_SIMDE EQUAL 0)
set(SIMD_ENABLED 0)
message(" SIMD disabled as simde is not built in fast interpreter mode")
else()
set(SIMD_ENABLED 1)
message (" SIMD enabled")
Expand Down
204 changes: 101 additions & 103 deletions core/iwasm/interpreter/wasm_loader.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7999,6 +7999,10 @@ typedef struct WASMLoaderContext {
int32 *i32_consts;
uint32 i32_const_max_num;
uint32 i32_const_num;
/* const buffer for V128 */
V128 *v128_consts;
uint32 v128_const_max_num;
uint32 v128_const_num;

/* processed code */
uint8 *p_code_compiled;
Expand Down Expand Up @@ -8232,6 +8236,8 @@ wasm_loader_ctx_destroy(WASMLoaderContext *ctx)
wasm_runtime_free(ctx->i64_consts);
if (ctx->i32_consts)
wasm_runtime_free(ctx->i32_consts);
if (ctx->v128_consts)
wasm_runtime_free(ctx->v128_consts);
#endif
wasm_runtime_free(ctx);
}
Expand Down Expand Up @@ -8289,6 +8295,11 @@ wasm_loader_ctx_init(WASMFunction *func, char *error_buf, uint32 error_buf_size)
loader_malloc(sizeof(int32) * loader_ctx->i32_const_max_num,
error_buf, error_buf_size)))
goto fail;
loader_ctx->v128_const_max_num = 8;
if (!(loader_ctx->v128_consts =
loader_malloc(sizeof(V128) * loader_ctx->v128_const_max_num,
error_buf, error_buf_size)))
goto fail;

if (func->param_cell_num >= (int32)INT16_MAX - func->local_cell_num) {
set_error_buf(error_buf, error_buf_size,
Expand Down Expand Up @@ -9569,6 +9580,15 @@ cmp_i32_const(const void *p_i32_const1, const void *p_i32_const2)
return (i32_const1 < i32_const2) ? -1 : (i32_const1 > i32_const2) ? 1 : 0;
}

static int
cmp_v128_const(const void *p_v128_const1, const void *p_v128_const2)
{
V128 v128_const1 = *(V128 *)p_v128_const1;
V128 v128_const2 = *(V128 *)p_v128_const2;

return memcmp(&v128_const1, &v128_const2, sizeof(V128));
}

static bool
wasm_loader_get_const_offset(WASMLoaderContext *ctx, uint8 type, void *value,
int16 *offset, char *error_buf,
Expand All @@ -9584,39 +9604,6 @@ wasm_loader_get_const_offset(WASMLoaderContext *ctx, uint8 type, void *value,
return true;
}

<<<<<<< HEAD
/* Search existing constant */
for (c = (Const *)ctx->const_buf;
(uint8 *)c < ctx->const_buf + ctx->num_const * sizeof(Const); c++) {
/* TODO: handle v128 type? */
if ((type == c->value_type)
&& ((type == VALUE_TYPE_I64 && *(int64 *)value == c->value.i64)
|| (type == VALUE_TYPE_I32 && *(int32 *)value == c->value.i32)
#if WASM_ENABLE_REF_TYPES != 0 && WASM_ENABLE_GC == 0
|| (type == VALUE_TYPE_FUNCREF
&& *(int32 *)value == c->value.i32)
|| (type == VALUE_TYPE_EXTERNREF
&& *(int32 *)value == c->value.i32)
#endif
|| (type == VALUE_TYPE_V128
&& (0 == memcmp(value, &(c->value.v128), sizeof(V128))))
|| (type == VALUE_TYPE_F64
&& (0 == memcmp(value, &(c->value.f64), sizeof(float64))))
|| (type == VALUE_TYPE_F32
&& (0
== memcmp(value, &(c->value.f32), sizeof(float32)))))) {
operand_offset = c->slot_index;
break;
}
if (is_32bit_type(c->value_type))
operand_offset += 1;
else if (c->value_type == VALUE_TYPE_V128) {
operand_offset += 4;
}
else
operand_offset += 2;
}
=======
/* Traverse the list if the const num is small */
if (ctx->i64_const_num < 10) {
for (uint32 i = 0; i < ctx->i64_const_num; i++) {
Expand All @@ -9626,7 +9613,6 @@ wasm_loader_get_const_offset(WASMLoaderContext *ctx, uint8 type, void *value,
}
}
}
>>>>>>> original/main

if (ctx->i64_const_num >= ctx->i64_const_max_num) {
MEM_REALLOC(ctx->i64_consts,
Expand All @@ -9636,6 +9622,32 @@ wasm_loader_get_const_offset(WASMLoaderContext *ctx, uint8 type, void *value,
}
ctx->i64_consts[ctx->i64_const_num++] = *(int64 *)value;
}
else if (type == VALUE_TYPE_V128) {
/* No slot left, emit const instead */
if (ctx->v128_const_num * 4 > INT16_MAX - 2) {
*offset = 0;
return true;
}

/* Traverse the list if the const num is small */
if (ctx->v128_const_num < 10) {
for (uint32 i = 0; i < ctx->v128_const_num; i++) {
if (memcmp(&ctx->v128_consts[i], value, sizeof(V128))
== 0) {
*offset = -1;
return true;
}
}
}

if (ctx->v128_const_num >= ctx->v128_const_max_num) {
MEM_REALLOC(ctx->i64_consts,
sizeof(V128) * ctx->v128_const_max_num,
sizeof(V128) * (ctx->v128_const_max_num * 2));
ctx->v128_const_max_num *= 2;
}
ctx->v128_consts[ctx->v128_const_num++] = *(V128 *)value;
}
else {
/* Treat i32 and f32 as the same by reading i32 value from
the raw bytes */
Expand Down Expand Up @@ -9666,65 +9678,6 @@ wasm_loader_get_const_offset(WASMLoaderContext *ctx, uint8 type, void *value,
ctx->i32_consts[ctx->i32_const_num++] = *(int32 *)value;
}

<<<<<<< HEAD
/* The max cell num of const buffer is 32768 since the valid index range
* is -32768 ~ -1. Return an invalid index 0 to indicate the buffer is
* full */
if (ctx->const_cell_num > INT16_MAX - bytes_to_increase + 1) {
*offset = 0;
return true;
}

if ((uint8 *)c == ctx->const_buf + ctx->const_buf_size) {
MEM_REALLOC(ctx->const_buf, ctx->const_buf_size,
ctx->const_buf_size + 4 * sizeof(Const));
ctx->const_buf_size += 4 * sizeof(Const);
c = (Const *)(ctx->const_buf + ctx->num_const * sizeof(Const));
}
c->value_type = type;
switch (type) {
case VALUE_TYPE_F64:
bh_memcpy_s(&(c->value.f64), sizeof(WASMValue), value,
sizeof(float64));
ctx->const_cell_num += 2;
/* The const buf will be reversed, we use the second cell */
/* of the i64/f64 const so the final offset is correct */
operand_offset++;
break;
case VALUE_TYPE_I64:
c->value.i64 = *(int64 *)value;
ctx->const_cell_num += 2;
operand_offset++;
break;
case VALUE_TYPE_F32:
bh_memcpy_s(&(c->value.f32), sizeof(WASMValue), value,
sizeof(float32));
ctx->const_cell_num++;
break;
case VALUE_TYPE_I32:
c->value.i32 = *(int32 *)value;
ctx->const_cell_num++;
break;
case VALUE_TYPE_V128:
bh_memcpy_s(&(c->value.v128), sizeof(WASMValue), value,
sizeof(V128));
ctx->const_cell_num++;
break;
#if WASM_ENABLE_REF_TYPES != 0 && WASM_ENABLE_GC == 0
case VALUE_TYPE_EXTERNREF:
case VALUE_TYPE_FUNCREF:
c->value.i32 = *(int32 *)value;
ctx->const_cell_num++;
break;
#endif
default:
break;
}
c->slot_index = operand_offset;
ctx->num_const++;
LOG_OP("#### new const [%d]: %ld\n", ctx->num_const,
(int64)c->value.i64);
=======
*offset = -1;
return true;
}
Expand All @@ -9740,6 +9693,17 @@ wasm_loader_get_const_offset(WASMLoaderContext *ctx, uint8 type, void *value,
*offset = -(uint32)(ctx->i64_const_num * 2 + ctx->i32_const_num)
+ (uint32)(i64_const - ctx->i64_consts) * 2;
}
else if (type == VALUE_TYPE_V128) {
V128 key = *(V128 *)value, *v128_const;
v128_const = bsearch(&key, ctx->v128_consts, ctx->v128_const_num,
sizeof(V128), cmp_v128_const);
if (!v128_const) { /* not found, emit const instead */
*offset = 0;
return true;
}
*offset = -(uint32)(ctx->v128_const_num)
+ (uint32)(v128_const - ctx->v128_consts);
}
else {
int32 key = *(int32 *)value, *i32_const;
i32_const = bsearch(&key, ctx->i32_consts, ctx->i32_const_num,
Expand All @@ -9753,7 +9717,6 @@ wasm_loader_get_const_offset(WASMLoaderContext *ctx, uint8 type, void *value,
}

return true;
>>>>>>> original/main
}
fail:
return false;
Expand Down Expand Up @@ -11354,6 +11317,39 @@ wasm_loader_prepare_bytecode(WASMModule *module, WASMFunction *func,
}
}

if (loader_ctx->v128_const_num > 0) {
V128 *v128_consts_old = loader_ctx->v128_consts;

/* Sort the v128 consts */
qsort(v128_consts_old, loader_ctx->v128_const_num, sizeof(V128),
cmp_v128_const);

/* Remove the duplicated v128 consts */
uint32 k = 1;
for (i = 1; i < loader_ctx->v128_const_num; i++) {
if (!(memcmp(&v128_consts_old[i], &v128_consts_old[i - 1],
sizeof(V128))
== 0)) {
v128_consts_old[k++] = v128_consts_old[i];
}
}

if (k < loader_ctx->v128_const_num) {
V128 *v128_consts_new;
/* Try to reallocate memory with a smaller size */
if ((v128_consts_new =
wasm_runtime_malloc((uint32)sizeof(V128) * k))) {
bh_memcpy_s(v128_consts_new, (uint32)sizeof(V128) * k,
v128_consts_old, (uint32)sizeof(V128) * k);
/* Free the old memory */
wasm_runtime_free(v128_consts_old);
loader_ctx->v128_consts = v128_consts_new;
loader_ctx->v128_const_max_num = k;
}
loader_ctx->v128_const_num = k;
}
}

if (loader_ctx->i32_const_num > 0) {
int32 *i32_consts_old = loader_ctx->i32_consts;

Expand Down Expand Up @@ -15856,16 +15852,11 @@ wasm_loader_prepare_bytecode(WASMModule *module, WASMFunction *func,
goto fail;
}

<<<<<<< HEAD
read_leb_mem_offset(p, p_end, mem_offset); /* offset */
pb_read_leb_mem_offset(p, p_end,
mem_offset); /* offset */
#if WASM_ENABLE_FAST_INTERP != 0
emit_uint32(loader_ctx, mem_offset);
#endif
=======
pb_read_leb_mem_offset(p, p_end,
mem_offset); /* offset */

>>>>>>> original/main
POP_AND_PUSH(mem_offset_type, VALUE_TYPE_V128);
#if WASM_ENABLE_JIT != 0 || WASM_ENABLE_WAMR_COMPILER != 0
func->has_memory_operations = true;
Expand Down Expand Up @@ -16395,8 +16386,9 @@ wasm_loader_prepare_bytecode(WASMModule *module, WASMFunction *func,
if (loader_ctx->p_code_compiled == NULL)
goto re_scan;

func->const_cell_num =
loader_ctx->i64_const_num * 2 + loader_ctx->i32_const_num;
func->const_cell_num = loader_ctx->i64_const_num * 2
+ loader_ctx->v128_const_num * 4
+ loader_ctx->i32_const_num;
if (func->const_cell_num > 0) {
if (!(func->consts =
loader_malloc((uint64)sizeof(uint32) * func->const_cell_num,
Expand All @@ -16415,6 +16407,12 @@ wasm_loader_prepare_bytecode(WASMModule *module, WASMFunction *func,
loader_ctx->i32_consts,
(uint32)sizeof(int32) * loader_ctx->i32_const_num);
}
if (loader_ctx->v128_const_num > 0) {
bh_memcpy_s(func->consts,
(uint32)sizeof(V128) * loader_ctx->v128_const_num,
loader_ctx->v128_consts,
(uint32)sizeof(V128) * loader_ctx->v128_const_num);
}
}

func->max_stack_cell_num = loader_ctx->preserved_local_offset
Expand Down

0 comments on commit 4a77d5c

Please sign in to comment.