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

Revert "Request inline cache values from mjit_compile"

Browse source 
This reverts commit 4161674b2f.

Revert "Eliminate mjit_copy_job_t reference from mjit_worker"

This reverts commit d86a1aa045.

Reverting them because of CI failures

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67291 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
k0kubun 2019-03-18 01:52:45 +00:00
parent ba03222da8
commit 908b530112
3 changed files with 50 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mjit.h
View file

@ -64,7 +64,7 @@ extern void mjit_add_iseq_to_process(const rb_iseq_t *iseq);
extern VALUE mjit_wait_call(rb_execution_context_t *ec, struct rb_iseq_constant_body *body); extern VALUE mjit_wait_call(rb_execution_context_t *ec, struct rb_iseq_constant_body *body);
RUBY_SYMBOL_EXPORT_END RUBY_SYMBOL_EXPORT_END
extern bool mjit_compile(FILE *f, const rb_iseq_t *iseq, const char *funcname); extern bool mjit_compile(FILE *f, const struct rb_iseq_constant_body *body, const char *funcname, struct rb_call_cache *cc_entries, union iseq_inline_storage_entry *is_entries);
extern void mjit_init(struct mjit_options *opts); extern void mjit_init(struct mjit_options *opts);
extern void mjit_postponed_job_register_start_hook(void); extern void mjit_postponed_job_register_start_hook(void);
extern void mjit_postponed_job_register_finish_hook(void); extern void mjit_postponed_job_register_finish_hook(void);

10
mjit_compile.c
View file

@ -196,14 +196,10 @@ compile_cancel_handler(FILE *f, const struct rb_iseq_constant_body *body, struct
fprintf(f, " return Qundef;\n"); fprintf(f, " return Qundef;\n");
} }
extern bool mjit_copy_cache_from_main_thread(const rb_iseq_t *iseq, struct rb_call_cache **cc_entries, union iseq_inline_storage_entry **is_entries);
// Compile ISeq to C code in `f`. It returns true if it succeeds to compile. // Compile ISeq to C code in `f`. It returns true if it succeeds to compile.
bool bool
mjit_compile(FILE *f, const rb_iseq_t *iseq, const char *funcname) mjit_compile(FILE *f, const struct rb_iseq_constant_body *body, const char *funcname, struct rb_call_cache *cc_entries, union iseq_inline_storage_entry *is_entries)
{ {
const struct rb_iseq_constant_body *body = iseq->body;
struct compile_status status; struct compile_status status;
status.success = true; status.success = true;
status.local_stack_p = !body->catch_except_p; status.local_stack_p = !body->catch_except_p;
@ -211,8 +207,8 @@ mjit_compile(FILE *f, const rb_iseq_t *iseq, const char *funcname)
if (status.stack_size_for_pos == NULL) if (status.stack_size_for_pos == NULL)
return false; return false;
memset(status.stack_size_for_pos, NOT_COMPILED_STACK_SIZE, sizeof(int) * body->iseq_size); memset(status.stack_size_for_pos, NOT_COMPILED_STACK_SIZE, sizeof(int) * body->iseq_size);
if (mjit_copy_cache_from_main_thread(iseq, &status.cc_entries, &status.is_entries) == false) status.cc_entries = cc_entries;
return false; status.is_entries = is_entries;
/* For performance, we verify stack size only on compilation time (mjit_compile.inc.erb) without --jit-debug */ /* For performance, we verify stack size only on compilation time (mjit_compile.inc.erb) without --jit-debug */
if (!mjit_opts.debug) { if (!mjit_opts.debug) {

99
mjit_worker.c
View file

@ -986,7 +986,7 @@ compile_prelude(FILE *f)
/* Compile ISeq in UNIT and return function pointer of JIT-ed code. /* Compile ISeq in UNIT and return function pointer of JIT-ed code.
It may return NOT_COMPILED_JIT_ISEQ_FUNC if something went wrong. */ It may return NOT_COMPILED_JIT_ISEQ_FUNC if something went wrong. */
static mjit_func_t static mjit_func_t
convert_unit_to_func(struct rb_mjit_unit *unit) convert_unit_to_func(struct rb_mjit_unit *unit, struct rb_call_cache *cc_entries, union iseq_inline_storage_entry *is_entries)
{ {
char c_file_buff[MAXPATHLEN], *c_file = c_file_buff, *so_file, funcname[35]; /* TODO: reconsider `35` */ char c_file_buff[MAXPATHLEN], *c_file = c_file_buff, *so_file, funcname[35]; /* TODO: reconsider `35` */
int fd; int fd;
@ -1067,7 +1067,7 @@ convert_unit_to_func(struct rb_mjit_unit *unit)
verbose(2, "start compilation: %s@%s:%d -> %s", label, path, lineno, c_file); verbose(2, "start compilation: %s@%s:%d -> %s", label, path, lineno, c_file);
fprintf(f, "/* %s@%s:%d */\n\n", label, path, lineno); fprintf(f, "/* %s@%s:%d */\n\n", label, path, lineno);
} }
bool success = mjit_compile(f, unit->iseq, funcname); bool success = mjit_compile(f, unit->iseq->body, funcname, cc_entries, is_entries);
/* release blocking mjit_gc_start_hook */ /* release blocking mjit_gc_start_hook */
CRITICAL_SECTION_START(3, "after mjit_compile to wakeup client for GC"); CRITICAL_SECTION_START(3, "after mjit_compile to wakeup client for GC");
@ -1141,66 +1141,33 @@ 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 *);
// Copy inline cache values of `iseq` to `*cc_entries` and `*is_entries`. /* We're lazily copying cache values from main thread because these cache values
// Return true if copy succeeds or is not needed. could be different between ones on enqueue timing and ones on dequeue timing.
// Return true if copy succeeds. */
// We're lazily copying cache values from main thread because these cache values static bool
// could be different between ones on enqueue timing and ones on dequeue timing. copy_cache_from_main_thread(mjit_copy_job_t *job)
bool
mjit_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 mjit_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 mjit_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 mjit_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 mjit_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);
} else if (rb_workqueue_register(0, mjit_copy_job_handler, (void *)job)) { return job->finish_p;
}
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 mjit_copy_cache_from_main_thread");
job->iseq = NULL; // Allow GC of this ISeq from here
// 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 mjit_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
@ -1209,6 +1176,8 @@ mjit_copy_cache_from_main_thread(const rb_iseq_t *iseq, struct rb_call_cache **c
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();
@ -1235,16 +1204,28 @@ 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) {
// JIT compile const struct rb_iseq_constant_body *body = unit->iseq->body;
mjit_func_t func = convert_unit_to_func(unit); 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);
// `mjit_copy_cache_from_main_thread` in `mjit_compile` may wait for a long time /* Copy ISeq's inline caches values to avoid race condition. */
// and worker may be stopped during the compilation. if (job->cc_entries != NULL || job->is_entries != NULL) {
if (stop_worker_p) if (copy_cache_from_main_thread(job) == false) {
break; continue; /* retry postponed_job failure, or stop worker */
}
}
// JIT compile
mjit_func_t func = convert_unit_to_func(unit, job->cc_entries, job->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 */
@ -1267,6 +1248,10 @@ 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;
} }