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

Eliminate mjit_copy_job_t reference from mjit_worker

Browse source 
and make `copy_cache_from_main_thread` easier to use.

For implementing inlining later, I'll use `copy_cache_from_main_thread`
inside `mjit_compile`.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67287 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
k0kubun 2019-03-17 18:07:06 +00:00
parent 3fc26f6013
commit d86a1aa045
1 changed files with 56 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

86
mjit_worker.c
View file

@ -1141,33 +1141,66 @@ static void mjit_copy_job_handler(void *data);
/* vm_trace.c */ /* vm_trace.c */
int rb_workqueue_register(unsigned flags, rb_postponed_job_func_t , void *); int rb_workqueue_register(unsigned flags, rb_postponed_job_func_t , void *);
/* We're lazily copying cache values from main thread because these cache values // Copy inline cache values of `iseq` to `*cc_entries` and `*is_entries`.
could be different between ones on enqueue timing and ones on dequeue timing. // Return true if copy succeeds or is not needed.
Return true if copy succeeds. */ //
// We're lazily copying cache values from main thread because these cache values
// could be different between ones on enqueue timing and ones on dequeue timing.
static bool static bool
copy_cache_from_main_thread(mjit_copy_job_t *job) copy_cache_from_main_thread(const rb_iseq_t *iseq, struct rb_call_cache **cc_entries, union iseq_inline_storage_entry **is_entries)
{ {
mjit_copy_job_t *job = &mjit_copy_job; // just a short hand
CRITICAL_SECTION_START(3, "in copy_cache_from_main_thread"); CRITICAL_SECTION_START(3, "in copy_cache_from_main_thread");
job->finish_p = true; // disable dispatching this job in mjit_copy_job_handler while it's being modified
CRITICAL_SECTION_FINISH(3, "in copy_cache_from_main_thread");
const struct rb_iseq_constant_body *body = iseq->body;
job->cc_entries = NULL;
if (body->ci_size > 0 || body->ci_kw_size > 0)
job->cc_entries = alloca(sizeof(struct rb_call_cache) * (body->ci_size + body->ci_kw_size));
job->is_entries = NULL;
if (body->is_size > 0)
job->is_entries = alloca(sizeof(union iseq_inline_storage_entry) * body->is_size);
// If ISeq has no inline cache, there's no need to run a copy job.
if (job->cc_entries == NULL && job->is_entries == NULL) {
*cc_entries = job->cc_entries;
*is_entries = job->is_entries;
return true;
}
CRITICAL_SECTION_START(3, "in copy_cache_from_main_thread");
job->iseq = iseq; // Prevernt GC of this ISeq from here
job->finish_p = false; // allow dispatching this job in mjit_copy_job_handler job->finish_p = false; // allow dispatching this job in mjit_copy_job_handler
CRITICAL_SECTION_FINISH(3, "in copy_cache_from_main_thread"); CRITICAL_SECTION_FINISH(3, "in copy_cache_from_main_thread");
if (UNLIKELY(mjit_opts.wait)) { if (UNLIKELY(mjit_opts.wait)) {
mjit_copy_job_handler((void *)job); mjit_copy_job_handler((void *)job);
return job->finish_p; } else if (rb_workqueue_register(0, mjit_copy_job_handler, (void *)job)) {
}
if (!rb_workqueue_register(0, mjit_copy_job_handler, (void *)job))
return false;
CRITICAL_SECTION_START(3, "in MJIT copy job wait"); CRITICAL_SECTION_START(3, "in MJIT copy job wait");
/* checking `stop_worker_p` too because `RUBY_VM_CHECK_INTS(ec)` may not // checking `stop_worker_p` too because `RUBY_VM_CHECK_INTS(ec)` may not
lush mjit_copy_job_handler when EC_EXEC_TAG() is not TAG_NONE, and then // lush mjit_copy_job_handler when EC_EXEC_TAG() is not TAG_NONE, and then
`stop_worker()` could dead lock with this function. */ // `stop_worker()` could dead lock with this function.
while (!job->finish_p && !stop_worker_p) { while (!job->finish_p && !stop_worker_p) {
rb_native_cond_wait(&mjit_worker_wakeup, &mjit_engine_mutex); rb_native_cond_wait(&mjit_worker_wakeup, &mjit_engine_mutex);
verbose(3, "Getting wakeup from client"); verbose(3, "Getting wakeup from client");
} }
CRITICAL_SECTION_FINISH(3, "in MJIT copy job wait"); CRITICAL_SECTION_FINISH(3, "in MJIT copy job wait");
return job->finish_p; }
// Set result values.
*cc_entries = job->cc_entries;
*is_entries = job->is_entries;
bool result = job->finish_p;
CRITICAL_SECTION_START(3, "in copy_cache_from_main_thread");
job->iseq = NULL; // Skip `mjit_mark`-ing this ISeq to allow GC
// Disable dispatching this job in mjit_copy_job_handler while memory allocated by alloca
// could be expired after finishing this function.
job->finish_p = true;
CRITICAL_SECTION_FINISH(3, "in copy_cache_from_main_thread");
return result;
} }
/* The function implementing a worker. It is executed in a separate /* The function implementing a worker. It is executed in a separate
@ -1176,8 +1209,6 @@ copy_cache_from_main_thread(mjit_copy_job_t *job)
void void
mjit_worker(void) mjit_worker(void)
{ {
mjit_copy_job_t *job = &mjit_copy_job; /* just a shorthand */
#ifndef _MSC_VER #ifndef _MSC_VER
if (pch_status == PCH_NOT_READY) { if (pch_status == PCH_NOT_READY) {
make_pch(); make_pch();
@ -1204,28 +1235,19 @@ mjit_worker(void)
verbose(3, "Getting wakeup from client"); verbose(3, "Getting wakeup from client");
} }
unit = get_from_list(&unit_queue); unit = get_from_list(&unit_queue);
if (unit) job->iseq = unit->iseq;
job->finish_p = true; // disable dispatching this job in mjit_copy_job_handler while it's being modified
CRITICAL_SECTION_FINISH(3, "in worker dequeue"); CRITICAL_SECTION_FINISH(3, "in worker dequeue");
if (unit) { if (unit) {
const struct rb_iseq_constant_body *body = unit->iseq->body; struct rb_call_cache *cc_entries;
job->cc_entries = NULL; union iseq_inline_storage_entry *is_entries;
if (body->ci_size > 0 || body->ci_kw_size > 0)
job->cc_entries = alloca(sizeof(struct rb_call_cache) * (body->ci_size + body->ci_kw_size));
job->is_entries = NULL;
if (body->is_size > 0)
job->is_entries = alloca(sizeof(union iseq_inline_storage_entry) * body->is_size);
/* Copy ISeq's inline caches values to avoid race condition. */ // Copy mutable values from main threads
if (job->cc_entries != NULL || job->is_entries != NULL) { if (copy_cache_from_main_thread(unit->iseq, &cc_entries, &is_entries) == false) {
if (copy_cache_from_main_thread(job) == false) { continue; // retry postponed_job failure, or stop worker
continue; /* retry postponed_job failure, or stop worker */
}
} }
// JIT compile // JIT compile
mjit_func_t func = convert_unit_to_func(unit, job->cc_entries, job->is_entries); mjit_func_t func = convert_unit_to_func(unit, cc_entries, is_entries);
CRITICAL_SECTION_START(3, "in jit func replace"); CRITICAL_SECTION_START(3, "in jit func replace");
while (in_gc) { /* Make sure we're not GC-ing when touching ISeq */ while (in_gc) { /* Make sure we're not GC-ing when touching ISeq */
@ -1248,10 +1270,6 @@ mjit_worker(void)
} }
} }
// Disable dispatching this job in mjit_copy_job_handler while memory allocated by alloca
// could be expired after finishing this function.
job->finish_p = true;
// To keep mutex unlocked when it is destroyed by mjit_finish, don't wrap CRITICAL_SECTION here. // To keep mutex unlocked when it is destroyed by mjit_finish, don't wrap CRITICAL_SECTION here.
worker_stopped = true; worker_stopped = true;
} }