Skip to content
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

[microTVM] Fix host-driven AOT memory workspaces #13807

Merged
merged 5 commits into from
Jan 26, 2023
Merged

[microTVM] Fix host-driven AOT memory workspaces #13807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ac17906
change host-driven AOT to call the _run() function instead of __tvm_m…
alanmacd Jan 18, 2023
3a515a7
only add run function when AOT executor is specified
alanmacd Jan 18, 2023
57fd0d3
only generate get_c_metadata function when executor is AOT
alanmacd Jan 19, 2023
40562d2
remove check for mod1_lib2.c since the file with the get_c_metadata i…
alanmacd Jan 20, 2023
35cc3f0
update USMP const pool test to always enable USMP and expect to succeed
alanmacd Jan 23, 2023
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
13 changes: 1 addition & 12 deletions src/runtime/crt/aot_executor/aot_executor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ int TVMAotExecutor_GetInputIndex(TVMAotExecutor* executor, const char* name) {
}

int TVMAotExecutor_Run(TVMAotExecutor* executor) {
const char* tvm_main_suffix = "___tvm_main__";
const char* tvm_main_suffix = "_run";
char tvm_main_name[TVM_CRT_MAX_STRLEN_FUNCTION_NAME];

{
Expand Down Expand Up @@ -203,17 +203,6 @@ int TVMAotExecutor_Init(TVMAotExecutor* executor, TVMModuleHandle module_handle,
TVMNDArray_IncrementReference(array);
}

for (i = 0; i < md->num_workspace_pools; ++i) {
LOG_DEBUG("pools allocate[%d]: %s\n", i, md->workspace_pools[i].name);

status = TVMNDArray_Empty(md->workspace_pools[i].num_shape, md->workspace_pools[i].shape,
alanmacd marked this conversation as resolved.
Show resolved Hide resolved
md->workspace_pools[i].dtype, executor->device,
&executor->args[arg_idx++]);
if (status != 0) {
return status;
}
}
CHECK_EQ(0, md->num_constant_pools, "Constant pools not supported");
alanmacd marked this conversation as resolved.
Show resolved Hide resolved
alanmacd marked this conversation as resolved.
Show resolved Hide resolved
return status;
}

Expand Down
16 changes: 13 additions & 3 deletions src/target/source/source_module.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -929,11 +929,21 @@ runtime::Module CreateCSourceCrtMetadataModule(const Array<runtime::Module>& mod
relay::backend::ExecutorCodegenMetadata metadata,
runtime::metadata::Metadata aot_metadata) {
Array<runtime::Module> final_modules(modules);
if (aot_metadata.defined()) {
final_modules.push_back(CreateAotMetadataModule(aot_metadata, true));
Array<String> func_names;

if (metadata.defined()) {
if (metadata->executor == "aot") {
if (aot_metadata.defined()) {
final_modules.push_back(CreateAotMetadataModule(aot_metadata, true));
}

// add the run function (typically "tvmgen_default_run") to function registry
// when using AOT executor
std::string run_func = runtime::get_name_mangled(metadata->mod_name, "run");
func_names.push_back(run_func);
}
}

Array<String> func_names;
for (runtime::Module mod : final_modules) {
auto pf_funcs = mod.GetFunction("get_func_names");
if (pf_funcs != nullptr) {
Expand Down
18 changes: 5 additions & 13 deletions tests/python/unittest/test_crt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,15 +229,10 @@ def do_test():
do_test()


enable_usmp, expect_exception = tvm.testing.parameters((True, True), (False, False))


@tvm.testing.requires_micro
def test_aot_executor_usmp_const_pool(enable_usmp, expect_exception):
"""Test the AOT executor with microTVM using usmp.
Test should fail if const pool is supplied to executor
as these are currently not supported
"""
def test_aot_executor_usmp_const_pool():
"""Test the AOT executor with microTVM using USMP to generate a constant data pool."""

ws_root = pathlib.Path(os.path.dirname(__file__) + "/micro-workspace-usmp")
if ws_root.exists():
shutil.rmtree(ws_root)
Expand All @@ -260,7 +255,7 @@ def @main(%a : Tensor[(1, 2), uint8], %b : Tensor[(1, 2), uint8], %c : Tensor[(1
C_np = np.array([[8, 9]], dtype="uint8").astype(type_dict["c"])
params = {"c": C_np}
with tvm.transform.PassContext(
opt_level=3, config={"tir.disable_vectorize": True, "tir.usmp.enable": enable_usmp}
opt_level=3, config={"tir.disable_vectorize": True, "tir.usmp.enable": True}
):
factory = tvm.relay.build(
relay_mod,
Expand All @@ -278,10 +273,7 @@ def do_test():
)
)
except tvm._ffi.base.TVMError as e:
if expect_exception:
return
else:
raise e
raise e

assert aot_executor.get_input_index("a") == 0
assert aot_executor.get_input_index("b") == 1
Expand Down
1 change: 0 additions & 1 deletion tests/python/unittest/test_micro_model_library_format.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,6 @@ def test_multiple_relay_modules_aot_graph():

assert os.path.exists(os.path.join(extract_dir, "codegen", "host", "src", "mod1_lib0.c"))
assert os.path.exists(os.path.join(extract_dir, "codegen", "host", "src", "mod1_lib1.c"))
assert os.path.exists(os.path.join(extract_dir, "codegen", "host", "src", "mod1_lib2.c"))
alanmacd marked this conversation as resolved.
Show resolved Hide resolved
assert os.path.exists(os.path.join(extract_dir, "codegen", "host", "src", "mod2_lib0.c"))
assert os.path.exists(os.path.join(extract_dir, "codegen", "host", "src", "mod2_lib1.c"))

Expand Down