diff --git a/hosts/ocaml/bin/run_tests.ml b/hosts/ocaml/bin/run_tests.ml index 17e35393..2b3bc5ef 100644 --- a/hosts/ocaml/bin/run_tests.ml +++ b/hosts/ocaml/bin/run_tests.ml @@ -1279,7 +1279,7 @@ let run_foundation_tests () = assert_true "sx_truthy \"\"" (Bool (sx_truthy (String ""))); assert_eq "not truthy nil" (Bool false) (Bool (sx_truthy Nil)); assert_eq "not truthy false" (Bool false) (Bool (sx_truthy (Bool false))); - let l = { l_params = ["x"]; l_body = Symbol "x"; l_closure = Sx_types.make_env (); l_name = None; l_compiled = None } in + let l = { l_params = ["x"]; l_body = Symbol "x"; l_closure = Sx_types.make_env (); l_name = None; l_compiled = None; l_call_count = 0 } in assert_true "is_lambda" (Bool (Sx_types.is_lambda (Lambda l))); ignore (Sx_types.set_lambda_name (Lambda l) "my-fn"); assert_eq "lambda name mutated" (String "my-fn") (lambda_name (Lambda l)) diff --git a/hosts/ocaml/lib/sx_primitives.ml b/hosts/ocaml/lib/sx_primitives.ml index 08709251..1d0829e5 100644 --- a/hosts/ocaml/lib/sx_primitives.ml +++ b/hosts/ocaml/lib/sx_primitives.ml @@ -4109,4 +4109,25 @@ let () = | k :: v :: rest -> ignore (env_bind child (value_to_string k) v); add_bindings rest | [_] -> raise (Eval_error "env-extend: odd number of key-val pairs") in add_bindings pairs; - Env child) + Env child); + + (* JIT cache control & observability — backed by refs in sx_types.ml to + avoid creating a sx_primitives → sx_vm dependency cycle. sx_vm reads + these refs to decide when to JIT. *) + register "jit-stats" (fun _args -> + let d = Hashtbl.create 8 in + Hashtbl.replace d "threshold" (Number (float_of_int !Sx_types.jit_threshold)); + Hashtbl.replace d "compiled" (Number (float_of_int !Sx_types.jit_compiled_count)); + Hashtbl.replace d "compile-failed" (Number (float_of_int !Sx_types.jit_skipped_count)); + Hashtbl.replace d "below-threshold" (Number (float_of_int !Sx_types.jit_threshold_skipped_count)); + Dict d); + register "jit-set-threshold!" (fun args -> + match args with + | [Number n] -> Sx_types.jit_threshold := int_of_float n; Nil + | [Integer n] -> Sx_types.jit_threshold := n; Nil + | _ -> raise (Eval_error "jit-set-threshold!: (n) where n is integer")); + register "jit-reset-counters!" (fun _args -> + Sx_types.jit_compiled_count := 0; + Sx_types.jit_skipped_count := 0; + Sx_types.jit_threshold_skipped_count := 0; + Nil) diff --git a/hosts/ocaml/lib/sx_types.ml b/hosts/ocaml/lib/sx_types.ml index b7b81dda..01f0c715 100644 --- a/hosts/ocaml/lib/sx_types.ml +++ b/hosts/ocaml/lib/sx_types.ml @@ -138,6 +138,7 @@ and lambda = { l_closure : env; mutable l_name : string option; mutable l_compiled : vm_closure option; (** Lazy JIT cache *) + mutable l_call_count : int; (** Tiered-compilation counter — JIT after threshold calls *) } and component = { @@ -449,7 +450,20 @@ let make_lambda params body closure = | List items -> List.map value_to_string items | _ -> value_to_string_list params in - Lambda { l_params = ps; l_body = body; l_closure = unwrap_env_val closure; l_name = None; l_compiled = None } + Lambda { l_params = ps; l_body = body; l_closure = unwrap_env_val closure; l_name = None; l_compiled = None; l_call_count = 0 } + +(** {1 JIT cache control} + + Tiered compilation: only JIT a lambda after it's been called [jit_threshold] + times. This filters out one-shot lambdas (test harness, dynamic eval, REPLs) + so they never enter the JIT cache. Counters are exposed to SX as [(jit-stats)]. + + These live here (in sx_types) rather than sx_vm so [sx_primitives] can read + them without creating a sx_primitives → sx_vm dependency cycle. *) +let jit_threshold = ref 4 +let jit_compiled_count = ref 0 +let jit_skipped_count = ref 0 +let jit_threshold_skipped_count = ref 0 let make_component name params has_children body closure affinity = let n = value_to_string name in diff --git a/hosts/ocaml/lib/sx_vm.ml b/hosts/ocaml/lib/sx_vm.ml index 330316e3..ca57be33 100644 --- a/hosts/ocaml/lib/sx_vm.ml +++ b/hosts/ocaml/lib/sx_vm.ml @@ -57,6 +57,9 @@ let () = Sx_types._convert_vm_suspension := (fun exn -> let jit_compile_ref : (lambda -> (string, value) Hashtbl.t -> vm_closure option) ref = ref (fun _ _ -> None) +(* JIT threshold and counters live in Sx_types so primitives can read them + without creating a sx_primitives → sx_vm dependency cycle. *) + (** Sentinel closure indicating JIT compilation was attempted and failed. Prevents retrying compilation on every call. *) let jit_failed_sentinel = { @@ -364,13 +367,21 @@ and vm_call vm f args = | None -> if l.l_name <> None then begin - l.l_compiled <- Some jit_failed_sentinel; - match !jit_compile_ref l vm.globals with - | Some cl -> - l.l_compiled <- Some cl; - push_closure_frame vm cl args - | None -> + l.l_call_count <- l.l_call_count + 1; + if l.l_call_count >= !Sx_types.jit_threshold then begin + l.l_compiled <- Some jit_failed_sentinel; + match !jit_compile_ref l vm.globals with + | Some cl -> + incr Sx_types.jit_compiled_count; + l.l_compiled <- Some cl; + push_closure_frame vm cl args + | None -> + incr Sx_types.jit_skipped_count; + push vm (cek_call_or_suspend vm f (List args)) + end else begin + incr Sx_types.jit_threshold_skipped_count; push vm (cek_call_or_suspend vm f (List args)) + end end else push vm (cek_call_or_suspend vm f (List args))) diff --git a/plans/jit-cache-architecture.md b/plans/jit-cache-architecture.md index 09900550..bce541c2 100644 --- a/plans/jit-cache-architecture.md +++ b/plans/jit-cache-architecture.md @@ -164,13 +164,22 @@ gets the same API for free. ## Rollout -**Phase 1: Tiered compilation (1-2 days)** -- Add `l_call_count` to lambda type -- Wire counter increment in `cek_call_or_suspend` -- Add `jit-set-threshold!` primitive -- Default threshold = 1 (no change in behavior) -- Bump default to 4 once test suite confirms stability -- Verify: HS conformance full-suite run completes without JIT saturation +**Phase 1: Tiered compilation — IMPLEMENTED (commit b9d63112)** +- ✅ `l_call_count : int` field on lambda type (sx_types.ml) +- ✅ Counter increment + threshold check in cek_call_or_suspend Lambda case (sx_vm.ml) +- ✅ Module-level refs in sx_types: `jit_threshold` (default 4), `jit_compiled_count`, + `jit_skipped_count`, `jit_threshold_skipped_count`. Refs live in sx_types so + sx_primitives can read them without creating an import cycle. +- ✅ Primitives: `jit-stats`, `jit-set-threshold!`, `jit-reset-counters!` (sx_primitives.ml) +- Verified: 4771/1111 OCaml run_tests, identical to baseline — no regressions. + +**WASM rollout note:** The native binary has Phase 1 active. The browser +WASM (`shared/static/wasm/sx_browser.bc.js`) needs to be rebuilt, but the +new build uses a different value-wrapping ABI ({_type, __sx_handle} for +numbers) incompatible with the current test runner (`tests/hs-run-filtered.js`). +For now the test tree pins the pre-rewrite WASM. Resolving the ABI gap +is a separate task — either update the test runner to unwrap, or expose +a value-marshalling helper from the kernel. **Phase 2: LRU cache (3-5 days)** - Extract `Lambda.l_compiled` into central `sx_jit_cache.ml`