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

Remove unused debug counters

Browse Source 
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.
This commit is contained in:
Takashi Kokubun 2022-11-13 13:58:50 -08:00
parent 6246788bc4
commit 68e0523484
No known key found for this signature in database
GPG Key ID: 6FFC433B12EE23DD
2 changed files with 1 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debug_counter.h
View File

@ -346,13 +346,6 @@ RB_DEBUG_COUNTER(vm_sync_lock_enter_nb)
RB_DEBUG_COUNTER(vm_sync_lock_enter_cr) RB_DEBUG_COUNTER(vm_sync_lock_enter_cr)
RB_DEBUG_COUNTER(vm_sync_barrier) 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 */ /* MJIT enqueue / unload */
RB_DEBUG_COUNTER(mjit_add_iseq_to_process) RB_DEBUG_COUNTER(mjit_add_iseq_to_process)
RB_DEBUG_COUNTER(mjit_unload_units) RB_DEBUG_COUNTER(mjit_unload_units)

22
vm.c
View File

@ -391,7 +391,6 @@ mjit_check_iseq(rb_execution_context_t *ec, const rb_iseq_t *iseq, struct rb_ise
ASSUME(func_i <= LAST_JIT_ISEQ_FUNC); ASSUME(func_i <= LAST_JIT_ISEQ_FUNC);
switch ((enum rb_mjit_iseq_func)func_i) { switch ((enum rb_mjit_iseq_func)func_i) {
case NOT_ADDED_JIT_ISEQ_FUNC: case NOT_ADDED_JIT_ISEQ_FUNC:
RB_DEBUG_COUNTER_INC(mjit_exec_not_added);
if (body->total_calls == mjit_opts.min_calls) { if (body->total_calls == mjit_opts.min_calls) {
rb_mjit_add_iseq_to_process(iseq); rb_mjit_add_iseq_to_process(iseq);
if (UNLIKELY(mjit_opts.wait && (uintptr_t)body->jit_func > LAST_JIT_ISEQ_FUNC)) { 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
} }
break; break;
case NOT_READY_JIT_ISEQ_FUNC: case NOT_READY_JIT_ISEQ_FUNC:
RB_DEBUG_COUNTER_INC(mjit_exec_not_ready);
break;
case NOT_COMPILED_JIT_ISEQ_FUNC: case NOT_COMPILED_JIT_ISEQ_FUNC:
RB_DEBUG_COUNTER_INC(mjit_exec_not_compiled);
break;
default: // to avoid warning with LAST_JIT_ISEQ_FUNC default: // to avoid warning with LAST_JIT_ISEQ_FUNC
break; break;
} }
@ -443,8 +438,6 @@ jit_exec(rb_execution_context_t *ec)
if (!(mjit_call_p || yjit_enabled)) if (!(mjit_call_p || yjit_enabled))
return Qundef; return Qundef;
RB_DEBUG_COUNTER_INC(jit_exec);
mjit_func_t func = body->jit_func; mjit_func_t func = body->jit_func;
// YJIT tried compiling this function once before and couldn't do // YJIT tried compiling this function once before and couldn't do
@ -454,23 +447,10 @@ jit_exec(rb_execution_context_t *ec)
} }
if (UNLIKELY((uintptr_t)func <= LAST_JIT_ISEQ_FUNC)) { 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); return mjit_check_iseq(ec, iseq, body);
} }
# ifdef MJIT_HEADER // Under SystemV x64 calling convention: ec -> RDI, cfp -> RSI
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
return func(ec, ec->cfp); return func(ec, ec->cfp);
} }
#endif #endif