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

[mono] Allow a single call when inlining methods #83548

Merged
merged 4 commits into from
Mar 17, 2023
Merged

[mono] Allow a single call when inlining methods #83548

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b9dd31e
Allow a single call when inlining methods, this makes it theoreticall…
kg Mar 16, 2023
5a820d8
Disable logging by default
kg Mar 16, 2023
446cb81
Properly save/restore the 'has inlined a call' flag when inlining met…
kg Mar 16, 2023
726c383
Fix crash in inlining due to attribute check
kg Mar 16, 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
47 changes: 44 additions & 3 deletions src/mono/mono/mini/interp/transform.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ static int stack_type [] = {
};

static GENERATE_TRY_GET_CLASS_WITH_CACHE (intrinsic_klass, "System.Runtime.CompilerServices", "IntrinsicAttribute")
static GENERATE_TRY_GET_CLASS_WITH_CACHE (doesnotreturn_klass, "System.Diagnostics.CodeAnalysis", "DoesNotReturnAttribute")

static gboolean generate_code (TransformData *td, MonoMethod *method, MonoMethodHeader *header, MonoGenericContext *generic_context, MonoError *error);

Expand All @@ -77,6 +78,21 @@ has_intrinsic_attribute (MonoMethod *method)
return result;
}

static gboolean
has_doesnotreturn_attribute (MonoMethod *method)
{
gboolean result = FALSE;
ERROR_DECL (aerror);
MonoClass *doesnotreturn_klass = mono_class_try_get_doesnotreturn_klass_class ();
MonoCustomAttrInfo *ainfo = mono_custom_attrs_from_method_checked (method, aerror);
mono_error_cleanup (aerror); /* FIXME don't swallow the error? */
if (ainfo) {
result = doesnotreturn_klass && mono_custom_attrs_has_attr (ainfo, doesnotreturn_klass);
mono_custom_attrs_free (ainfo);
}
return result;
}

static InterpInst*
interp_new_ins (TransformData *td, int opcode, int len)
{
Expand Down Expand Up @@ -2863,6 +2879,7 @@ interp_inline_method (TransformData *td, MonoMethod *target_method, MonoMethodHe
int i;
int prev_sp_offset;
int prev_aggressive_inlining;
int prev_has_inlined_one_call;
MonoGenericContext *generic_context = NULL;
StackInfo *prev_param_area;
InterpBasicBlock **prev_offset_to_bb;
Expand Down Expand Up @@ -2892,6 +2909,8 @@ interp_inline_method (TransformData *td, MonoMethod *target_method, MonoMethodHe
prev_entry_bb = td->entry_bb;
prev_aggressive_inlining = td->aggressive_inlining;
prev_imethod_items = td->imethod_items;
prev_has_inlined_one_call = td->has_inlined_one_call;
td->has_inlined_one_call = FALSE;
td->inlined_method = target_method;

prev_max_stack_height = td->max_stack_height;
Expand Down Expand Up @@ -2973,6 +2992,7 @@ interp_inline_method (TransformData *td, MonoMethod *target_method, MonoMethodHe
td->code_size = prev_code_size;
td->entry_bb = prev_entry_bb;
td->aggressive_inlining = prev_aggressive_inlining;
td->has_inlined_one_call = prev_has_inlined_one_call;

g_free (td->in_offsets);
td->in_offsets = prev_in_offsets;
Expand Down Expand Up @@ -3440,9 +3460,30 @@ interp_transform_call (TransformData *td, MonoMethod *method, MonoMethod *target
}
}

/* Don't inline methods that do calls */
if (op == -1 && td->inlined_method && !td->aggressive_inlining)
return FALSE;
/*
* When inlining a method, only allow it to perform one call.
* We previously prohibited calls entirely, this is a conservative rule that allows
* Things like ThrowHelper.ThrowIfNull to theoretically inline, along with a hypothetical
* X.get_Item that just calls Y.get_Item (profitable to inline)
*/
if (op == -1 && td->inlined_method && !td->aggressive_inlining) {
if (has_doesnotreturn_attribute(target_method)) {
/*
* Since the method does not return, it's probably a throw helper and will not be called.
* As such we don't want it to prevent inlining of the method that calls it.
*/
if (td->verbose_level > 2)
g_print("Overlooking inlined doesnotreturn call in %s (target %s)\n", td->method->name, target_method->name);
} else if (td->has_inlined_one_call) {
if (td->verbose_level > 1)
g_print("Prohibiting second inlined call in %s (target %s)\n", td->method->name, target_method->name);
return FALSE;
} else {
if (td->verbose_level > 2)
g_print("Allowing single inlined call in %s (target %s)\n", td->method->name, target_method->name);
td->has_inlined_one_call = TRUE;
}
}

/* We need to convert delegate invoke to a indirect call on the interp_invoke_impl field */
if (target_method && m_class_get_parent (target_method->klass) == mono_defaults.multicastdelegate_class) {
Expand Down
1 change: 1 addition & 0 deletions src/mono/mono/mini/interp/transform.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,7 @@ typedef struct
int aggressive_inlining : 1;
int optimized : 1;
int has_invalid_code : 1;
int has_inlined_one_call : 1;
} TransformData;

#define STACK_TYPE_I4 0
Expand Down