@thi.ng/shader-ast-optimize 0.2.52 → 0.3.0

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change Log
 
-- **Last updated**: 2023-05-11T12:16:33Z
+- **Last updated**: 2023-05-24T14:26:03Z
 - **Generator**: [thi.ng/monopub](https://thi.ng/monopub)
 
 All notable changes to this project will be documented in this file.
@@ -9,6 +9,13 @@ See [Conventional Commits](https://conventionalcommits.org/) for commit guidelin
 **Note:** Unlisted _patch_ versions only involve non-code or otherwise excluded changes
 and/or version bumps of transitive dependencies.
 
+## [0.3.0](https://github.com/thi-ng/umbrella/tree/@thi.ng/shader-ast-optimize@0.3.0) (2023-05-24)
+
+#### 🚀 Features
+
+- update constant folding ([1bd5fef](https://github.com/thi-ng/umbrella/commit/1bd5fef))
+  - add simplifications for 0/1 cases
+
 ## [0.2.0](https://github.com/thi-ng/umbrella/tree/@thi.ng/shader-ast-optimize@0.2.0) (2021-11-17)
 
 #### 🚀 Features

package/contant-folding.js

@@ -5,7 +5,7 @@ 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 { float, int, lit, uint } from "@thi.ng/shader-ast/ast/lit";
+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";
 /**
@@ -84,13 +84,33 @@ export const foldNode = defmulti((t) => t.tag, {}, {
     },
     op2: (node) => {
         const $node = node;
-        if (isLitNumericConst($node.l) && isLitNumericConst($node.r)) {
-            const l = $node.l.val;
-            const r = $node.r.val;
-            let res = maybeFoldMath($node.op, l, r);
-            if (res !== undefined) {
+        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);
         }
     },
     call_i: (node) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thi.ng/shader-ast-optimize",
-  "version": "0.2.52",
+  "version": "0.3.0",
   "description": "Shader AST code optimization passes/strategies",
   "type": "module",
   "module": "./index.js",
@@ -77,5 +77,5 @@
     "parent": "@thi.ng/shader-ast",
     "year": 2019
   },
-  "gitHead": "20ab11b687a13228f6a8cecdc5f05ba9105122ea\n"
+  "gitHead": "26a171dff04a026e5466fc655b91c09e5279db8e\n"
 }