Merge pull request #467 from OpenVADL/bugfix/canonalize-unary-nodes

viam: Canonalized sext + sext or zext + zext

Author: kper

vadl/main/vadl/viam/graph/dependency/SignExtendNode.java

@@ -84,6 +84,12 @@ public Node canonical() {
       return value;
     }
 
+    // sext (sext X) -> sext X
+    if (value instanceof SignExtendNode subNode) {
+      replaceInput(value, subNode.value);
+      subNode.safeDelete();
+    }
+
     return this;
   }
 }

vadl/main/vadl/viam/graph/dependency/ZeroExtendNode.java

@@ -84,6 +84,12 @@ public Node canonical() {
       return value;
     }
 
+    // zext (zext X) -> zext X
+    if (value instanceof ZeroExtendNode subNode) {
+      replaceInput(value, subNode.value);
+      subNode.safeDelete();
+    }
+
     return this;
   }
 }

vadl/main/vadl/viam/passes/functionInliner/FunctionInlinerPass.java

@@ -82,6 +82,4 @@ private UninlinedGraph handleMainBehavior(DefProp.WithBehavior def) {
     Inliner.inlineFuncs(behavior);
     return new UninlinedGraph(copy, def.asDefinition());
   }
-
-
 }

vadl/test/resources/snapshots/aarch64/InstrInfoTableGen.td

@@ -51245,7 +51245,7 @@ def : Pat<(add X:$ra, (mul X:$rn, X:$rm)),
         (MADDX X:$ra, X:$rn, X:$rm)>;
 
 
-def : Pat<(zext (zext AArch64Base_MOVZWPos00_imm16AsInt16:$imm16)),
+def : Pat<(zext AArch64Base_MOVZWPos00_imm16AsInt16:$imm16),
         (MOVZWPos00 AArch64Base_MOVZWPos00_imm16AsInt16:$imm16)>;