From d86cd94c715adb2c1487e44e71a032896151fbf3 Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Thu, 28 Oct 2021 12:11:40 +0200 Subject: [PATCH] efinix/memory: Avoid specific memory_efinix generator by applying FullMemoryWE on the design. --- litex/build/efinix/efinity.py | 7 +- litex/gen/fhdl/memory_efinix.py | 132 -------------------------------- litex/gen/fhdl/verilog.py | 11 +-- 3 files changed, 8 insertions(+), 142 deletions(-) delete mode 100644 litex/gen/fhdl/memory_efinix.py diff --git a/litex/build/efinix/efinity.py b/litex/build/efinix/efinity.py index 6f50a4f97..77ff913f7 100644 --- a/litex/build/efinix/efinity.py +++ b/litex/build/efinix/efinity.py @@ -18,12 +18,12 @@ import datetime from xml.dom import expatbuilder import xml.etree.ElementTree as et -from litex.build.generic_platform import * - from migen.fhdl.structure import _Fragment from migen.fhdl.tools import * from migen.fhdl.namer import build_namespace +from migen.fhdl.simplify import FullMemoryWE +from litex.build.generic_platform import * from litex.build.generic_platform import Pins, IOStandard, Misc from litex.build import tools @@ -268,6 +268,9 @@ class EfinityToolchain: os.makedirs(build_dir, exist_ok=True) os.chdir(build_dir) + # Apply FullMemoryWE on design (Efiniy does not infer memories correctly otherwise). + FullMemoryWE()(fragment) + # Finalize design if not isinstance(fragment, _Fragment): fragment = fragment.get_fragment() diff --git a/litex/gen/fhdl/memory_efinix.py b/litex/gen/fhdl/memory_efinix.py deleted file mode 100644 index 406438146..000000000 --- a/litex/gen/fhdl/memory_efinix.py +++ /dev/null @@ -1,132 +0,0 @@ -from migen.fhdl.structure import * -from migen.fhdl.module import * -from migen.fhdl.bitcontainer import bits_for -from migen.fhdl.tools import * -from migen.fhdl.verilog import _printexpr as verilog_printexpr -from migen.fhdl.specials import * - -def memory_emit_verilog(memory, ns, add_data_file): - r = "" - def gn(e): - if isinstance(e, Memory): - return ns.get_name(e) - else: - return verilog_printexpr(ns, e)[0] - adrbits = bits_for(memory.depth-1) - - for i in range(memory.width // 8): - r += "reg [" + str((memory.width//4)-1) + ":0] " \ - + gn(memory) + '_efx_' + str(i) \ - + "[0:" + str(memory.depth-1) + "];\n" - - adr_regs = {} - data_regs = {} - for port in memory.ports: - if not port.async_read: - if port.mode == WRITE_FIRST: - adr_reg = Signal(name_override="memadr") - r += "reg [" + str(adrbits-1) + ":0] " \ - + gn(adr_reg) + ";\n" - adr_regs[id(port)] = adr_reg - else: - data_reg = Signal(name_override="memdat") - r += "reg [" + str(memory.width-1) + ":0] " \ - + gn(data_reg) + ";\n" - data_regs[id(port)] = data_reg - - for port in memory.ports: - r += "always @(posedge " + gn(port.clock) + ") begin\n" - if port.we is not None: - if port.we_granularity: - n = memory.width//port.we_granularity - for i in range(n): - if (i > 0): - r += "always @(posedge " + gn(port.clock) + ") begin\n" - m = i*port.we_granularity - M = (i+1)*port.we_granularity-1 - sl = "[" + str(M) + ":" + str(m) + "]" - r += "\tif (" + gn(port.we) + "[" + str(i) + "])\n" - r += "\t\t" + gn(memory) + '_efx_' + str(i) + "[" + gn(port.adr) + "]" + " <= " + gn(port.dat_w) + sl + ";\n" - r += "end\n" - else: - r += "\tif (" + gn(port.we) + ")\n" - r += "\t\t" + gn(memory) + "[" + gn(port.adr) + "] <= " + gn(port.dat_w) + ";\n" - if not port.async_read: - if port.mode == WRITE_FIRST: - r += "always @(posedge " + gn(port.clock) + ") begin\n" - rd = "\t" + gn(adr_regs[id(port)]) + " <= " + gn(port.adr) + ";\n" - else: - bassign = "" - for i in range(memory.width // 8): - m = i*port.we_granularity - M = (i+1)*port.we_granularity-1 - sl = "[" + str(M) + ":" + str(m) + "]" - bassign += gn(data_regs[id(port)]) + sl + " <= " + gn(memory) + "_efx_" + str(i) + "[" + gn(port.adr) + "];\n" - if port.mode == READ_FIRST: - rd = "\t" + bassign - elif port.mode == NO_CHANGE: - rd = "\tif (!" + gn(port.we) + ")\n" \ - + "\t\t" + bassign - if port.re is None: - r += rd - else: - r += "\tif (" + gn(port.re) + ")\n" - r += "\t" + rd.replace("\n\t", "\n\t\t") - r += "end\n\n" - - for port in memory.ports: - if port.async_read: - r += "assign " + gn(port.dat_r) + " = " + gn(memory) + "[" + gn(port.adr) + "];\n" - else: - if port.mode == WRITE_FIRST: - for i in range(memory.width // 8): - m = i*port.we_granularity - M = (i+1)*port.we_granularity-1 - sl = "[" + str(M) + ":" + str(m) + "]" - r += "assign " + gn(port.dat_r) + sl + " = " + gn(memory) + "_efx_" + str(i) + "[" + gn(adr_regs[id(port)]) + "];\n" - else: - r += "assign " + gn(port.dat_r) + " = " + gn(data_regs[id(port)]) + ";\n" - r += "\n" - - if memory.init is not None: - content_7_0 = "" - content_15_8 = "" - content_23_16 = "" - content_31_24 = "" - formatter = "{:0" + str(int(memory.width / 4)) + "X}\n" - - init_7_0 = [] - init_15_8 = [] - init_23_16 = [] - init_31_24 = [] - - for w in memory.init: - init_7_0.append(w & 0xff) - init_15_8.append((w >> 8) & 0xff) - init_23_16.append((w >> 16) & 0xff) - init_31_24.append((w >> 24) & 0xff) - - for d in init_7_0: - content_7_0 += formatter.format(d) - - for d in init_15_8: - content_15_8 += formatter.format(d) - - for d in init_23_16: - content_23_16 += formatter.format(d) - - for d in init_31_24: - content_31_24 += formatter.format(d) - - memory_filename1 = add_data_file(gn(memory) + "_efx_1.init", content_7_0) - memory_filename2 = add_data_file(gn(memory) + "_efx_2.init", content_15_8) - memory_filename3 = add_data_file(gn(memory) + "_efx_3.init", content_23_16) - memory_filename4 = add_data_file(gn(memory) + "_efx_4.init", content_31_24) - r += "initial begin\n" - r += "\t$readmemh(\"" + memory_filename1 + "\", " + gn(memory)+ "_efx_0" + ");\n" - r += "\t$readmemh(\"" + memory_filename2 + "\", " + gn(memory)+ "_efx_1" + ");\n" - r += "\t$readmemh(\"" + memory_filename3 + "\", " + gn(memory)+ "_efx_2" + ");\n" - r += "\t$readmemh(\"" + memory_filename4 + "\", " + gn(memory)+ "_efx_3" + ");\n" - r += "end\n\n" - - return r diff --git a/litex/gen/fhdl/verilog.py b/litex/gen/fhdl/verilog.py index f60e0e310..33020394c 100644 --- a/litex/gen/fhdl/verilog.py +++ b/litex/gen/fhdl/verilog.py @@ -439,15 +439,10 @@ def _print_specials(overrides, specials, ns, add_data_file, attr_translate): attr = _print_attribute(special.attr, attr_translate) if attr: r += attr + " " - # Replace Migen Memory's emit_verilog with our implementation. + # Replace Migen Memory's emit_verilog with LiteX's implementation. if isinstance(special, Memory): - from litex.build.efinix.platform import EfinixPlatform - if isinstance(special.platform, EfinixPlatform) and (special.width == 32): # FIXME: Improve. - from litex.gen.fhdl.memory_efinix import memory_emit_verilog - pr = memory_emit_verilog(special, ns, add_data_file) - else: - from litex.gen.fhdl.memory import memory_emit_verilog - pr = memory_emit_verilog(special, ns, add_data_file) + from litex.gen.fhdl.memory import memory_emit_verilog + pr = memory_emit_verilog(special, ns, add_data_file) else: pr = call_special_classmethod(overrides, special, "emit_verilog", ns, add_data_file) if pr is None: