Track nested meta-tracing states.

tests/c/nested_execution.c

@@ -0,0 +1,134 @@
+// Run-time:
+//   env-var: YKD_SERIALISE_COMPILATION=1
+//   env-var: YKD_LOG_IR=jit-pre-opt
+//   env-var: YK_LOG=4
+//   stderr:
+//     enter
+//     yk-jit-event: start-tracing
+//     6
+//     enter
+//     5
+//     4
+//     3
+//     2
+//     1
+//     return
+//     yk-jit-event: stop-tracing
+//     --- Begin jit-pre-opt ---
+//       ...
+//       guard true, ...
+//       ...
+//       guard false, ...
+//       ...
+//       guard false, ...
+//       ...
+//       guard false, ...
+//       ...
+//       guard true, ...
+//       ...
+//       guard true, ...
+//       ...
+//     --- End jit-pre-opt ---
+//     5
+//     enter
+//     yk-jit-event: start-tracing
+//     4
+//     yk-jit-event: stop-tracing
+//     --- Begin jit-pre-opt ---
+//       ...
+//       guard false, ...
+//       ...
+//       guard false, ...
+//       ...
+//       guard true, ...
+//       ...
+//     --- End jit-pre-opt ---
+//     3
+//     yk-jit-event: enter-jit-code
+//     2
+//     1
+//     yk-jit-event: deoptimise
+//     return
+//     yk-jit-event: enter-jit-code
+//     4
+//     enter
+//     yk-jit-event: enter-jit-code
+//     3
+//     2
+//     1
+//     yk-jit-event: deoptimise
+//     return
+//     yk-jit-event: deoptimise
+//     c
+//     3
+//     enter
+//     yk-jit-event: enter-jit-code
+//     2
+//     1
+//     yk-jit-event: deoptimise
+//     return
+//     yk-jit-event: enter-jit-code
+//     yk-jit-event: deoptimise
+//     b
+//     2
+//     enter
+//     yk-jit-event: enter-jit-code
+//     1
+//     yk-jit-event: deoptimise
+//     return
+//     yk-jit-event: enter-jit-code
+//     yk-jit-event: deoptimise
+//     a
+//     1
+//     enter
+//     return
+//     return
+
+// Check that recursive execution finds the right guards.
+
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <yk.h>
+#include <yk_testing.h>
+
+void f(YkMT *mt, int who, YkLocation *loc1, YkLocation *loc2, int i) {
+  fprintf(stderr, "enter\n");
+  while (i > 0) {
+    yk_mt_control_point(mt, loc1);
+    if (who) {
+      if (i == 1) {
+        fprintf(stderr, "a\n");
+      }
+      if (i == 2) {
+        fprintf(stderr, "b\n");
+      }
+      if (i == 3) {
+        fprintf(stderr, "c\n");
+      }
+    }
+    fprintf(stderr, "%d\n", i);
+    i -= 1;
+    if (loc2 != NULL) {
+      f(mt, 0, loc2, NULL, i);
+    }
+  }
+  fprintf(stderr, "return\n");
+}
+
+int main(int argc, char **argv) {
+  YkMT *mt = yk_mt_new(NULL);
+  yk_mt_hot_threshold_set(mt, 0);
+  YkLocation loc1 = yk_location_new();
+  YkLocation loc2 = yk_location_new();
+  int i = 6;
+  NOOPT_VAL(loc1);
+  NOOPT_VAL(loc2);
+  NOOPT_VAL(i);
+  f(mt, 1, &loc1, &loc2, i);
+  yk_location_drop(loc1);
+  yk_location_drop(loc2);
+  yk_mt_shutdown(mt);
+  return (EXIT_SUCCESS);
+}

ykrt/src/compile/jitc_yk/codegen/x64/deopt.rs

@@ -101,8 +101,8 @@ pub(crate) extern "C" fn __yk_deopt(
     let info = &ctr.deoptinfo[&usize::from(gidx)];
     let mt = Arc::clone(&ctr.mt);
 
-    ctr.mt
-        .stats
+    mt.deopt();
+    mt.stats
         .timing_state(crate::log::stats::TimingState::Deopting);
     mt.log.log(Verbosity::JITEvent, "deoptimise");
 
@@ -352,9 +352,8 @@ pub(crate) extern "C" fn __yk_deopt(
 
     // The `clone` should really be `Arc::clone(&ctr)` but that doesn't play well with type
     // inference in this (unusual) case.
-    ctr.mt.guard_failure(ctr.clone(), gidx, frameaddr);
-    ctr.mt
-        .stats
+    mt.guard_failure(ctr.clone(), gidx, frameaddr);
+    mt.stats
         .timing_state(crate::log::stats::TimingState::OutsideYk);
 
     // Since we won't return from this function, drop `ctr` manually.