@thi.ng/shader-ast-optimize 0.3.31 → 0.3.33

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change Log
 
-- **Last updated**: 2023-12-03T12:13:31Z
+- **Last updated**: 2023-12-11T10:07:09Z
 - **Generator**: [thi.ng/monopub](https://thi.ng/monopub)
 
 All notable changes to this project will be documented in this file.

package/contant-folding.js

@@ -4,211 +4,158 @@ import { deg, rad } from "@thi.ng/math/angle";
 import { clamp } from "@thi.ng/math/interval";
 import { mix } from "@thi.ng/math/mix";
 import { fract, mod } from "@thi.ng/math/prec";
-import { isFloat, isInt, isLitNumericConst, isLitVecConst, isUint, } from "@thi.ng/shader-ast/ast/checks";
+import {
+  isFloat,
+  isInt,
+  isLitNumericConst,
+  isLitVecConst,
+  isUint
+} from "@thi.ng/shader-ast/ast/checks";
 import { FLOAT0, float, int, lit, uint } from "@thi.ng/shader-ast/ast/lit";
 import { allChildren, walk } from "@thi.ng/shader-ast/ast/scope";
 import { LOGGER } from "@thi.ng/shader-ast/logger";
-/**
- * Replaces contents of `node` with those of `next`. All other existing props in
- * `node` will be removed.
- *
- * @param node -
- * @param next -
- *
- * @internal
- */
 const replaceNode = (node, next) => {
-    if (LOGGER.level <= LogLevel.DEBUG) {
-        LOGGER.debug(`replacing AST node:`);
-        LOGGER.debug("\told: " + JSON.stringify(node));
-        LOGGER.debug("\tnew: " + JSON.stringify(next));
-    }
-    for (let k in node) {
-        !next.hasOwnProperty(k) && delete node[k];
-    }
-    Object.assign(node, next);
-    return true;
+  if (LOGGER.level <= LogLevel.DEBUG) {
+    LOGGER.debug(`replacing AST node:`);
+    LOGGER.debug("	old: " + JSON.stringify(node));
+    LOGGER.debug("	new: " + JSON.stringify(next));
+  }
+  for (let k in node) {
+    !next.hasOwnProperty(k) && delete node[k];
+  }
+  Object.assign(node, next);
+  return true;
 };
 const replaceNumericNode = (node, res) => {
-    node.type === "int" && (res |= 0);
-    node.type === "uint" && (res >>>= 0);
-    return replaceNode(node, lit(node.type, res));
+  node.type === "int" && (res |= 0);
+  node.type === "uint" && (res >>>= 0);
+  return replaceNode(node, lit(node.type, res));
 };
-/** @internal */
-const maybeFoldMath = (op, l, r) => op === "+"
-    ? l + r
-    : op === "-"
-        ? l - r
-        : op === "*"
-            ? l * r
-            : op === "/"
-                ? l / r
-                : undefined;
-/** @internal */
+const maybeFoldMath = (op, l, r) => op === "+" ? l + r : op === "-" ? l - r : op === "*" ? l * r : op === "/" ? l / r : void 0;
 const COMPS = { x: 0, y: 1, z: 2, w: 3 };
 const BUILTINS = {
-    abs: ([a]) => Math.abs(a),
-    acos: ([a]) => Math.acos(a),
-    asin: ([a]) => Math.asin(a),
-    ceil: ([a]) => Math.ceil(a),
-    clamp: ([a, b, c]) => clamp(a, b, c),
-    cos: ([a]) => Math.cos(a),
-    degrees: ([a]) => deg(a),
-    exp: ([a]) => Math.exp(a),
-    exp2: ([a]) => Math.pow(2, a),
-    floor: ([a]) => Math.floor(a),
-    fract: ([a]) => fract(a),
-    inversesqrt: ([a]) => 1 / Math.sqrt(a),
-    log: ([a]) => Math.log(a),
-    log2: ([a]) => Math.log2(a),
-    max: ([a, b]) => Math.max(a, b),
-    min: ([a, b]) => Math.min(a, b),
-    mix: ([a, b, c]) => mix(a, b, c),
-    mod: ([a, b]) => mod(a, b),
-    pow: ([a, b]) => Math.pow(a, b),
-    radians: ([a]) => rad(a),
-    sign: ([a]) => Math.sign(a),
-    sin: ([a]) => Math.sin(a),
-    tan: ([a]) => Math.tan(a),
-    sqrt: ([a]) => Math.sqrt(a),
+  abs: ([a]) => Math.abs(a),
+  acos: ([a]) => Math.acos(a),
+  asin: ([a]) => Math.asin(a),
+  ceil: ([a]) => Math.ceil(a),
+  clamp: ([a, b, c]) => clamp(a, b, c),
+  cos: ([a]) => Math.cos(a),
+  degrees: ([a]) => deg(a),
+  exp: ([a]) => Math.exp(a),
+  exp2: ([a]) => Math.pow(2, a),
+  floor: ([a]) => Math.floor(a),
+  fract: ([a]) => fract(a),
+  inversesqrt: ([a]) => 1 / Math.sqrt(a),
+  log: ([a]) => Math.log(a),
+  log2: ([a]) => Math.log2(a),
+  max: ([a, b]) => Math.max(a, b),
+  min: ([a, b]) => Math.min(a, b),
+  mix: ([a, b, c]) => mix(a, b, c),
+  mod: ([a, b]) => mod(a, b),
+  pow: ([a, b]) => Math.pow(a, b),
+  radians: ([a]) => rad(a),
+  sign: ([a]) => Math.sign(a),
+  sin: ([a]) => Math.sin(a),
+  tan: ([a]) => Math.tan(a),
+  sqrt: ([a]) => Math.sqrt(a)
 };
-/** @internal */
-export const foldNode = defmulti((t) => t.tag, {}, {
+const foldNode = defmulti(
+  (t) => t.tag,
+  {},
+  {
     [DEFAULT]: () => false,
     op1: (node) => {
-        const $node = node;
-        if ($node.op == "-" && isLitNumericConst($node.val)) {
-            $node.val.val *= -1;
-            return replaceNode(node, $node.val);
-        }
+      const $node = node;
+      if ($node.op == "-" && isLitNumericConst($node.val)) {
+        $node.val.val *= -1;
+        return replaceNode(node, $node.val);
+      }
     },
     op2: (node) => {
-        const $node = node;
-        const op = $node.op;
-        const l = $node.l;
-        const r = $node.r;
-        const isNumL = isLitNumericConst(l);
-        const isNumR = isLitNumericConst(r);
-        if (isNumL && isNumR) {
-            let res = maybeFoldMath(op, l.val, r.val);
-            if (res !== undefined)
-                return replaceNumericNode(node, res);
-        }
-        else if (op === "*") {
-            if ((isNumL && l.val === 0) || (isNumR && r.val === 0))
-                return replaceNode(node, FLOAT0);
-            if (isNumL && l.val === 1)
-                return replaceNode(node, r);
-            if (isNumR && r.val === 1)
-                return replaceNode(node, l);
-        }
-        else if (op === "/") {
-            if (isNumR && r.val === 1)
-                return replaceNode(node, l);
-        }
-        else if (op === "+" || op === "-") {
-            if (isNumL && l.val === 0)
-                return replaceNode(node, r);
-            if (isNumR && r.val === 0)
-                return replaceNode(node, l);
-        }
+      const $node = node;
+      const op = $node.op;
+      const l = $node.l;
+      const r = $node.r;
+      const isNumL = isLitNumericConst(l);
+      const isNumR = isLitNumericConst(r);
+      if (isNumL && isNumR) {
+        let res = maybeFoldMath(op, l.val, r.val);
+        if (res !== void 0)
+          return replaceNumericNode(node, res);
+      } else if (op === "*") {
+        if (isNumL && l.val === 0 || isNumR && r.val === 0)
+          return replaceNode(node, FLOAT0);
+        if (isNumL && l.val === 1)
+          return replaceNode(node, r);
+        if (isNumR && r.val === 1)
+          return replaceNode(node, l);
+      } else if (op === "/") {
+        if (isNumR && r.val === 1)
+          return replaceNode(node, l);
+      } else if (op === "+" || op === "-") {
+        if (isNumL && l.val === 0)
+          return replaceNode(node, r);
+        if (isNumR && r.val === 0)
+          return replaceNode(node, l);
+      }
     },
     call_i: (node) => {
-        const $node = node;
-        if ($node.args.every((x) => isLitNumericConst(x))) {
-            const op = BUILTINS[$node.id];
-            if (op !== undefined) {
-                return replaceNumericNode(node, op($node.args.map((x) => x.val)));
-            }
+      const $node = node;
+      if ($node.args.every((x) => isLitNumericConst(x))) {
+        const op = BUILTINS[$node.id];
+        if (op !== void 0) {
+          return replaceNumericNode(
+            node,
+            op($node.args.map((x) => x.val))
+          );
         }
+      }
     },
     lit: (node) => {
-        const $node = node;
-        if (isLitNumericConst($node.val)) {
-            if (isFloat($node.val)) {
-                return replaceNode(node, float($node.val.val));
-            }
-            if (isInt($node.val)) {
-                return replaceNode(node, int($node.val.val));
-            }
-            if (isUint($node.val)) {
-                return replaceNode(node, uint($node.val.val));
-            }
+      const $node = node;
+      if (isLitNumericConst($node.val)) {
+        if (isFloat($node.val)) {
+          return replaceNode(node, float($node.val.val));
+        }
+        if (isInt($node.val)) {
+          return replaceNode(node, int($node.val.val));
+        }
+        if (isUint($node.val)) {
+          return replaceNode(node, uint($node.val.val));
         }
+      }
     },
     swizzle: (node) => {
-        const $node = node;
-        const val = $node.val;
-        if (isLitVecConst(val)) {
-            if (isFloat(node)) {
-                return replaceNode(node, float(val.val[COMPS[$node.id]]));
-            }
+      const $node = node;
+      const val = $node.val;
+      if (isLitVecConst(val)) {
+        if (isFloat(node)) {
+          return replaceNode(
+            node,
+            float(val.val[COMPS[$node.id]])
+          );
         }
-    },
-});
-/**
- * Traverses given AST (potentially several times) and applies constant folding
- * optimizations where possible. Returns possibly updated tree (mutates
- * original).
- *
- * @remarks
- * Currently, only the following operations are supported / considered:
- *
- * - scalar math operators
- * - scalar math built-in functions
- * - single component vector swizzling
- * - literal hoisting
- *
- * @example
- * ```ts
- * const foo = defn("float", "foo", ["float"], (x) => [
- *   ret(mul(x, add(neg(float(10)), float(42))))]
- * )
- *
- * const bar = vec2(100, 200);
- *
- * const prog = scope([
- *   foo,
- *   foo(add(float(1), float(2))),
- *   foo(add($x(bar), $y(bar)))
- * ], true);
- *
- * // serialized (GLSL)
- * glsl(prog);
- *
- * // float foo(in float _sym0) {
- * //   return (_sym0 * (-10.0 + 42.0));
- * // };
- * // foo((1.0 + 2.0));
- * // foo((vec2(100.0, 200.0).x + vec2(100.0, 200.0).y));
- *
- * // with constant folding
- * glsl(constantFolding(prog))
- *
- * // float foo(in float _sym0) {
- * //   return (_sym0 * 32.0);
- * // };
- * // foo(3.0);
- * // foo(300.0);
- *
- * const expr = mul(float(4), $x(vec2(2)))
- *
- * glsl(expr)
- * // (4.0 * vec2(2.0).x)
- *
- * glsl(constantFolding(expr))
- * // 8.0
- * ```
- *
- * @param tree -
- */
-export const constantFolding = (tree) => {
-    let exec = true;
-    while (exec) {
-        exec = false;
-        walk((_, node) => {
-            exec = foldNode(node) || exec;
-        }, allChildren, null, tree, false);
+      }
     }
-    return tree;
+  }
+);
+const constantFolding = (tree) => {
+  let exec = true;
+  while (exec) {
+    exec = false;
+    walk(
+      (_, node) => {
+        exec = foldNode(node) || exec;
+      },
+      allChildren,
+      null,
+      tree,
+      false
+    );
+  }
+  return tree;
+};
+export {
+  constantFolding,
+  foldNode
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thi.ng/shader-ast-optimize",
-  "version": "0.3.31",
+  "version": "0.3.33",
   "description": "Shader AST code optimization passes/strategies",
   "type": "module",
   "module": "./index.js",
@@ -24,7 +24,9 @@
   "author": "Karsten Schmidt (https://thi.ng)",
   "license": "Apache-2.0",
   "scripts": {
-    "build": "yarn clean && tsc --declaration",
+    "build": "yarn build:esbuild && yarn build:decl",
+    "build:decl": "tsc --declaration --emitDeclarationOnly",
+    "build:esbuild": "esbuild --format=esm --platform=neutral --target=es2022 --tsconfig=tsconfig.json --outdir=. src/**/*.ts",
     "clean": "rimraf --glob '*.js' '*.d.ts' '*.map' doc",
     "doc": "typedoc --excludePrivate --excludeInternal --out doc src/index.ts",
     "doc:ae": "mkdir -p .ae/doc .ae/temp && api-extractor run --local --verbose",
@@ -33,15 +35,15 @@
     "test": "bun test"
   },
   "dependencies": {
-    "@thi.ng/api": "^8.9.10",
-    "@thi.ng/defmulti": "^3.0.8",
-    "@thi.ng/logger": "^2.0.1",
-    "@thi.ng/math": "^5.7.5",
-    "@thi.ng/shader-ast": "^0.12.83"
+    "@thi.ng/api": "^8.9.12",
+    "@thi.ng/defmulti": "^3.0.10",
+    "@thi.ng/logger": "^2.0.2",
+    "@thi.ng/math": "^5.7.7",
+    "@thi.ng/shader-ast": "^0.12.85"
   },
   "devDependencies": {
     "@microsoft/api-extractor": "^7.38.3",
-    "@thi.ng/testament": "^0.4.3",
+    "esbuild": "^0.19.8",
     "rimraf": "^5.0.5",
     "tools": "^0.0.1",
     "typedoc": "^0.25.4",
@@ -76,5 +78,5 @@
     "parent": "@thi.ng/shader-ast",
     "year": 2019
   },
-  "gitHead": "04d1de79f256d7a53c6b5fd157b37f49bc88e11d\n"
+  "gitHead": "5e7bafedfc3d53bc131469a28de31dd8e5b4a3ff\n"
 }