From ac1e968351f43e019a0adf48c5d162972e54fda2 Mon Sep 17 00:00:00 2001 From: Ilya Epifanov Date: Tue, 28 Apr 2020 22:10:20 +0200 Subject: [PATCH] Can now pass `--seed` to `nextpnr-ecp5` via `TrellisToolchain` `kwargs` --- litex/build/lattice/trellis.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/litex/build/lattice/trellis.py b/litex/build/lattice/trellis.py index fa19b9192..3aba0a849 100644 --- a/litex/build/lattice/trellis.py +++ b/litex/build/lattice/trellis.py @@ -117,11 +117,11 @@ nextpnr_ecp5_architectures = { _build_template = [ "yosys -l {build_name}.rpt {build_name}.ys", "nextpnr-ecp5 --json {build_name}.json --lpf {build_name}.lpf --textcfg {build_name}.config \ - --{architecture} --package {package} --speed {speed_grade} {timefailarg} {ignoreloops}", + --{architecture} --package {package} --speed {speed_grade} {timefailarg} {ignoreloops} {seed}", "ecppack {build_name}.config --svf {build_name}.svf --bit {build_name}.bit" ] -def _build_script(source, build_template, build_name, architecture, package, speed_grade, timingstrict, ignoreloops): +def _build_script(source, build_template, build_name, architecture, package, speed_grade, timingstrict, ignoreloops, seed): if sys.platform in ("win32", "cygwin"): script_ext = ".bat" script_contents = "@echo off\nrem Autogenerated by LiteX / git: " + tools.get_litex_git_revision() + "\n\n" @@ -140,7 +140,8 @@ def _build_script(source, build_template, build_name, architecture, package, spe speed_grade = speed_grade, timefailarg = "--timing-allow-fail" if not timingstrict else "", ignoreloops = "--ignore-loops" if ignoreloops else "", - fail_stmt = fail_stmt) + fail_stmt = fail_stmt, + seed = f"--seed {seed}" if seed is not None else "") script_file = "build_" + build_name + script_ext tools.write_to_file(script_file, script_contents, force_unix=False) @@ -186,6 +187,7 @@ class LatticeTrellisToolchain: nowidelut = False, timingstrict = False, ignoreloops = False, + seed = None, **kwargs): # Create build directory @@ -217,7 +219,7 @@ class LatticeTrellisToolchain: # Generate build script script = _build_script(False, self.build_template, build_name, architecture, package, - speed_grade, timingstrict, ignoreloops) + speed_grade, timingstrict, ignoreloops, seed) # Run if run: