diff options
| author | 卜部昌平 <shyouhei@ruby-lang.org> | 2020-06-01 16:01:30 +0900 |
|---|---|---|
| committer | 卜部昌平 <shyouhei@ruby-lang.org> | 2020-06-09 09:52:46 +0900 |
| commit | 46728557c16be2693c81c7c5ca51ea161ef28f65 (patch) | |
| tree | 30cb78c0e60d233ff8e24e4b26753bc8ea8f5a67 | |
| parent | db406daa60c1cc1585dd8a7227a87d45bbd3cb89 (diff) | |
rb_vm_call0: on-stack call info
This changeset reduces the generated binary of rb_vm_call0 from 281
bytes to 211 bytes on my machine. Should reduce GC pressure as well.
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/3179
| -rw-r--r-- | vm_callinfo.h | 37 | ||||
| -rw-r--r-- | vm_eval.c | 20 | ||||
| -rw-r--r-- | vm_insnhelper.c | 22 |
3 files changed, 35 insertions, 44 deletions
diff --git a/vm_callinfo.h b/vm_callinfo.h index 7c73194fca..f9ede405b9 100644 --- a/vm_callinfo.h +++ b/vm_callinfo.h @@ -251,6 +251,17 @@ vm_ci_markable(const struct rb_callinfo *ci) } } +#define VM_CI_ON_STACK(mid_, flags_, argc_, kwarg_) \ + (struct rb_callinfo) { \ + .flags = T_IMEMO | \ + (imemo_callinfo << FL_USHIFT) | \ + VM_CALLINFO_NOT_UNDER_GC, \ + .mid = mid_, \ + .flag = flags_, \ + .argc = argc_, \ + .kwarg = kwarg_, \ + } + typedef VALUE (*vm_call_handler)( struct rb_execution_context_struct *ec, struct rb_control_frame_struct *cfp, @@ -290,22 +301,16 @@ vm_cc_new(VALUE klass, return cc; } -static inline const struct rb_callcache * -vm_cc_fill(struct rb_callcache *cc, - VALUE klass, - const struct rb_callable_method_entry_struct *cme, - vm_call_handler call) -{ - struct rb_callcache cc_body = { - .flags = T_IMEMO | (imemo_callcache << FL_USHIFT) | VM_CALLCACHE_UNMARKABLE, - .klass = klass, - .cme_ = cme, - .call_ = call, - .aux_.v = 0, - }; - MEMCPY(cc, &cc_body, struct rb_callcache, 1); - return cc; -} +#define VM_CC_ON_STACK(clazz, call, aux, cme) \ + (struct rb_callcache) { \ + .flags = T_IMEMO | \ + (imemo_callcache << FL_USHIFT) | \ + VM_CALLCACHE_UNMARKABLE, \ + .klass = clazz, \ + .cme_ = cme, \ + .call_ = call, \ + .aux_ = aux, \ + } static inline bool vm_cc_class_check(const struct rb_callcache *cc, VALUE klass) @@ -45,12 +45,20 @@ static VALUE vm_call0_body(rb_execution_context_t* ec, struct rb_calling_info *c MJIT_FUNC_EXPORTED VALUE rb_vm_call0(rb_execution_context_t *ec, VALUE recv, ID id, int argc, const VALUE *argv, const rb_callable_method_entry_t *me, int kw_splat) { - struct rb_calling_info calling = { Qundef, recv, argc, kw_splat, }; - const struct rb_callinfo *ci = vm_ci_new_runtime(id, kw_splat ? VM_CALL_KW_SPLAT : 0, argc, NULL); - struct rb_callcache cc_body; - const struct rb_callcache *cc = vm_cc_fill(&cc_body, 0, me, vm_call_general); - struct rb_call_data cd = { ci, cc, }; - return vm_call0_body(ec, &calling, &cd, argv); + return vm_call0_body( + ec, + &(struct rb_calling_info) { + .block_handler = VM_BLOCK_HANDLER_NONE, + .recv = recv, + .argc = argc, + .kw_splat = kw_splat, + }, + &(struct rb_call_data) { + .ci = &VM_CI_ON_STACK(id, kw_splat ? VM_CALL_KW_SPLAT : 0, argc, NULL), + .cc = &VM_CC_ON_STACK(Qfalse, vm_call_general, { 0 }, me), + }, + argv + ); } static VALUE diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 93b97f5e9e..6d4afa2d24 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -2682,28 +2682,6 @@ aliased_callable_method_entry(const rb_callable_method_entry_t *me) return cme; } -#define VM_CI_ON_STACK(mid_, flags_, argc_, kwarg_) \ - (struct rb_callinfo) { \ - .flags = T_IMEMO | \ - (imemo_callinfo << FL_USHIFT) | \ - VM_CALLINFO_NOT_UNDER_GC, \ - .mid = mid_, \ - .flag = flags_, \ - .argc = argc_, \ - .kwarg = kwarg_, \ - } - -#define VM_CC_ON_STACK(clazz, call, aux, cme) \ - (struct rb_callcache) { \ - .flags = T_IMEMO | \ - (imemo_callcache << FL_USHIFT) | \ - VM_CALLCACHE_UNMARKABLE, \ - .klass = clazz, \ - .cme_ = cme, \ - .call_ = call, \ - .aux_ = aux, \ - } - static VALUE vm_call_alias(rb_execution_context_t *ec, rb_control_frame_t *cfp, struct rb_calling_info *calling, struct rb_call_data *cd) { |