grr fix more names thanks to nmigen renaming

diff --git a/src/nmutil/picker.py b/src/nmutil/picker.py
index ece57ea0ba06939ee4f12dd41f3abd9a88082d46..4ff5e57e41b270c10973bb89eb2adc98330f7445 100644 (file)
--- a/src/nmutil/picker.py
+++ b/src/nmutil/picker.py
@@ -170,7 +170,15 @@ class MultiPriorityPicker(Elaboratable):
 
 
 if __name__ == '__main__':
+    dut = PriorityPicker(16)
+    vl = rtlil.convert(dut, ports=dut.ports())
+    with open("test_picker.il", "w") as f:
+        f.write(vl)
     dut = MultiPriorityPicker(5, 4, True)
     vl = rtlil.convert(dut, ports=dut.ports())
     with open("test_multi_picker.il", "w") as f:
         f.write(vl)
+    dut = MultiPriorityPicker(5, 4, False)
+    vl = rtlil.convert(dut, ports=dut.ports())
+    with open("test_multi_picker_noidx.il", "w") as f:
+        f.write(vl)

diff --git a/src/nmutil/singlepipe.py b/src/nmutil/singlepipe.py
index 4880a819f22caf361a276083a40e618a9b538383..cbd06f648b23a3ad6e9b064093de0f039c76bb32 100644 (file)
--- a/src/nmutil/singlepipe.py
+++ b/src/nmutil/singlepipe.py
@@ -945,12 +945,12 @@ class FIFOControl(ControlBase):
 
         ## prev: make the FIFO (Queue object) "look" like a PrevControl...
         m.submodules.fp = fp = PrevControl()
-        fp.valid_i, fp._ready_o, fp.data_i = fifo.we, fifo.writable, fifo.din
+        fp.valid_i, fp._ready_o, fp.data_i = fifo.w_en, fifo.w_rdy, fifo.w_data
         m.d.comb += fp._connect_in(self.p, fn=processfn)
 
         # next: make the FIFO (Queue object) "look" like a NextControl...
         m.submodules.fn = fn = NextControl()
-        fn.valid_o, fn.ready_i, fn.data_o  = fifo.readable, fifo.re, fifo.dout
+        fn.valid_o, fn.ready_i, fn.data_o  = fifo.r_rdy, fifo.r_en, fifo.r_data
         connections = fn._connect_out(self.n, fn=nmoperator.cat)
         valid_eq, ready_eq, data_o = connections