YJIT: Add JIT compilation of C function substitutions to the compilat…

…ion log.

yjit/src/codegen.rs

@@ -458,6 +458,7 @@ macro_rules! perf_call {
 }
 
 use crate::codegen::JCCKinds::*;
+use crate::compilation_log::CompilationLog;
 
 #[allow(non_camel_case_types, unused)]
 pub enum JCCKinds {
@@ -6567,6 +6568,9 @@ fn gen_send_cfunc(
  perf_call!("gen_send_cfunc: ", known_cfunc_codegen(jit, asm, ci, cme, block, argc, recv_known_class))
  };
 
+ let method_id = unsafe { (*cme).called_id };
+ CompilationLog::add_cfunc(recv_known_class.unwrap(), method_id);
+
  if cfunc_codegen {
  assert_eq!(expected_stack_after, asm.ctx.get_stack_size() as i32);
  gen_counter_incr(jit, asm, Counter::num_send_cfunc_inline);

yjit/src/compilation_log.rs

@@ -8,18 +8,42 @@ use crate::yjit::yjit_enabled_p;
 
 use std::os::raw::c_long;
 
-#[derive(Copy, Clone)]
-pub struct CompilationLogEntry {
- /// The compiled block.
- pub block_id: BlockId,
+type Timestamp = f64;
 
+#[derive(Copy, Clone, Debug)]
+pub struct CompilationLogEntry {
  /// The time when the block was compiled.
- pub timestamp: f64,
+ pub timestamp: Timestamp,
+
+ /// The compilation event payload.
+ pub payload: CompilationLogPayload,
+}
+
+#[derive(Copy, Clone, Debug)]
+pub enum CompilationLogPayload {
+ ISeq(BlockId),
+ CFunc(VALUE, ID)
+}
+
+impl Display for CompilationLogPayload {
+ fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+ match self {
+ CompilationLogPayload::ISeq(block_id) => {
+ write!(f, "{}", block_id.iseq_name())
+ }
+ CompilationLogPayload::CFunc(class, method_id) => {
+ let class_name = cstr_to_rust_string(unsafe { rb_class2name(*class) });
+ let method_name = cstr_to_rust_string(unsafe { rb_id2name(*method_id) });
+
+ write!(f, "<cfunc> {}#{}", class_name.unwrap(), method_name.unwrap())
+ }
+ }
+ }
 }
 
 impl Display for CompilationLogEntry {
  fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
- write!(f, "{:15.6}: {}", self.timestamp, self.block_id.iseq_name())
+ write!(f, "{:15.6}: {}", self.timestamp, self.payload)
  }
 }
 
@@ -45,13 +69,21 @@ impl CompilationLog {
  }
  }
 
- pub fn add_entry(block_id: BlockId) {
+ pub fn add_iseq(block_id: BlockId) {
+ Self::add_payload(CompilationLogPayload::ISeq(block_id))
+ }
+
+ pub fn add_cfunc(class: VALUE, method_id: ID) {
+ Self::add_payload(CompilationLogPayload::CFunc(class, method_id))
+ }
+
+ fn add_payload(payload: CompilationLogPayload) {
  let print_compilation_log = get_option!(print_compilation_log);
  let timestamp = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_secs_f64();
 
  let entry = CompilationLogEntry {
- block_id,
- timestamp
+ timestamp,
+ payload
  };
 
  match print_compilation_log {
@@ -61,7 +93,7 @@ impl CompilationLog {
 
  // Write with the fd opened during boot
  let mut file = unsafe { std::fs::File::from_raw_fd(fd) };
- writeln!(file, "{}", entry).unwrap();
+ writeln!(file, "{}", payload).unwrap();
  file.flush().unwrap();
  file.into_raw_fd(); // keep the fd open
  },
@@ -201,7 +233,7 @@ fn rb_yjit_get_compilation_log_array() -> VALUE {
  for entry in log.iter() {
  unsafe {
  let entry_array = rb_ary_new_capa(2);
- rb_ary_push(entry_array, entry.block_id.iseq_name().into());
+ rb_ary_push(entry_array, entry.payload.to_string().into());
  rb_ary_push(entry_array, rb_float_new(entry.timestamp));
  rb_ary_push(array, entry_array);
  }

yjit/src/core.rs

@@ -3234,7 +3234,7 @@ pub fn gen_entry_point(iseq: IseqPtr, ec: EcPtr, jit_exception: bool) -> Option<
  // Count the number of entry points we compile
  incr_counter!(compiled_iseq_entry);
 
- CompilationLog::add_entry(blockid);
+ CompilationLog::add_iseq(blockid);
 
  // Compilation successful and block not empty
  code_ptr.map(|ptr| ptr.raw_ptr(cb))