Skip to content

Restrict inlining to leaf methods #4

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
tenderlove merged 3 commits into from
Mar 15, 2022
Merged

Restrict inlining to leaf methods #4

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7798c73
Check for leaf functions before inlining
wildmaples Mar 10, 2022
1cac577
Add new func to check if callee contains method calls
wildmaples Mar 11, 2022
a303c42
Tighten definition of an inlinable call
wildmaples Mar 11, 2022
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
50 changes: 42 additions & 8 deletions compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13035,15 +13035,49 @@ rb_iseq_t * iseq_alloc_for_inlining(const rb_iseq_t *original_iseq);
bool rb_simple_iseq_p(const rb_iseq_t *iseq);

static bool
inlineable_call(CALL_DATA cd)
contains_method_calls(VALUE *code, size_t size, rb_vm_insns_translator_t * translator)
{
unsigned int flags = vm_ci_flag(cd->ci);
if (flags & VM_CALL_ARGS_SIMPLE) {
return true;
int n = 0;

// Scan the instructions looking for method calls
for (n = 0; n < size;) {
int insn_id = (int)translator((void *)code[n]);
int len = insn_len(insn_id);

// Any time we find a method call
if (insn_id == BIN(opt_send_without_block)) {
return true;
}

n += len;
}
else {
return false;

return false;
}

static bool
inlineable_call(CALL_DATA cd, rb_vm_insns_translator_t * translator)
{
unsigned int flags = vm_ci_flag(cd->ci);
const struct rb_callable_method_entry_struct * cme = vm_cc_cme(cd->cc);

if (cme) {
const rb_iseq_t * callee_iseq = cme->def->body.iseq.iseqptr;
VALUE * callee_iseq_code = callee_iseq->body->iseq_encoded;
size_t callee_iseq_size = callee_iseq->body->iseq_size;
bool contain_method_call = contains_method_calls(callee_iseq_code, callee_iseq_size, translator);

// A leaf method is a method with the builtin inline flag set
// or a method that doesn't contain a method call
bool is_leaf_method = callee_iseq->body->builtin_inline_p || !contain_method_call;

// Only inline simple and leaf methods
if (flags & VM_CALL_ARGS_SIMPLE && is_leaf_method) {
return true;
}
}

return false;
}

static int
Expand All @@ -13070,7 +13104,7 @@ inline_iseqs(VALUE *code, size_t pos, iseq_value_itr_t * func, void *_ctx, rb_vm
if (ctx->depth == 0 && insn_id == BIN(opt_send_without_block)) {
CALL_DATA cd = (CALL_DATA)code[pos + 1];

if (inlineable_call(cd)) {
if (inlineable_call(cd, translator)) {
const struct rb_callable_method_entry_struct * cme = vm_cc_cme(cd->cc);

// Convert the method call in to a linked list of the instructions
Expand Down Expand Up @@ -13235,7 +13269,7 @@ find_max_local_table(VALUE *code, size_t pos, iseq_value_itr_t * func, void *_ct
if (insn_id == BIN(opt_send_without_block)) {
CALL_DATA cd = (CALL_DATA)code[pos + 1];

if (inlineable_call(cd)) {
if (inlineable_call(cd, translator)) {
const struct rb_callable_method_entry_struct * cme = vm_cc_cme(cd->cc);

// Convert the method call in to a linked list of the instructions
Expand Down