ZJIT: Create dedicated def_type counter for Send

Author: st0012

zjit.rb

@@ -159,7 +159,8 @@ def stats_string
     print_counters_with_prefix(prefix: 'not_annotated_cfuncs_', prompt: 'not annotated C methods', buf:, stats:, limit: 20)
 
     # Show fallback counters, ordered by the typical amount of fallbacks for the prefix at the time
-    print_counters_with_prefix(prefix: 'unspecialized_def_type_', prompt: 'not optimized method types', buf:, stats:, limit: 20)
+    print_counters_with_prefix(prefix: 'unspecialized_send_def_type_', prompt: 'not optimized method types for send', buf:, stats:, limit: 20)
+    print_counters_with_prefix(prefix: 'unspecialized_send_without_block_def_type_', prompt: 'not optimized method types for send_without_block', buf:, stats:, limit: 20)
     print_counters_with_prefix(prefix: 'not_optimized_yarv_insn_', prompt: 'not optimized instructions', buf:, stats:, limit: 20)
     print_counters_with_prefix(prefix: 'send_fallback_', prompt: 'send fallback reasons', buf:, stats:, limit: 20)
 

zjit/src/codegen.rs

@@ -15,7 +15,7 @@ use crate::invariants::{
 };
 use crate::gc::{append_gc_offsets, get_or_create_iseq_payload, get_or_create_iseq_payload_ptr, IseqCodePtrs, IseqPayload, IseqStatus};
 use crate::state::ZJITState;
-use crate::stats::{send_fallback_counter, exit_counter_for_compile_error, incr_counter, incr_counter_by, send_fallback_counter_for_method_type, send_fallback_counter_ptr_for_opcode, CompileError};
+use crate::stats::{send_fallback_counter, exit_counter_for_compile_error, incr_counter, incr_counter_by, send_fallback_counter_for_method_type, send_without_block_fallback_counter_for_method_type, send_fallback_counter_ptr_for_opcode, CompileError};
 use crate::stats::{counter_ptr, with_time_stat, Counter, Counter::{compile_time_ns, exit_compile_error}};
 use crate::{asm::CodeBlock, cruby::*, options::debug, virtualmem::CodePtr};
 use crate::backend::lir::{self, asm_comment, asm_ccall, Assembler, Opnd, Target, CFP, C_ARG_OPNDS, C_RET_OPND, EC, NATIVE_STACK_PTR, NATIVE_BASE_PTR, SCRATCH_OPND, SP};
@@ -1616,7 +1616,10 @@ fn gen_incr_send_fallback_counter(asm: &mut Assembler, reason: SendFallbackReaso
         NotOptimizedInstruction(opcode) => {
             gen_incr_counter_ptr(asm, send_fallback_counter_ptr_for_opcode(opcode));
         }
-        SendWithoutBlockNotOptimizedMethodType(method_type) | SendNotOptimizedMethodType(method_type) => {
+        SendWithoutBlockNotOptimizedMethodType(method_type) => {
+            gen_incr_counter(asm, send_without_block_fallback_counter_for_method_type(method_type));
+        }
+        SendNotOptimizedMethodType(method_type) => {
             gen_incr_counter(asm, send_fallback_counter_for_method_type(method_type));
         }
         _ => {}

zjit/src/stats.rs

@@ -188,20 +188,35 @@ make_counters! {
     dynamic_getivar_count,
     dynamic_setivar_count,
 
-    // Method call def_type related to fallback to dynamic dispatch
-    unspecialized_def_type_iseq,
-    unspecialized_def_type_cfunc,
-    unspecialized_def_type_attrset,
-    unspecialized_def_type_ivar,
-    unspecialized_def_type_bmethod,
-    unspecialized_def_type_zsuper,
-    unspecialized_def_type_alias,
-    unspecialized_def_type_undef,
-    unspecialized_def_type_not_implemented,
-    unspecialized_def_type_optimized,
-    unspecialized_def_type_missing,
-    unspecialized_def_type_refined,
-    unspecialized_def_type_null,
+    // Method call def_type related to send without block fallback to dynamic dispatch
+    unspecialized_send_without_block_def_type_iseq,
+    unspecialized_send_without_block_def_type_cfunc,
+    unspecialized_send_without_block_def_type_attrset,
+    unspecialized_send_without_block_def_type_ivar,
+    unspecialized_send_without_block_def_type_bmethod,
+    unspecialized_send_without_block_def_type_zsuper,
+    unspecialized_send_without_block_def_type_alias,
+    unspecialized_send_without_block_def_type_undef,
+    unspecialized_send_without_block_def_type_not_implemented,
+    unspecialized_send_without_block_def_type_optimized,
+    unspecialized_send_without_block_def_type_missing,
+    unspecialized_send_without_block_def_type_refined,
+    unspecialized_send_without_block_def_type_null,
+
+    // Method call def_type related to send fallback to dynamic dispatch
+    unspecialized_send_def_type_iseq,
+    unspecialized_send_def_type_cfunc,
+    unspecialized_send_def_type_attrset,
+    unspecialized_send_def_type_ivar,
+    unspecialized_send_def_type_bmethod,
+    unspecialized_send_def_type_zsuper,
+    unspecialized_send_def_type_alias,
+    unspecialized_send_def_type_undef,
+    unspecialized_send_def_type_not_implemented,
+    unspecialized_send_def_type_optimized,
+    unspecialized_send_def_type_missing,
+    unspecialized_send_def_type_refined,
+    unspecialized_send_def_type_null,
 
     // Writes to the VM frame
     vm_write_pc_count,
@@ -332,24 +347,45 @@ pub fn send_fallback_counter(reason: crate::hir::SendFallbackReason) -> Counter
     }
 }
 
+pub fn send_without_block_fallback_counter_for_method_type(method_type: crate::hir::MethodType) -> Counter {
+    use crate::hir::MethodType::*;
+    use crate::stats::Counter::*;
+
+    match method_type {
+        Iseq => unspecialized_send_without_block_def_type_iseq,
+        Cfunc => unspecialized_send_without_block_def_type_cfunc,
+        Attrset => unspecialized_send_without_block_def_type_attrset,
+        Ivar => unspecialized_send_without_block_def_type_ivar,
+        Bmethod => unspecialized_send_without_block_def_type_bmethod,
+        Zsuper => unspecialized_send_without_block_def_type_zsuper,
+        Alias => unspecialized_send_without_block_def_type_alias,
+        Undefined => unspecialized_send_without_block_def_type_undef,
+        NotImplemented => unspecialized_send_without_block_def_type_not_implemented,
+        Optimized => unspecialized_send_without_block_def_type_optimized,
+        Missing => unspecialized_send_without_block_def_type_missing,
+        Refined => unspecialized_send_without_block_def_type_refined,
+        Null => unspecialized_send_without_block_def_type_null,
+    }
+}
+
 pub fn send_fallback_counter_for_method_type(method_type: crate::hir::MethodType) -> Counter {
     use crate::hir::MethodType::*;
     use crate::stats::Counter::*;
 
     match method_type {
-        Iseq => unspecialized_def_type_iseq,
-        Cfunc => unspecialized_def_type_cfunc,
-        Attrset => unspecialized_def_type_attrset,
-        Ivar => unspecialized_def_type_ivar,
-        Bmethod => unspecialized_def_type_bmethod,
-        Zsuper => unspecialized_def_type_zsuper,
-        Alias => unspecialized_def_type_alias,
-        Undefined => unspecialized_def_type_undef,
-        NotImplemented => unspecialized_def_type_not_implemented,
-        Optimized => unspecialized_def_type_optimized,
-        Missing => unspecialized_def_type_missing,
-        Refined => unspecialized_def_type_refined,
-        Null => unspecialized_def_type_null,
+        Iseq => unspecialized_send_def_type_iseq,
+        Cfunc => unspecialized_send_def_type_cfunc,
+        Attrset => unspecialized_send_def_type_attrset,
+        Ivar => unspecialized_send_def_type_ivar,
+        Bmethod => unspecialized_send_def_type_bmethod,
+        Zsuper => unspecialized_send_def_type_zsuper,
+        Alias => unspecialized_send_def_type_alias,
+        Undefined => unspecialized_send_def_type_undef,
+        NotImplemented => unspecialized_send_def_type_not_implemented,
+        Optimized => unspecialized_send_def_type_optimized,
+        Missing => unspecialized_send_def_type_missing,
+        Refined => unspecialized_send_def_type_refined,
+        Null => unspecialized_send_def_type_null,
     }
 }