Merge branch 'main' into tidy-queue-teststing

calyxir · Jun 18, 2024 · 844f542 · 844f542
2 parents fff1e7e + 04add67
commit 844f542
Show file tree

Hide file tree

Showing 14 changed files with 519 additions and 247 deletions.
diff --git a/calyx-py/calyx/builder.py b/calyx-py/calyx/builder.py
@@ -734,7 +734,7 @@ def bitwise_flip_reg(self, reg, cellname=None):
 
     def incr(self, reg, val=1, signed=False, cellname=None, static=False):
         """Inserts wiring into `self` to perform `reg := reg + val`."""
-        cellname = cellname or f"{reg.name}_incr"
+        cellname = cellname or self.generate_name(f"{reg.name}_incr_{val}")
         width = reg.infer_width_reg()
         add_cell = self.add(width, cellname, signed)
         group = (
@@ -753,7 +753,7 @@ def incr(self, reg, val=1, signed=False, cellname=None, static=False):
 
     def decr(self, reg, val=1, signed=False, cellname=None):
         """Inserts wiring into `self` to perform `reg := reg - val`."""
-        cellname = cellname or f"{reg.name}_decr"
+        cellname = cellname or self.generate_name(f"{reg.name}_decr_{val}")
         width = reg.infer_width_reg()
         sub_cell = self.sub(width, cellname, signed)
         with self.group(f"{cellname}_group") as decr_group:

diff --git a/calyx-py/test/correctness/tuple.py → calyx-py/calyx/tuple.py b/calyx-py/test/correctness/tuple.py → calyx-py/calyx/tuple.py
diff --git a/calyx-py/test/correctness/queues/binheap.data b/calyx-py/test/correctness/queues/binheap.data
@@ -1,5 +1,5 @@
 {
-  "mem": {
+  "out": {
     "data": [
       0,
       0,
@@ -20,7 +20,7 @@
     "format": {
       "is_signed": false,
       "numeric_type": "bitnum",
-      "width": 64
+      "width": 32
     }
   }
-}
+}
diff --git a/calyx-py/test/correctness/queues/binheap.expect b/calyx-py/test/correctness/queues/binheap.expect
@@ -1,14 +1,14 @@
 {
-  "mem": [
+  "out": [
     3,
     6,
+    6,
+    8,
+    9,
     9,
+    10,
     12,
-    0,
-    0,
-    0,
-    0,
-    0,
+    3,
     0,
     0,
     0,