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

mac/sram: Add dw=8, 16 support and simplify logic (let the toolchain unused logic for 8/16/32-bit dw automatically).

This commit is contained in:
Florent Kermarrec 2021-10-30 23:28:10 +02:00
parent 2ec2669f6b
commit 1b25f7781c
1 changed files with 24 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
liteeth/mac/sram.py
View File

@ -23,7 +23,7 @@ class LiteEthMACSRAMWriter(Module, AutoCSR):
self.crc_error = Signal() self.crc_error = Signal()
# Parameters Check / Compute. # Parameters Check / Compute.
assert dw in [32, 64] assert dw in [8, 16, 32, 64]
slotbits = max(int(math.log2(nslots)), 1) slotbits = max(int(math.log2(nslots)), 1)
lengthbits = bits_for(depth * dw//8) lengthbits = bits_for(depth * dw//8)
@ -55,24 +55,16 @@ class LiteEthMACSRAMWriter(Module, AutoCSR):
sink.ready.reset = 1 sink.ready.reset = 1
# Decode Length increment from from last_be. # Decode Length increment from from last_be.
if dw == 32: self.comb += Case(sink.last_be, {
self.comb += Case(sink.last_be, { 0b00000001 : length_inc.eq(1),
0b0001 : length_inc.eq(1), 0b00000010 : length_inc.eq(2),
0b0010 : length_inc.eq(2), 0b00000100 : length_inc.eq(3),
0b0100 : length_inc.eq(3), 0b00001000 : length_inc.eq(4),
"default" : length_inc.eq(4) 0b00010000 : length_inc.eq(5),
}) 0b00100000 : length_inc.eq(6),
else: 0b01000000 : length_inc.eq(7),
self.comb += Case(sink.last_be, { "default" : length_inc.eq(dw//8)
0b00000001 : length_inc.eq(1), })
0b00000010 : length_inc.eq(2),
0b00000100 : length_inc.eq(3),
0b00001000 : length_inc.eq(4),
0b00010000 : length_inc.eq(5),
0b00100000 : length_inc.eq(6),
0b01000000 : length_inc.eq(7),
"default" : length_inc.eq(8)
})
# Status FIFO. # Status FIFO.
stat_fifo_layout = [("slot", slotbits), ("length", lengthbits)] stat_fifo_layout = [("slot", slotbits), ("length", lengthbits)]
@ -173,7 +165,7 @@ class LiteEthMACSRAMReader(Module, AutoCSR):
self.source = source = stream.Endpoint(eth_phy_description(dw)) self.source = source = stream.Endpoint(eth_phy_description(dw))
# Parameters Check / Compute. # Parameters Check / Compute.
assert dw in [32, 64] assert dw in [8, 16, 32, 64]
slotbits = max(int(math.log2(nslots)), 1) slotbits = max(int(math.log2(nslots)), 1)
lengthbits = bits_for(depth * dw//8) lengthbits = bits_for(depth * dw//8)
@ -222,28 +214,18 @@ class LiteEthMACSRAMReader(Module, AutoCSR):
# Encode Length to last_be. # Encode Length to last_be.
length_lsb = cmd_fifo.source.length[0:int(math.log2(dw//8))] length_lsb = cmd_fifo.source.length[0:int(math.log2(dw//8))]
if dw == 32: self.comb += If(source.last,
self.comb += If(source.last, Case(length_lsb, {
Case(length_lsb, { 1 : source.last_be.eq(0b00000001),
1 : source.last_be.eq(0b0001), 2 : source.last_be.eq(0b00000010),
2 : source.last_be.eq(0b0010), 3 : source.last_be.eq(0b00000100),
3 : source.last_be.eq(0b0100), 4 : source.last_be.eq(0b00001000),
"default" : source.last_be.eq(0b1000), 5 : source.last_be.eq(0b00010000),
}) 6 : source.last_be.eq(0b00100000),
) 7 : source.last_be.eq(0b01000000),
else: "default" : source.last_be.eq(2**(dw//8 - 1)),
self.comb += If(source.last, })
Case(length_lsb, { )
1 : source.last_be.eq(0b00000001),
2 : source.last_be.eq(0b00000010),
3 : source.last_be.eq(0b00000100),
4 : source.last_be.eq(0b00001000),
5 : source.last_be.eq(0b00010000),
6 : source.last_be.eq(0b00100000),
7 : source.last_be.eq(0b01000000),
"default" : source.last_be.eq(0b10000000),
})
)
# FSM. # FSM.
self.submodules.fsm = fsm = FSM(reset_state="IDLE") self.submodules.fsm = fsm = FSM(reset_state="IDLE")