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

Implement --ujit-call-threshold

Browse Source
This commit is contained in:
Maxime Chevalier-Boisvert 2021-02-23 15:22:20 -05:00 committed by Alan Wu
parent 58657b33e7
commit 0710bec01e
4 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mjit.h
View File

@ -150,7 +150,7 @@ mjit_exec(rb_execution_context_t *ec)
} }
#ifndef MJIT_HEADER #ifndef MJIT_HEADER
if (rb_ujit_enabled_p() && !mjit_call_p && body->total_calls == UJIT_CALL_THRESHOLD) { if (rb_ujit_enabled_p() && !mjit_call_p && body->total_calls == rb_ujit_call_threshold()) {
rb_ujit_compile_iseq(iseq); rb_ujit_compile_iseq(iseq);
return Qundef; return Qundef;
} }

7
ruby.c
View File

@ -1033,12 +1033,13 @@ set_option_encoding_once(const char *type, VALUE *name, const char *e, long elen
static void static void
setup_ujit_options(const char *s, struct rb_ujit_options *ujit_opt) setup_ujit_options(const char *s, struct rb_ujit_options *ujit_opt)
{ {
*ujit_opt = (struct rb_ujit_options) { 0 };
if (*s != '-') return; if (*s != '-') return;
const size_t l = strlen(++s); const size_t l = strlen(++s);
if (opt_match_noarg(s, l, "stats")) { if (opt_match_arg(s, l, "call-threshold")) {
ujit_opt->call_threshold = atoi(s + 1);
}
else if (opt_match_noarg(s, l, "stats")) {
ujit_opt->gen_stats = true; ujit_opt->gen_stats = true;
} }
else { else {

19
ujit.h
View File

@ -32,22 +32,21 @@ typedef struct rb_iseq_struct rb_iseq_t;
#endif #endif
struct rb_ujit_options { struct rb_ujit_options {
bool ujit_enabled;
// Number of method calls after which to start generating code
// Threshold==1 means compile on first execution
unsigned call_threshold;
// Capture and print out stats
bool gen_stats; bool gen_stats;
}; };
RUBY_SYMBOL_EXPORT_BEGIN RUBY_SYMBOL_EXPORT_BEGIN
RUBY_EXTERN bool rb_ujit_enabled; bool rb_ujit_enabled_p(void);
unsigned rb_ujit_call_threshold(void);
RUBY_SYMBOL_EXPORT_END RUBY_SYMBOL_EXPORT_END
static inline
bool rb_ujit_enabled_p(void)
{
return rb_ujit_enabled;
}
// Threshold==1 means compile on first execution
#define UJIT_CALL_THRESHOLD (2u)
void rb_ujit_collect_vm_usage_insn(int insn); void rb_ujit_collect_vm_usage_insn(int insn);
void rb_ujit_method_lookup_change(VALUE cme_or_cc); void rb_ujit_method_lookup_change(VALUE cme_or_cc);
void rb_ujit_compile_iseq(const rb_iseq_t *iseq); void rb_ujit_compile_iseq(const rb_iseq_t *iseq);

20
ujit_iface.c
View File

@ -24,12 +24,12 @@ VALUE cUjitBlock;
VALUE cUjitDisasm; VALUE cUjitDisasm;
VALUE cUjitDisasmInsn; VALUE cUjitDisasmInsn;
bool rb_ujit_enabled; #if RUBY_DEBUG
static int64_t vm_insns_count = 0; static int64_t vm_insns_count = 0;
int64_t rb_ujit_exec_insns_count = 0; int64_t rb_ujit_exec_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; int64_t rb_compiled_iseq_count = 0;
#endif
// Machine code blocks (executable memory) // Machine code blocks (executable memory)
extern codeblock_t *cb; extern codeblock_t *cb;
@ -627,6 +627,16 @@ rb_ujit_iseq_free(const struct rb_iseq_constant_body *body)
rb_darray_free(body->ujit_blocks); rb_darray_free(body->ujit_blocks);
} }
bool rb_ujit_enabled_p(void)
{
return rb_ujit_opts.ujit_enabled;
}
unsigned rb_ujit_call_threshold(void)
{
return rb_ujit_opts.call_threshold;
}
void void
rb_ujit_init(struct rb_ujit_options *options) rb_ujit_init(struct rb_ujit_options *options)
{ {
@ -636,8 +646,12 @@ rb_ujit_init(struct rb_ujit_options *options)
} }
rb_ujit_opts = *options; rb_ujit_opts = *options;
rb_ujit_opts.ujit_enabled = true;
rb_ujit_enabled = true; // Normalize options
if (rb_ujit_opts.call_threshold < 1) {
rb_ujit_opts.call_threshold = 10;
}
ujit_init_core(); ujit_init_core();
ujit_init_codegen(); ujit_init_codegen();