mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-30 00:40:20 +02:00
Code Activity

Fix JIT tier-up from within loops for already-JIT-compiled functions

Browse source 
* libguile/jit.c (scm_jit_compute_mcode): If a caller wants mcode for a
  loop but the function already has mcode, instead of punting, just
  compile again.
This commit is contained in:
Andy Wingo 2019-12-08 21:44:47 +01:00
parent d14e8fabb3
commit a1e88ebc12
1 changed files with 32 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

60
libguile/jit.c
View file

@ -4916,37 +4916,41 @@ scm_jit_compute_mcode (scm_thread *thread, struct scm_jit_function_data *data)
if (vcode_start == thread->vm.ip) if (vcode_start == thread->vm.ip)
return data->mcode; return data->mcode;
/* FIXME: The function has mcode, compiled via some other /* The function has mcode, compiled via some other activation
activation (possibly in another thread), but right now we're (possibly in another thread), but right now we're currently in
currently in an interpreted loop (not at the beginning of the an interpreted loop (not at the beginning of the function). It
function). We should re-compute the offset into the mcode. would be nice if we could jump into the already-compiled
For now though, just punt. */ function, but we don't know the offset. You'd think we could
return NULL; just compile again without writing bytes to find out the offset
into the old code, but we're not guaranteed to get the same
compiled code, for example due to variations on whether direct
callees have mcode at the time of the compile, or different
encodings for relative references. So oh well: we're just
going to compile another copy and update the mcode pointer,
hoping this is a rare occurence. */
} }
else
uint8_t *mcode = compute_mcode (thread, thread->vm.ip, data);
if (!mcode)
{ {
uint8_t *mcode = compute_mcode (thread, thread->vm.ip, data); scm_jit_counter_threshold = -1;
fprintf (stderr, "JIT failed due to resource exhaustion\n");
if (!mcode) fprintf (stderr, "disabling automatic JIT compilation\n");
{
scm_jit_counter_threshold = -1;
fprintf (stderr, "JIT failed due to resource exhaustion\n");
fprintf (stderr, "disabling automatic JIT compilation\n");
}
else if (--jit_stop_after == 0)
{
scm_jit_counter_threshold = -1;
fprintf (stderr, "stopping automatic JIT compilation, as requested\n");
if (jit_pause_when_stopping)
{
fprintf (stderr, "sleeping for 30s; to debug:\n");
fprintf (stderr, " gdb -p %d\n\n", getpid ());
sleep (30);
}
}
return mcode;
} }
else if (--jit_stop_after == 0)
{
scm_jit_counter_threshold = -1;
fprintf (stderr, "stopping automatic JIT compilation, as requested\n");
if (jit_pause_when_stopping)
{
fprintf (stderr, "sleeping for 30s; to debug:\n");
fprintf (stderr, " gdb -p %d\n\n", getpid ());
sleep (30);
}
}
return mcode;
} }
void void