test: update test_etherbone, use litex.gen.sim for all tests

test/model/etherbone.py

@@ -34,8 +34,8 @@ class Etherbone(Module):
             print_etherbone(">>>>>>>>")
             print_etherbone(packet)
         udp_packet = udp.UDPPacket(packet)
-        udp_packet.src_port = 0x1234  # XXX
-        udp_packet.dst_port = 20000  # XXX
+        udp_packet.src_port = 0x1234 # FIXME
+        udp_packet.dst_port = 0x1234 # FIXME
         udp_packet.length   = len(packet)
         udp_packet.checksum = 0
         self.udp.send(udp_packet)

test/model/udp.py

@@ -80,7 +80,7 @@ class UDP(Module):
         ip_packet.fragment_offset = 0
         ip_packet.ttl             = 0x80
         ip_packet.sender_ip       = self.ip_address
-        ip_packet.target_ip       = 0x12345678  # XXX
+        ip_packet.target_ip       = 0x12345678  # FIXME
         ip_packet.checksum        = 0
         ip_packet.protocol        = udp_protocol
         self.ip.send(ip_packet)
@@ -97,6 +97,6 @@ class UDP(Module):
             self.process(packet)
 
     def process(self, packet):
-        if packet.dst_port == 20000:
+        if packet.dst_port == 0x1234: # FIXME
             if self.etherbone_callback is not None:
                 self.etherbone_callback(packet)

test/test_etherbone.py

@@ -14,6 +14,8 @@ from liteeth.frontend.etherbone import LiteEthEtherbone
 
 from test.model import phy, mac, arp, ip, udp, etherbone
 
+from litex.gen.sim import *
+
 ip_address = 0x12345678
 mac_address = 0x12345678abcd
 
@@ -28,10 +30,10 @@ class DUT(Module):
         self.submodules.etherbone_model = etherbone.Etherbone(self.udp_model, debug=False)
 
         self.submodules.core = LiteEthUDPIPCore(self.phy_model, mac_address, ip_address, 100000)
-        self.submodules.etherbone = LiteEthEtherbone(self.core.udp, 1234)
+        self.submodules.etherbone = LiteEthEtherbone(self.core.udp, 0x1234)
 
         self.submodules.sram = wishbone.SRAM(1024)
-        self.submodules.interconnect = wishbone.InterconnectPointToPoint(self.etherbone.master.bus, self.sram.bus)
+        self.submodules.interconnect = wishbone.InterconnectPointToPoint(self.etherbone.wishbone.bus, self.sram.bus)
 
 
 def main_generator(dut):
@@ -47,12 +49,11 @@ def main_generator(dut):
         yield from dut.etherbone_model.receive()
         print("probe: " + str(bool(dut.etherbone_model.rx_packet.pr)))
 
-    for i in range(8):
+    for i in range(2):
         # test writes
         if test_writes:
-            writes_datas = [j for j in range(16)]
-            writes = etherbone.EtherboneWrites(base_addr=0x1000,
-                                               datas=writes_datas)
+            writes_datas = [j for j in range(4)]
+            writes = etherbone.EtherboneWrites(base_addr=0x1000, datas=writes_datas)
             record = etherbone.EtherboneRecord()
             record.writes      = writes
             record.reads       = None
@@ -74,9 +75,8 @@ def main_generator(dut):
 
         # test reads
         if test_reads:
-            reads_addrs = [0x1000 + 4*j for j in range(16)]
-            reads = etherbone.EtherboneReads(base_ret_addr=0x1000,
-                                             addrs=reads_addrs)
+            reads_addrs = [0x1000 + 4*j for j in range(4)]
+            reads = etherbone.EtherboneReads(base_ret_addr=0x1000, addrs=reads_addrs)
             record = etherbone.EtherboneRecord()
             record.writes      = None
             record.reads       = reads
@@ -103,7 +103,7 @@ def main_generator(dut):
 
 
 class TestEtherbone(unittest.TestCase):
-    def _test(self): # FIXME
+    def test_etherbone(self):
         dut = DUT()
         generators = {
             "sys" :   [main_generator(dut)],

test/test_icmp.py

@@ -17,6 +17,8 @@ from test.model.ip import *
 from test.model.icmp import *
 from test.model import phy, mac, arp, ip, icmp
 
+from litex.gen.sim import *
+
 ip_address = 0x12345678
 mac_address = 0x12345678abcd
 

test/test_ip.py

@@ -13,6 +13,8 @@ from liteeth.core import LiteEthIPCore
 
 from test.model import phy, mac, arp, ip
 
+from litex.gen.sim import *
+
 ip_address = 0x12345678
 mac_address = 0x12345678abcd
 

test/test_mac_core.py

@@ -13,6 +13,8 @@ from liteeth.mac.core import LiteEthMACCore
 
 from test.model import phy, mac
 
+from litex.gen.sim import *
+
 
 class DUT(Module):
     def __init__(self):

test/test_mac_wishbone.py

@@ -13,6 +13,8 @@ from liteeth.mac import LiteEthMAC
 
 from test.model import phy, mac
 
+from litex.gen.sim import *
+
 
 class WishboneMaster:
     def __init__(self, obj):

test/test_model.py

@@ -14,6 +14,7 @@ from test.model.udp import UDPPacket
 from litex.tools.remote.etherbone import *
 from test.model.etherbone import Etherbone
 
+from litex.gen.sim import *
 
 class TestModel(unittest.TestCase):
     def test_mac(self):

test/test_udp.py

@@ -13,6 +13,8 @@ from liteeth.core import LiteEthUDPIPCore
 
 from test.model import phy, mac, arp, ip, udp
 
+from litex.gen.sim import *
+
 ip_address = 0x12345678
 mac_address = 0x12345678abcd