mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
Implement optimize call (#6691)
This dispatches to a c func for doing the dynamic lookup. I experimented with chain on the proc but wasn't able to detect which call sites would be monomorphic vs polymorphic. There is definitely room for optimization here, but it does reduce exits.
This commit is contained in:
parent
aada904d94
commit
1a65ab20cb
Notes:
git
2022-11-08 20:28:48 +00:00
Merged-By: maximecb <maximecb@ruby-lang.org>
5 changed files with 70 additions and 3 deletions
9
yjit.c
9
yjit.c
|
@ -716,6 +716,15 @@ rb_get_iseq_body_param_opt_table(const rb_iseq_t *iseq)
|
||||||
return iseq->body->param.opt_table;
|
return iseq->body->param.opt_table;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
VALUE
|
||||||
|
rb_optimized_call(VALUE *recv, rb_execution_context_t *ec, int argc, VALUE *argv, int kw_splat, VALUE block_handler)
|
||||||
|
{
|
||||||
|
rb_proc_t *proc;
|
||||||
|
GetProcPtr(recv, proc);
|
||||||
|
return rb_vm_invoke_proc(ec, proc, argc, argv, kw_splat, block_handler);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// If true, the iseq is leaf and it can be replaced by a single C call.
|
// If true, the iseq is leaf and it can be replaced by a single C call.
|
||||||
bool
|
bool
|
||||||
rb_leaf_invokebuiltin_iseq_p(const rb_iseq_t *iseq)
|
rb_leaf_invokebuiltin_iseq_p(const rb_iseq_t *iseq)
|
||||||
|
|
|
@ -288,7 +288,7 @@ fn main() {
|
||||||
.allowlist_function("rb_yjit_get_proc_ptr")
|
.allowlist_function("rb_yjit_get_proc_ptr")
|
||||||
.allowlist_function("rb_yjit_exit_locations_dict")
|
.allowlist_function("rb_yjit_exit_locations_dict")
|
||||||
.allowlist_function("rb_yjit_icache_invalidate")
|
.allowlist_function("rb_yjit_icache_invalidate")
|
||||||
|
.allowlist_function("rb_optimized_call")
|
||||||
// from vm_sync.h
|
// from vm_sync.h
|
||||||
.allowlist_function("rb_vm_barrier")
|
.allowlist_function("rb_vm_barrier")
|
||||||
|
|
||||||
|
|
|
@ -5557,8 +5557,53 @@ fn gen_send_general(
|
||||||
|
|
||||||
}
|
}
|
||||||
OPTIMIZED_METHOD_TYPE_CALL => {
|
OPTIMIZED_METHOD_TYPE_CALL => {
|
||||||
gen_counter_incr!(asm, send_optimized_method_call);
|
|
||||||
return CantCompile;
|
if block.is_some() {
|
||||||
|
gen_counter_incr!(asm, send_call_block);
|
||||||
|
return CantCompile;
|
||||||
|
}
|
||||||
|
|
||||||
|
if flags & VM_CALL_KWARG != 0 {
|
||||||
|
gen_counter_incr!(asm, send_call_kwarg);
|
||||||
|
return CantCompile;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Optimize for single ractor mode and avoid runtime check for
|
||||||
|
// "defined with an un-shareable Proc in a different Ractor"
|
||||||
|
if !assume_single_ractor_mode(jit, ocb) {
|
||||||
|
gen_counter_incr!(asm, send_call_multi_ractor);
|
||||||
|
return CantCompile;
|
||||||
|
}
|
||||||
|
|
||||||
|
// About to reset the SP, need to load this here
|
||||||
|
let recv_load = asm.load(recv);
|
||||||
|
|
||||||
|
let sp = asm.lea(ctx.sp_opnd(0));
|
||||||
|
|
||||||
|
// Write interpreter SP into CFP.
|
||||||
|
// Needed in case the callee yields to the block.
|
||||||
|
jit_save_pc(jit, asm);
|
||||||
|
// Store incremented PC into current control frame in case callee raises.
|
||||||
|
gen_save_sp(jit, asm, ctx);
|
||||||
|
|
||||||
|
let kw_splat = flags & VM_CALL_KW_SPLAT;
|
||||||
|
let stack_argument_pointer = asm.lea(Opnd::mem(64, sp, -(argc) * SIZEOF_VALUE_I32));
|
||||||
|
|
||||||
|
let ret = asm.ccall(rb_optimized_call as *const u8, vec![
|
||||||
|
recv_load,
|
||||||
|
EC,
|
||||||
|
argc.into(),
|
||||||
|
stack_argument_pointer,
|
||||||
|
kw_splat.into(),
|
||||||
|
VM_BLOCK_HANDLER_NONE.into(),
|
||||||
|
]);
|
||||||
|
|
||||||
|
ctx.stack_pop(argc as usize + 1);
|
||||||
|
|
||||||
|
let stack_ret = ctx.stack_push(Type::Unknown);
|
||||||
|
asm.mov(stack_ret, ret);
|
||||||
|
return KeepCompiling;
|
||||||
|
|
||||||
}
|
}
|
||||||
OPTIMIZED_METHOD_TYPE_BLOCK_CALL => {
|
OPTIMIZED_METHOD_TYPE_BLOCK_CALL => {
|
||||||
gen_counter_incr!(asm, send_optimized_method_block_call);
|
gen_counter_incr!(asm, send_optimized_method_block_call);
|
||||||
|
|
|
@ -1480,6 +1480,16 @@ extern "C" {
|
||||||
extern "C" {
|
extern "C" {
|
||||||
pub fn rb_get_iseq_body_param_opt_table(iseq: *const rb_iseq_t) -> *const VALUE;
|
pub fn rb_get_iseq_body_param_opt_table(iseq: *const rb_iseq_t) -> *const VALUE;
|
||||||
}
|
}
|
||||||
|
extern "C" {
|
||||||
|
pub fn rb_optimized_call(
|
||||||
|
recv: *mut VALUE,
|
||||||
|
ec: *mut rb_execution_context_t,
|
||||||
|
argc: ::std::os::raw::c_int,
|
||||||
|
argv: *mut VALUE,
|
||||||
|
kw_splat: ::std::os::raw::c_int,
|
||||||
|
block_handler: VALUE,
|
||||||
|
) -> VALUE;
|
||||||
|
}
|
||||||
extern "C" {
|
extern "C" {
|
||||||
pub fn rb_leaf_invokebuiltin_iseq_p(iseq: *const rb_iseq_t) -> bool;
|
pub fn rb_leaf_invokebuiltin_iseq_p(iseq: *const rb_iseq_t) -> bool;
|
||||||
}
|
}
|
||||||
|
|
|
@ -173,6 +173,9 @@ make_counters! {
|
||||||
send_optimized_method,
|
send_optimized_method,
|
||||||
send_optimized_method_call,
|
send_optimized_method_call,
|
||||||
send_optimized_method_block_call,
|
send_optimized_method_block_call,
|
||||||
|
send_call_block,
|
||||||
|
send_call_kwarg,
|
||||||
|
send_call_multi_ractor,
|
||||||
send_missing_method,
|
send_missing_method,
|
||||||
send_refined_method,
|
send_refined_method,
|
||||||
send_cfunc_ruby_array_varg,
|
send_cfunc_ruby_array_varg,
|
||||||
|
|
Loading…
Reference in a new issue