diff options
| author | Takashi Kokubun <takashikkbn@gmail.com> | 2020-06-22 01:44:11 -0700 |
|---|---|---|
| committer | Takashi Kokubun <takashikkbn@gmail.com> | 2020-06-22 02:08:21 -0700 |
| commit | 78352fb52ed2c15fe0d74c02ea29b7e5a28b18c0 (patch) | |
| tree | 143236704c56577bf75945875ce5574e37e2a907 /mjit_compile.c | |
| parent | 3238641750c1f6d9e6be5d74fadc53e512638fe2 (diff) | |
| download | ruby-78352fb52ed2c15fe0d74c02ea29b7e5a28b18c0.tar.gz | |
Compile opt_send for opt_* only when cc has ISeq
because opt_nil/opt_not/opt_eq populates cc even when it doesn't
fallback to opt_send_without_block because of vm_method_cfunc_is.
```
$ 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-22T08:11:24Z master d231b8f95b) +JIT [x86_64-linux]
after --jit: ruby 2.8.0dev (2020-06-22T08:53:27Z master e1125879ed) +JIT [x86_64-linux]
last_commit=Compile opt_send for opt_* only when cc has ISeq
Calculating -------------------------------------
before --jit after --jit
mjit_nil?(1) 54.106M 73.693M i/s - 40.000M times in 0.739288s 0.542795s
mjit_not(1) 53.398M 74.477M i/s - 40.000M times in 0.749090s 0.537075s
mjit_eq(1, nil) 7.427M 6.497M i/s - 8.000M times in 1.077136s 1.231326s
Comparison:
mjit_nil?(1)
after --jit: 73692594.3 i/s
before --jit: 54106108.4 i/s - 1.36x slower
mjit_not(1)
after --jit: 74477487.9 i/s
before --jit: 53398125.0 i/s - 1.39x slower
mjit_eq(1, nil)
before --jit: 7427105.9 i/s
after --jit: 6497063.0 i/s - 1.14x slower
```
Actually opt_eq becomes slower by this. Maybe it's indeed using
opt_send_without_block, but I'll approach that one in another commit.
Diffstat (limited to 'mjit_compile.c')
| -rw-r--r-- | mjit_compile.c | 7 |
1 files changed, 3 insertions, 4 deletions
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)) { |