1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

YJIT: Don't side-exit on too-complex shapes (#7298)

Browse Source
This commit is contained in:
Takashi Kokubun 2023-02-14 09:12:48 -08:00 committed by GitHub
parent e5e506095c
commit 55af69b15e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
Notes: git 2023-02-14 17:13:08 +00:00 
Merged-By: maximecb <maximecb@ruby-lang.org>
2 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
yjit/src/codegen.rs
View File

@ -1975,12 +1975,6 @@ fn gen_get_ivar(
recv_opnd: YARVOpnd, recv_opnd: YARVOpnd,
side_exit: Target, side_exit: Target,
) -> CodegenStatus { ) -> CodegenStatus {
// If the object has a too complex shape, we exit
if comptime_receiver.shape_too_complex() {
gen_counter_incr!(asm, getivar_too_complex);
return CantCompile;
}
let comptime_val_klass = comptime_receiver.class_of(); let comptime_val_klass = comptime_receiver.class_of();
let starting_context = ctx.clone(); // make a copy for use with jit_chain_guard let starting_context = ctx.clone(); // make a copy for use with jit_chain_guard
@ -2007,7 +2001,8 @@ fn gen_get_ivar(
// NOTE: This assumes nobody changes the allocator of the class after allocation. // NOTE: This assumes nobody changes the allocator of the class after allocation.
// Eventually, we can encode whether an object is T_OBJECT or not // Eventually, we can encode whether an object is T_OBJECT or not
// inside object shapes. // inside object shapes.
if !receiver_t_object || uses_custom_allocator { // too-complex shapes can't use index access, so we use rb_ivar_get for them too.
if !receiver_t_object || uses_custom_allocator || comptime_receiver.shape_too_complex() {
// General case. Call rb_ivar_get(). // General case. Call rb_ivar_get().
// VALUE rb_ivar_get(VALUE obj, ID id) // VALUE rb_ivar_get(VALUE obj, ID id)
asm.comment("call rb_ivar_get()"); asm.comment("call rb_ivar_get()");
@ -2214,11 +2209,6 @@ fn gen_setinstancevariable(
gen_counter_incr!(asm, setivar_frozen); gen_counter_incr!(asm, setivar_frozen);
return CantCompile; return CantCompile;
} }
// If the object has a too complex shape, we will also exit
if comptime_receiver.shape_too_complex() {
gen_counter_incr!(asm, setivar_too_complex);
return CantCompile;
}
let (_, stack_type) = ctx.get_opnd_mapping(StackOpnd(0)); let (_, stack_type) = ctx.get_opnd_mapping(StackOpnd(0));
@ -2236,8 +2226,9 @@ fn gen_setinstancevariable(
let receiver_t_object = unsafe { RB_TYPE_P(comptime_receiver, RUBY_T_OBJECT) }; let receiver_t_object = unsafe { RB_TYPE_P(comptime_receiver, RUBY_T_OBJECT) };
// If the receiver isn't a T_OBJECT, or uses a custom allocator, // If the receiver isn't a T_OBJECT, or uses a custom allocator,
// then just write out the IV write as a function call // then just write out the IV write as a function call.
if !receiver_t_object || uses_custom_allocator { // too-complex shapes can't use index access, so we use rb_ivar_get for them too.
if !receiver_t_object || uses_custom_allocator || comptime_receiver.shape_too_complex() {
asm.comment("call rb_vm_setinstancevariable()"); asm.comment("call rb_vm_setinstancevariable()");
let ic = jit_get_arg(jit, 1).as_u64(); // type IVC let ic = jit_get_arg(jit, 1).as_u64(); // type IVC

2
yjit/src/stats.rs
View File

@ -265,7 +265,6 @@ make_counters! {
getivar_se_self_not_heap, getivar_se_self_not_heap,
getivar_idx_out_of_range, getivar_idx_out_of_range,
getivar_megamorphic, getivar_megamorphic,
getivar_too_complex,
setivar_se_self_not_heap, setivar_se_self_not_heap,
setivar_idx_out_of_range, setivar_idx_out_of_range,
@ -274,7 +273,6 @@ make_counters! {
setivar_not_object, setivar_not_object,
setivar_frozen, setivar_frozen,
setivar_megamorphic, setivar_megamorphic,
setivar_too_complex,
oaref_argc_not_one, oaref_argc_not_one,
oaref_arg_not_fixnum, oaref_arg_not_fixnum,