Skip to content

[instantiation linking] create and import WASMMemoryInstance for aot #3887

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
lum1n0us merged 14 commits into from
Nov 20, 2024
Merged

[instantiation linking] create and import WASMMemoryInstance for aot #3887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
d1139cc
Allow .aot files in raw demo
lum1n0us Oct 27, 2024
9189eae
Allow to emit and load import_memory info
lum1n0us Oct 28, 2024
14de319
create/destroy memory api for aot
lum1n0us Oct 28, 2024
505dbef
Refactor memory instantiation logic
lum1n0us Oct 30, 2024
e4fd6ee
Refactor AOT memory handling and improve memory initialization logic
lum1n0us Oct 31, 2024
454d576
fix memory instantiation issues
lum1n0us Oct 31, 2024
929e4a3
Refactor aot_instantiate function parameters for improved clarity
lum1n0us Nov 1, 2024
ac405d3
Add wasm_runtime_get_extern_instance function and refactor memory ins…
lum1n0us Nov 1, 2024
365cee9
Implement import inheritance and disinheritance functions for WASI th…
lum1n0us Nov 1, 2024
b0cc5ce
Fix memory deinstantiation loop to correctly reference import_memory_…
lum1n0us Nov 1, 2024
4f00332
Refactor aot_lookup_memory function to simplify memory lookup logic a…
lum1n0us Nov 18, 2024
a821adf
Add documentation for imports in InstantiationArgs structure
lum1n0us Nov 18, 2024
e4cde59
Fix memory allocation check and update documentation for import memor…
lum1n0us Nov 19, 2024
01ac337
Align memory size and offset calculations to 4-byte boundaries for im…
lum1n0us Nov 20, 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
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,5 @@ tests/benchmarks/coremark/coremark*
samples/workload/include/**
!samples/workload/include/.gitkeep

# core/iwasm/libraries/wasi-threads
core/iwasm/libraries/lib-wasi-threads/**/*.aot
core/iwasm/libraries/lib-wasi-threads/**/*.wasm
83 changes: 69 additions & 14 deletions core/iwasm/aot/aot_loader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -963,6 +963,11 @@ load_custom_section(const uint8 *buf, const uint8 *buf_end, AOTModule *module,
static void
destroy_import_memories(AOTImportMemory *import_memories)
{
if (!import_memories)
return;

import_memories->module_name = NULL;
import_memories->memory_name = NULL;
wasm_runtime_free(import_memories);
}

Expand Down Expand Up @@ -991,6 +996,13 @@ load_mem_init_data_list(const uint8 **p_buf, const uint8 *buf_end,
uint64 size;
uint32 i;

read_uint32(buf, buf_end, module->mem_init_data_count);

if (module->mem_init_data_count == 0) {
*p_buf = buf;
return true;
}

/* Allocate memory */
size = sizeof(AOTMemInitData *) * (uint64)module->mem_init_data_count;
if (!(module->mem_init_data_list = data_list =
Expand Down Expand Up @@ -1035,6 +1047,51 @@ load_mem_init_data_list(const uint8 **p_buf, const uint8 *buf_end,
return false;
}

static bool
load_import_memory_info(const uint8 **p_buf, const uint8 *buf_end,
AOTModule *module, bool is_load_from_file_buf,
char *error_buf, uint32 error_buf_size)
{
const uint8 *buf = *p_buf;

read_uint32(buf, buf_end, module->import_memory_count);

if (module->import_memory_count == 0) {
*p_buf = buf;
return true;
}

uint64 size = sizeof(AOTImportMemory) * (uint64)module->import_memory_count;
AOTImportMemory *import_memories =
loader_malloc(size, error_buf, error_buf_size);
if (!import_memories) {
return false;
}

module->import_memories = import_memories;
for (uint32 i = 0; i < module->import_memory_count; i++) {
AOTImportMemory *import_memory = import_memories + i;

read_uint32(buf, buf_end, import_memory->mem_type.flags);
if (!wasm_memory_check_flags(import_memory->mem_type.flags, error_buf,
error_buf_size, true)) {
set_error_buf(error_buf, error_buf_size, "invalid memory flags");
return false;
}

read_uint32(buf, buf_end, import_memory->mem_type.num_bytes_per_page);
read_uint32(buf, buf_end, import_memory->mem_type.init_page_count);
read_uint32(buf, buf_end, import_memory->mem_type.max_page_count);
read_string(buf, buf_end, import_memory->module_name);
read_string(buf, buf_end, import_memory->memory_name);
}

*p_buf = buf;
return true;
fail:
return false;
}

static bool
load_memory_info(const uint8 **p_buf, const uint8 *buf_end, AOTModule *module,
char *error_buf, uint32 error_buf_size)
Expand All @@ -1043,12 +1100,13 @@ load_memory_info(const uint8 **p_buf, const uint8 *buf_end, AOTModule *module,
uint64 total_size;
const uint8 *buf = *p_buf;

read_uint32(buf, buf_end, module->import_memory_count);
/* We don't support import_memory_count > 0 currently */
if (module->import_memory_count > 0)
return false;

read_uint32(buf, buf_end, module->memory_count);

if (module->memory_count == 0) {
*p_buf = buf;
return true;
}

total_size = sizeof(AOTMemory) * (uint64)module->memory_count;
if (!(module->memories =
loader_malloc(total_size, error_buf, error_buf_size))) {
Expand All @@ -1068,14 +1126,6 @@ load_memory_info(const uint8 **p_buf, const uint8 *buf_end, AOTModule *module,
read_uint32(buf, buf_end, module->memories[i].max_page_count);
}

read_uint32(buf, buf_end, module->mem_init_data_count);

/* load memory init data list */
if (module->mem_init_data_count > 0
&& !load_mem_init_data_list(&buf, buf_end, module, error_buf,
error_buf_size))
return false;

*p_buf = buf;
return true;
fail:
Expand Down Expand Up @@ -2414,7 +2464,11 @@ load_init_data_section(const uint8 *buf, const uint8 *buf_end,
{
const uint8 *p = buf, *p_end = buf_end;

if (!load_memory_info(&p, p_end, module, error_buf, error_buf_size)
if (!load_import_memory_info(&p, p_end, module, is_load_from_file_buf,
error_buf, error_buf_size)
|| !load_memory_info(&p, p_end, module, error_buf, error_buf_size)
|| !load_mem_init_data_list(&p, p_end, module, error_buf,
error_buf_size)
|| !load_table_info(&p, p_end, module, error_buf, error_buf_size)
|| !load_type_info(&p, p_end, module, error_buf, error_buf_size)
|| !load_import_global_info(&p, p_end, module, is_load_from_file_buf,
Expand Down Expand Up @@ -3799,6 +3853,7 @@ has_module_memory64(AOTModule *module)
{
/* TODO: multi-memories for now assuming the memory idx type is consistent
* across multi-memories */
/*FIXME: support import memory */
if (module->import_memory_count > 0)
return !!(module->import_memories[0].mem_type.flags & MEMORY64_FLAG);
else if (module->memory_count > 0)
Expand Down
Loading