parseman 0.61.5 → 0.61.6

package/dist/analysis/diagnostics.js

@@ -4072,7 +4072,7 @@ function regex(pattern, flags = "") {
 }
 
 // src/version.ts
-var PARSEMAN_VERSION = "0.61.5";
+var PARSEMAN_VERSION = "0.61.6";
 
 // src/table/lex-body.ts
 function buildLexBodyRecognizer(spec, constants) {

package/dist/cli/index.js

@@ -5708,7 +5708,7 @@ function regex(pattern, flags = "") {
 }
 
 // src/version.ts
-var PARSEMAN_VERSION = "0.61.5";
+var PARSEMAN_VERSION = "0.61.6";
 
 // src/table/lex-body.ts
 function buildLexBodyRecognizer(spec, constants) {

package/dist/index.js

@@ -5661,7 +5661,7 @@ function sourceLeaf(root, fn) {
 }
 
 // src/version.ts
-var PARSEMAN_VERSION = "0.61.5";
+var PARSEMAN_VERSION = "0.61.6";
 
 // src/table/lex-body.ts
 function buildLexBodyRecognizer(spec, constants) {
@@ -19833,21 +19833,70 @@ function runDuplicationDiagnosticRules(ruleMap, opt) {
 var LOOP = 8;
 var ROUNDS = 60;
 var CAP = 1e12;
+var CROSSING_WEIGHT = 4;
+var TAKEN = -1;
 function selectHotSites(code, entries, siteBytes, budget, profile) {
   const selected = /* @__PURE__ */ new Set();
   if (budget <= 0) return selected;
-  const weight = profile === void 0 ? staticWeights(code, entries) : void 0;
-  const w = (ip) => (weight !== void 0 ? weight.get(ip) : profile[ip]) ?? 0;
-  const ranked = [...siteBytes.keys()].sort((a, b) => w(b) / siteBytes.get(b) - w(a) / siteBytes.get(a) || a - b);
   let spent = 0;
-  for (const ip of ranked) {
-    if (w(ip) === 0) break;
+  for (const ip of profile === void 0 ? staticRanking(code, entries, siteBytes) : connectedRanking(code, siteBytes, profile)) {
     spent += siteBytes.get(ip);
     if (spent > budget) break;
     selected.add(ip);
   }
   return selected;
 }
+function edgesAsLowered(code, siteBytes, ip, out) {
+  out.length = 0;
+  if (code[ip] !== OP_CONT) childSlots(code, ip, out);
+  else if (siteBytes.has(ip)) out.push(code[ip + 1], code[ip + 3]);
+  else out.push(code[ip + 2]);
+  for (let i = 0; i < out.length; i++) {
+    let row = out[i];
+    for (; ; ) {
+      const op = code[row];
+      if (op === OP_GAPGATE || op === OP_SEED) row = code[row + 1];
+      else if (op === OP_CONT && !siteBytes.has(row)) row = code[row + 2];
+      else break;
+    }
+    out[i] = row;
+  }
+}
+function staticRanking(code, entries, siteBytes) {
+  const weight = staticWeights(code, entries, siteBytes);
+  const w = (ip) => weight.get(ip) ?? 0;
+  return [...siteBytes.keys()].filter((ip) => w(ip) > 0).sort((a, b) => w(b) / siteBytes.get(b) - w(a) / siteBytes.get(a) || a - b);
+}
+function* connectedRanking(code, siteBytes, calls) {
+  const ran = [...siteBytes.keys()].filter((ip) => calls[ip] > 0).sort((a, b) => a - b);
+  const slot = new Map(ran.map((ip, i) => [ip, i]));
+  const bytes2 = ran.map((ip) => siteBytes.get(ip));
+  const worth = ran.map((ip) => calls[ip]);
+  const score = worth.map((value, i) => value / bytes2[i]);
+  const crossings = ran.map(() => []);
+  const kids = [];
+  ran.forEach((ip, from) => {
+    edgesAsLowered(code, siteBytes, ip, kids);
+    for (const callee of kids) {
+      const to = slot.get(callee);
+      if (to === void 0) continue;
+      const gain = CROSSING_WEIGHT * calls[callee];
+      crossings[from].push([to, gain]);
+      crossings[to].push([from, gain]);
+    }
+  });
+  for (let left = ran.length; left > 0; left--) {
+    let best = 0;
+    for (let i = 1; i < score.length; i++) if (score[i] > score[best]) best = i;
+    score[best] = TAKEN;
+    yield ran[best];
+    for (const [neighbour, gain] of crossings[best]) {
+      if (score[neighbour] === TAKEN) continue;
+      worth[neighbour] = worth[neighbour] + gain;
+      score[neighbour] = worth[neighbour] / bytes2[neighbour];
+    }
+  }
+}
 function fitHotSites(code, entries, siteBytes, fixed, ceiling, sourceBytes, profile) {
   const ranked = [...selectHotSites(code, entries, siteBytes, ceiling - fixed, profile)];
   for (; ranked.length > 0; ranked.pop()) {
@@ -19857,25 +19906,17 @@ function fitHotSites(code, entries, siteBytes, fixed, ceiling, sourceBytes, prof
   }
   return void 0;
 }
-function staticWeights(code, entries) {
+function staticWeights(code, entries, siteBytes) {
   let weight = /* @__PURE__ */ new Map();
   const kids = [];
   for (let round = 0; round < ROUNDS; round++) {
     const next = /* @__PURE__ */ new Map();
     for (const ip of entries) next.set(ip, 1);
     for (const [ip, w] of weight) {
-      kids.length = 0;
-      childSlots(code, ip, kids);
+      edgesAsLowered(code, siteBytes, ip, kids);
       const op = code[ip];
-      if (op === OP_CONT && continuationGate(code, code[ip + 3]) !== void 0) {
-        kids.length = 0;
-        kids.push(code[ip + 1], code[ip + 3]);
-      }
       const scale = op === OP_REP || op === OP_REPV ? LOOP : op === OP_CHOICE || op === OP_DISPATCH ? 1 / Math.max(1, kids.length) : 1;
-      for (const k of kids) {
-        const kid = code[k] === OP_GAPGATE ? code[k + 1] : k;
-        next.set(kid, Math.min(CAP, (next.get(kid) ?? 0) + w * scale));
-      }
+      for (const kid of kids) next.set(kid, Math.min(CAP, (next.get(kid) ?? 0) + w * scale));
     }
     weight = next;
   }