M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

drtio: more fixes and tests

This commit is contained in:
Sebastien Bourdeauducq 2016-10-26 11:48:47 +08:00
parent 22173b8c70
commit 7f8e53aa5c
2 changed files with 40 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
artiq/gateware/drtio/rt_controller.py
View File

@ -37,7 +37,7 @@ class RTController(Module):
def __init__(self, rt_packets, channel_count, fine_ts_width): def __init__(self, rt_packets, channel_count, fine_ts_width):
self.kcsrs = _KernelCSRs() self.kcsrs = _KernelCSRs()
self.submodules.counter = RTIOCounter(64) self.submodules.counter = RTIOCounter(64-fine_ts_width)
self.sync += If(self.kcsrs.counter_update.re, self.sync += If(self.kcsrs.counter_update.re,
self.kcsrs.counter.status.eq(self.counter.value_sys)) self.kcsrs.counter.status.eq(self.counter.value_sys))
tsc_correction = Signal(64) tsc_correction = Signal(64)
@ -93,10 +93,10 @@ class RTController(Module):
# TODO: collision, replace, busy # TODO: collision, replace, busy
cond_sequence_error = self.kcsrs.o_timestamp.storage < last_timestamps.dat_r cond_sequence_error = self.kcsrs.o_timestamp.storage < last_timestamps.dat_r
cond_underflow = ((self.kcsrs.o_timestamp.storage - self.kcsrs.underflow_margin.storage cond_underflow = ((self.kcsrs.o_timestamp.storage[fine_ts_width:]
>> fine_ts_width) < self.counter.value_sys) - self.kcsrs.underflow_margin.storage[fine_ts_width:]) < self.counter.value_sys)
cond_fifo_emptied = ((last_timestamps.dat_r cond_fifo_emptied = ((last_timestamps.dat_r[fine_ts_width:]
< self.counter.value_sys - self.kcsrs.underflow_margin.storage) < self.counter.value_sys - self.kcsrs.underflow_margin.storage[fine_ts_width:])
& (last_timestamps.dat_r != 0)) & (last_timestamps.dat_r != 0))
fsm.act("IDLE", fsm.act("IDLE",
@ -124,7 +124,7 @@ class RTController(Module):
fifo_spaces.dat_w.eq(fifo_spaces.dat_r - 1) fifo_spaces.dat_w.eq(fifo_spaces.dat_r - 1)
), ),
last_timestamps.we.eq(1), last_timestamps.we.eq(1),
If(fifo_spaces.dat_r <= 1, If(~cond_fifo_emptied & (fifo_spaces.dat_r <= 1),
NextState("GET_FIFO_SPACE") NextState("GET_FIFO_SPACE")
).Else( ).Else(
NextState("IDLE") NextState("IDLE")

39
artiq/test/gateware/drtio/test_full_stack.py
View File

@ -47,8 +47,8 @@ class DUT(Module):
self.submodules.phy0 = ttl_simple.Output(self.ttl0) self.submodules.phy0 = ttl_simple.Output(self.ttl0)
self.submodules.phy1 = ttl_simple.Output(self.ttl1) self.submodules.phy1 = ttl_simple.Output(self.ttl1)
rtio_channels = [ rtio_channels = [
rtio.Channel.from_phy(self.phy0), rtio.Channel.from_phy(self.phy0, ofifo_depth=4),
rtio.Channel.from_phy(self.phy1) rtio.Channel.from_phy(self.phy1, ofifo_depth=4)
] ]
self.submodules.satellite = DRTIOSatellite( self.submodules.satellite = DRTIOSatellite(
self.transceivers.bob, rx_synchronizer, rtio_channels) self.transceivers.bob, rx_synchronizer, rtio_channels)
@ -79,6 +79,7 @@ class TestFullStack(unittest.TestCase):
yield from kcsrs.o_we.write(1) yield from kcsrs.o_we.write(1)
yield yield
status = 1 status = 1
wlen = 0
while status: while status:
status = yield from kcsrs.o_status.read() status = yield from kcsrs.o_status.read()
if status & 2: if status & 2:
@ -88,6 +89,8 @@ class TestFullStack(unittest.TestCase):
yield from kcsrs.o_sequence_error_reset.write(1) yield from kcsrs.o_sequence_error_reset.write(1)
raise RTIOSequenceError raise RTIOSequenceError
yield yield
wlen += 1
return wlen
def test(): def test():
yield from get_fifo_space(0) yield from get_fifo_space(0)
@ -109,9 +112,28 @@ class TestFullStack(unittest.TestCase):
yield from write(0, 1) yield from write(0, 1)
delay(200*8) delay(200*8)
for _ in range(50): delay(200*8)
max_wlen = 0
for _ in range(3):
wlen = yield from write(0, 1)
max_wlen = max(max_wlen, wlen)
delay(40*8)
wlen = yield from write(0, 0)
max_wlen = max(max_wlen, wlen)
delay(40*8)
# check that some writes caused FIFO space requests
self.assertGreater(max_wlen, 5)
# wait for all TTL events to execute
for _ in range(40):
yield yield
# check "last timestamp passed" FIFO empty condition
delay(1000*8)
wlen = yield from write(0, 1)
self.assertEqual(wlen, 2)
ttl_changes = [] ttl_changes = []
@passive @passive
def check_ttls(): def check_ttls():
@ -128,10 +150,17 @@ class TestFullStack(unittest.TestCase):
run_simulation(dut, run_simulation(dut,
{"sys": test(), "rtio": check_ttls()}, {"sys": test(), "rtio": check_ttls()},
{"sys": 8, "rtio": 5, "rtio_rx": 5, "rio": 5, "rio_phy": 5}, vcd_name="foo.vcd") {"sys": 8, "rtio": 5, "rtio_rx": 5, "rio": 5, "rio_phy": 5})
self.assertEqual(ttl_changes, [ self.assertEqual(ttl_changes, [
(203, 0), (203, 0),
(208, 0), (208, 0),
(208, 1), (208, 1),
(214, 1) (214, 1),
(414, 0),
(454, 0),
(494, 0),
(534, 0),
(574, 0),
(614, 0)
]) ])