Merge branch 'master' into tidy-calyx-py-correctness

calyxir · Jul 25, 2023 · ea41043 · ea41043
2 parents c44426f + 720b974
commit ea41043
Show file tree

Hide file tree

Showing 10 changed files with 445 additions and 387 deletions.
diff --git a/calyx-py/calyx/builder.py b/calyx-py/calyx/builder.py
@@ -251,6 +251,13 @@ def seq_mem_d1(
             name, ast.Stdlib.seq_mem_d1(bitwidth, len, idx_size), is_external, is_ref
         )
 
+    def is_seq_mem_d1(self, cell: CellBuilder) -> bool:
+        """Check if the cell is a SeqMemD1 cell."""
+        return (
+            isinstance(cell._cell.comp, ast.CompInst)
+            and cell._cell.comp.name == "seq_mem_d1"
+        )
+
     def add(self, name: str, size: int, signed=False) -> CellBuilder:
         """Generate a StdAdd cell."""
         self.prog.import_("primitives/binary_operators.futil")

diff --git a/calyx-py/test/correctness/fifo.data b/calyx-py/test/correctness/fifo.data
@@ -0,0 +1,45 @@
+{
+  "commands": {
+    "data": [
+      100,
+      0,
+      101,
+      102,
+      0,
+      103,
+      104,
+      105,
+      106,
+      107,
+      108,
+      0,
+      0,
+      0,
+      0
+    ],
+    "format": {
+      "is_signed": false,
+      "numeric_type": "bitnum",
+      "width": 32
+    }
+  },
+  "ans_mem": {
+    "data": [
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0
+    ],
+    "format": {
+      "is_signed": false,
+      "numeric_type": "bitnum",
+      "width": 32
+    }
+  }
+}
diff --git a/calyx-py/test/correctness/fifo.expect b/calyx-py/test/correctness/fifo.expect
@@ -0,0 +1,31 @@
+{
+  "ans_mem": [
+    100,
+    101,
+    102,
+    103,
+    104,
+    105,
+    0,
+    0,
+    0,
+    0
+  ],
+  "commands": [
+    100,
+    0,
+    101,
+    102,
+    0,
+    103,
+    104,
+    105,
+    106,
+    107,
+    108,
+    0,
+    0,
+    0,
+    0
+  ]
+}