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

ZJIT: Emit CCall if we know the type statically, not just from profiles (#13173)

Browse Source 
Emit CCall if we know the type statically, not just from profiles
This commit is contained in:
Max Bernstein 2025-04-25 12:33:51 -04:00 committed by GitHub
parent c772d2691d
commit 871d07a20e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
Notes: git 2025-04-25 16:34:11 +00:00 
Merged-By: k0kubun <takashikkbn@gmail.com>
1 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
zjit/src/hir.rs
View File

@ -1028,10 +1028,11 @@ impl Function {
fun: &mut Function, fun: &mut Function,
block: BlockId, block: BlockId,
payload: &profile::IseqPayload, payload: &profile::IseqPayload,
self_type: Type,
send: Insn, send: Insn,
send_insn_id: InsnId, send_insn_id: InsnId,
) -> Result<(), ()> { ) -> Result<(), ()> {
let Insn::SendWithoutBlock { self_val, cd, mut args, state, .. } = send else { let Insn::SendWithoutBlock { mut self_val, cd, mut args, state, .. } = send else {
return Err(()); return Err(());
}; };
@ -1045,13 +1046,14 @@ impl Function {
// TODO(alan): there was a seemingly a miscomp here if you swap with // TODO(alan): there was a seemingly a miscomp here if you swap with
// `inexact_ruby_class`. Theoretically it can call a method too general // `inexact_ruby_class`. Theoretically it can call a method too general
// for the receiver. Confirm and add a test. // for the receiver. Confirm and add a test.
// let (recv_class, guard_type) = if let Some(klass) = self_type.runtime_exact_ruby_class() {
// TODO(max): Use runtime_exact_ruby_class so we can also specialize on known (not just (klass, None)
// profiled) types. } else {
let (recv_class, recv_type) = payload.get_operand_types(iseq_insn_idx) payload.get_operand_types(iseq_insn_idx)
.and_then(|types| types.get(argc as usize)) .and_then(|types| types.get(argc as usize))
.and_then(|recv_type| recv_type.exact_ruby_class().and_then(|class| Some((class, recv_type)))) .and_then(|recv_type| recv_type.exact_ruby_class().and_then(|class| Some((class, Some(recv_type.unspecialized())))))
.ok_or(())?; .ok_or(())?
};
// Do method lookup // Do method lookup
let method = unsafe { rb_callable_method_entry(recv_class, method_id) }; let method = unsafe { rb_callable_method_entry(recv_class, method_id) };
@ -1090,8 +1092,10 @@ impl Function {
if ci_flags & VM_CALL_ARGS_SIMPLE != 0 { if ci_flags & VM_CALL_ARGS_SIMPLE != 0 {
// Commit to the replacement. Put PatchPoint. // Commit to the replacement. Put PatchPoint.
fun.push_insn(block, Insn::PatchPoint(Invariant::MethodRedefined { klass: recv_class, method: method_id })); fun.push_insn(block, Insn::PatchPoint(Invariant::MethodRedefined { klass: recv_class, method: method_id }));
// Guard receiver class if let Some(guard_type) = guard_type {
let self_val = fun.push_insn(block, Insn::GuardType { val: self_val, guard_type: recv_type.unspecialized(), state }); // Guard receiver class
self_val = fun.push_insn(block, Insn::GuardType { val: self_val, guard_type, state });
}
let cfun = unsafe { get_mct_func(cfunc) }.cast(); let cfun = unsafe { get_mct_func(cfunc) }.cast();
let mut cfunc_args = vec![self_val]; let mut cfunc_args = vec![self_val];
cfunc_args.append(&mut args); cfunc_args.append(&mut args);
@ -1119,8 +1123,9 @@ impl Function {
let old_insns = std::mem::take(&mut self.blocks[block.0].insns); let old_insns = std::mem::take(&mut self.blocks[block.0].insns);
assert!(self.blocks[block.0].insns.is_empty()); assert!(self.blocks[block.0].insns.is_empty());
for insn_id in old_insns { for insn_id in old_insns {
if let send @ Insn::SendWithoutBlock { .. } = self.find(insn_id) { if let send @ Insn::SendWithoutBlock { self_val, .. } = self.find(insn_id) {
if reduce_to_ccall(self, block, payload, send, insn_id).is_ok() { let self_type = self.type_of(self_val);
if reduce_to_ccall(self, block, payload, self_type, send, insn_id).is_ok() {
continue; continue;
} }
} }
@ -3330,7 +3335,7 @@ mod opt_tests {
} }
#[test] #[test]
fn kernel_itself_simple() { fn kernel_itself_const() {
eval(" eval("
def test(x) = x.itself def test(x) = x.itself
test(0) # profile test(0) # profile
@ -3346,6 +3351,21 @@ mod opt_tests {
"#]]); "#]]);
} }
#[test]
fn kernel_itself_known_type() {
eval("
def test = [].itself
");
assert_optimized_method_hir("test", expect![[r#"
fn test:
bb0():
v2:ArrayExact = NewArray
PatchPoint MethodRedefined(Array@0x1000, itself@0x1008)
v7:BasicObject = CCall itself@0x1010, v2
Return v7
"#]]);
}
#[test] #[test]
fn kernel_itself_argc_mismatch() { fn kernel_itself_argc_mismatch() {
eval(" eval("
@ -3412,8 +3432,8 @@ mod opt_tests {
v1:StringExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) v1:StringExact[VALUE(0x1000)] = Const Value(VALUE(0x1000))
v2:StringExact = StringCopy v1 v2:StringExact = StringCopy v1
PatchPoint MethodRedefined(String@0x1008, bytesize@0x1010) PatchPoint MethodRedefined(String@0x1008, bytesize@0x1010)
v8:Fixnum = CCall bytesize@0x1018, v2 v7:Fixnum = CCall bytesize@0x1018, v2
Return v8 Return v7
"#]]); "#]]);
} }
} }