add more use of Elaboratables

diff --git a/src/add/multipipe.py b/src/add/multipipe.py
index e8cc689d8d05974b10dfa52856b9dc076e77e5e9..1b434832798f6b9c05f70c2734c110e256184823 100644 (file)
--- a/src/add/multipipe.py
+++ b/src/add/multipipe.py
@@ -11,7 +11,7 @@
 """
 
 from math import log
 """
 
 from math import log

-from nmigen import Signal, Cat, Const, Mux, Module, Array
+from nmigen import Signal, Cat, Const, Mux, Module, Array, Elaboratable

 from nmigen.cli import verilog, rtlil
 from nmigen.lib.coding import PriorityEncoder
 from nmigen.hdl.rec import Record, Layout
 from nmigen.cli import verilog, rtlil
 from nmigen.lib.coding import PriorityEncoder
 from nmigen.hdl.rec import Record, Layout


@@ -21,7 +21,7 @@ from collections.abc import Sequence
 from example_buf_pipe import eq, NextControl, PrevControl, ExampleStage
 
 
 from example_buf_pipe import eq, NextControl, PrevControl, ExampleStage
 
 

-class MultiInControlBase:
+class MultiInControlBase(Elaboratable):

     """ Common functions for Pipeline API
     """
     def __init__(self, in_multi=None, p_len=1):
     """ Common functions for Pipeline API
     """
     def __init__(self, in_multi=None, p_len=1):


@@ -68,6 +68,13 @@ class MultiInControlBase:
         """
         return eq(self.p[idx].i_data, i)
 
         """
         return eq(self.p[idx].i_data, i)
 

+    def elaborate(self, platform):
+        m = Module()
+        for i, p in enumerate(self.p):
+            setattr(m.submodules, "p%d" % i, p)
+        m.submodules.n = self.n
+        return m
+

     def __iter__(self):
         for p in self.p:
             yield from p
     def __iter__(self):
         for p in self.p:
             yield from p


@@ -77,7 +84,7 @@ class MultiInControlBase:
         return list(self)
 
 
         return list(self)
 
 

-class MultiOutControlBase:
+class MultiOutControlBase(Elaboratable):

     """ Common functions for Pipeline API
     """
     def __init__(self, n_len=1, in_multi=None):
     """ Common functions for Pipeline API
     """
     def __init__(self, n_len=1, in_multi=None):


@@ -119,6 +126,13 @@ class MultiOutControlBase:
             return self.n[idx]._connect_out(nxt.n)
         return self.n[idx]._connect_out(nxt.n[nxt_idx])
 
             return self.n[idx]._connect_out(nxt.n)
         return self.n[idx]._connect_out(nxt.n[nxt_idx])
 

+    def elaborate(self, platform):
+        m = Module()
+        m.submodules.p = self.p
+        for i, n in enumerate(self.n):
+            setattr(m.submodules, "n%d" % i, n)
+        return m
+

     def set_input(self, i):
         """ helper function to set the input data
         """
     def set_input(self, i):
         """ helper function to set the input data
         """


@@ -153,7 +167,7 @@ class CombMultiOutPipeline(MultiOutControlBase):
             self.n[i].o_data = stage.ospec() # output type
 
     def elaborate(self, platform):
             self.n[i].o_data = stage.ospec() # output type
 
     def elaborate(self, platform):

-        m = Module()
+        m = MultiOutControlBase.elaborate(self, platform)

 
         if hasattr(self.n_mux, "elaborate"): # TODO: identify submodule?
             m.submodules += self.n_mux
 
         if hasattr(self.n_mux, "elaborate"): # TODO: identify submodule?
             m.submodules += self.n_mux


@@ -213,7 +227,7 @@ class CombMultiInPipeline(MultiInControlBase):
         self.n.o_data = stage.ospec()
 
     def elaborate(self, platform):
         self.n.o_data = stage.ospec()
 
     def elaborate(self, platform):

-        m = Module()
+        m = MultiInControlBase.elaborate(self, platform)

 
         m.submodules += self.p_mux
 
 
         m.submodules += self.p_mux
 


@@ -278,7 +292,7 @@ class CombMuxOutPipe(CombMultiOutPipeline):
 
 
 
 
 
 

-class InputPriorityArbiter:
+class InputPriorityArbiter(Elaboratable):

     """ arbitration module for Input-Mux pipe, baed on PriorityEncoder
     """
     def __init__(self, pipe, num_rows):
     """ arbitration module for Input-Mux pipe, baed on PriorityEncoder
     """
     def __init__(self, pipe, num_rows):

diff --git a/src/add/test_inout_mux_pipe.py b/src/add/test_inout_mux_pipe.py
index 8861f281d5e4cea7800bf91225ca7b9c9b6c7ec5..3bb7c4010dedb43d57ef5c884a999468d4e84cc5 100644 (file)
--- a/src/add/test_inout_mux_pipe.py
+++ b/src/add/test_inout_mux_pipe.py
@@ -7,7 +7,7 @@
 
 from random import randint
 from math import log
 
 from random import randint
 from math import log

-from nmigen import Module, Signal, Cat, Value
+from nmigen import Module, Signal, Cat, Value, Elaboratable

 from nmigen.compat.sim import run_simulation
 from nmigen.cli import verilog, rtlil
 
 from nmigen.compat.sim import run_simulation
 from nmigen.cli import verilog, rtlil
 


@@ -183,7 +183,7 @@ class TestMuxOutPipe(CombMuxOutPipe):
         CombMuxOutPipe.__init__(self, stage, n_len=self.num_rows)
 
 
         CombMuxOutPipe.__init__(self, stage, n_len=self.num_rows)
 
 

-class TestInOutPipe:
+class TestInOutPipe(Elaboratable):

     def __init__(self, num_rows=4):
         self.num_rows = num_rows
         self.inpipe = TestPriorityMuxPipe(num_rows) # fan-in (combinatorial)
     def __init__(self, num_rows=4):
         self.num_rows = num_rows
         self.inpipe = TestPriorityMuxPipe(num_rows) # fan-in (combinatorial)