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

Convert yjit static stat variables to counters

Browse Source
This commit is contained in:
Noah Gibbs 2021-06-28 18:06:03 +01:00 committed by Alan Wu
parent 94cb5a6b1e
commit 25792c17d4
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yjit_core.c
View File

@ -344,7 +344,7 @@ add_block_version(blockid_t blockid, block_t* block)
#if RUBY_DEBUG #if RUBY_DEBUG
// First block compiled for this iseq // First block compiled for this iseq
rb_compiled_iseq_count++; yjit_runtime_counters.compiled_iseq_count++;
#endif #endif
} }

12
yjit_iface.c
View File

@ -26,9 +26,7 @@ static VALUE mYjit;
static VALUE cYjitBlock; static VALUE cYjitBlock;
#if RUBY_DEBUG #if RUBY_DEBUG
static int64_t vm_insns_count = 0;
static int64_t exit_op_count[VM_INSTRUCTION_SIZE] = { 0 }; static int64_t exit_op_count[VM_INSTRUCTION_SIZE] = { 0 };
int64_t rb_compiled_iseq_count = 0;
struct rb_yjit_runtime_counters yjit_runtime_counters = { 0 }; struct rb_yjit_runtime_counters yjit_runtime_counters = { 0 };
static VALUE cYjitCodeComment; static VALUE cYjitCodeComment;
#endif #endif
@ -761,8 +759,6 @@ static VALUE
reset_stats_bang(rb_execution_context_t *ec, VALUE self) reset_stats_bang(rb_execution_context_t *ec, VALUE self)
{ {
#if RUBY_DEBUG #if RUBY_DEBUG
vm_insns_count = 0;
rb_compiled_iseq_count = 0;
memset(&exit_op_count, 0, sizeof(exit_op_count)); memset(&exit_op_count, 0, sizeof(exit_op_count));
memset(&yjit_runtime_counters, 0, sizeof(yjit_runtime_counters)); memset(&yjit_runtime_counters, 0, sizeof(yjit_runtime_counters));
#endif // if RUBY_DEBUG #endif // if RUBY_DEBUG
@ -777,7 +773,7 @@ reset_stats_bang(rb_execution_context_t *ec, VALUE self)
void void
rb_yjit_collect_vm_usage_insn(int insn) rb_yjit_collect_vm_usage_insn(int insn)
{ {
vm_insns_count++; yjit_runtime_counters.vm_insns_count++;
} }
void void
@ -903,16 +899,16 @@ print_yjit_stats(void)
double avg_len_in_yjit = (double)retired_in_yjit / total_exit_count; double avg_len_in_yjit = (double)retired_in_yjit / total_exit_count;
// Proportion of instructions that retire in YJIT // Proportion of instructions that retire in YJIT
int64_t total_insns_count = retired_in_yjit + vm_insns_count; int64_t total_insns_count = retired_in_yjit + yjit_runtime_counters.vm_insns_count;
double ratio = retired_in_yjit / (double)total_insns_count; double ratio = retired_in_yjit / (double)total_insns_count;
fprintf(stderr, "compiled_iseq_count: %10" PRId64 "\n", rb_compiled_iseq_count); fprintf(stderr, "compiled_iseq_count: %10" PRId64 "\n", yjit_runtime_counters.compiled_iseq_count);
fprintf(stderr, "inline_code_size: %10d\n", cb->write_pos); fprintf(stderr, "inline_code_size: %10d\n", cb->write_pos);
fprintf(stderr, "outlined_code_size: %10d\n", ocb->write_pos); fprintf(stderr, "outlined_code_size: %10d\n", ocb->write_pos);
fprintf(stderr, "total_exit_count: %10" PRId64 "\n", total_exit_count); fprintf(stderr, "total_exit_count: %10" PRId64 "\n", total_exit_count);
fprintf(stderr, "total_insns_count: %10" PRId64 "\n", total_insns_count); fprintf(stderr, "total_insns_count: %10" PRId64 "\n", total_insns_count);
fprintf(stderr, "vm_insns_count: %10" PRId64 "\n", vm_insns_count); fprintf(stderr, "vm_insns_count: %10" PRId64 "\n", yjit_runtime_counters.vm_insns_count);
fprintf(stderr, "yjit_insns_count: %10" PRId64 "\n", yjit_runtime_counters.exec_instruction); fprintf(stderr, "yjit_insns_count: %10" PRId64 "\n", yjit_runtime_counters.exec_instruction);
fprintf(stderr, "ratio_in_yjit: %9.1f%%\n", ratio * 100); fprintf(stderr, "ratio_in_yjit: %9.1f%%\n", ratio * 100);
fprintf(stderr, "avg_len_in_yjit: %10.1f\n", avg_len_in_yjit); fprintf(stderr, "avg_len_in_yjit: %10.1f\n", avg_len_in_yjit);

4
yjit_iface.h
View File

@ -75,6 +75,9 @@ YJIT_DECLARE_COUNTERS(
binding_allocations, binding_allocations,
binding_set, binding_set,
vm_insns_count,
compiled_iseq_count,
// Member with known name for iterating over counters // Member with known name for iterating over counters
last_member last_member
) )
@ -93,7 +96,6 @@ extern yjit_comment_array_t yjit_code_comments;
#endif // if RUBY_DEBUG #endif // if RUBY_DEBUG
RUBY_EXTERN struct rb_yjit_options rb_yjit_opts; RUBY_EXTERN struct rb_yjit_options rb_yjit_opts;
RUBY_EXTERN int64_t rb_compiled_iseq_count;
RUBY_EXTERN struct rb_yjit_runtime_counters yjit_runtime_counters; RUBY_EXTERN struct rb_yjit_runtime_counters yjit_runtime_counters;
void cb_write_pre_call_bytes(codeblock_t* cb); void cb_write_pre_call_bytes(codeblock_t* cb);