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

test/test_fifo: minor cleanup.

This commit is contained in:
Florent Kermarrec 2020-03-26 12:23:25 +01:00
parent 0ee9d7db5f
commit 6951428af5
1 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
test/test_fifo.py
View File

@ -10,16 +10,15 @@ from litex.soc.interconnect.stream import *
from litedram.common import LiteDRAMNativeWritePort from litedram.common import LiteDRAMNativeWritePort
from litedram.common import LiteDRAMNativeReadPort from litedram.common import LiteDRAMNativeReadPort
from litedram.frontend.fifo import LiteDRAMFIFO, \ from litedram.frontend.fifo import LiteDRAMFIFO, _LiteDRAMFIFOCtrl
_LiteDRAMFIFOCtrl, _LiteDRAMFIFOWriter, _LiteDRAMFIFOReader from litedram.frontend.fifo import _LiteDRAMFIFOWriter, _LiteDRAMFIFOReader
from test.common import * from test.common import *
class TestFIFO(unittest.TestCase): class TestFIFO(unittest.TestCase):
@passive @passive
def fifo_ctrl_flag_checker(self, fifo_ctrl, write_threshold, read_threshold): def fifo_ctrl_flag_checker(self, fifo_ctrl, write_threshold, read_threshold):
# checks the combinational logic # Checks the combinational logic
while True: while True:
level = (yield fifo_ctrl.level) level = (yield fifo_ctrl.level)
self.assertEqual((yield fifo_ctrl.writable), level < write_threshold) self.assertEqual((yield fifo_ctrl.writable), level < write_threshold)
@ -29,17 +28,17 @@ class TestFIFO(unittest.TestCase):
# _LiteDRAMFIFOCtrl ---------------------------------------------------------------------------- # _LiteDRAMFIFOCtrl ----------------------------------------------------------------------------
def test_fifo_ctrl_address_changes(self): def test_fifo_ctrl_address_changes(self):
# we are ignoring thresholds (so readable/writable signals) # We are ignoring thresholds (so readable/writable signals)
dut = _LiteDRAMFIFOCtrl(base=0, depth=16, read_threshold=0, write_threshold=16) dut = _LiteDRAMFIFOCtrl(base=0, depth=16, read_threshold=0, write_threshold=16)
def main_generator(): def main_generator():
self.assertEqual((yield dut.write_address), 0) self.assertEqual((yield dut.write_address), 0)
self.assertEqual((yield dut.read_address), 0) self.assertEqual((yield dut.read_address), 0)
# write address # Write address
yield dut.write.eq(1) yield dut.write.eq(1)
yield yield
# write_address gets updated 1 cycle later # Write_address gets updated 1 cycle later
for i in range(24 - 1): for i in range(24 - 1):
self.assertEqual((yield dut.write_address), i % 16) self.assertEqual((yield dut.write_address), i % 16)
yield yield
@ -47,7 +46,7 @@ class TestFIFO(unittest.TestCase):
yield yield
self.assertEqual((yield dut.write_address), 24 % 16) self.assertEqual((yield dut.write_address), 24 % 16)
# read address # Read address
yield dut.read.eq(1) yield dut.read.eq(1)
yield yield
for i in range(24 - 1): for i in range(24 - 1):
@ -69,7 +68,7 @@ class TestFIFO(unittest.TestCase):
def main_generator(): def main_generator():
self.assertEqual((yield dut.level), 0) self.assertEqual((yield dut.level), 0)
# level # Level
def check_level_diff(write, read, diff): def check_level_diff(write, read, diff):
level = (yield dut.level) level = (yield dut.level)
yield dut.write.eq(write) yield dut.write.eq(write)
@ -99,10 +98,11 @@ class TestFIFO(unittest.TestCase):
class DUT(Module): class DUT(Module):
def __init__(self): def __init__(self):
self.port = LiteDRAMNativeWritePort(address_width=32, data_width=32) self.port = LiteDRAMNativeWritePort(address_width=32, data_width=32)
ctrl = _LiteDRAMFIFOCtrl(base=8, depth=depth, read_threshold=0, ctrl = _LiteDRAMFIFOCtrl(base=8, depth=depth,
write_threshold=write_threshold) read_threshold = 0,
writer = _LiteDRAMFIFOWriter(data_width=32, port=self.port, ctrl=ctrl) write_threshold = write_threshold)
self.submodules.ctrl = ctrl self.submodules.ctrl = ctrl
writer = _LiteDRAMFIFOWriter(data_width=32, port=self.port, ctrl=ctrl)
self.submodules.writer = writer self.submodules.writer = writer
self.memory = DRAMMemory(32, 128) self.memory = DRAMMemory(32, 128)
@ -127,7 +127,8 @@ class TestFIFO(unittest.TestCase):
generator(dut), generator(dut),
dut.memory.write_handler(dut.port), dut.memory.write_handler(dut.port),
self.fifo_ctrl_flag_checker(dut.ctrl, self.fifo_ctrl_flag_checker(dut.ctrl,
write_threshold=write_threshold, read_threshold=0), write_threshold = write_threshold,
read_threshold = 0),
timeout_generator(1500), timeout_generator(1500),
] ]
run_simulation(dut, generators) run_simulation(dut, generators)
@ -156,8 +157,9 @@ class TestFIFO(unittest.TestCase):
class DUT(Module): class DUT(Module):
def __init__(self): def __init__(self):
self.port = LiteDRAMNativeReadPort(address_width=32, data_width=32) self.port = LiteDRAMNativeReadPort(address_width=32, data_width=32)
ctrl = _LiteDRAMFIFOCtrl(base=8, depth=depth, read_threshold=read_threshold, ctrl = _LiteDRAMFIFOCtrl(base=8, depth=depth,
write_threshold=depth) read_threshold = read_threshold,
write_threshold = depth)
reader = _LiteDRAMFIFOReader(data_width=32, port=self.port, ctrl=ctrl) reader = _LiteDRAMFIFOReader(data_width=32, port=self.port, ctrl=ctrl)
self.submodules.ctrl = ctrl self.submodules.ctrl = ctrl
self.submodules.reader = reader self.submodules.reader = reader
@ -166,7 +168,7 @@ class TestFIFO(unittest.TestCase):
assert 8 + sequence_len <= len(self.memory.mem) assert 8 + sequence_len <= len(self.memory.mem)
def reader(dut): def reader(dut):
# fake writing to fifo # Fake writing to fifo
yield dut.ctrl.write.eq(1) yield dut.ctrl.write.eq(1)
for _ in range(inital_writes): for _ in range(inital_writes):
yield yield
@ -174,7 +176,7 @@ class TestFIFO(unittest.TestCase):
yield yield
for _ in range(sequence_len): for _ in range(sequence_len):
# fake single write # Fake single write
yield dut.ctrl.write.eq(1) yield dut.ctrl.write.eq(1)
yield yield
yield dut.ctrl.write.eq(0) yield dut.ctrl.write.eq(0)
@ -191,8 +193,9 @@ class TestFIFO(unittest.TestCase):
generators = [ generators = [
reader(dut), reader(dut),
dut.memory.read_handler(dut.port), dut.memory.read_handler(dut.port),
self.fifo_ctrl_flag_checker(dut.ctrl, write_threshold=depth, self.fifo_ctrl_flag_checker(dut.ctrl,
read_threshold=read_threshold), write_threshold = depth,
read_threshold = read_threshold),
timeout_generator(1500), timeout_generator(1500),
] ]
run_simulation(dut, generators) run_simulation(dut, generators)
@ -209,18 +212,19 @@ class TestFIFO(unittest.TestCase):
def test_fifo_reader_requires_threshold(self): def test_fifo_reader_requires_threshold(self):
with self.assertRaises(TimeoutError): with self.assertRaises(TimeoutError):
self.fifo_reader_test(sequence_len=48, depth=32, read_threshold=8) self.fifo_reader_test(sequence_len=48, depth=32, read_threshold=8)
# will work after we perform the initial writes # Will work after we perform the initial writes
self.fifo_reader_test(sequence_len=48, depth=32, read_threshold=8, inital_writes=8) self.fifo_reader_test(sequence_len=48, depth=32, read_threshold=8, inital_writes=8)
# LiteDRAMFIFO --------------------------------------------------------------------------------- # LiteDRAMFIFO ---------------------------------------------------------------------------------
def test_fifo_default_thresholds(self): def test_fifo_default_thresholds(self):
# defaults: read_threshold=0, write_threshold=depth # Defaults: read_threshold=0, write_threshold=depth
read_threshold, write_threshold = (0, 128) read_threshold, write_threshold = (0, 128)
write_port = LiteDRAMNativeWritePort(address_width=32, data_width=32) write_port = LiteDRAMNativeWritePort(address_width=32, data_width=32)
read_port = LiteDRAMNativeReadPort(address_width=32, data_width=32) read_port = LiteDRAMNativeReadPort(address_width=32, data_width=32)
fifo = LiteDRAMFIFO(data_width=32, base=0, depth=write_threshold, fifo = LiteDRAMFIFO(data_width=32, base=0, depth=write_threshold,
write_port=write_port, read_port=read_port) write_port = write_port,
read_port = read_port)
def generator(): def generator():
yield write_port.cmd.ready.eq(1) yield write_port.cmd.ready.eq(1)
@ -255,7 +259,7 @@ class TestFIFO(unittest.TestCase):
def generator(dut, valid_random=90): def generator(dut, valid_random=90):
prng = random.Random(42) prng = random.Random(42)
# we need 8 more writes to account for read_threshold=8 # We need 8 more writes to account for read_threshold=8
for i in range(64 + 8): for i in range(64 + 8):
while prng.randrange(100) < valid_random: while prng.randrange(100) < valid_random:
yield yield