watr 4.3.3 → 4.3.4

package/dist/watr.js

@@ -3084,6 +3084,7 @@ var treeshake = (ast) => {
   }
   return result;
 };
+var roundEven = (x) => x - Math.floor(x) !== 0.5 ? Math.round(x) : 2 * Math.round(x / 2);
 var FOLDABLE = {
   // i32
   "i32.add": (a, b) => a + b | 0,
@@ -3167,7 +3168,7 @@ var FOLDABLE = {
   "f32.ceil": (a) => Math.fround(Math.ceil(a)),
   "f32.floor": (a) => Math.fround(Math.floor(a)),
   "f32.trunc": (a) => Math.fround(Math.trunc(a)),
-  "f32.nearest": (a) => Math.fround(Math.round(a)),
+  "f32.nearest": (a) => Math.fround(roundEven(a)),
   "f64.add": (a, b) => a + b,
   "f64.sub": (a, b) => a - b,
   "f64.mul": (a, b) => a * b,
@@ -3178,7 +3179,7 @@ var FOLDABLE = {
   "f64.ceil": (a) => Math.ceil(a),
   "f64.floor": (a) => Math.floor(a),
   "f64.trunc": (a) => Math.trunc(a),
-  "f64.nearest": (a) => Math.round(a)
+  "f64.nearest": roundEven
 };
 var getConst = (node) => {
   if (!Array.isArray(node) || node.length !== 2) return null;
@@ -3518,55 +3519,101 @@ var localReuse = (ast) => {
   });
   return result;
 };
+var isPure = (node) => {
+  if (!Array.isArray(node)) return true;
+  const op = node[0];
+  if (typeof op !== "string") return false;
+  if (op === "call" || op === "call_indirect" || op === "return_call" || op === "return_call_indirect") return false;
+  if (op.includes(".store") || op.includes(".load") || op.includes("memory.")) return false;
+  if (op === "global.set") return false;
+  for (let i = 1; i < node.length; i++) if (Array.isArray(node[i]) && !isPure(node[i])) return false;
+  return true;
+};
+var countLocalUses = (node) => {
+  const counts = /* @__PURE__ */ new Map();
+  const ensure = (name2) => {
+    if (!counts.has(name2)) counts.set(name2, { gets: 0, sets: 0, tees: 0 });
+    return counts.get(name2);
+  };
+  walk2(node, (n) => {
+    if (!Array.isArray(n) || n.length < 2 || typeof n[1] !== "string") return;
+    if (n[0] === "local.get") ensure(n[1]).gets++;
+    else if (n[0] === "local.set") ensure(n[1]).sets++;
+    else if (n[0] === "local.tee") ensure(n[1]).tees++;
+  });
+  return counts;
+};
+var canSubst = (k) => getConst(k.val) || k.pure && k.singleUse;
+var substGets = (node, known) => walkPost2(node, (n) => {
+  if (!Array.isArray(n) || n[0] !== "local.get" || n.length !== 2) return;
+  const k = typeof n[1] === "string" && known.get(n[1]);
+  if (k && canSubst(k)) return clone2(k.val);
+});
 var propagate = (ast) => {
   const result = clone2(ast);
-  walk2(result, (node) => {
-    if (!Array.isArray(node) || node[0] !== "func") return;
-    const constLocals = /* @__PURE__ */ new Map();
-    const processBlock = (block, startIdx = 1) => {
-      for (let i = startIdx; i < block.length; i++) {
-        const instr2 = block[i];
+  walk2(result, (funcNode) => {
+    if (!Array.isArray(funcNode) || funcNode[0] !== "func") return;
+    const params = /* @__PURE__ */ new Set();
+    for (const sub of funcNode)
+      if (Array.isArray(sub) && sub[0] === "param" && typeof sub[1] === "string") params.add(sub[1]);
+    for (let pass = 0; pass < 4; pass++) {
+      let changed = false;
+      const uses = countLocalUses(funcNode);
+      const getUses = (name2) => uses.get(name2) || { gets: 0, sets: 0, tees: 0 };
+      const known = /* @__PURE__ */ new Map();
+      for (let i = 1; i < funcNode.length; i++) {
+        const instr2 = funcNode[i];
         if (!Array.isArray(instr2)) continue;
         const op = instr2[0];
-        if (op === "local.set" && instr2.length === 3) {
-          const local = instr2[1];
-          const val = instr2[2];
-          const c = getConst(val);
-          if (c && typeof local === "string") {
-            constLocals.set(local, val);
-          } else if (typeof local === "string") {
-            constLocals.delete(local);
-          }
-        } else if (op === "local.tee" && instr2.length === 3) {
-          const local = instr2[1];
-          const val = instr2[2];
-          const c = getConst(val);
-          if (c && typeof local === "string") {
-            constLocals.set(local, val);
-          } else if (typeof local === "string") {
-            constLocals.delete(local);
-          }
-        } else if (op === "local.get" && instr2.length === 2) {
-          const local = instr2[1];
-          if (typeof local === "string" && constLocals.has(local)) {
-            const constVal = constLocals.get(local);
+        if (op === "param" || op === "result" || op === "local" || op === "type" || op === "export") continue;
+        if (op === "local.set" && instr2.length === 3 && typeof instr2[1] === "string") {
+          substGets(instr2[2], known);
+          const u = getUses(instr2[1]);
+          known.set(instr2[1], {
+            val: instr2[2],
+            pure: isPure(instr2[2]),
+            singleUse: u.gets <= 1 && u.sets <= 1 && u.tees === 0
+          });
+          continue;
+        }
+        if (op === "block" || op === "loop" || op === "if") known.clear();
+        if (op === "call" || op === "call_indirect" || op === "return_call" || op === "return_call_indirect") {
+          for (const [k, v] of known) if (!getConst(v.val)) known.delete(k);
+        }
+        if (op === "local.get" && instr2.length === 2 && typeof instr2[1] === "string") {
+          const k = known.get(instr2[1]);
+          if (k && canSubst(k)) {
+            const r = clone2(k.val);
             instr2.length = 0;
-            instr2.push(...clone2(constVal));
+            instr2.push(...Array.isArray(r) ? r : [r]);
+            changed = true;
+            continue;
           }
-        } else if (op === "block" || op === "loop" || op === "if" || op === "call" || op === "call_indirect") {
-          constLocals.clear();
         }
-        walkPost2(instr2, (n) => {
-          if (!Array.isArray(n) || n[0] !== "local.get" || n.length !== 2) return;
-          const local = n[1];
-          if (typeof local === "string" && constLocals.has(local)) {
-            const constVal = constLocals.get(local);
-            return clone2(constVal);
-          }
-        });
+        if (op !== "block" && op !== "loop" && op !== "if") {
+          const prev = JSON.stringify(instr2);
+          substGets(instr2, known);
+          if (JSON.stringify(instr2) !== prev) changed = true;
+        }
       }
-    };
-    processBlock(node);
+      const postUses = countLocalUses(funcNode);
+      const pu = (name2) => postUses.get(name2) || { gets: 0, sets: 0, tees: 0 };
+      for (let i = funcNode.length - 1; i >= 1; i--) {
+        const sub = funcNode[i];
+        if (!Array.isArray(sub)) continue;
+        const name2 = typeof sub[1] === "string" ? sub[1] : null;
+        if (!name2 || params.has(name2)) continue;
+        const u = pu(name2);
+        if (sub[0] === "local.set" && u.gets === 0 && u.tees === 0 && isPure(sub[2])) {
+          funcNode.splice(i, 1);
+          changed = true;
+        } else if (sub[0] === "local" && name2[0] === "$" && u.gets === 0 && u.sets === 0 && u.tees === 0) {
+          funcNode.splice(i, 1);
+          changed = true;
+        }
+      }
+      if (!changed) break;
+    }
   });
   return result;
 };
@@ -3717,7 +3764,7 @@ function genImports(imports) {
 }
 function compile2(source, ...values) {
   let opts = {};
-  if (!Array.isArray(source) && values.length && typeof values[values.length - 1] === "object" && values[values.length - 1] !== null && !(values[values.length - 1] instanceof Uint8Array)) {
+  if (!Array.isArray(source) && values.length && typeof values[values.length - 1] === "object" && values[values.length - 1] !== null && !values[values.length - 1].byteLength) {
     opts = values.pop();
   }
   if (Array.isArray(source) && source.raw) {
@@ -3742,7 +3789,7 @@ function compile2(source, ...values) {
           }
           return parsed;
         }
-        if (value instanceof Uint8Array) return [...value];
+        if (value.byteLength !== void 0) return [...value];
         return value;
       }
       return node;