Decide JIT-ed insn based on cached cfunc

for opt_* insns.

opt_eq handles rb_obj_equal inside opt_eq, and all other cfunc is
handled by opt_send_without_block. Therefore we can't decide which insn
should be generated by checking whether it's cfunc cc or not.

```
$ benchmark-driver -v --rbenv 'before --jit;after --jit' benchmark/mjit_opt_cc_insns.yml --repeat-count=4
before --jit: ruby 2.8.0dev (2020-06-26T05:21:43Z master 9dbc2294) +JIT [x86_64-linux]
after --jit: ruby 2.8.0dev (2020-06-26T06:30:18Z master 75cece1b0b) +JIT [x86_64-linux]
last_commit=Decide JIT-ed insn based on cached cfunc
Calculating -------------------------------------
                     before --jit  after --jit
        mjit_nil?(1)      73.878M      74.021M i/s -     40.000M times in 0.541432s 0.540391s
         mjit_not(1)      72.635M      74.601M i/s -     40.000M times in 0.550702s 0.536187s
     mjit_eq(1, nil)       7.331M       7.445M i/s -      8.000M times in 1.091211s 1.074596s
     mjit_eq(nil, 1)      49.450M      64.711M i/s -      8.000M times in 0.161781s 0.123627s

Comparison:
                     mjit_nil?(1)
         after --jit:  74020528.4 i/s
        before --jit:  73878185.9 i/s - 1.00x  slower

                      mjit_not(1)
         after --jit:  74600882.0 i/s
        before --jit:  72634507.6 i/s - 1.03x  slower

                  mjit_eq(1, nil)
         after --jit:   7444657.4 i/s
        before --jit:   7331304.3 i/s - 1.02x  slower

                  mjit_eq(nil, 1)
         after --jit:  64710790.6 i/s
        before --jit:  49449507.4 i/s - 1.31x  slower
```
上级 9dbc2294
...@@ -23,3 +23,5 @@ benchmark: ...@@ -23,3 +23,5 @@ benchmark:
loop_count: 40000000 loop_count: 40000000
- script: mjit_eq(1, nil) - script: mjit_eq(1, nil)
loop_count: 8000000 loop_count: 8000000
- script: mjit_eq(nil, 1)
loop_count: 8000000
...@@ -105,9 +105,11 @@ has_valid_method_type(CALL_CACHE cc) ...@@ -105,9 +105,11 @@ has_valid_method_type(CALL_CACHE cc)
// Returns true if MJIT thinks this cc's opt_* insn may fallback to opt_send_without_block. // Returns true if MJIT thinks this cc's opt_* insn may fallback to opt_send_without_block.
static bool static bool
has_cache_for_send(CALL_CACHE cc, bool cfunc_cached) has_cache_for_send(CALL_CACHE cc, int insn)
{ {
return has_valid_method_type(cc) && (!cfunc_cached || vm_cc_cme(cc)->def->type != VM_METHOD_TYPE_CFUNC); extern bool rb_vm_opt_cfunc_p(CALL_CACHE cc, int insn);
return has_valid_method_type(cc) &&
!(vm_cc_cme(cc)->def->type == VM_METHOD_TYPE_CFUNC && rb_vm_opt_cfunc_p(cc, insn));
} }
// Returns true if iseq can use fastpath for setup, otherwise NULL. This becomes true in the same condition // Returns true if iseq can use fastpath for setup, otherwise NULL. This becomes true in the same condition
......
...@@ -29,12 +29,6 @@ ...@@ -29,12 +29,6 @@
% insn.expr.expr.lines.any? { |l| l.match(/\A\s+CALL_SIMPLE_METHOD\(\);\s+\z/) } % insn.expr.expr.lines.any? { |l| l.match(/\A\s+CALL_SIMPLE_METHOD\(\);\s+\z/) }
% end.map(&:name) % end.map(&:name)
% %
% # These insns cache cfunc in cc under optimized circumstances. They don't generate opt_send when cfunc is cached.
% cfunc_insns = [
% 'opt_nil_p',
% 'opt_not',
% ]
%
% # Available variables and macros in JIT-ed function: % # Available variables and macros in JIT-ed function:
% # ec: the first argument of _mjitXXX % # ec: the first argument of _mjitXXX
% # reg_cfp: the second argument of _mjitXXX % # reg_cfp: the second argument of _mjitXXX
...@@ -62,7 +56,7 @@ switch (insn) { ...@@ -62,7 +56,7 @@ switch (insn) {
% when *send_compatible_opt_insns % when *send_compatible_opt_insns
% # To avoid cancel, just emit `opt_send_without_block` instead of `opt_*` insn if call cache is populated. % # 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' } % cd_index = insn.opes.index { |o| o.fetch(:type) == 'CALL_DATA' }
if (has_cache_for_send(captured_cc_entries(status)[call_data_index((CALL_DATA)operands[<%= cd_index %>], body)], <%= cfunc_insns.include?(insn.name) %>)) { if (has_cache_for_send(captured_cc_entries(status)[call_data_index((CALL_DATA)operands[<%= cd_index %>], body)], BIN(<%= insn.name %>))) {
<%= render 'mjit_compile_send', locals: { insn: opt_send_without_block } -%> <%= render 'mjit_compile_send', locals: { insn: opt_send_without_block } -%>
<%= render 'mjit_compile_insn', locals: { insn: opt_send_without_block } -%> <%= render 'mjit_compile_insn', locals: { insn: opt_send_without_block } -%>
break; break;
......
...@@ -4903,6 +4903,22 @@ vm_trace_hook(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, const VAL ...@@ -4903,6 +4903,22 @@ vm_trace_hook(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, const VAL
} }
} }
// Return true if given cc has cfunc which is NOT handled by opt_send_without_block.
bool
rb_vm_opt_cfunc_p(CALL_CACHE cc, int insn)
{
switch (insn) {
case BIN(opt_eq):
return check_cfunc(vm_cc_cme(cc), rb_obj_equal);
case BIN(opt_nil_p):
return check_cfunc(vm_cc_cme(cc), rb_false);
case BIN(opt_not):
return check_cfunc(vm_cc_cme(cc), rb_obj_not);
default:
return false;
}
}
#define VM_TRACE_HOOK(target_event, val) do { \ #define VM_TRACE_HOOK(target_event, val) do { \
if ((pc_events & (target_event)) & enabled_flags) { \ if ((pc_events & (target_event)) & enabled_flags) { \
vm_trace_hook(ec, reg_cfp, pc, pc_events, (target_event), global_hooks, local_hooks, (val)); \ vm_trace_hook(ec, reg_cfp, pc, pc_events, (target_event), global_hooks, local_hooks, (val)); \
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册