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

Backport the latest jit_compile()

Browse Source
This commit is contained in:
Takashi Kokubun 2025-02-14 17:27:44 -08:00
parent 3e49f3304d
commit 06d875b979
Notes: git 2025-04-18 13:48:37 +00:00 
Merged: https://github.com/ruby/ruby/pull/13131
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
vm.c
View File

@ -433,29 +433,25 @@ jit_compile(rb_execution_context_t *ec)
{ {
const rb_iseq_t *iseq = ec->cfp->iseq; const rb_iseq_t *iseq = ec->cfp->iseq;
struct rb_iseq_constant_body *body = ISEQ_BODY(iseq); struct rb_iseq_constant_body *body = ISEQ_BODY(iseq);
bool yjit_enabled = rb_yjit_enabled_p;
extern bool rb_zjit_enabled_p;
bool zjit_enabled = rb_zjit_enabled_p;
if (!(yjit_enabled || zjit_enabled || rb_rjit_call_p)) {
return NULL;
}
// Increment the ISEQ's call counter and trigger JIT compilation if not compiled // Increment the ISEQ's call counter and trigger JIT compilation if not compiled
if (body->jit_entry == NULL && rb_yjit_enabled_p) { #if USE_ZJIT
extern bool rb_zjit_enabled_p;
if (body->jit_entry == NULL && rb_zjit_enabled_p) {
body->jit_entry_calls++; body->jit_entry_calls++;
if (zjit_enabled) { if (body->jit_entry_calls == 1) {
extern void rb_zjit_compile_iseq(const rb_iseq_t *iseq, rb_execution_context_t *ec, bool jit_exception); extern void rb_zjit_compile_iseq(const rb_iseq_t *iseq, rb_execution_context_t *ec, bool jit_exception);
rb_zjit_compile_iseq(iseq, ec, false); rb_zjit_compile_iseq(iseq, ec, false);
} }
else if (yjit_enabled) { }
if (rb_yjit_threshold_hit(iseq, body->jit_entry_calls)) { #elif USE_YJIT
rb_yjit_compile_iseq(iseq, ec, false); if (body->jit_entry == NULL && rb_yjit_enabled_p) {
} body->jit_entry_calls++;
} if (rb_yjit_threshold_hit(iseq, body->jit_entry_calls)) {
else if (body->jit_entry_calls == rb_rjit_call_threshold()) { rb_yjit_compile_iseq(iseq, ec, false);
rb_rjit_compile(iseq);
} }
} }
#endif
return body->jit_entry; return body->jit_entry;
} }
@ -491,15 +487,14 @@ jit_compile_exception(rb_execution_context_t *ec)
struct rb_iseq_constant_body *body = ISEQ_BODY(iseq); struct rb_iseq_constant_body *body = ISEQ_BODY(iseq);
// Increment the ISEQ's call counter and trigger JIT compilation if not compiled // Increment the ISEQ's call counter and trigger JIT compilation if not compiled
#if USE_YJIT
if (body->jit_exception == NULL && rb_yjit_enabled_p) { if (body->jit_exception == NULL && rb_yjit_enabled_p) {
body->jit_exception_calls++; body->jit_exception_calls++;
if (body->jit_exception_calls == rb_yjit_call_threshold) { if (body->jit_exception_calls == rb_yjit_call_threshold) {
rb_yjit_compile_iseq(iseq, ec, true); rb_yjit_compile_iseq(iseq, ec, true);
} }
} }
#endif
return body->jit_exception; return body->jit_exception;
} }

10
vm_core.h
View File

@ -534,7 +534,7 @@ struct rb_iseq_constant_body {
const rb_iseq_t *mandatory_only_iseq; const rb_iseq_t *mandatory_only_iseq;
#if USE_YJIT #if USE_YJIT || USE_ZJIT
// Function pointer for JIT code on jit_exec() // Function pointer for JIT code on jit_exec()
rb_jit_func_t jit_entry; rb_jit_func_t jit_entry;
// Number of calls on jit_exec() // Number of calls on jit_exec()
@ -543,11 +543,19 @@ struct rb_iseq_constant_body {
rb_jit_func_t jit_exception; rb_jit_func_t jit_exception;
// Number of calls on jit_exec_exception() // Number of calls on jit_exec_exception()
long unsigned jit_exception_calls; long unsigned jit_exception_calls;
#endif
#if USE_YJIT
// YJIT stores some data on each iseq. // YJIT stores some data on each iseq.
void *yjit_payload; void *yjit_payload;
// Used to estimate how frequently this ISEQ gets called // Used to estimate how frequently this ISEQ gets called
uint64_t yjit_calls_at_interv; uint64_t yjit_calls_at_interv;
#endif #endif
#if USE_ZJIT
// ZJIT stores some data on each iseq.
void *zjit_payload;
#endif
}; };
/* T_IMEMO/iseq */ /* T_IMEMO/iseq */