Skip to content

[mono][aot] Deduplicate runtime invoke wrappers on iOS #85908

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 5 commits into from
May 24, 2023
Merged

[mono][aot] Deduplicate runtime invoke wrappers on iOS #85908

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
d7130c8
Deduplicate runtime invoke wrappers on iOS
kotlarmilos May 8, 2023
459eba0
Move log to the add_extra_method_full
kotlarmilos May 9, 2023
ff09838
Merge branch 'dotnet:main' into improvement/deduplicate-runtime-invok…
kotlarmilos May 12, 2023
60e63a6
Merge branch 'dotnet:main' into improvement/deduplicate-runtime-invok…
kotlarmilos May 15, 2023
96e84b7
Merge branch 'dotnet:main' into improvement/deduplicate-runtime-invok…
kotlarmilos May 19, 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
6 changes: 3 additions & 3 deletions src/mono/mono/mini/aot-compiler.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4331,6 +4331,9 @@ collect_dedup_method (MonoAotCompile *acfg, MonoMethod *method)
static int
add_method_full (MonoAotCompile *acfg, MonoMethod *method, gboolean extra, int depth)
{
if (collect_dedup_method (acfg, method))
return -1;

int index;

index = GPOINTER_TO_UINT (g_hash_table_lookup (acfg->method_indexes, method));
Expand Down Expand Up @@ -4417,9 +4420,6 @@ add_extra_method_full (MonoAotCompile *acfg, MonoMethod *method, gboolean prefer
mono_error_assert_ok (error);
}

if (collect_dedup_method (acfg, method))
return;

if (acfg->aot_opts.log_generics)
aot_printf (acfg, "%*sAdding method %s.\n", depth, "", mono_method_get_full_name (method));

Expand Down
5 changes: 0 additions & 5 deletions src/mono/mono/mini/aot-runtime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4545,12 +4545,7 @@ mono_aot_can_dedup (MonoMethod *method)
/* Use a set of wrappers/instances which work and useful */
switch (method->wrapper_type) {
case MONO_WRAPPER_RUNTIME_INVOKE:
#ifdef TARGET_WASM
return TRUE;
#else
return FALSE;
#endif
break;
case MONO_WRAPPER_OTHER: {
WrapperInfo *info = mono_marshal_get_wrapper_info (method);

Expand Down