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

fhdl/memory: Simplify Write Logic (Avoid specific cases on write granuarity).

This commit is contained in:
Florent Kermarrec 2021-10-28 14:19:02 +02:00
parent d86cd94c71
commit 576bb67332
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
litex/gen/fhdl/memory.py
View File

@ -29,13 +29,19 @@ def memory_emit_verilog(memory, ns, add_data_file):
# Ports Transformations. # Ports Transformations.
# ---------------------- # ----------------------
# https://github.com/enjoy-digital/litex/issues/1003
# FIXME: Verify behaviour with the different FPGA toolchains. # Set Port Mode to Read-First when several Ports with different Clocks.
# FIXME: Verify behaviour with the different FPGA toolchains, try to avoid it.
clocks = [port.clock for port in memory.ports] clocks = [port.clock for port in memory.ports]
if clocks.count(clocks[0]) != len(clocks): if clocks.count(clocks[0]) != len(clocks):
for port in memory.ports: for port in memory.ports:
port.mode = READ_FIRST port.mode = READ_FIRST
# Set Port Granularity when 0.
for port in memory.ports:
if port.we_granularity == 0:
port.we_granularity = memory.width
# Memory Description. # Memory Description.
# ------------------- # -------------------
r += "//" + "-"*80 + "\n" r += "//" + "-"*80 + "\n"
@ -98,17 +104,13 @@ def memory_emit_verilog(memory, ns, add_data_file):
r += f"always @(posedge {gn(port.clock)}) begin\n" r += f"always @(posedge {gn(port.clock)}) begin\n"
# Write Logic. # Write Logic.
if port.we is not None: if port.we is not None:
# Split Write Logic when Granularity. # Split Write Logic.
if port.we_granularity:
for i in range(memory.width//port.we_granularity): for i in range(memory.width//port.we_granularity):
r += f"\tif ({gn(port.we)}[{i}])\n" wbit = f"[{i}]" if memory.width != port.we_granularity else ""
r += f"\tif ({gn(port.we)}{wbit})\n"
lbit = i*port.we_granularity lbit = i*port.we_granularity
hbit = (i+1)*port.we_granularity-1 hbit = (i+1)*port.we_granularity-1
r += f"\t\t{gn(memory)}[{gn(port.adr)}][{hbit}:{lbit}] <= {gn(port.dat_w)}[{hbit}:{lbit}];\n" r += f"\t\t{gn(memory)}[{gn(port.adr)}][{hbit}:{lbit}] <= {gn(port.dat_w)}[{hbit}:{lbit}];\n"
# Else use common Write Logic.
else:
r += f"\tif ({gn(port.we)})\n"
r += f"\t\t{gn(memory)}[{gn(port.adr)}] <= {gn(port.dat_w)};\n"
# Read Logic. # Read Logic.
if not port.async_read: if not port.async_read: