From e7caf8acfb94ac6f28fb3f498b65005c5f4b8d13 Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Sat, 14 Nov 2015 00:42:33 +0100 Subject: [PATCH] use stream_packet and stream_sim from litex --- liteeth/software/etherbone.py | 5 +- test/arp_tb.py | 2 +- test/common.py | 184 ---------------------------------- test/etherbone_tb.py | 2 +- test/icmp_tb.py | 2 +- test/ip_tb.py | 2 +- test/mac_core_tb.py | 2 +- test/mac_wishbone_tb.py | 2 +- test/model/arp.py | 3 +- test/model/etherbone.py | 5 +- test/model/icmp.py | 3 +- test/model/ip.py | 3 +- test/model/mac.py | 4 +- test/model/phy.py | 4 +- test/model/udp.py | 3 +- test/udp_tb.py | 2 +- 16 files changed, 25 insertions(+), 203 deletions(-) delete mode 100644 test/common.py diff --git a/liteeth/software/etherbone.py b/liteeth/software/etherbone.py index ca2f3ff..643a87c 100644 --- a/liteeth/software/etherbone.py +++ b/liteeth/software/etherbone.py @@ -1,4 +1,5 @@ -import copy +from copy import deepcopy + from liteeth.common import * @@ -254,7 +255,7 @@ class EtherbonePacket(Packet): while len(payload) != 0: record = EtherboneRecord(payload) record.decode() - records.append(copy.deepcopy(record)) + records.append(deepcopy(record)) payload = record return records diff --git a/test/arp_tb.py b/test/arp_tb.py index 4ad8d5a..79d89a2 100644 --- a/test/arp_tb.py +++ b/test/arp_tb.py @@ -2,12 +2,12 @@ from litex.gen import * from litex.gen.sim.generic import run_simulation from litex.soc.interconnect import wishbone +from litex.soc.interconnect.stream_sim import * from liteeth.common import * from liteeth.core.mac import LiteEthMAC from liteeth.core.arp import LiteEthARP -from test.common import * from test.model import phy, mac, arp ip_address = 0x12345678 diff --git a/test/common.py b/test/common.py deleted file mode 100644 index fe92a6e..0000000 --- a/test/common.py +++ /dev/null @@ -1,184 +0,0 @@ -import random -from copy import deepcopy - -from litex.gen import * -from litex.soc.interconnect.stream import Sink, Source - -from liteeth.common import * - - -def print_with_prefix(s, prefix=""): - if not isinstance(s, str): - s = s.__repr__() - s = s.split("\n") - for l in s: - print(prefix + l) - - -def seed_to_data(seed, random=True): - if random: - return (seed * 0x31415979 + 1) & 0xffffffff - else: - return seed - - -def split_bytes(v, n, endianness="big"): - r = [] - r_bytes = v.to_bytes(n, byteorder=endianness) - for byte in r_bytes: - r.append(int(byte)) - return r - - -def merge_bytes(b, endianness="big"): - return int.from_bytes(bytes(b), endianness) - - -def get_field_data(field, datas): - v = merge_bytes(datas[field.byte:field.byte+math.ceil(field.width/8)]) - return (v >> field.offset) & (2**field.width-1) - - -def comp(p1, p2): - r = True - for x, y in zip(p1, p2): - if x != y: - r = False - return r - - -def check(p1, p2): - p1 = deepcopy(p1) - p2 = deepcopy(p2) - if isinstance(p1, int): - return 0, 1, int(p1 != p2) - else: - if len(p1) >= len(p2): - ref, res = p1, p2 - else: - ref, res = p2, p1 - shift = 0 - while((ref[0] != res[0]) and (len(res) > 1)): - res.pop(0) - shift += 1 - length = min(len(ref), len(res)) - errors = 0 - for i in range(length): - if ref.pop(0) != res.pop(0): - errors += 1 - return shift, length, errors - - -def randn(max_n): - return random.randint(0, max_n-1) - - -class Packet(list): - def __init__(self, init=[]): - self.ongoing = False - self.done = False - for data in init: - self.append(data) - - -class PacketStreamer(Module): - def __init__(self, description, last_be=None): - self.source = Source(description) - self.last_be = last_be - - # # # - - self.packets = [] - self.packet = Packet() - self.packet.done = True - - def send(self, packet): - packet = deepcopy(packet) - self.packets.append(packet) - return packet - - def send_blocking(self, packet): - packet = self.send(packet) - while not packet.done: - yield - - def do_simulation(self, selfp): - if len(self.packets) and self.packet.done: - self.packet = self.packets.pop(0) - if not self.packet.ongoing and not self.packet.done: - selfp.source.stb = 1 - if self.source.description.packetized: - selfp.source.sop = 1 - selfp.source.data = self.packet.pop(0) - self.packet.ongoing = True - elif selfp.source.stb == 1 and selfp.source.ack == 1: - if self.source.description.packetized: - selfp.source.sop = 0 - if len(self.packet) == 1: - selfp.source.eop = 1 - if self.last_be is not None: - selfp.source.last_be = self.last_be - else: - selfp.source.eop = 0 - if self.last_be is not None: - selfp.source.last_be = 0 - if len(self.packet) > 0: - selfp.source.stb = 1 - selfp.source.data = self.packet.pop(0) - else: - self.packet.done = True - selfp.source.stb = 0 - - -class PacketLogger(Module): - def __init__(self, description): - self.sink = Sink(description) - - # # # - - self.packet = Packet() - - def receive(self): - self.packet.done = False - while not self.packet.done: - yield - - def do_simulation(self, selfp): - selfp.sink.ack = 1 - if selfp.sink.stb: - if self.sink.description.packetized: - if selfp.sink.sop: - self.packet = Packet() - self.packet.append(selfp.sink.data) - else: - self.packet.append(selfp.sink.data) - if selfp.sink.eop: - self.packet.done = True - else: - self.packet.append(selfp.sink.data) - - -class AckRandomizer(Module): - def __init__(self, description, level=0): - self.level = level - - self.sink = Sink(description) - self.source = Source(description) - - self.run = Signal() - - self.comb += \ - If(self.run, - Record.connect(self.sink, self.source) - ).Else( - self.source.stb.eq(0), - self.sink.ack.eq(0), - ) - - def do_simulation(self, selfp): - n = randn(100) - if n < self.level: - selfp.run = 0 - else: - selfp.run = 1 - diff --git a/test/etherbone_tb.py b/test/etherbone_tb.py index add9f9a..4e0d81f 100644 --- a/test/etherbone_tb.py +++ b/test/etherbone_tb.py @@ -2,12 +2,12 @@ from litex.gen import * from litex.gen.sim.generic import run_simulation from litex.soc.interconnect import wishbone +from litex.soc.interconnect.stream_sim import * from liteeth.common import * from liteeth.core import LiteEthUDPIPCore from liteeth.frontend.etherbone import LiteEthEtherbone -from test.common import * from test.model import phy, mac, arp, ip, udp, etherbone ip_address = 0x12345678 diff --git a/test/icmp_tb.py b/test/icmp_tb.py index 63a14c3..c008e81 100644 --- a/test/icmp_tb.py +++ b/test/icmp_tb.py @@ -2,11 +2,11 @@ from litex.gen import * from litex.gen.sim.generic import run_simulation from litex.soc.interconnect import wishbone +from litex.soc.interconnect.stream_sim import * from liteeth.common import * from liteeth.core import LiteEthIPCore -from test.common import * from test.model.dumps import * from test.model.mac import * from test.model.ip import * diff --git a/test/ip_tb.py b/test/ip_tb.py index f8f2a54..36c31e8 100644 --- a/test/ip_tb.py +++ b/test/ip_tb.py @@ -2,11 +2,11 @@ from litex.gen import * from litex.gen.sim.generic import run_simulation from litex.soc.interconnect import wishbone +from litex.soc.interconnect.stream_sim import * from liteeth.common import * from liteeth.core import LiteEthIPCore -from test.common import * from test.model import phy, mac, arp, ip ip_address = 0x12345678 diff --git a/test/mac_core_tb.py b/test/mac_core_tb.py index a9e7311..9bfeb77 100644 --- a/test/mac_core_tb.py +++ b/test/mac_core_tb.py @@ -2,11 +2,11 @@ from litex.gen import * from litex.gen.sim.generic import run_simulation from litex.soc.interconnect import wishbone +from litex.soc.interconnect.stream_sim import * from liteeth.common import * from liteeth.core.mac.core import LiteEthMACCore -from test.common import * from test.model import phy, mac diff --git a/test/mac_wishbone_tb.py b/test/mac_wishbone_tb.py index 61bb59e..261f1ab 100644 --- a/test/mac_wishbone_tb.py +++ b/test/mac_wishbone_tb.py @@ -2,11 +2,11 @@ from litex.gen import * from litex.gen.sim.generic import run_simulation from litex.soc.interconnect import wishbone +from litex.soc.interconnect.stream_sim import * from liteeth.common import * from liteeth.core.mac import LiteEthMAC -from test.common import * from test.model import phy, mac diff --git a/test/model/arp.py b/test/model/arp.py index 995fdd9..6b9eba4 100644 --- a/test/model/arp.py +++ b/test/model/arp.py @@ -1,8 +1,9 @@ import math +from litex.soc.interconnect.stream_sim import * + from liteeth.common import * -from test.common import * from test.model import mac diff --git a/test/model/etherbone.py b/test/model/etherbone.py index e515a0d..b0d68ea 100644 --- a/test/model/etherbone.py +++ b/test/model/etherbone.py @@ -1,10 +1,11 @@ import math import copy +from litex.soc.interconnect.stream_sim import * + from liteeth.common import * from liteeth.software.etherbone import * -from test.common import * from test.model import udp @@ -74,7 +75,7 @@ if __name__ == "__main__": # Packet packet = EtherbonePacket() - packet.records = [copy.deepcopy(record) for i in range(8)] + packet.records = [deepcopy(record) for i in range(8)] packet.nr = 0 packet.pr = 0 packet.pf = 0 diff --git a/test/model/icmp.py b/test/model/icmp.py index 2abffeb..1b2b200 100644 --- a/test/model/icmp.py +++ b/test/model/icmp.py @@ -1,8 +1,9 @@ import math +from litex.soc.interconnect.stream_sim import * + from liteeth.common import * -from test.common import * from test.model import ip diff --git a/test/model/ip.py b/test/model/ip.py index babbf3b..0ca3785 100644 --- a/test/model/ip.py +++ b/test/model/ip.py @@ -1,8 +1,9 @@ import math +from litex.soc.interconnect.stream_sim import * + from liteeth.common import * -from test.common import * from test.model import mac diff --git a/test/model/mac.py b/test/model/mac.py index 982323e..765ff02 100644 --- a/test/model/mac.py +++ b/test/model/mac.py @@ -1,9 +1,9 @@ import math import binascii -from liteeth.common import * +from litex.soc.interconnect.stream_sim import * -from test.common import * +from liteeth.common import * def print_mac(s): diff --git a/test/model/phy.py b/test/model/phy.py index 62947b4..613cefc 100644 --- a/test/model/phy.py +++ b/test/model/phy.py @@ -1,6 +1,6 @@ -from liteeth.common import * +from litex.soc.interconnect.stream_sim import * -from test.common import * +from liteeth.common import * def print_phy(s): diff --git a/test/model/udp.py b/test/model/udp.py index 374cfb6..322bf03 100644 --- a/test/model/udp.py +++ b/test/model/udp.py @@ -1,8 +1,9 @@ import math +from litex.soc.interconnect.stream_sim import * + from liteeth.common import * -from test.common import * from test.model import ip diff --git a/test/udp_tb.py b/test/udp_tb.py index 27df513..780a5d2 100644 --- a/test/udp_tb.py +++ b/test/udp_tb.py @@ -2,11 +2,11 @@ from litex.gen import * from litex.gen.sim.generic import run_simulation from litex.soc.interconnect import wishbone +from litex.soc.interconnect.stream_sim import * from liteeth.common import * from liteeth.core import LiteEthUDPIPCore -from test.common import * from test.model import phy, mac, arp, ip, udp ip_address = 0x12345678