projects
/
ieee754fpu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
72c3bef
)
rename MultiIn/Out to MultiIn/OutControlBase
author
Luke Kenneth Casson Leighton
<lkcl@lkcl.net>
Wed, 27 Mar 2019 09:04:44 +0000
(09:04 +0000)
committer
Luke Kenneth Casson Leighton
<lkcl@lkcl.net>
Wed, 27 Mar 2019 09:04:44 +0000
(09:04 +0000)
src/add/multipipe.py
patch
|
blob
|
history
diff --git
a/src/add/multipipe.py
b/src/add/multipipe.py
index 8dfc87aadf5a5c2d47c449eee6fa8e4588f53ed3..5fd2f1623822f52ff071f11ffe8a9bb43e2ba889 100644
(file)
--- a/
src/add/multipipe.py
+++ b/
src/add/multipipe.py
@@
-12,11
+12,15
@@
from collections.abc import Sequence
from example_buf_pipe import eq, NextControl, PrevControl, ExampleStage
from example_buf_pipe import eq, NextControl, PrevControl, ExampleStage
-class MultiInControl:
+class MultiInControl
Base
:
""" 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):
- """ Multi-input Control class
+ """ Multi-input Control class. Conforms to same API as ControlBase...
+ mostly. has additional indices to the *multiple* input stages
+
+ * p: contains ready/valid to the previous stages PLURAL
+ * n: contains ready/valid to the next stage
User must also:
* add i_data members to PrevControl and
User must also:
* add i_data members to PrevControl and
@@
-66,12
+70,15
@@
class MultiInControl:
-class MultiOutControl:
+class MultiOutControl
Base
:
""" Common functions for Pipeline API
"""
def __init__(self, n_len=1):
""" Multi-output Control class
""" Common functions for Pipeline API
"""
def __init__(self, n_len=1):
""" Multi-output Control class
+ * p: contains ready/valid to the previou stage
+ * n: contains ready/valid to the next stages PLURAL
+
User must also:
* add i_data member to PrevControl and
* add o_data members to NextControl
User must also:
* add i_data member to PrevControl and
* add o_data members to NextControl
@@
-118,7
+125,7
@@
class MultiOutControl:
-class CombMultiOutPipeline(Multi
InControl
):
+class CombMultiOutPipeline(Multi
OutControlBase
):
""" A multi-input Combinatorial block conforming to the Pipeline API
Attributes:
""" A multi-input Combinatorial block conforming to the Pipeline API
Attributes:
@@
-134,7
+141,7
@@
class CombMultiOutPipeline(MultiInControl):
"""
def __init__(self, stage, n_len, n_mux):
"""
def __init__(self, stage, n_len, n_mux):
- Multi
InControl
.__init__(self, n_len=n_len)
+ Multi
OutControlBase
.__init__(self, n_len=n_len)
self.stage = stage
self.p_mux = p_mux
self.stage = stage
self.p_mux = p_mux
@@
-189,7
+196,7
@@
class CombMultiOutPipeline(MultiInControl):
return m
return m
-class CombMultiInPipeline(MultiInControl):
+class CombMultiInPipeline(MultiInControl
Base
):
""" A multi-input Combinatorial block conforming to the Pipeline API
Attributes:
""" A multi-input Combinatorial block conforming to the Pipeline API
Attributes:
@@
-205,7
+212,7
@@
class CombMultiInPipeline(MultiInControl):
"""
def __init__(self, stage, p_len, p_mux):
"""
def __init__(self, stage, p_len, p_mux):
- MultiInControl.__init__(self, p_len=p_len)
+ MultiInControl
Base
.__init__(self, p_len=p_len)
self.stage = stage
self.p_mux = p_mux
self.stage = stage
self.p_mux = p_mux