Hardware/litex
1
0
Fork 0
mirror of https://github.com/enjoy-digital/litex.git synced 2025-01-04 09:52:26 -05:00
Code Issues Projects Releases Packages Wiki Activity

soc/interconnect/stream_sim: add more genericity to PacketStreamer/PacketLogger to use them for all cores

Browse source
This commit is contained in:
Florent Kermarrec 2016-03-30 23:39:26 +02:00
parent b8d89535fd
commit 1d4f44e7db
1 changed files with 19 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
litex/soc/interconnect/stream_sim.py
View file

@ -83,14 +83,14 @@ class Packet(list):
class PacketStreamer(Module): class PacketStreamer(Module):
def __init__(self, description, last_be=None): def __init__(self, description, last_be=None, packet_cls=Packet):
self.source = stream.Endpoint(description) self.source = stream.Endpoint(description)
self.last_be = last_be self.last_be = last_be
# # # # # #
self.packets = [] self.packets = []
self.packet = Packet() self.packet = packet_cls()
self.packet.done = True self.packet.done = True
def send(self, packet): def send(self, packet):
@ -112,16 +112,11 @@ class PacketStreamer(Module):
yield self.source.valid.eq(1) yield self.source.valid.eq(1)
yield self.source.data.eq(self.packet.pop(0)) yield self.source.data.eq(self.packet.pop(0))
self.packet.ongoing = True self.packet.ongoing = True
elif (yield self.source.valid) == 1 and (yield self.source.ready) == 1: elif (yield self.source.valid) and (yield self.source.ready):
if len(self.packet) == 1: yield self.source.last.eq(len(self.packet) == 1)
yield self.source.last.eq(1) if self.last_be is not None:
if self.last_be is not None: yield self.source.last_be.eq(self.last_be & (len(self.packet) == 1))
yield self.source.last_be.eq(self.last_be) if len(self.packet):
else:
yield self.source.last.eq(0)
if self.last_be is not None:
yield self.source.last_be.eq(0)
if len(self.packet) > 0:
yield self.source.valid.eq(1) yield self.source.valid.eq(1)
yield self.source.data.eq(self.packet.pop(0)) yield self.source.data.eq(self.packet.pop(0))
else: else:
@ -131,18 +126,23 @@ class PacketStreamer(Module):
class PacketLogger(Module): class PacketLogger(Module):
def __init__(self, description): def __init__(self, description, packet_cls=Packet):
self.sink = stream.Endpoint(description) self.sink = stream.Endpoint(description)
# # # # # #
self.packet = Packet() self.packet_cls = packet_cls
self.packet = packet_cls()
self.first = True self.first = True
def receive(self): def receive(self, length=None):
self.packet.done = False self.packet.done = False
while not self.packet.done: if length is None:
yield while not self.packet.done:
yield
else:
while length > len(self.packet):
yield
@passive @passive
def generator(self): def generator(self):
@ -150,11 +150,9 @@ class PacketLogger(Module):
yield self.sink.ready.eq(1) yield self.sink.ready.eq(1)
if (yield self.sink.valid): if (yield self.sink.valid):
if self.first: if self.first:
self.packet = Packet() self.packet = self.packet_cls()
self.packet.append((yield self.sink.data))
self.first = False self.first = False
else: self.packet.append((yield self.sink.data))
self.packet.append((yield self.sink.data))
if (yield self.sink.last): if (yield self.sink.last):
self.packet.done = True self.packet.done = True
self.first = True self.first = True