Arbiter works

calyxir · Aug 15, 2023 · b317c80 · b317c80
1 parent 8d66d43
commit b317c80
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/calyx-py/calyx/builder_util.py b/calyx-py/calyx/builder_util.py
@@ -14,7 +14,7 @@ def insert_comb_group(comp: cb.ComponentBuilder, left, right, cell, groupname=No
     return cell, comb_group
 
 
-def insert_eq(comp: cb.ComponentBuilder, left, right, width):
+def insert_eq(comp: cb.ComponentBuilder, left, right, width, cellname=None):
     """Inserts wiring into component {comp} to check if {left} == {right}.
 
     <cellname> = std_eq(<width>);
@@ -26,7 +26,7 @@ def insert_eq(comp: cb.ComponentBuilder, left, right, width):
 
     Returns handles to the cell and the combinational group.
     """
-    return insert_comb_group(comp, left, right, comp.eq(width))
+    return insert_comb_group(comp, left, right, comp.eq(width, cellname))
 
 
 def insert_neq(comp: cb.ComponentBuilder, left, right, cellname, width):

diff --git a/calyx-py/test/correctness/arbiter_6.py b/calyx-py/test/correctness/arbiter_6.py
@@ -30,8 +30,8 @@ def add_wrap2(prog):
     j_mod_4 = wrap.reg("j_mod_4", 32)
 
     # Additional cells and groups to compute equality and lt
-    i_eq_0_cell, i_eq_0_grp = util.insert_eq(wrap, i, 0, "i_eq_0", 32)
-    i_eq_1_cell, i_eq_1_group = util.insert_eq(wrap, i, 1, "i_eq_1", 32)
+    i_eq_0_cell, i_eq_0_grp = util.insert_eq(wrap, i, 0, 32, "i_eq_0")
+    i_eq_1_cell, i_eq_1_group = util.insert_eq(wrap, i, 1, 32, "i_eq_1")
     j_lt_4_cell, j_lt_4_group = util.insert_lt(wrap, j, 4, "j_lt_4", 32)
     j_lt_8_cell, j_lt_8_group = util.insert_lt(wrap, j, 8, "j_lt_8", 32)
 
@@ -126,9 +126,9 @@ def add_wrap3(prog):
     j_mod_4 = wrap.reg("j_mod_4", 32)
 
     # Additional cells to compute equality, and lt
-    i_eq_0_cell, i_eq_0_group = util.insert_eq(wrap, i, 0, "i_eq_0", 32)
-    i_eq_1_cell, i_eq_1_group = util.insert_eq(wrap, i, 1, "i_eq_1", 32)
-    i_eq_2_cell, i_eq_2_group = util.insert_eq(wrap, i, 2, "i_eq_2", 32)
+    i_eq_0_cell, i_eq_0_group = util.insert_eq(wrap, i, 0, 32, "i_eq_0")
+    i_eq_1_cell, i_eq_1_group = util.insert_eq(wrap, i, 1, 32, "i_eq_1")
+    i_eq_2_cell, i_eq_2_group = util.insert_eq(wrap, i, 2, 32, "i_eq_2")
     j_lt_4_cell, j_lt_4_group = util.insert_lt(wrap, j, 4, "j_lt_4", 32)
 
     # Load `j` unchanged into `j_mod_4`.