From 1b5aa4f5161972d3598b738312e771c6706a7af6 Mon Sep 17 00:00:00 2001 From: k0kubun Date: Sun, 21 Oct 2018 13:21:28 +0000 Subject: mjit.c: copy inline cache values to MJIT worker on VM_CHECK_INTS. Letting MJIT worker directly see inline cache which may be being updated could result in inconsistent IC index and serial. mjit_worker.c: request the copy job after dequeue, and receive the result synchronously. tool/ruby_vm/views/_mjit_compile_ivar.erb: use the copied IC mjit_compile.c: change the interface to pass is_entries mjit.h: ditto === Optcarrot Benchmark === Thankfully this didn't have major performance regression. $ benchmark-driver benchmark.yml --rbenv 'before::before --disable-gems --jit;after::after --disable-gems --jit' -v --repeat-count 24 before: ruby 2.6.0dev (2018-10-21 trunk 65263) +JIT [x86_64-linux] after: ruby 2.6.0dev (2018-10-21 trunk 65263) +JIT [x86_64-linux] last_commit=mjit.c: copy inline cache values to MJIT worker Calculating ------------------------------------- before after Optcarrot Lan_Master.nes 85.421 85.454 fps Comparison: Optcarrot Lan_Master.nes after: 85.5 fps before: 85.4 fps - 1.00x slower git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65275 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- mjit.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'mjit.c') diff --git a/mjit.c b/mjit.c index 88df66bb77..f2b2581f7a 100644 --- a/mjit.c +++ b/mjit.c @@ -20,6 +20,19 @@ #include "constant.h" #include "id_table.h" +/* Copy ISeq's states so that race condition does not happen on compilation. */ +static void +mjit_copy_job_handler(void *data) +{ + struct mjit_copy_job *job = (struct mjit_copy_job *)data; + memcpy(job->is_entries, job->body->is_entries, sizeof(union iseq_inline_storage_entry) * job->body->is_size); + + CRITICAL_SECTION_START(3, "in MJIT copy job wait"); + job->finish_p = TRUE; + rb_native_cond_broadcast(&mjit_worker_wakeup); + CRITICAL_SECTION_FINISH(3, "in MJIT copy job wait"); +} + extern int rb_thread_create_mjit_thread(void (*worker_func)(void)); /* Return an unique file name in /tmp with PREFIX and SUFFIX and -- cgit v1.2.3