@markw65/monkeyc-optimizer 1.0.29 → 1.0.30

package/README.md

@@ -330,3 +330,16 @@ More fixes found via open source projects.
   - Actually run the rest of the expected-to-crash tests
   - Better error messages from pragma checker
   - Better regex for filtering projects
+
+### 1.0.30
+
+- Less greedy approach to finding candidate sets
+  - slightly better size reduction when globals maybe modified
+- Fix the control flow after the test of a while loop
+  - one of the edges was in the wrong place, leading to suboptimal solutions in some cases
+
+Bug Fixes
+
+- Fix a bug that could lead to the optimizer never completing
+- Fix a bug that prevented inlining functions that ended in a BlockStatement
+- Fix a bug that could cause nested inlined functions inlined in declarations to not be removed

package/build/api.cjs

@@ -928,6 +928,10 @@ function inlineWithArgs(state, func, call, context) {
     if (!func.node || !func.node.body) {
         return null;
     }
+    const lastStmt = (block) => {
+        const last = block.body.slice(-1)[0];
+        return last.type === "BlockStatement" ? lastStmt(last) : [last, block];
+    };
     let retStmtCount = 0;
     if (context.type === "ReturnStatement") {
         const last = func.node.body.body.slice(-1)[0];
@@ -950,7 +954,7 @@ function inlineWithArgs(state, func, call, context) {
             return null;
         }
         if (retStmtCount === 1) {
-            const last = func.node.body.body.slice(-1)[0];
+            const [last] = lastStmt(func.node.body);
             if (!last ||
                 last.type !== "ReturnStatement" ||
                 ((context.type === "AssignmentExpression" ||
@@ -975,21 +979,21 @@ function inlineWithArgs(state, func, call, context) {
     }
     inliner_diagnostic(state, call.loc, null);
     if (context.type !== "ReturnStatement" && retStmtCount) {
-        const last = body.body[body.body.length - 1];
+        const [last, block] = lastStmt(body);
         if (last.type != "ReturnStatement") {
             throw new Error("ReturnStatement got lost!");
         }
         if (last.argument) {
             if (context.type === "AssignmentExpression") {
                 context.right = last.argument;
-                body.body[body.body.length - 1] = {
+                block.body[block.body.length - 1] = {
                     type: "ExpressionStatement",
                     expression: context,
                 };
             }
             else if (context.type === "VariableDeclarator") {
                 const { id, init: _init, kind: _kind, ...rest } = context;
-                body.body[body.body.length - 1] = {
+                block.body[block.body.length - 1] = {
                     ...rest,
                     type: "ExpressionStatement",
                     expression: {
@@ -1003,11 +1007,11 @@ function inlineWithArgs(state, func, call, context) {
             }
             else {
                 const side_exprs = inliner_unused(last.argument);
-                body.body.splice(body.body.length - 1, 1, ...side_exprs);
+                block.body.splice(block.body.length - 1, 1, ...side_exprs);
             }
         }
         else {
-            --body.body.length;
+            --block.body.length;
         }
     }
     return body;
@@ -1271,7 +1275,8 @@ function control_flow_buildReducedGraph(state, func, notice) {
                     if (node.type === "WhileStatement") {
                         head = localState.newBlock(top.continue);
                         state.traverse(node.test);
-                        localState.addEdge(localState.newBlock(), top.break);
+                        localState.addEdge(localState.curBlock, top.break);
+                        localState.newBlock();
                     }
                     else {
                         head = localState.newBlock();
@@ -1592,6 +1597,8 @@ function cleanCfg(head) {
                         }
                     }));
                 }
+                if (!cur.node)
+                    cur.node = succ.node;
             }
         }
     });
@@ -1690,6 +1697,20 @@ function declName(decl) {
             throw new Error(`Unexpected EventDecl type: ${decl.type}`);
     }
 }
+function logAntState(s, decl) {
+    const defs = Array.from(s.ant).reduce((defs, event) => {
+        if (event.type === "def" || event.type === "mod")
+            defs++;
+        return defs;
+    }, 0);
+    console.log(`  - ${declFullName(decl)}: ${candidateCost(s)} bytes, ${s.ant.size - defs} refs, ${defs} defs, ${s.live ? "" : "!"}live, ${s.isIsolated ? "" : "!"}isolated`);
+    console.log(`    - members: ${Array.from(s.members)
+        .map(([block, live]) => block.order + (live ? "t" : "f"))
+        .join(", ")}`);
+}
+function logAntDecls(antDecls) {
+    antDecls.forEach(logAntState);
+}
 function pre_sizeBasedPRE(state, func) {
     if (!func.node.body)
         return;
@@ -1704,14 +1725,7 @@ function pre_sizeBasedPRE(state, func) {
     if (candidates) {
         if (logging) {
             console.log(`Found ${candidates.size} candidates in ${func.fullName}`);
-            candidates.forEach((s, decl) => {
-                const defs = Array.from(s.ant).reduce((defs, event) => {
-                    if (event.type === "def")
-                        defs++;
-                    return defs;
-                }, 0);
-                console.log(`  - ${declFullName(decl)}: ${candidateCost(s)} bytes, ${s.ant.size - defs} refs, ${defs} defs, ${s.live ? "" : "!"}live`);
-            });
+            logAntDecls(candidates);
         }
         const nodeMap = new Map();
         const declMap = new Map();
@@ -1957,21 +1971,28 @@ function cloneAnticipatedState(as) {
         members: new Map(as.members),
     };
 }
+function mergeAnticipatedState(ae, be) {
+    mergeSet(ae.ant, be.ant);
+    be.members.forEach((live, block) => ae.members.set(block, live));
+    if (be.live)
+        ae.live = true;
+}
 function cloneAnticipatedDecls(ad) {
     const copy = anticipatedDecls();
     for (const [k, v] of ad) {
-        copy.set(k, cloneAnticipatedState(v));
+        if (!v.isIsolated) {
+            copy.set(k, cloneAnticipatedState(v));
+        }
     }
     return copy;
 }
 function mergeAnticipatedDecls(a, b) {
     for (const [k, v] of b) {
+        if (v.isIsolated)
+            continue;
         const ae = a.get(k);
         if (ae) {
-            mergeSet(ae.ant, v.ant);
-            v.members.forEach((live, block) => ae.members.set(block, live));
-            if (v.live)
-                ae.live = true;
+            mergeAnticipatedState(ae, v);
         }
         else {
             a.set(k, cloneAnticipatedState(v));
@@ -1985,6 +2006,7 @@ function equalStates(a, b) {
         const be = b.get(k);
         if (!be ||
             be.live != ae.live ||
+            be.isIsolated != ae.isIsolated ||
             !equalSet(ae.ant, be.ant) ||
             !equalMap(ae.members, be.members)) {
             return false;
@@ -2055,7 +2077,8 @@ function candidateCost(candState) {
             cost += defCost(candState.node);
         }
     });
-    cost += defCost(candState.node) * candidateBoundary(candState).size;
+    const boundarySize = candidateBoundary(candState).size;
+    cost += defCost(candState.node) * boundarySize;
     return cost;
 }
 function computeAttributes(head) {
@@ -2193,9 +2216,7 @@ function computeAttributes(head) {
                         if (isUpdate || candidates.live) {
                             candidates.ant.add(event);
                         }
-                        if (!isUpdate) {
-                            candidates.live = false;
-                        }
+                        candidates.live = isUpdate;
                         break;
                     }
                 }
@@ -2204,12 +2225,23 @@ function computeAttributes(head) {
         curState.forEach((antState) => {
             antState.head = top;
             antState.members.set(top, antState.live);
+            if (!antState.live && candidateBoundary(antState).size === 0) {
+                // we found a group that's isolated from the rest
+                // of the function. Don't merge it with earlier
+                // refs and defs, because we can take it or leave
+                // it based on its own cost.
+                antState.isIsolated = true;
+            }
         });
         const oldState = blockStates[top.order];
         if (oldState && equalStates(oldState, curState)) {
             continue;
         }
         blockStates[top.order] = curState;
+        if (logging) {
+            console.log(`Updated block ${top.order}`);
+            logAntDecls(curState);
+        }
         if (top.preds) {
             top.preds.forEach((pred) => enqueue(pred));
         }
@@ -2222,7 +2254,9 @@ function computeAttributes(head) {
                 if (cost >= 0)
                     return;
                 const existing = candidateDecls.get(decl);
-                if (!existing || candidateCost(existing) > cost) {
+                if (!existing ||
+                    existing.isIsolated ||
+                    candidateCost(existing) > cost) {
                     const boundary = candidateBoundary(events);
                     if (!Array.from(boundary).every((block) => {
                         if (block !== events.head && block.events) {
@@ -2262,7 +2296,11 @@ function computeAttributes(head) {
                         return;
                     }
                     events.live = false;
-                    if (candidateCost(events) != cost) {
+                    if (existing && existing.isIsolated) {
+                        delete existing.isIsolated;
+                        mergeAnticipatedState(events, existing);
+                    }
+                    else if (candidateCost(events) != cost) {
                         throw new Error(`cost of block ${i} changed`);
                     }
                     candidateDecls.set(decl, events);
@@ -3444,10 +3482,10 @@ async function optimizeMonkeyC(fnMap, barrelList, config) {
                     while (i < node.declarations.length) {
                         const decl = declarations[i++];
                         if (decl.init && decl.init.type === "CallExpression") {
-                            const inlined = optimizeCall(state, decl.init, decl);
+                            const inlined = replace(optimizeCall(state, decl.init, decl), decl.init);
                             if (!inlined)
                                 continue;
-                            if (inlined.type != "BlockStatement") {
+                            if (Array.isArray(inlined) || inlined.type != "BlockStatement") {
                                 throw new Error("Unexpected inlined result");
                             }
                             if (!results) {

package/build/optimizer.cjs

@@ -11625,6 +11625,10 @@ function inlineWithArgs(state, func, call, context) {
     if (!func.node || !func.node.body) {
         return null;
     }
+    const lastStmt = (block) => {
+        const last = block.body.slice(-1)[0];
+        return last.type === "BlockStatement" ? lastStmt(last) : [last, block];
+    };
     let retStmtCount = 0;
     if (context.type === "ReturnStatement") {
         const last = func.node.body.body.slice(-1)[0];
@@ -11647,7 +11651,7 @@ function inlineWithArgs(state, func, call, context) {
             return null;
         }
         if (retStmtCount === 1) {
-            const last = func.node.body.body.slice(-1)[0];
+            const [last] = lastStmt(func.node.body);
             if (!last ||
                 last.type !== "ReturnStatement" ||
                 ((context.type === "AssignmentExpression" ||
@@ -11672,21 +11676,21 @@ function inlineWithArgs(state, func, call, context) {
     }
     diagnostic(state, call.loc, null);
     if (context.type !== "ReturnStatement" && retStmtCount) {
-        const last = body.body[body.body.length - 1];
+        const [last, block] = lastStmt(body);
         if (last.type != "ReturnStatement") {
             throw new Error("ReturnStatement got lost!");
         }
         if (last.argument) {
             if (context.type === "AssignmentExpression") {
                 context.right = last.argument;
-                body.body[body.body.length - 1] = {
+                block.body[block.body.length - 1] = {
                     type: "ExpressionStatement",
                     expression: context,
                 };
             }
             else if (context.type === "VariableDeclarator") {
                 const { id, init: _init, kind: _kind, ...rest } = context;
-                body.body[body.body.length - 1] = {
+                block.body[block.body.length - 1] = {
                     ...rest,
                     type: "ExpressionStatement",
                     expression: {
@@ -11700,11 +11704,11 @@ function inlineWithArgs(state, func, call, context) {
             }
             else {
                 const side_exprs = unused(last.argument);
-                body.body.splice(body.body.length - 1, 1, ...side_exprs);
+                block.body.splice(block.body.length - 1, 1, ...side_exprs);
             }
         }
         else {
-            --body.body.length;
+            --block.body.length;
         }
     }
     return body;
@@ -11966,7 +11970,8 @@ function buildReducedGraph(state, func, notice) {
                     if (node.type === "WhileStatement") {
                         head = localState.newBlock(top.continue);
                         state.traverse(node.test);
-                        localState.addEdge(localState.newBlock(), top.break);
+                        localState.addEdge(localState.curBlock, top.break);
+                        localState.newBlock();
                     }
                     else {
                         head = localState.newBlock();
@@ -12287,6 +12292,8 @@ function cleanCfg(head) {
                         }
                     }));
                 }
+                if (!cur.node)
+                    cur.node = succ.node;
             }
         }
     });
@@ -12385,6 +12392,20 @@ function declName(decl) {
             throw new Error(`Unexpected EventDecl type: ${decl.type}`);
     }
 }
+function logAntState(s, decl) {
+    const defs = Array.from(s.ant).reduce((defs, event) => {
+        if (event.type === "def" || event.type === "mod")
+            defs++;
+        return defs;
+    }, 0);
+    console.log(`  - ${declFullName(decl)}: ${candidateCost(s)} bytes, ${s.ant.size - defs} refs, ${defs} defs, ${s.live ? "" : "!"}live, ${s.isIsolated ? "" : "!"}isolated`);
+    console.log(`    - members: ${Array.from(s.members)
+        .map(([block, live]) => block.order + (live ? "t" : "f"))
+        .join(", ")}`);
+}
+function logAntDecls(antDecls) {
+    antDecls.forEach(logAntState);
+}
 function sizeBasedPRE(state, func) {
     if (!func.node.body)
         return;
@@ -12399,14 +12420,7 @@ function sizeBasedPRE(state, func) {
     if (candidates) {
         if (logging) {
             console.log(`Found ${candidates.size} candidates in ${func.fullName}`);
-            candidates.forEach((s, decl) => {
-                const defs = Array.from(s.ant).reduce((defs, event) => {
-                    if (event.type === "def")
-                        defs++;
-                    return defs;
-                }, 0);
-                console.log(`  - ${declFullName(decl)}: ${candidateCost(s)} bytes, ${s.ant.size - defs} refs, ${defs} defs, ${s.live ? "" : "!"}live`);
-            });
+            logAntDecls(candidates);
         }
         const nodeMap = new Map();
         const declMap = new Map();
@@ -12652,21 +12666,28 @@ function cloneAnticipatedState(as) {
         members: new Map(as.members),
     };
 }
+function mergeAnticipatedState(ae, be) {
+    mergeSet(ae.ant, be.ant);
+    be.members.forEach((live, block) => ae.members.set(block, live));
+    if (be.live)
+        ae.live = true;
+}
 function cloneAnticipatedDecls(ad) {
     const copy = anticipatedDecls();
     for (const [k, v] of ad) {
-        copy.set(k, cloneAnticipatedState(v));
+        if (!v.isIsolated) {
+            copy.set(k, cloneAnticipatedState(v));
+        }
     }
     return copy;
 }
 function mergeAnticipatedDecls(a, b) {
     for (const [k, v] of b) {
+        if (v.isIsolated)
+            continue;
         const ae = a.get(k);
         if (ae) {
-            mergeSet(ae.ant, v.ant);
-            v.members.forEach((live, block) => ae.members.set(block, live));
-            if (v.live)
-                ae.live = true;
+            mergeAnticipatedState(ae, v);
         }
         else {
             a.set(k, cloneAnticipatedState(v));
@@ -12680,6 +12701,7 @@ function equalStates(a, b) {
         const be = b.get(k);
         if (!be ||
             be.live != ae.live ||
+            be.isIsolated != ae.isIsolated ||
             !equalSet(ae.ant, be.ant) ||
             !equalMap(ae.members, be.members)) {
             return false;
@@ -12750,7 +12772,8 @@ function candidateCost(candState) {
             cost += defCost(candState.node);
         }
     });
-    cost += defCost(candState.node) * candidateBoundary(candState).size;
+    const boundarySize = candidateBoundary(candState).size;
+    cost += defCost(candState.node) * boundarySize;
     return cost;
 }
 function computeAttributes(head) {
@@ -12888,9 +12911,7 @@ function computeAttributes(head) {
                         if (isUpdate || candidates.live) {
                             candidates.ant.add(event);
                         }
-                        if (!isUpdate) {
-                            candidates.live = false;
-                        }
+                        candidates.live = isUpdate;
                         break;
                     }
                 }
@@ -12899,12 +12920,23 @@ function computeAttributes(head) {
         curState.forEach((antState) => {
             antState.head = top;
             antState.members.set(top, antState.live);
+            if (!antState.live && candidateBoundary(antState).size === 0) {
+                // we found a group that's isolated from the rest
+                // of the function. Don't merge it with earlier
+                // refs and defs, because we can take it or leave
+                // it based on its own cost.
+                antState.isIsolated = true;
+            }
         });
         const oldState = blockStates[top.order];
         if (oldState && equalStates(oldState, curState)) {
             continue;
         }
         blockStates[top.order] = curState;
+        if (logging) {
+            console.log(`Updated block ${top.order}`);
+            logAntDecls(curState);
+        }
         if (top.preds) {
             top.preds.forEach((pred) => enqueue(pred));
         }
@@ -12917,7 +12949,9 @@ function computeAttributes(head) {
                 if (cost >= 0)
                     return;
                 const existing = candidateDecls.get(decl);
-                if (!existing || candidateCost(existing) > cost) {
+                if (!existing ||
+                    existing.isIsolated ||
+                    candidateCost(existing) > cost) {
                     const boundary = candidateBoundary(events);
                     if (!Array.from(boundary).every((block) => {
                         if (block !== events.head && block.events) {
@@ -12957,7 +12991,11 @@ function computeAttributes(head) {
                         return;
                     }
                     events.live = false;
-                    if (candidateCost(events) != cost) {
+                    if (existing && existing.isIsolated) {
+                        delete existing.isIsolated;
+                        mergeAnticipatedState(events, existing);
+                    }
+                    else if (candidateCost(events) != cost) {
                         throw new Error(`cost of block ${i} changed`);
                     }
                     candidateDecls.set(decl, events);
@@ -14138,10 +14176,10 @@ async function optimizeMonkeyC(fnMap, barrelList, config) {
                     while (i < node.declarations.length) {
                         const decl = declarations[i++];
                         if (decl.init && decl.init.type === "CallExpression") {
-                            const inlined = optimizeCall(state, decl.init, decl);
+                            const inlined = replace(optimizeCall(state, decl.init, decl), decl.init);
                             if (!inlined)
                                 continue;
-                            if (inlined.type != "BlockStatement") {
+                            if (Array.isArray(inlined) || inlined.type != "BlockStatement") {
                                 throw new Error("Unexpected inlined result");
                             }
                             if (!results) {
@@ -14905,7 +14943,7 @@ async function generateOneConfig(buildConfig, dependencyFiles, config) {
         // the oldest optimized file, we don't need to regenerate
         const source_time = await (0,external_util_cjs_namespaceObject.last_modified)(Object.keys(fnMap).concat(dependencyFiles));
         const opt_time = await (0,external_util_cjs_namespaceObject.first_modified)(Object.values(fnMap).map((v) => v.output));
-        if (source_time < opt_time && 1656718632916 < opt_time) {
+        if (source_time < opt_time && 1656860602542 < opt_time) {
             return { hasTests, diagnostics: prevDiagnostics };
         }
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@markw65/monkeyc-optimizer",
   "type": "module",
-  "version": "1.0.29",
+  "version": "1.0.30",
   "description": "Source to source optimizer for Garmin Monkey C code",
   "main": "build/optimizer.cjs",
   "types": "build/src/optimizer.d.ts",