4018eb87ed
direct-var? now treats a cfunction root the same as a function root, so a call/ref to a native fn (clojure.math/sqrt et al.) embeds the value instead of a per-call cell deref. This was the hot indirection in the ray tracer — sqrt runs every bounce — and it applies in every direct-link build, not just whole-program. const-link? is new and whole-program-only: in a closed world every non-dynamic var has a stable root, so embed it as a constant (quoted unless it's already callable) rather than reading the cell each reference. Covers what direct-var? can't — ^:redef vars (reloading is off under the flag), data defs, and record type/ctor roots. Dynamic vars stay indirect; a nil (not-yet-defined) root stays indirect and the whole-program re-emit picks it up once the root is in place. Measured on the records ray tracer: hot-path indirect refs (sqrt + data vars) gone; the only indirect refs left are cold defrecord self-references. whole- program-test now also checks a ^:redef fn and a data def so the per-ns vs whole-program comparison guards const-link soundness.
49 lines
2.5 KiB
Text
49 lines
2.5 KiB
Text
# Whole-program (Stalin) mode (jolt-t34, opt-in JOLT_WHOLE_PROGRAM): one closed-
|
|
# world inference fixpoint over ALL user namespaces, so param types propagate
|
|
# across ns boundaries (a non-inlined fn's record params get proven from its
|
|
# callers in another unit). This must be SOUND — same results as the per-ns
|
|
# pass — which is what this test guards, by running a cross-namespace record
|
|
# program both ways through the built binary and comparing output. Skips cleanly
|
|
# if build/jolt is absent (source-only test run).
|
|
(def jolt "build/jolt")
|
|
|
|
(defn- run [env-extra]
|
|
(def dir (string (or (os/getenv "TMPDIR") "/tmp") "/jolt-wp-test"))
|
|
(os/mkdir dir)
|
|
(spit (string dir "/wputil.clj")
|
|
(string "(ns wputil)\n"
|
|
"(defrecord V [x y z])\n"
|
|
# const-link targets (jolt-rvt): a data def and a ^:redef fn are
|
|
# indirect (cell deref) per-ns but embedded as constants under
|
|
# whole-program. Soundness => both modes must give the same answer.
|
|
"(def scale 2.0)\n"
|
|
"(defn ^:redef bump [x] (+ x 1.0))\n"
|
|
# recursive => never inlined; params proven only whole-program
|
|
"(defn dot [a b n]\n"
|
|
" (if (<= n 0) 0.0\n"
|
|
" (+ (* (:x a) (:x b)) (* (:y a) (:y b)) (* (:z a) (:z b)) (bump (* scale (dot a b (dec n)))))))\n"))
|
|
(spit (string dir "/wpmain.clj")
|
|
(string "(ns wpmain (:require [wputil :as v]))\n"
|
|
"(defn -main []\n"
|
|
" (loop [i 0 acc 0.0]\n"
|
|
" (if (< i 1000)\n"
|
|
" (let [a (v/->V (double i) 2.0 3.0) b (v/->V 1.0 (double i) 0.5)]\n"
|
|
" (recur (inc i) (+ acc (v/dot a b 2))))\n"
|
|
" (println \"sum\" acc))))\n"))
|
|
(def out (string dir "/out.txt"))
|
|
(def jbin (string (os/cwd) "/" jolt))
|
|
(def cmd (string env-extra "JOLT_DIRECT_LINK=1 JOLT_PATH=" dir " " jbin
|
|
" -m wpmain > " out " 2>&1"))
|
|
(os/execute ["sh" "-c" cmd] :p)
|
|
(string/trimr (slurp out)))
|
|
|
|
(if (not (os/stat jolt))
|
|
(print "whole-program: SKIP (no build/jolt — run from source)")
|
|
(let [per-ns (run "")
|
|
whole (run "JOLT_WHOLE_PROGRAM=1 ")]
|
|
(printf " per-ns: %s" per-ns)
|
|
(printf " whole-program: %s" whole)
|
|
(if (and (= per-ns whole) (string/has-prefix? "sum" per-ns))
|
|
(print "whole-program: results match — sound")
|
|
(do (printf "whole-program: MISMATCH per-ns=%q whole=%q" per-ns whole)
|
|
(os/exit 1)))))
|