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

rtio/sed: more output network fixes

This commit is contained in:
Sebastien Bourdeauducq 2017-09-10 23:41:04 +08:00
parent 96505a1cd9
commit c5d6a2ba1a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
artiq/gateware/rtio/sed/output_network.py
View File

@ -68,8 +68,10 @@ class OutputNetwork(Module):
for _ in range(lane_count)] for _ in range(lane_count)]
for node1, node2 in step: for node1, node2 in step:
k1 = Cat(step_input[node1].payload.channel, ~step_input[node1].valid)
k2 = Cat(step_input[node2].payload.channel, ~step_input[node2].valid)
self.sync += [ self.sync += [
If(step_input[node1].payload.channel == step_input[node2].payload.channel, If(k1 == k2,
If(cmp_wrap(step_input[node1].seqn, step_input[node2].seqn), If(cmp_wrap(step_input[node1].seqn, step_input[node2].seqn),
step_output[node1].eq(step_input[node2]), step_output[node1].eq(step_input[node2]),
step_output[node2].eq(step_input[node1]) step_output[node2].eq(step_input[node1])
@ -77,11 +79,9 @@ class OutputNetwork(Module):
step_output[node1].eq(step_input[node1]), step_output[node1].eq(step_input[node1]),
step_output[node2].eq(step_input[node2]) step_output[node2].eq(step_input[node2])
), ),
If(step_input[node1].valid & step_input[node2].valid, step_output[node1].replace_occured.eq(1),
step_output[node1].replace_occured.eq(1), step_output[node2].valid.eq(0),
step_output[node2].valid.eq(0) ).Elif(k1 < k2,
)
).Elif(step_input[node1].payload.channel < step_input[node2].payload.channel,
step_output[node1].eq(step_input[node1]), step_output[node1].eq(step_input[node1]),
step_output[node2].eq(step_input[node2]) step_output[node2].eq(step_input[node2])
).Else( ).Else(