diff options
| -rw-r--r-- | benchmark/mjit_opt_cc_insns.yml | 25 | ||||
| -rw-r--r-- | mjit_compile.c | 7 | ||||
| -rw-r--r-- | tool/ruby_vm/views/_mjit_compile_send.erb | 6 | ||||
| -rw-r--r-- | tool/ruby_vm/views/mjit_compile.inc.erb | 2 |
4 files changed, 32 insertions, 8 deletions
diff --git a/benchmark/mjit_opt_cc_insns.yml b/benchmark/mjit_opt_cc_insns.yml new file mode 100644 index 0000000000..d8738b55c9 --- /dev/null +++ b/benchmark/mjit_opt_cc_insns.yml @@ -0,0 +1,25 @@ +# opt_* insns using vm_method_cfunc_is with send-compatible operands: +# * opt_nil_p +# * opt_not +# * opt_eq +type: lib/benchmark_driver/runner/mjit +prelude: | + def mjit_nil?(obj) + obj.nil? + end + + def mjit_not(obj) + !obj + end + + def mjit_eq(a, b) + a == b + end + +benchmark: + - script: mjit_nil?(1) + loop_count: 40000000 + - script: mjit_not(1) + loop_count: 40000000 + - script: mjit_eq(1, nil) + loop_count: 8000000 diff --git a/mjit_compile.c b/mjit_compile.c index c4c31aa251..ed1cd1fd1c 100644 --- a/mjit_compile.c +++ b/mjit_compile.c @@ -97,9 +97,9 @@ captured_cc_entries(const struct compile_status *status) // Returns true if call cache is still not obsoleted and vm_cc_cme(cc)->def->type is available. static bool -has_valid_method_type(CALL_CACHE cc) +has_valid_method_type(CALL_CACHE cc, rb_method_type_t type) { - return vm_cc_cme(cc) != NULL; + return vm_cc_cme(cc) != NULL && vm_cc_cme(cc)->def->type == type; } // Returns true if iseq can use fastpath for setup, otherwise NULL. This becomes true in the same condition @@ -439,9 +439,8 @@ precompile_inlinable_iseqs(FILE *f, const rb_iseq_t *iseq, struct compile_status const struct rb_callcache *cc = captured_cc_entries(status)[call_data_index(cd, body)]; // use copy to avoid race condition const rb_iseq_t *child_iseq; - if (has_valid_method_type(cc) && + if (has_valid_method_type(cc, VM_METHOD_TYPE_ISEQ) && !(vm_ci_flag(ci) & VM_CALL_TAILCALL) && // inlining only non-tailcall path - vm_cc_cme(cc)->def->type == VM_METHOD_TYPE_ISEQ && fastpath_applied_iseq_p(ci, cc, child_iseq = def_iseq_ptr(vm_cc_cme(cc)->def)) && // CC_SET_FASTPATH in vm_callee_setup_arg inlinable_iseq_p(child_iseq->body)) { diff --git a/tool/ruby_vm/views/_mjit_compile_send.erb b/tool/ruby_vm/views/_mjit_compile_send.erb index 8c1c1c094d..71efae9497 100644 --- a/tool/ruby_vm/views/_mjit_compile_send.erb +++ b/tool/ruby_vm/views/_mjit_compile_send.erb @@ -20,13 +20,13 @@ const CALL_INFO ci = cd->ci; int kw_splat = IS_ARGS_KW_SPLAT(ci) > 0; extern bool rb_splat_or_kwargs_p(const struct rb_callinfo *restrict ci); - if (!status->compile_info->disable_send_cache && has_valid_method_type(captured_cc) && ( + if (!status->compile_info->disable_send_cache && ( % # `CC_SET_FASTPATH(cd->cc, vm_call_cfunc_with_frame, ...)` in `vm_call_cfunc` - (vm_cc_cme(captured_cc)->def->type == VM_METHOD_TYPE_CFUNC + (has_valid_method_type(captured_cc, VM_METHOD_TYPE_CFUNC) && !rb_splat_or_kwargs_p(ci) && !kw_splat) % # `CC_SET_FASTPATH(cc, vm_call_iseq_setup_func(...), vm_call_iseq_optimizable_p(...))` in `vm_callee_setup_arg`, % # and support only non-VM_CALL_TAILCALL path inside it - || (vm_cc_cme(captured_cc)->def->type == VM_METHOD_TYPE_ISEQ + || (has_valid_method_type(captured_cc, VM_METHOD_TYPE_ISEQ) && fastpath_applied_iseq_p(ci, captured_cc, iseq = def_iseq_ptr(vm_cc_cme(captured_cc)->def)) && !(vm_ci_flag(ci) & VM_CALL_TAILCALL)) )) { diff --git a/tool/ruby_vm/views/mjit_compile.inc.erb b/tool/ruby_vm/views/mjit_compile.inc.erb index fa2e52e480..ea145e5b87 100644 --- a/tool/ruby_vm/views/mjit_compile.inc.erb +++ b/tool/ruby_vm/views/mjit_compile.inc.erb @@ -56,7 +56,7 @@ switch (insn) { % when *send_compatible_opt_insns % # To avoid cancel, just emit `opt_send_without_block` instead of `opt_*` insn if call cache is populated. % cd_index = insn.opes.index { |o| o.fetch(:type) == 'CALL_DATA' } - if (has_valid_method_type(captured_cc_entries(status)[call_data_index((CALL_DATA)operands[<%= cd_index %>], body)])) { + if (has_valid_method_type(captured_cc_entries(status)[call_data_index((CALL_DATA)operands[<%= cd_index %>], body)], VM_METHOD_TYPE_ISEQ)) { <%= render 'mjit_compile_send', locals: { insn: opt_send_without_block } -%> <%= render 'mjit_compile_insn', locals: { insn: opt_send_without_block } -%> break; |