diff options
| author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2021-11-18 12:11:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-18 12:11:53 -0500 |
| commit | ec574ab3453709490b53b5cc761ec158103fe42a (patch) | |
| tree | 9fec6338decfd4dbb013ca3981df5159510a9bd4 /vm_insnhelper.c | |
| parent | d48f5082e5b5af56bc9a0986eb83bb18520f4233 (diff) | |
Refactor getclassvariable (#5137)
* Refactor getclassvariable
We only need the cref when we have a cache miss so don't look it up until we
need it. This speeds up class variable reads in the interpreter but
also simplifies the jit code.
Benchmarks for master vs this branch (without yjit):
Before:
```
Warming up --------------------------------------
read a cvar 1.276M i/100ms
Calculating -------------------------------------
read a cvar 12.596M (± 1.7%) i/s - 63.781M in 5.064902s
```
After:
```
Warming up --------------------------------------
read a cvar 1.336M i/100ms
Calculating -------------------------------------
read a cvar 13.114M (± 3.6%) i/s - 65.488M in 5.000584s
```
Co-authored-by: Aaron Patterson <tenderlove@ruby-lang.org>
* Clean up function signatures / remove dead code
rb_vm_getclassvariable signature has changed and we don't need
rb_vm_get_cref.
Co-authored-by: Aaron Patterson <tenderlove@ruby-lang.org>
Notes
Notes:
Merged-By: maximecb <maximecb@ruby-lang.org>
Diffstat (limited to 'vm_insnhelper.c')
| -rw-r--r-- | vm_insnhelper.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 06a92013bd..7323d80834 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -1321,8 +1321,10 @@ update_classvariable_cache(const rb_iseq_t *iseq, VALUE klass, ID id, ICVARC ic) } static inline VALUE -vm_getclassvariable(const rb_iseq_t *iseq, const rb_cref_t *cref, const rb_control_frame_t *cfp, ID id, ICVARC ic) +vm_getclassvariable(const rb_iseq_t *iseq, const rb_control_frame_t *reg_cfp, ID id, ICVARC ic) { + const rb_cref_t *cref; + if (ic->entry && ic->entry->global_cvar_state == GET_GLOBAL_CVAR_STATE()) { VALUE v = Qundef; RB_DEBUG_COUNTER_INC(cvar_read_inline_hit); @@ -1332,15 +1334,16 @@ vm_getclassvariable(const rb_iseq_t *iseq, const rb_cref_t *cref, const rb_contr } } - VALUE klass = vm_get_cvar_base(cref, cfp, 1); + cref = vm_get_cref(GET_EP()); + VALUE klass = vm_get_cvar_base(cref, reg_cfp, 1); return update_classvariable_cache(iseq, klass, id, ic); } VALUE -rb_vm_getclassvariable(const rb_iseq_t *iseq, const rb_cref_t *cref, const rb_control_frame_t *cfp, ID id, ICVARC ic) +rb_vm_getclassvariable(const rb_iseq_t *iseq, const rb_control_frame_t *cfp, ID id, ICVARC ic) { - return vm_getclassvariable(iseq, cref, cfp, id, ic); + return vm_getclassvariable(iseq, cfp, id, ic); } static inline void |