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

drtio: change data direction in _CrossDomainRequest

This commit is contained in:
Sebastien Bourdeauducq 2016-10-21 22:44:47 +08:00
parent 6a88229e6a
commit c71c4c89e0
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
artiq/gateware/drtio/rt_packets.py
View File

@ -333,14 +333,15 @@ class _CrossDomainRequest(Module):
If(req_ack, ongoing.eq(0)) If(req_ack, ongoing.eq(0))
] ]
if req_data is not None: if req_data is not None:
srv_data_r = Signal.like(srv_data) req_data_r = Signal.like(req_data)
dsync += If(srv_stb & srv_ack, srv_data_r.eq(srv_data)) self.specials += NoRetiming(req_data_r)
self.specials += NoRetiming(srv_data_r) self.sync += If(req_stb, req_data_r.eq(req_data))
self.sync += If(reply.o, req_data.eq(srv_data_r))
dsync += [ dsync += [
If(request.o, srv_stb.eq(1)), If(request.o, srv_stb.eq(1)),
If(srv_ack, srv_stb.eq(0)) If(srv_ack, srv_stb.eq(0))
] ]
if req_data is not None:
dsync += If(request.o, srv_data.eq(req_data_r))
self.comb += reply.i.eq(srv_stb & srv_ack) self.comb += reply.i.eq(srv_stb & srv_ack)

11
artiq/test/gateware/drtio/test_rt_packets.py
View File

@ -125,10 +125,9 @@ class TestSatellite(unittest.TestCase):
class TestCrossDomainRequest(unittest.TestCase): class TestCrossDomainRequest(unittest.TestCase):
def test_cross_domain_request(self): def test_cross_domain_request(self):
prng = random.Random(1)
for sys_freq in 3, 6, 11: for sys_freq in 3, 6, 11:
for srv_freq in 3, 6, 11: for srv_freq in 3, 6, 11:
prng = random.Random(1)
req_stb = Signal() req_stb = Signal()
req_ack = Signal() req_ack = Signal()
req_data = Signal(8) req_data = Signal(8)
@ -139,23 +138,23 @@ class TestCrossDomainRequest(unittest.TestCase):
received_seq = [] received_seq = []
def requester(): def requester():
for i in range(len(test_seq)): for data in test_seq:
yield req_data.eq(data)
yield req_stb.eq(1) yield req_stb.eq(1)
yield yield
while not (yield req_ack): while not (yield req_ack):
yield yield
received_seq.append((yield req_data))
yield req_stb.eq(0) yield req_stb.eq(0)
for j in range(prng.randrange(0, 10)): for j in range(prng.randrange(0, 10)):
yield yield
def server(): def server():
for data in test_seq: for i in range(len(test_seq)):
while not (yield srv_stb): while not (yield srv_stb):
yield yield
received_seq.append((yield srv_data))
for j in range(prng.randrange(0, 10)): for j in range(prng.randrange(0, 10)):
yield yield
yield srv_data.eq(data)
yield srv_ack.eq(1) yield srv_ack.eq(1)
yield yield
yield srv_ack.eq(0) yield srv_ack.eq(0)