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

Merge pull request #484 from ilya-epifanov/lattice-trellis-toolchain-seed 

Can now pass `--seed` to `nextpnr-ecp5` via `TrellisToolchain` `kwargs`
This commit is contained in:
enjoy-digital 2020-05-11 09:13:26 +02:00 committed by GitHub
parent 5987ddb454 ac1e968351
commit 5ee01c9460
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
litex/build/lattice/trellis.py
View File

@ -117,11 +117,11 @@ nextpnr_ecp5_architectures = {
_build_template = [ _build_template = [
"yosys -l {build_name}.rpt {build_name}.ys", "yosys -l {build_name}.rpt {build_name}.ys",
"nextpnr-ecp5 --json {build_name}.json --lpf {build_name}.lpf --textcfg {build_name}.config \ "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" "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"): if sys.platform in ("win32", "cygwin"):
script_ext = ".bat" script_ext = ".bat"
script_contents = "@echo off\nrem Autogenerated by LiteX / git: " + tools.get_litex_git_revision() + "\n\n" 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, speed_grade = speed_grade,
timefailarg = "--timing-allow-fail" if not timingstrict else "", timefailarg = "--timing-allow-fail" if not timingstrict else "",
ignoreloops = "--ignore-loops" if ignoreloops 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 script_file = "build_" + build_name + script_ext
tools.write_to_file(script_file, script_contents, force_unix=False) tools.write_to_file(script_file, script_contents, force_unix=False)
@ -186,6 +187,7 @@ class LatticeTrellisToolchain:
nowidelut = False, nowidelut = False,
timingstrict = False, timingstrict = False,
ignoreloops = False, ignoreloops = False,
seed = None,
**kwargs): **kwargs):
# Create build directory # Create build directory
@ -217,7 +219,7 @@ class LatticeTrellisToolchain:
# Generate build script # Generate build script
script = _build_script(False, self.build_template, build_name, architecture, package, script = _build_script(False, self.build_template, build_name, architecture, package,
speed_grade, timingstrict, ignoreloops) speed_grade, timingstrict, ignoreloops, seed)
# Run # Run
if run: if run: