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

lattice/icestorm: add ignoreloops/seed support (similar to trellis) and icestorm_args.

This commit is contained in:
Florent Kermarrec 2020-05-11 09:33:26 +02:00
parent ea7fe383a3
commit c9e36d7fdd
2 changed files with 38 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
litex/build/lattice/icestorm.py
View File

@ -93,32 +93,35 @@ def parse_device(device):
_build_template = [ _build_template = [
"yosys -l {build_name}.rpt {build_name}.ys", "yosys -l {build_name}.rpt {build_name}.ys",
"nextpnr-ice40 --json {build_name}.json --pcf {build_name}.pcf --asc {build_name}.txt \ "nextpnr-ice40 --json {build_name}.json --pcf {build_name}.pcf --asc {build_name}.txt \
--pre-pack {build_name}_pre_pack.py --{architecture} --package {package} {timefailarg}", --pre-pack {build_name}_pre_pack.py --{architecture} --package {package} {timefailarg} {ignoreloops} --seed {seed}",
"icepack -s {build_name}.txt {build_name}.bin" "icepack -s {build_name}.txt {build_name}.bin"
] ]
def _build_script(build_template, build_name, architecture, package, timingstrict): def _build_script(build_template, build_name, architecture, package, timingstrict, ignoreloops, seed):
if sys.platform in ("win32", "cygwin"): if sys.platform in ("win32", "cygwin"):
script_ext = ".bat" script_ext = ".bat"
build_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"
fail_stmt = " || exit /b" fail_stmt = " || exit /b"
else: else:
script_ext = ".sh" script_ext = ".sh"
build_script_contents = "# Autogenerated by LiteX / git: " + tools.get_litex_git_revision() + "\nset -e\n" script_contents = "# Autogenerated by LiteX / git: " + tools.get_litex_git_revision() + "\nset -e\n"
fail_stmt = "" fail_stmt = ""
for s in build_template: for s in build_template:
s_fail = s + "{fail_stmt}\n" # Required so Windows scripts fail early. s_fail = s + "{fail_stmt}\n" # Required so Windows scripts fail early.
build_script_contents += s_fail.format( script_contents += s_fail.format(
build_name = build_name, build_name = build_name,
architecture = architecture, architecture = architecture,
package = package, package = package,
timefailarg = "--timing-allow-fail" if not timingstrict else "", timefailarg = "--timing-allow-fail" if not timingstrict else "",
fail_stmt = fail_stmt) ignoreloops = "--ignore-loops" if ignoreloops else "",
fail_stmt = fail_stmt,
seed = seed)
build_script_file = "build_" + build_name + script_ext script_file = "build_" + build_name + script_ext
tools.write_to_file(build_script_file, build_script_contents,force_unix=False) tools.write_to_file(script_file, script_contents, force_unix=False)
return build_script_file
return script_file
def _run_script(script): def _run_script(script):
if sys.platform in ("win32", "cygwin"): if sys.platform in ("win32", "cygwin"):
@ -158,6 +161,8 @@ class LatticeIceStormToolchain:
synth_opts = "", synth_opts = "",
run = True, run = True,
timingstrict = False, timingstrict = False,
ignoreloops = False,
seed = 1,
**kwargs): **kwargs):
# Create build directory # Create build directory
@ -190,7 +195,7 @@ class LatticeIceStormToolchain:
(family, architecture, package) = parse_device(platform.device) (family, architecture, package) = parse_device(platform.device)
# Generate build script # Generate build script
script = _build_script(self.build_template, build_name, architecture, package, timingstrict) script = _build_script(self.build_template, build_name, architecture, package, timingstrict, ignoreloops, seed)
# Run # Run
if run: if run:
@ -207,3 +212,18 @@ class LatticeIceStormToolchain:
raise ValueError("Clock already constrained to {:.2f}ns, new constraint to {:.2f}ns" raise ValueError("Clock already constrained to {:.2f}ns, new constraint to {:.2f}ns"
.format(self.clocks[clk], period)) .format(self.clocks[clk], period))
self.clocks[clk] = period self.clocks[clk] = period
def icestorm_args(parser):
parser.add_argument("--nextpnr-timingstrict", action="store_true",
help="fail if timing not met, i.e., do NOT pass '--timing-allow-fail' to nextpnr")
parser.add_argument("--nextpnr-ignoreloops", action="store_true",
help="ignore combinational loops in timing analysis, i.e. pass '--ignore-loops' to nextpnr")
parser.add_argument("--nextpnr-seed", default=1, type=int,
help="seed to pass to nextpnr")
def icestorm_argdict(args):
return {
"timingstrict": args.nextpnr_timingstrict,
"ignoreloops": args.nextpnr_ignoreloops,
"seed": args.nextpnr_seed,
}