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][interp] Allocate basic block link array in exponential fashion #98701

Merged
merged 2 commits into from
Feb 21, 2024
Merged

[mono][interp] Allocate basic block link array in exponential fashion #98701

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59053b6
[mono][interp] Allocate basic block link array in exponential fashion
BrzVlad Feb 20, 2024
00c6125
[mono][interp] Use memcpy
BrzVlad Feb 21, 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
37 changes: 27 additions & 10 deletions src/mono/mono/mini/interp/transform-opt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

#include "mintops.h"
#include "transform.h"
#include "interp-intrins.h"

/*
* VAR OFFSET ALLOCATOR
Expand Down Expand Up @@ -1681,6 +1682,16 @@ interp_remove_bblock (TransformData *td, InterpBasicBlock *bb, InterpBasicBlock
mark_bb_as_dead (td, bb, bb->next_bb);
}

static int
get_bb_links_capacity (int links)
{
if (links <= 2)
return links;
// Return the next power of 2 bigger or equal to links
int leading_zero = interp_intrins_clz_i4 (links - 1);
return 1 << (32 - leading_zero);
}

void
interp_link_bblocks (TransformData *td, InterpBasicBlock *from, InterpBasicBlock *to)
{
Expand All @@ -1694,12 +1705,15 @@ interp_link_bblocks (TransformData *td, InterpBasicBlock *from, InterpBasicBlock
}
}
if (!found) {
InterpBasicBlock **newa = (InterpBasicBlock**)mono_mempool_alloc (td->mempool, sizeof (InterpBasicBlock*) * (from->out_count + 1));
for (i = 0; i < from->out_count; ++i)
newa [i] = from->out_bb [i];
newa [i] = to;
int prev_capacity = get_bb_links_capacity (from->out_count);
int new_capacity = get_bb_links_capacity (from->out_count + 1);
if (new_capacity > prev_capacity) {
InterpBasicBlock **newa = (InterpBasicBlock**)mono_mempool_alloc (td->mempool, new_capacity * sizeof (InterpBasicBlock*));
memcpy (newa, from->out_bb, from->out_count * sizeof (InterpBasicBlock*));
from->out_bb = newa;
}
from->out_bb [from->out_count] = to;
from->out_count++;
from->out_bb = newa;
}

found = FALSE;
Expand All @@ -1710,12 +1724,15 @@ interp_link_bblocks (TransformData *td, InterpBasicBlock *from, InterpBasicBlock
}
}
if (!found) {
InterpBasicBlock **newa = (InterpBasicBlock**)mono_mempool_alloc (td->mempool, sizeof (InterpBasicBlock*) * (to->in_count + 1));
for (i = 0; i < to->in_count; ++i)
newa [i] = to->in_bb [i];
newa [i] = from;
int prev_capacity = get_bb_links_capacity (to->in_count);
int new_capacity = get_bb_links_capacity (to->in_count + 1);
if (new_capacity > prev_capacity) {
InterpBasicBlock **newa = (InterpBasicBlock**)mono_mempool_alloc (td->mempool, new_capacity * sizeof (InterpBasicBlock*));
memcpy (newa, to->in_bb, to->in_count * sizeof (InterpBasicBlock*));
to->in_bb = newa;
}
to->in_bb [to->in_count] = from;
to->in_count++;
to->in_bb = newa;
}
}

Expand Down