ZJIT: Add zjit_alloc_bytes and total_mem_bytes stats (ruby#15059)

Author: k0kubun

zjit.rb

@@ -211,6 +211,9 @@ def stats_string
       :guard_shape_exit_ratio,
 
       :code_region_bytes,
+      :zjit_alloc_bytes,
+      :total_mem_bytes,
+
       :side_exit_count,
       :total_insn_count,
       :vm_insn_count,

zjit/src/stats.rs

@@ -550,7 +550,10 @@ pub extern "C" fn rb_zjit_stats(_ec: EcPtr, _self: VALUE, target_key: VALUE) ->
     }
 
     // Memory usage stats
-    set_stat_usize!(hash, "code_region_bytes", ZJITState::get_code_block().mapped_region_size());
+    let code_region_bytes = ZJITState::get_code_block().mapped_region_size();
+    set_stat_usize!(hash, "code_region_bytes", code_region_bytes);
+    set_stat_usize!(hash, "zjit_alloc_bytes", zjit_alloc_bytes());
+    set_stat_usize!(hash, "total_mem_bytes", code_region_bytes + zjit_alloc_bytes());
 
     // End of default stats. Every counter beyond this is provided only for --zjit-stats.
     if !get_option!(stats) {
@@ -645,7 +648,7 @@ pub fn with_time_stat<F, R>(counter: Counter, func: F) -> R where F: FnOnce() ->
 }
 
 /// The number of bytes ZJIT has allocated on the Rust heap.
-pub fn zjit_alloc_size() -> usize {
+pub fn zjit_alloc_bytes() -> usize {
     jit::GLOBAL_ALLOCATOR.alloc_size.load(Ordering::SeqCst)
 }
 

zjit/src/virtualmem.rs

@@ -5,7 +5,7 @@
 
 use std::ptr::NonNull;
 use crate::cruby::*;
-use crate::stats::zjit_alloc_size;
+use crate::stats::zjit_alloc_bytes;
 
 pub type VirtualMem = VirtualMemory<sys::SystemAllocator>;
 
@@ -199,7 +199,7 @@ impl<A: Allocator> VirtualMemory<A> {
             // Ignore zjit_alloc_size() if self.memory_limit_bytes is None for testing
             let mut required_region_bytes = page_addr + page_size - start as usize;
             if self.memory_limit_bytes.is_some() {
-                required_region_bytes += zjit_alloc_size();
+                required_region_bytes += zjit_alloc_bytes();
             }
 
             assert!((start..=whole_region_end).contains(&mapped_region_end));