From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Tue, 19 Mar 2019 04:11:38 +0000 (+0000)
Subject: create connect_to_next function in NextControl, use it in Stage
X-Git-Tag: ls180-24jan2020~1641
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e563164de46e525953101317ce5634f7966f4ee2;p=ieee754fpu.git

create connect_to_next function in NextControl, use it in Stage
---

diff --git a/src/add/example_buf_pipe.py b/src/add/example_buf_pipe.py
index 51c95520..6d42c1cc 100644
--- a/src/add/example_buf_pipe.py
+++ b/src/add/example_buf_pipe.py
@@ -49,6 +49,11 @@ from collections.abc import Sequence
 
 
 class PrevControl:
+    """ contains signals that come *from* the previous stage (both in and out)
+        * i_valid: input from previous stage indicating incoming data is valid
+        * o_ready: output to next stage indicating readiness to accept data
+        * i_data : an input - added by the user of this class
+    """
 
     def __init__(self):
         self.i_valid = Signal(name="p_i_valid") # >>in
@@ -56,11 +61,24 @@ class PrevControl:
 
 
 class NextControl:
-
+    """ contains the signals that go *to* the next stage (both in and out)
+        * o_valid: output indicating to next stage that data is valid
+        * i_ready: input from next stage indicating that it can accept data
+        * o_data : an output - added by the user of this class
+    """
     def __init__(self):
         self.o_valid = Signal(name="n_o_valid") # out>>
         self.i_ready = Signal(name="n_i_ready") # <<in
 
+    def connect_to_next(self, nxt):
+        """ helper function to connect to the next stage data/valid/ready.
+            data/valid is passed *TO* nxt, and ready comes *IN* from nxt.
+        """
+        return [nxt.i_valid.eq(self.o_valid),
+                self.i_ready.eq(nxt.o_ready),
+                eq(nxt.data, self.data),
+               ]
+
 
 def eq(o, i):
     if not isinstance(o, Sequence):
@@ -122,14 +140,11 @@ class BufferedPipeline:
         self.result = stage.ospec()
         self.n.data = stage.ospec()
 
-    def connect_next(self, nxt):
+    def connect_to_next(self, nxt):
         """ helper function to connect to the next stage data/valid/ready.
             data/valid is passed *TO* nxt, and ready comes *IN* from nxt.
         """
-        return [nxt.p.i_valid.eq(self.n.o_valid),
-                self.n.i_ready.eq(nxt.p.o_ready),
-                eq(nxt.p.data, self.n.data),
-               ]
+        return self.n.connect_to_next(nxt.p)
 
     def connect_in(self, prev):
         """ helper function to connect stage to an input source.  do not
diff --git a/src/add/test_buf_pipe.py b/src/add/test_buf_pipe.py
index 76c71a83..60804653 100644
--- a/src/add/test_buf_pipe.py
+++ b/src/add/test_buf_pipe.py
@@ -252,7 +252,7 @@ class ExampleBufPipe2:
         m.submodules.pipe2 = self.pipe2
 
         # connect inter-pipe input/output valid/ready/data
-        m.d.comb += self.pipe1.connect_next(self.pipe2)
+        m.d.comb += self.pipe1.connect_to_next(self.pipe2)
 
         # inputs/outputs to the module: pipe1 connections here (LHS)
         m.d.comb += self.pipe1.connect_in(self)