@@ -646,6 +656,7 @@
+
diff --git a/src/decompnet/app/static/js/deep-progress.js b/src/decompnet/app/static/js/deep-progress.js
new file mode 100644
index 00000000..6507d954
--- /dev/null
+++ b/src/decompnet/app/static/js/deep-progress.js
@@ -0,0 +1,22 @@
+"use strict";
+/* A compact live scorecard, independent of the detailed compiler log. */
+function deepProgressView() {
+ const ids = ["fnDeepMetrics", "fnDeepStartPercent", "fnDeepStartScore", "fnDeepBestPercent", "fnDeepBestScore",
+ "fnDeepImproved", "fnDeepTested", "fnDeepSkipped", "fnDeepTime"];
+ const el = Object.fromEntries(ids.map((id) => [id, $(id)]));
+ const number = (value) => value == null ? "—" : value.toLocaleString();
+ const percent = (value) => value == null ? "—" : `${value === 100 ? "100" : (Math.floor(value * 10 + 1e-8) / 10).toFixed(1)}%`;
+ return (p = {}) => {
+ el.fnDeepMetrics.hidden = false;
+ el.fnDeepStartPercent.textContent = percent(p.starting_percent);
+ el.fnDeepStartScore.textContent = `Score ${number(p.starting_score)}`;
+ el.fnDeepBestPercent.textContent = percent(p.best_percent);
+ el.fnDeepBestScore.textContent = `Score ${number(p.best_score)}`;
+ el.fnDeepImproved.textContent = number(p.improvements ?? 0);
+ el.fnDeepTested.textContent = number(p.tested ?? 0);
+ el.fnDeepSkipped.textContent = number(p.skipped ?? 0);
+ el.fnDeepTime.textContent = p.seconds_left == null ? "" : `${Math.floor(p.seconds_left / 60)}m ${p.seconds_left % 60}s left`;
+ el.fnDeepMetrics.dataset.matched = String(p.best_percent === 100);
+ el.fnDeepMetrics.dataset.improved = String((p.improvements ?? 0) > 0);
+ };
+}
diff --git a/src/decompnet/app/static/js/function.js b/src/decompnet/app/static/js/function.js
index bc887e8a..fb032d99 100644
--- a/src/decompnet/app/static/js/function.js
+++ b/src/decompnet/app/static/js/function.js
@@ -111,6 +111,10 @@ async function refreshFn(first) {
? `${d.unit} · ${d.insns} instructions${d.match_percent != null ? ` · ${d.match_percent >= 100 ? "100" : (Math.floor(d.match_percent * 10) / 10).toFixed(1)}% now` : ""}`
: `${hex8(d.vram)} · ROM 0x${d.rom_offset.toString(16).toUpperCase()} · ${d.insns} instructions`;
if ($("fnName").textContent !== d.name) {
+ if (!deepPermuterBusy) {
+ $("fnDeepMetrics").hidden = true;
+ $("fnDeepStatus").textContent = "";
+ }
$("fnCompilerRanked").replaceChildren();
$("fnApplyCompiler").hidden = true;
$("fnCompilerSummary").hidden = true;
@@ -532,18 +536,25 @@ $("fnDeepRun").onclick = async () => {
const log = $("fnDeepLog"), status = $("fnDeepStatus"), stop = $("fnDeepStop");
const controls = [$("fnDeepRun"), $("fnDeepMinutes"), $("fnDeepVariants")];
const minutes = Number($("fnDeepMinutes").value), maxVariants = Number($("fnDeepVariants").value);
+ const renderProgress = deepProgressView();
+ renderProgress();
+ log._followTail = false;
deepPermuterBusy = true;
log.hidden = false; stop.hidden = false; stop.disabled = true;
showJobError(log, "");
status.textContent = `Starting deep search for ${name}…`;
const done = beginWork(log, "Searching this function locally", controls, "Deep search finished.");
+ const bar = log.previousElementSibling;
+ $("fnDeepWork").append(log._workStatus);
+ $("fnDeepWork").append(bar);
try {
const { job } = await api("/api/permuter/function", { method: "POST", body: { slug, function: name, minutes, max_variants: maxVariants } });
deepPermuterJob = job; stop.disabled = false;
const result = await followJob(job, log, (_, state) => {
const p = state.progress;
- if (p) status.textContent = `${name} · ${p.phase} · ${p.tested.toLocaleString()} tested · ${p.skipped.toLocaleString()} cached misses skipped · best score ${p.best_score ?? "—"} · ${p.seconds_left}s left`;
+ if (p) { renderProgress(p); status.textContent = `${name} · ${p.phase}`; }
});
+ renderProgress(result);
status.textContent = `${name} · ${result.reason} · ${result.tested.toLocaleString()} tested. Improvements saved.`;
if (S.slug === slug && S.fn === name) { await refreshMap(true); await refreshFn(false); }
} catch (error) {
@@ -551,7 +562,7 @@ $("fnDeepRun").onclick = async () => {
status.textContent = `${name} · Stopped. Verified improvements are saved.`;
log._workStatus.dataset.state = "cancelled"; log._workStatus.textContent = "Stopped";
}
- else showJobError(log, error.message);
+ else { status.textContent = error.message; $("fnDeepOutput").open = true; showJobError(log, error.message); }
} finally {
deepPermuterBusy = false; deepPermuterJob = null; stop.hidden = true; done();
}
diff --git a/tests/gui_progress.js b/tests/gui_progress.js
index b2c20c5f..fd7b4454 100644
--- a/tests/gui_progress.js
+++ b/tests/gui_progress.js
@@ -71,6 +71,7 @@ function setup(file, marker, end, logId, buttonId, ranges = "") {
},
};
vm.createContext(ctx);
+ vm.runInContext(read("deep-progress"), ctx);
const base = read("base");
vm.runInContext(base.slice(base.indexOf("const JOB_POLL_MS"), base.indexOf("/* The map's still")), ctx);
// The page error box is independent of the bar; keep its text to check that cleanup preserves it.
@@ -230,6 +231,24 @@ async function main() {
copyTest.ctx.showJobError(copyTest.log, "");
assert.equal(toolbar.hidden, true);
assert.equal(copyTest.log.textContent, "");
+ // Deep-search scores remain visible independently of the collapsed technical log.
+ {
+ const test = setup(...cases[cases.length - 1]);
+ const running = test.ctx.run();
+ assert.ok(test.get("fnDeepWork").children.includes(test.log.bar));
+ assert.equal(test.log._followTail, false);
+ test.start.resolve({job:"deep"}); await tick();
+ const metrics = {starting_score:14639,starting_percent:76.3,best_score:0,best_percent:100,
+ improvements:4,tested:268,skipped:1,reason:"Matched",seconds_left:165};
+ test.poll.resolve({state:"done",log:[],progress:metrics,result:metrics}); await running;
+ assert.equal(test.get("fnDeepStartPercent").textContent,"76.3%");
+ assert.equal(test.get("fnDeepBestPercent").textContent,"100%");
+ assert.equal(test.get("fnDeepBestScore").textContent,"Score 0");
+ assert.equal(test.get("fnDeepImproved").textContent,"4");
+ assert.equal(test.get("fnDeepTime").textContent,"2m 45s left");
+ assert.equal(test.get("fnDeepMetrics").dataset.matched,"true");
+ assert.equal(test.log.bar.removed,true);
+ }
// A range-only compiler setting remains immediate and has no progress bar.
const range = setup(...cases[9], "0x1000-0x2000");
const running = range.ctx.run();
diff --git a/tests/test_deep_permuter.py b/tests/test_deep_permuter.py
index 6f97960c..54567fad 100644
--- a/tests/test_deep_permuter.py
+++ b/tests/test_deep_permuter.py
@@ -169,3 +169,35 @@ def test_invalid_generated_calls_do_not_consume_the_compile_allowance(monkeypatc
source = 'int send(int a,int b); int f(void) { return send(1); }'
assert search._score(AGENT, net.project_row('game'), net.function(), source, 40, None) is None
assert search.rejected == 1 and search.tested == 0 and not calls
+
+
+def test_live_metrics_count_only_verified_strict_improvements_and_keep_starting_baseline(monkeypatch):
+ net = setup(monkeypatch)
+ fn = net.function()
+ search = deep_permuter.Search(net, 1, 20, Log(), fn)
+ answers = iter([50, 30, 30, None, 20, 20, 0])
+ monkeypatch.setattr(Permuter, '_score', lambda *args:next(answers))
+ proj = net.project_row('game')
+ search.measuring_baseline = True
+ search._score(AGENT, proj, fn, 'baseline', 40, None)
+ assert search.metrics()['starting_score'] == 50 # The stale saved score was 40.
+ search.measuring_baseline = False
+ for source in ['better', 'equal', 'error', 'better again']:
+ search._score(AGENT, proj, fn, source, 50, None)
+ assert search.improvements == 2 and search.best == 20
+ # A second baseline when random search starts must not erase local-repair progress.
+ search.measuring_baseline = True
+ search._score(AGENT, proj, fn, 'current baseline', 20, None)
+ search.measuring_baseline = False
+ search._score(AGENT, proj, fn, 'match', 20, None)
+ assert search.metrics() == {'starting_score':50,'starting_percent':95.0,'best_score':0,
+ 'best_percent':100.0,'improvements':3}
+ assert search.log.updates[-1]['improvements'] == 3
+
+
+def test_percentages_do_not_round_a_near_match_to_100(monkeypatch):
+ net = setup(monkeypatch)
+ fn = {**dict(net.function()), 'n_insns':10000, 'best_score':1}
+ search = deep_permuter.Search(net, 1, 20, Log(), fn)
+ assert search.metrics()['starting_percent'] == search.metrics()['best_percent'] == 99.9
+ assert search.improvements == 0