https://git.ruby-lang.org/ruby.git/commit/?id=68e0523484

From 68e05234848e8cd0dae7ba9f27a17f9220236fba Mon Sep 17 00:00:00 2001
From: Takashi Kokubun <takashikkbn@g...>
Date: Sun, 13 Nov 2022 13:58:50 -0800
Subject: Remove unused debug counters

The structure and readability of jit_exec is messed up right now. I'd
like to help the current situation by this for now. I'll resurrect
them when I need it again.
---
 debug_counter.h |  7 -------
 vm.c            | 22 +---------------------
 2 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/debug_counter.h b/debug_counter.h
index f3a799913b..bcc19f6231 100644
--- a/debug_counter.h
+++ b/debug_counter.h
@@ -346,13 +346,6 @@ RB_DEBUG_COUNTER(vm_sync_lock_enter_nb) https://github.com/ruby/ruby/blob/trunk/debug_counter.h#L346
 RB_DEBUG_COUNTER(vm_sync_lock_enter_cr)
 RB_DEBUG_COUNTER(vm_sync_barrier)
 
-/* jit_exec() counts */
-RB_DEBUG_COUNTER(jit_exec)
-RB_DEBUG_COUNTER(mjit_exec_not_added)
-RB_DEBUG_COUNTER(mjit_exec_not_ready)
-RB_DEBUG_COUNTER(mjit_exec_not_compiled)
-RB_DEBUG_COUNTER(mjit_exec_call_func)
-
 /* MJIT enqueue / unload */
 RB_DEBUG_COUNTER(mjit_add_iseq_to_process)
 RB_DEBUG_COUNTER(mjit_unload_units)
diff --git a/vm.c b/vm.c
index 058c361183..b441d70716 100644
--- a/vm.c
+++ b/vm.c
@@ -391,7 +391,6 @@ mjit_check_iseq(rb_execution_context_t *ec, const rb_iseq_t *iseq, struct rb_ise https://github.com/ruby/ruby/blob/trunk/vm.c#L391
     ASSUME(func_i <= LAST_JIT_ISEQ_FUNC);
     switch ((enum rb_mjit_iseq_func)func_i) {
       case NOT_ADDED_JIT_ISEQ_FUNC:
-        RB_DEBUG_COUNTER_INC(mjit_exec_not_added);
         if (body->total_calls == mjit_opts.min_calls) {
             rb_mjit_add_iseq_to_process(iseq);
             if (UNLIKELY(mjit_opts.wait && (uintptr_t)body->jit_func > LAST_JIT_ISEQ_FUNC)) {
@@ -400,11 +399,7 @@ mjit_check_iseq(rb_execution_context_t *ec, const rb_iseq_t *iseq, struct rb_ise https://github.com/ruby/ruby/blob/trunk/vm.c#L399
         }
         break;
       case NOT_READY_JIT_ISEQ_FUNC:
-        RB_DEBUG_COUNTER_INC(mjit_exec_not_ready);
-        break;
       case NOT_COMPILED_JIT_ISEQ_FUNC:
-        RB_DEBUG_COUNTER_INC(mjit_exec_not_compiled);
-        break;
       default: // to avoid warning with LAST_JIT_ISEQ_FUNC
         break;
     }
@@ -443,8 +438,6 @@ jit_exec(rb_execution_context_t *ec) https://github.com/ruby/ruby/blob/trunk/vm.c#L438
     if (!(mjit_call_p || yjit_enabled))
         return Qundef;
 
-    RB_DEBUG_COUNTER_INC(jit_exec);
-
     mjit_func_t func = body->jit_func;
 
     // YJIT tried compiling this function once before and couldn't do
@@ -454,23 +447,10 @@ jit_exec(rb_execution_context_t *ec) https://github.com/ruby/ruby/blob/trunk/vm.c#L447
     }
 
     if (UNLIKELY((uintptr_t)func <= LAST_JIT_ISEQ_FUNC)) {
-# ifdef MJIT_HEADER
-        RB_DEBUG_COUNTER_INC(mjit_frame_JT2VM);
-# else
-        RB_DEBUG_COUNTER_INC(mjit_frame_VM2VM);
-# endif
         return mjit_check_iseq(ec, iseq, body);
     }
 
-# ifdef MJIT_HEADER
-    RB_DEBUG_COUNTER_INC(mjit_frame_JT2JT);
-# else
-    RB_DEBUG_COUNTER_INC(mjit_frame_VM2JT);
-# endif
-    RB_DEBUG_COUNTER_INC(mjit_exec_call_func);
-    // Under SystemV x64 calling convention
-    // ec -> RDI
-    // cfp -> RSI
+    // Under SystemV x64 calling convention: ec -> RDI, cfp -> RSI
     return func(ec, ec->cfp);
 }
 #endif
-- 
cgit v1.2.3


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/