Skip to content

Commit

Permalink
YJIT: Add specialized codegen function for TrueClass#=== (#10640)
Browse files Browse the repository at this point in the history
* YJIT: Add specialized codegen function for `TrueClass#===`

TrueClass#=== is currently number 10 in the most frequent C calls list of the lobsters benchmark.

```
require "benchmark/ips"

def wrap
  true === true
  true === false
  true === :x
end

Benchmark.ips do |x|
  x.report(:wrap) do
    wrap
  end
end
```

```
before
Warming up --------------------------------------
                wrap     1.791M i/100ms
Calculating -------------------------------------
                wrap     17.806M (± 1.0%) i/s -     89.544M in   5.029363s

after
Warming up --------------------------------------
                wrap     4.024M i/100ms
Calculating -------------------------------------
                wrap     40.149M (± 1.1%) i/s -    201.223M in   5.012527s
```

Co-authored-by: Maxime Chevalier-Boisvert <maxime.chevalierboisvert@shopify.com>
Co-authored-by: Takashi Kokubun (k0kubun) <takashikkbn@gmail.com>
Co-authored-by: Kevin Menard <kevin.menard@shopify.com>
Co-authored-by: Alan Wu <XrXr@users.noreply.github.com>

* Fix the new test for RJIT

---------

Co-authored-by: Maxime Chevalier-Boisvert <maxime.chevalierboisvert@shopify.com>
Co-authored-by: Takashi Kokubun (k0kubun) <takashikkbn@gmail.com>
Co-authored-by: Kevin Menard <kevin.menard@shopify.com>
Co-authored-by: Alan Wu <XrXr@users.noreply.github.com>
  • Loading branch information
5 people committed Apr 29, 2024
1 parent e3bfd25 commit 845f2db
Show file tree
Hide file tree
Showing 5 changed files with 95 additions and 0 deletions.
35 changes: 35 additions & 0 deletions bootstraptest/test_yjit.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4859,3 +4859,38 @@ def foo(obj)
ret += [foo(Class), foo(Class.new)]
}

# test TrueClass#=== before and after redefining TrueClass#==
assert_equal '[[true, false, false], [true, true, false], [true, :error, :error]]', %q{
def true_eqq(x)
true === x
rescue NoMethodError
:error
end
def test
[
# first one is always true because rb_equal does object comparison before calling #==
true_eqq(true),
# these will use TrueClass#==
true_eqq(false),
true_eqq(:truthy),
]
end
results = [test]
class TrueClass
def ==(x)
!x
end
end
results << test
class TrueClass
undef_method :==
end
results << test
} unless rjit_enabled? # Not yet working on RJIT
1 change: 1 addition & 0 deletions yjit/bindgen/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,7 @@ fn main() {

// From internal/object.h
.allowlist_function("rb_class_allocate_instance")
.allowlist_function("rb_obj_equal")

// From gc.h and internal/gc.h
.allowlist_function("rb_obj_info")
Expand Down
57 changes: 57 additions & 0 deletions yjit/src/codegen.rs
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,33 @@ impl JITState {
}
}

pub fn assume_expected_cfunc(
&mut self,
asm: &mut Assembler,
ocb: &mut OutlinedCb,
class: VALUE,
method: ID,
cfunc: *mut c_void,
) -> bool {
let cme = unsafe { rb_callable_method_entry(class, method) };

if cme.is_null() {
return false;
}

let def_type = unsafe { get_cme_def_type(cme) };
if def_type != VM_METHOD_TYPE_CFUNC {
return false;
}
if unsafe { get_mct_func(get_cme_def_body_cfunc(cme)) } != cfunc {
return false;
}

self.assume_method_lookup_stable(asm, ocb, cme);

true
}

pub fn assume_method_lookup_stable(&mut self, asm: &mut Assembler, ocb: &mut OutlinedCb, cme: CmePtr) -> Option<()> {
jit_ensure_block_entry_exit(self, asm, ocb)?;
self.method_lookup_assumptions.push(cme);
Expand Down Expand Up @@ -6164,6 +6191,34 @@ fn jit_rb_class_superclass(
true
}

// Codegen for rb_trueclass_case_equal()
fn jit_rb_trueclass_case_equal(
jit: &mut JITState,
asm: &mut Assembler,
ocb: &mut OutlinedCb,
_ci: *const rb_callinfo,
_cme: *const rb_callable_method_entry_t,
_block: Option<BlockHandler>,
_argc: i32,
_known_recv_class: Option<VALUE>,
) -> bool {
if !jit.assume_expected_cfunc( asm, ocb, unsafe { rb_cTrueClass }, ID!(eq), rb_obj_equal as _) {
return false;
}

// Compare the arguments
asm_comment!(asm, "TrueClass#===");
let arg1 = asm.stack_pop(1);
let arg0 = asm.stack_pop(1);
asm.cmp(arg0, arg1);
let ret_opnd = asm.csel_e(Qtrue.into(), Qfalse.into());

let stack_ret = asm.stack_push(Type::UnknownImm);
asm.mov(stack_ret, ret_opnd);

true
}

fn jit_thread_s_current(
_jit: &mut JITState,
asm: &mut Assembler,
Expand Down Expand Up @@ -10166,6 +10221,8 @@ pub fn yjit_reg_method_codegen_fns() {
yjit_reg_method(rb_cString, "<<", jit_rb_str_concat);
yjit_reg_method(rb_cString, "+@", jit_rb_str_uplus);

yjit_reg_method(rb_cTrueClass, "===", jit_rb_trueclass_case_equal);

yjit_reg_method(rb_cArray, "empty?", jit_rb_ary_empty_p);
yjit_reg_method(rb_cArray, "length", jit_rb_ary_length);
yjit_reg_method(rb_cArray, "size", jit_rb_ary_length);
Expand Down
1 change: 1 addition & 0 deletions yjit/src/cruby.rs
Original file line number Diff line number Diff line change
Expand Up @@ -805,6 +805,7 @@ pub(crate) mod ids {
name: hash content: b"hash"
name: respond_to_missing content: b"respond_to_missing?"
name: to_ary content: b"to_ary"
name: eq content: b"=="
}
}

Expand Down
1 change: 1 addition & 0 deletions yjit/src/cruby_bindings.inc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1024,6 +1024,7 @@ extern "C" {
pub fn rb_attr_get(obj: VALUE, name: ID) -> VALUE;
pub fn rb_obj_info_dump(obj: VALUE);
pub fn rb_class_allocate_instance(klass: VALUE) -> VALUE;
pub fn rb_obj_equal(obj1: VALUE, obj2: VALUE) -> VALUE;
pub fn rb_reg_new_ary(ary: VALUE, options: ::std::os::raw::c_int) -> VALUE;
pub fn rb_ary_tmp_new_from_values(
arg1: VALUE,
Expand Down

0 comments on commit 845f2db

Please sign in to comment.