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 #94 from cr1901/nextpnr 

lattice/icestorm: Add nextpnr pnr as alternate pnr tool.
This commit is contained in:
enjoy-digital 2018-08-28 11:46:35 +02:00 committed by GitHub
parent 7a14b75cd6 7af89efc70
commit 05c7b9daf4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 40 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,7 +34,7 @@ def _build_pcf(named_sc, named_pc):
def _run_icestorm(source, build_template, build_name, pnr_pkg_opts, def _run_icestorm(source, build_template, build_name, pnr_pkg_opts,
icetime_pkg_opts, icetime_constraint): icetime_pkg_opts, freq_constraint):
if sys.platform == "win32" or sys.platform == "cygwin": if sys.platform == "win32" or sys.platform == "cygwin":
script_ext = ".bat" script_ext = ".bat"
shell = ["cmd", "/c"] shell = ["cmd", "/c"]
@ -51,7 +51,7 @@ def _run_icestorm(source, build_template, build_name, pnr_pkg_opts,
build_script_contents += s_fail.format(build_name=build_name, build_script_contents += s_fail.format(build_name=build_name,
pnr_pkg_opts=pnr_pkg_opts, pnr_pkg_opts=pnr_pkg_opts,
icetime_pkg_opts=icetime_pkg_opts, icetime_pkg_opts=icetime_pkg_opts,
icetime_constraint=icetime_constraint, freq_constraint=freq_constraint,
fail_stmt=fail_stmt) fail_stmt=fail_stmt)
build_script_file = "build_" + build_name + script_ext build_script_file = "build_" + build_name + script_ext
@ -88,7 +88,11 @@ class LatticeIceStormToolchain:
special_overrides = common.icestorm_special_overrides special_overrides = common.icestorm_special_overrides
def __init__(self): def __init__(self, use_nextpnr=False):
# Variables within replacement fields should be backend-aware and
# update their syntax accordingly. Currently, only {pnr_pkg_opts}
# needs this functionality.
self.yosys_template = [ self.yosys_template = [
"{read_files}", "{read_files}",
"attrmap -tocase keep -imap keep=\"true\" keep=1 -imap keep=\"false\" keep=0 -remove keep=0", "attrmap -tocase keep -imap keep=\"true\" keep=1 -imap keep=\"false\" keep=0 -remove keep=0",
@ -97,8 +101,20 @@ class LatticeIceStormToolchain:
self.build_template = [ self.build_template = [
"yosys -q -l {build_name}.rpt {build_name}.ys", "yosys -q -l {build_name}.rpt {build_name}.ys",
"arachne-pnr -q {pnr_pkg_opts} -p {build_name}.pcf {build_name}.blif -o {build_name}.txt", "arachne-pnr -q -l {pnr_pkg_opts} -p {build_name}.pcf {build_name}.blif -o {build_name}.txt",
"icetime {icetime_pkg_opts} -c {icetime_constraint} -t -p {build_name}.pcf -r {build_name}.tim {build_name}.txt", "icetime {icetime_pkg_opts} -c {freq_constraint} -t -p {build_name}.pcf -r {build_name}.tim {build_name}.txt",
"icepack {build_name}.txt {build_name}.bin"
]
self.nextpnr_yosys_template = [
"{read_files}",
"attrmap -tocase keep -imap keep=\"true\" keep=1 -imap keep=\"false\" keep=0 -remove keep=0",
"synth_ice40 -top top -json {build_name}.json",
]
self.nextpnr_build_template = [
"yosys -q -l {build_name}.rpt {build_name}.ys",
"nextpnr-ice40 {pnr_pkg_opts} --pcf {build_name}.pcf --json {build_name}.json --asc {build_name}.txt --freq {freq_constraint}",
"icepack {build_name}.txt {build_name}.bin" "icepack {build_name}.txt {build_name}.bin"
] ]
@ -106,7 +122,7 @@ class LatticeIceStormToolchain:
# platform.device should be of the form "ice40-{lp384, hx1k, etc}-{tq144, etc}" # platform.device should be of the form "ice40-{lp384, hx1k, etc}-{tq144, etc}"
def build(self, platform, fragment, build_dir="build", build_name="top", def build(self, platform, fragment, build_dir="build", build_name="top",
toolchain_path=None, run=True): toolchain_path=None, use_nextpnr=False, run=True):
os.makedirs(build_dir, exist_ok=True) os.makedirs(build_dir, exist_ok=True)
cwd = os.getcwd() cwd = os.getcwd()
os.chdir(build_dir) os.chdir(build_dir)
@ -120,9 +136,13 @@ class LatticeIceStormToolchain:
v_file = build_name + ".v" v_file = build_name + ".v"
v_output.write(v_file) v_output.write(v_file)
if use_nextpnr:
chosen_yosys_template = self.nextpnr_yosys_template
else:
chosen_yosys_template = self.yosys_template
ys_contents = "\n".join(_.format(build_name=build_name, ys_contents = "\n".join(_.format(build_name=build_name,
read_files=self.gen_read_files(platform, v_file)) read_files=self.gen_read_files(platform, v_file))
for _ in self.yosys_template) for _ in chosen_yosys_template)
ys_name = build_name + ".ys" ys_name = build_name + ".ys"
tools.write_to_file(ys_name, ys_contents) tools.write_to_file(ys_name, ys_contents)
@ -131,14 +151,21 @@ class LatticeIceStormToolchain:
_build_pcf(named_sc, named_pc)) _build_pcf(named_sc, named_pc))
if run: if run:
(family, series_size, package) = self.parse_device_string(platform.device) (family, series_size, package) = self.parse_device_string(platform.device)
if use_nextpnr:
pnr_pkg_opts = "--" + series_size + " --package " + package
else:
pnr_pkg_opts = "-d " + self.get_size_string(series_size) + \ pnr_pkg_opts = "-d " + self.get_size_string(series_size) + \
" -P " + package " -P " + package
icetime_pkg_opts = "-P " + package + " -d " + series_size icetime_pkg_opts = "-P " + package + " -d " + series_size
icetime_constraint = str(max(self.freq_constraints.values(), freq_constraint = str(max(self.freq_constraints.values(),
default=0.0)) default=0.0))
_run_icestorm(False, self.build_template, build_name, pnr_pkg_opts, if use_nextpnr:
icetime_pkg_opts, icetime_constraint) chosen_build_template = self.nextpnr_build_template
else:
chosen_build_template = self.build_template
_run_icestorm(False, chosen_build_template, build_name,
pnr_pkg_opts, icetime_pkg_opts, freq_constraint)
os.chdir(cwd) os.chdir(cwd)