M-Labs
/
rtio-nmigen
7
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Prepare rtio.sed.output_network for assertions on replacements

This commit is contained in:
Donald Sebastian Leung 2020-10-22 10:56:59 +08:00
parent c8775cba44
commit 1766fbeca9
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
rtio/sed/output_network.py
View File

@ -129,21 +129,22 @@ class OutputNetwork(Elaboratable):
f_output_valid = Signal() f_output_valid = Signal()
m.d.comb += f_output_valid.eq(counter == network_latency) m.d.comb += f_output_valid.eq(counter == network_latency)
# If there are no replacements, all input data are unique and they
# all make it through the sorting network
with m.If(f_output_valid): with m.If(f_output_valid):
replacement_occurred = Signal() replacement_occurred = Signal()
for node in self.output: for node in self.output:
with m.If(node.replace_occured): with m.If(node.replace_occured):
m.d.comb += replacement_occurred.eq(1) m.d.comb += replacement_occurred.eq(1)
nodes_unique = Signal(reset=1)
for node1 in range(len(self.input)):
for node2 in range(node1):
k1 = Cat(Past(self.input[node1].payload.channel, clocks=network_latency), ~Past(self.input[node1].valid, clocks=network_latency))
k2 = Cat(Past(self.input[node2].payload.channel, clocks=network_latency), ~Past(self.input[node2].valid, clocks=network_latency))
with m.If(k1 == k2):
m.d.comb += nodes_unique.eq(0)
# If there are no replacements then:
# - All input data are unique
# - They all make it through the sorting network
with m.If(~replacement_occurred): with m.If(~replacement_occurred):
nodes_unique = Signal(reset=1)
for node1 in range(len(self.input)):
for node2 in range(node1):
k1 = Cat(Past(self.input[node1].payload.channel, clocks=network_latency), ~Past(self.input[node1].valid, clocks=network_latency))
k2 = Cat(Past(self.input[node2].payload.channel, clocks=network_latency), ~Past(self.input[node2].valid, clocks=network_latency))
with m.If(k1 == k2):
m.d.comb += nodes_unique.eq(0)
m.d.comb += Assert(nodes_unique) m.d.comb += Assert(nodes_unique)
for input_node in self.input: for input_node in self.input:
appeared = Signal() appeared = Signal()
@ -164,8 +165,6 @@ class OutputNetwork(Elaboratable):
m.d.comb += appeared.eq(1) m.d.comb += appeared.eq(1)
m.d.comb += Assert(appeared) m.d.comb += Assert(appeared)
# If the valid bit / channel no. combinations of all input data are
# unique then there should be no replacements
with m.If(f_output_valid): with m.If(f_output_valid):
nodes_unique = Signal(reset=1) nodes_unique = Signal(reset=1)
for node1 in range(len(self.input)): for node1 in range(len(self.input)):
@ -174,11 +173,13 @@ class OutputNetwork(Elaboratable):
k2 = Cat(Past(self.input[node2].payload.channel, clocks=network_latency), ~Past(self.input[node2].valid, clocks=network_latency)) k2 = Cat(Past(self.input[node2].payload.channel, clocks=network_latency), ~Past(self.input[node2].valid, clocks=network_latency))
with m.If(k1 == k2): with m.If(k1 == k2):
m.d.comb += nodes_unique.eq(0) m.d.comb += nodes_unique.eq(0)
replacement_occurred = Signal()
for output_node in self.output:
with m.If(output_node.replace_occured):
m.d.comb += replacement_occurred.eq(1)
# If the valid bit / channel no. combinations of all input data
# are unique then there should be no replacements
with m.If(nodes_unique): with m.If(nodes_unique):
replacement_occurred = Signal()
for output_node in self.output:
with m.If(output_node.replace_occured):
m.d.comb += replacement_occurred.eq(1)
m.d.comb += Assert(~replacement_occurred) m.d.comb += Assert(~replacement_occurred)
def elaborate(self, platform): def elaborate(self, platform):