kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Avoid unloading units which have enough total_calls

Browse source 
instead of just unloading worst 10% methods.
This commit is contained in:
Takashi Kokubun 2020-11-27 22:07:02 -08:00
parent 12866b0d31
commit d80226e7bd
No known key found for this signature in database
GPG key ID: 6FFC433B12EE23DD
2 changed files with 32 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
mjit_worker.c
View file

@ -1259,9 +1259,9 @@ static struct mjit_cont *first_cont;
static void static void
unload_units(void) unload_units(void)
{ {
struct rb_mjit_unit *unit = 0, *next, *worst; struct rb_mjit_unit *unit = 0, *next;
struct mjit_cont *cont; struct mjit_cont *cont;
int delete_num, units_num = active_units.length; int units_num = active_units.length;
// For now, we don't unload units when ISeq is GCed. We should // For now, we don't unload units when ISeq is GCed. We should
// unload such ISeqs first here. // unload such ISeqs first here.
@ -1284,29 +1284,35 @@ unload_units(void)
} }
// TODO: check stale_units and unload unused ones! (note that the unit is not associated to ISeq anymore) // TODO: check stale_units and unload unused ones! (note that the unit is not associated to ISeq anymore)
// Remove 1/10 units more to decrease unloading calls. // Unload units whose total_calls is smaller than any total_calls in unit_queue.
// TODO: Calculate max total_calls in unit_queue and don't unload units // TODO: make the algorithm more efficient
// whose total_calls are larger than the max. long unsigned prev_queue_calls = -1;
delete_num = active_units.length / 10; while (true) {
for (; active_units.length > mjit_opts.max_cache_size - delete_num;) { // Calculate the next max total_calls in unit_queue
// Find one unit that has the minimum total_calls. long unsigned max_queue_calls = 0;
worst = NULL; list_for_each(&unit_queue.head, unit, unode) {
if (unit->iseq != NULL && max_queue_calls < unit->iseq->body->total_calls
&& unit->iseq->body->total_calls < prev_queue_calls) {
max_queue_calls = unit->iseq->body->total_calls;
}
}
prev_queue_calls = max_queue_calls;
bool unloaded_p = false;
list_for_each(&active_units.head, unit, unode) { list_for_each(&active_units.head, unit, unode) {
if (unit->used_code_p) // We can't unload code on stack. if (unit->used_code_p) // We can't unload code on stack.
continue; continue;
if (worst == NULL || worst->iseq->body->total_calls > unit->iseq->body->total_calls) { if (max_queue_calls > unit->iseq->body->total_calls) {
worst = unit; verbose(2, "Unloading unit %d (calls=%lu, threshold=%lu)",
unit->id, unit->iseq->body->total_calls, max_queue_calls);
assert(unit->handle != NULL);
remove_from_list(unit, &active_units);
free_unit(unit);
unloaded_p = true;
} }
} }
if (worst == NULL) if (!unloaded_p) break;
break;
// Unload the worst node.
verbose(2, "Unloading unit %d (calls=%lu)", worst->id, worst->iseq->body->total_calls);
assert(worst->handle != NULL);
remove_from_list(worst, &active_units);
free_unit(worst);
} }
if (units_num > active_units.length) { if (units_num > active_units.length) {

10
test/ruby/test_jit.rb
View file

@ -690,11 +690,15 @@ class TestJIT < Test::Unit::TestCase
assert_match(/\A#{JIT_SUCCESS_PREFIX}: mjit#{i}@\(eval\):/, errs[i], debug_info) assert_match(/\A#{JIT_SUCCESS_PREFIX}: mjit#{i}@\(eval\):/, errs[i], debug_info)
end end
assert_equal("Too many JIT code -- 1 units unloaded\n", errs[10], debug_info)
assert_match(/\A#{JIT_SUCCESS_PREFIX}: mjit10@\(eval\):/, errs[11], debug_info)
# On --jit-wait, when the number of JIT-ed code reaches --jit-max-cache, # On --jit-wait, when the number of JIT-ed code reaches --jit-max-cache,
# it should trigger compaction. # it should trigger compaction.
unless RUBY_PLATFORM.match?(/mswin|mingw/) # compaction is not supported on Windows yet if RUBY_PLATFORM.match?(/mswin|mingw/) # compaction is not supported on Windows yet
assert_equal("Too many JIT code -- 1 units unloaded\n", errs[10], debug_info)
assert_match(/\A#{JIT_SUCCESS_PREFIX}: mjit10@\(eval\):/, errs[11], debug_info)
else
assert_equal("No units can be unloaded -- incremented max-cache-size to 11 for --jit-wait\n", errs[10], debug_info)
assert_match(/\A#{JIT_SUCCESS_PREFIX}: mjit10@\(eval\):/, errs[11], debug_info)
assert_equal(3, compactions.size, debug_info) assert_equal(3, compactions.size, debug_info)
end end