From 6fac3f027fc9c5bd779ee47e566b8065f8659356 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sebastien@milkymist.org>
Date: Wed, 20 Jun 2012 18:25:01 +0200
Subject: [PATCH] examples/dataflow: structuring test
---
examples/dataflow/structuring.py | 38 ++++++++++++++++++++++++++++++++
migen/actorlib/structuring.py | 18 +++++++--------
2 files changed, 46 insertions(+), 10 deletions(-)
create mode 100644 examples/dataflow/structuring.py
diff --git a/examples/dataflow/structuring.py b/examples/dataflow/structuring.py
new file mode 100644
index 000000000..3963777ed
--- /dev/null
+++ b/examples/dataflow/structuring.py
@@ -0,0 +1,38 @@
+from migen.flow.network import *
+from migen.actorlib import structuring
+from migen.actorlib.sim import *
+from migen.sim.generic import Simulator
+from migen.sim.icarus import Runner
+
+pack_factor = 5
+
+def source_gen():
+ for i in range(80):
+ #print("==> " + str(i))
+ yield Token("source", {"value": i})
+
+def sink_gen():
+ while True:
+ t = Token("sink")
+ yield t
+ print(t.value["value"])
+
+def main():
+ base_layout = [("value", BV(32))]
+
+ source = ActorNode(SimActor(source_gen(), ("source", Source, base_layout)))
+ packer = ActorNode(structuring.Pack(base_layout, pack_factor))
+ unpacker = ActorNode(structuring.Unpack(pack_factor, base_layout))
+ sink = ActorNode(SimActor(sink_gen(), ("sink", Sink, base_layout)))
+
+ g = DataFlowGraph()
+ g.add_connection(source, packer)
+ g.add_connection(packer, unpacker)
+ g.add_connection(unpacker, sink)
+ comp = CompositeActor(g)
+
+ fragment = comp.get_fragment()
+ sim = Simulator(fragment, Runner())
+ sim.run(100)
+
+main()
diff --git a/migen/actorlib/structuring.py b/migen/actorlib/structuring.py
index dff402780..1f8687e65 100644
--- a/migen/actorlib/structuring.py
+++ b/migen/actorlib/structuring.py
@@ -16,13 +16,14 @@ class Cast(CombinatorialActor):
Cat(*sigs_to).eq(Cat(*sigs_from))
])
-class Chop(Actor):
+def pack_layout(l, n):
+ return [("chunk{0}".format(i), l) for i in range(n)]
+
+class Unpack(Actor):
def __init__(self, n, layout_to):
self.n = n
- layout_from = [("chunk{0}".format(i), layout_to)
- for i in range(self.n)]
super().__init__(
- ("sink", Sink, layout_from),
+ ("sink", Sink, pack_layout(layout_to, n)),
("source", Source, layout_to))
def get_fragment(self):
@@ -43,21 +44,18 @@ class Chop(Actor):
)
)
]
- cases = [(Constant(i, BV(muxbits)),
+ cases = [(Constant(i, BV(muxbits)) if i else Default(),
Cat(*self.token("source").flatten()).eq(*self.token("sink").subrecord("chunk{0}".format(i)).flatten()))
for i in range(self.n)]
- cases[-1][0] = Default()
comb.append(Case(mux, *cases))
return Fragment(comb, sync)
class Pack(Actor):
def __init__(self, layout_from, n):
self.n = n
- layout_to = [("chunk{0}".format(i), layout_from)
- for i in range(self.n)]
super().__init__(
("sink", Sink, layout_from),
- ("source", Source, layout_to))
+ ("source", Source, pack_layout(layout_from, n)))
def get_fragment(self):
demuxbits = bits_for(self.n-1)
@@ -66,7 +64,7 @@ class Pack(Actor):
load_part = Signal()
strobe_all = Signal()
cases = [(Constant(i, BV(demuxbits)),
- Cat(*self.token("source").subrecord("chunk{0}".format(i)).flatten()).eq(*self.token("sink").flatten())
+ Cat(*self.token("source").subrecord("chunk{0}".format(i)).flatten()).eq(*self.token("sink").flatten()))
for i in range(self.n)]
comb = [
self.endpoints["sink"].ack.eq(~strobe_all | self.endpoints["source"].ack),