test: finish mac_wishbone_tb (simulator limitation removed)

This commit is contained in:
Florent Kermarrec 2016-03-23 09:47:47 +01:00
parent 7ea1b5a22d
commit 87924c84e6
1 changed files with 27 additions and 28 deletions

View File

@ -22,7 +22,7 @@ class WishboneMaster:
yield self.obj.we.eq(1) yield self.obj.we.eq(1)
yield self.obj.sel.eq(0xf) yield self.obj.sel.eq(0xf)
yield self.obj.dat_w.eq(dat) yield self.obj.dat_w.eq(dat)
while (yield self.obj.ack) == 0: while not (yield self.obj.ack):
yield yield
yield self.obj.cyc.eq(0) yield self.obj.cyc.eq(0)
yield self.obj.stb.eq(0) yield self.obj.stb.eq(0)
@ -35,9 +35,9 @@ class WishboneMaster:
yield self.obj.we.eq(0) yield self.obj.we.eq(0)
yield self.obj.sel.eq(0xf) yield self.obj.sel.eq(0xf)
yield self.obj.dat_w.eq(0) yield self.obj.dat_w.eq(0)
while (yield self.obj.ack) == 0: while not (yield self.obj.ack):
yield yield
yield self.dat.eq(self.obj.dat_r) self.dat = (yield self.obj.dat_r)
yield self.obj.cyc.eq(0) yield self.obj.cyc.eq(0)
yield self.obj.stb.eq(0) yield self.obj.stb.eq(0)
yield yield
@ -56,7 +56,7 @@ class SRAMReaderDriver:
yield yield
def wait_done(self): def wait_done(self):
while (yield self.obj.ev.done.pending) == 0: while not (yield self.obj.ev.done.pending):
yield yield
def clear_done(self): def clear_done(self):
@ -71,7 +71,7 @@ class SRAMWriterDriver:
self.obj = obj self.obj = obj
def wait_available(self): def wait_available(self):
while (yield self.obj.ev.available.pending) == 0: while not (yield self.obj.ev.available.pending):
yield yield
def clear_available(self): def clear_available(self):
@ -83,8 +83,8 @@ class SRAMWriterDriver:
class TB(Module): class TB(Module):
def __init__(self): def __init__(self):
self.submodules.phy_model = phy.PHY(8, debug=True) self.submodules.phy_model = phy.PHY(8, debug=False)
self.submodules.mac_model = mac.MAC(self.phy_model, debug=True, loopback=True) self.submodules.mac_model = mac.MAC(self.phy_model, debug=False, loopback=True)
self.submodules.ethmac = LiteEthMAC(phy=self.phy_model, dw=32, interface="wishbone", with_preamble_crc=True) self.submodules.ethmac = LiteEthMAC(phy=self.phy_model, dw=32, interface="wishbone", with_preamble_crc=True)
@ -98,11 +98,11 @@ def main_generator(dut):
length = 150+2 length = 150+2
tx_payload = [seed_to_data(i, True) % 0xFF for i in range(length)] + [0, 0, 0, 0] tx_payload = [seed_to_data(i, True) % 0xff for i in range(length)] + [0, 0, 0, 0]
errors = 0 errors = 0
while True: for i in range(2):
for i in range(20): for i in range(20):
yield yield
for slot in range(2): for slot in range(2):
@ -112,26 +112,25 @@ def main_generator(dut):
dat = int.from_bytes(tx_payload[4*i:4*(i+1)], "big") dat = int.from_bytes(tx_payload[4*i:4*(i+1)], "big")
yield from wishbone_master.write(sram_reader_slots_offset[slot]+i, dat) yield from wishbone_master.write(sram_reader_slots_offset[slot]+i, dat)
# send tx payload & wait
yield from sram_reader_driver.start(slot, length)
yield from sram_reader_driver.wait_done()
yield from sram_reader_driver.clear_done()
# # send tx payload & wait # wait rx
# yield from sram_reader_driver.start(slot, length) yield from sram_writer_driver.wait_available()
# yield from sram_reader_driver.wait_done() yield from sram_writer_driver.clear_available()
# yield from sram_reader_driver.clear_done()
# # get rx payload (loopback on PHY Model)
# # wait rx rx_payload = []
# yield from sram_writer_driver.wait_available() for i in range(length//4+1):
# yield from sram_writer_driver.clear_available() yield from wishbone_master.read(sram_writer_slots_offset[slot]+i)
# dat = wishbone_master.dat
# # get rx payload (loopback on PHY Model) rx_payload += list(dat.to_bytes(4, byteorder='big'))
# rx_payload = []
# for i in range(length//4+1): # check results
# yield from wishbone_master.read(sram_writer_slots_offset[slot]+i) s, l, e = check(tx_payload[:length], rx_payload[:min(length, len(rx_payload))])
# dat = wishbone_master.dat print("shift " + str(s) + " / length " + str(l) + " / errors " + str(e))
# rx_payload += list(dat.to_bytes(4, byteorder='big'))
#
# # check results
# s, l, e = check(tx_payload[:length], rx_payload[:min(length, len(rx_payload))])
# print("shift " + str(s) + " / length " + str(l) + " / errors " + str(e))
if __name__ == "__main__": if __name__ == "__main__":
tb = TB() tb = TB()