Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

interconnect/packet: Improve PacketFIFO to handle payload/param separately. 

Useful to save resources and store Stream's params more efficiently.
This commit is contained in:
Florent Kermarrec 2021-07-15 18:04:13 +02:00
parent b2f8fa5464
commit 0a919e709f
1 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
litex/soc/interconnect/packet.py
View File

@ -391,30 +391,39 @@ class Depacketizer(Module):
# PacketFIFO --------------------------------------------------------------------------------------- # PacketFIFO ---------------------------------------------------------------------------------------
class PacketFIFO(Module): class PacketFIFO(Module):
def __init__(self, description, depth, buffered=False): def __init__(self, layout, payload_depth, param_depth=None, buffered=False):
self.sink = sink = stream.Endpoint(description) self.sink = sink = stream.Endpoint(layout)
self.source = source = stream.Endpoint(description) self.source = source = stream.Endpoint(layout)
# # # # # #
# Create the FIFO. # Parameters.
self.submodules.fifo = fifo = stream.SyncFIFO(description, depth, buffered) param_layout = sink.description.param_layout
payload_layout = sink.description.payload_layout
if param_layout == []:
param_layout = [("dummy", 1)]
if param_depth is None:
param_depth = payload_depth
# Connect our sink to FIFO.sink. # Create the FIFOs.
self.comb += sink.connect(fifo.sink) payload_description = stream.EndpointDescription(payload_layout=payload_layout)
param_description = stream.EndpointDescription(param_layout=param_layout)
self.submodules.payload_fifo = payload_fifo = stream.SyncFIFO(payload_description, payload_depth, buffered)
self.submodules.param_fifo = param_fifo = stream.SyncFIFO(param_description, param_depth, buffered)
# Count packets in the FIFO. # Connect Sink to FIFOs.
count = Signal(int(log2(depth))+1)
inc = (sink.valid & sink.ready & sink.last)
dec = (source.valid & source.ready & source.last)
self.sync += If(inc & ~dec, count.eq(count + 1))
self.sync += If(~inc & dec, count.eq(count - 1))
# Connect FIFO.sink to source only we have at least one packet in the FIFO.
self.comb += [ self.comb += [
fifo.source.connect(source, omit={"valid", "ready"}), sink.connect(param_fifo.sink, keep=set([e[0] for e in param_layout])),
If(count > 0, sink.connect(payload_fifo.sink, keep=set([e[0] for e in payload_layout] + ["last"])),
source.valid.eq(1), param_fifo.sink.valid.eq(sink.valid & sink.last),
fifo.source.ready.eq(source.ready) payload_fifo.sink.valid.eq(sink.valid & payload_fifo.sink.ready),
) sink.ready.eq(param_fifo.sink.ready & payload_fifo.sink.ready),
]
# Connect FIFOs to Source.
self.comb += [
param_fifo.source.connect(source, omit={"last", "ready"}),
payload_fifo.source.connect(source, omit={"valid", "ready"}),
param_fifo.source.ready.eq( source.valid & source.last & source.ready),
payload_fifo.source.ready.eq(source.valid & source.ready),
] ]