Skip to content

Commit

Permalink
mac: Allow configuring usage of FullMemoryWE (fixes #70)
Browse files Browse the repository at this point in the history
On ecp5 `FullMemoryWE` leads to an increase of DP16KD block mem, while
it works better on Intel/Altera devices according to
6c3af74.

Simple solution: Make it configurable
  • Loading branch information
david-sawatzke committed Aug 10, 2021
1 parent 2a8cac9 commit e14c90d
Showing 1 changed file with 14 additions and 3 deletions.
17 changes: 14 additions & 3 deletions liteeth/mac/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ def __init__(self, phy, dw,
nrxslots = 2,
ntxslots = 2,
hw_mac = None,
timestamp = None):
timestamp = None,
full_memory_we = False):
assert interface in ["crossbar", "wishbone", "hybrid"]
self.submodules.core = LiteEthMACCore(phy, dw, endianness, with_preamble_crc)
self.csrs = []
Expand All @@ -38,13 +39,23 @@ def __init__(self, phy, dw,
self.rx_slots = CSRConstant(nrxslots)
self.tx_slots = CSRConstant(ntxslots)
self.slot_size = CSRConstant(2**bits_for(eth_mtu))
self.submodules.interface = FullMemoryWE()(LiteEthMACWishboneInterface(
wishbone_interface = LiteEthMACWishboneInterface(
dw = 32,
nrxslots = nrxslots,
ntxslots = ntxslots,
endianness = endianness,
timestamp = timestamp,
))
)
# On some targets (Intel/Altera), the complex ports aren't inferred
# as block ram, but are created with LUTs. FullMemoryWe splits such
# `Memory` instances up into 4 separate memory blocks, each
# containing 8 bits which gets inferred correctly on intel/altera.
# Yosys on ECP5 inferrs the original correctly, so FullMemoryWE
# leads to additional block ram instances being used, which
# increases memory usage by a lot.
if full_memory_we:
wishbone_interface = FullMemoryWE()(wishbone_interface)
self.submodules.interface = wishbone_interface
self.ev, self.bus = self.interface.sram.ev, self.interface.bus
self.csrs = self.interface.get_csrs() + self.core.get_csrs()
if interface == "hybrid":
Expand Down

0 comments on commit e14c90d

Please sign in to comment.