Skip to content

[WIP] NISP integration #550

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mkurc-ant wants to merge 3 commits into
base: main
Choose a base branch
from
Open

[WIP] NISP integration #550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce64c61
Added passing NISP data to nextpnr
mkurc-ant Jan 23, 2023
097e2ef
Enabled building nextpnr-fpga_interchange with NISP
mkurc-ant Jan 23, 2023
6c833cf
Better fpga-tool-perf error handling
mkurc-ant Jan 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/scripts/build_nextpnr_fpga_interchange.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ echo '::endgroup::'

echo '::group::Building nextpnr-fpga_interchange'
cd ./third_party/nextpnr
cmake . -DARCH=fpga_interchange -DRAPIDWRIGHT_PATH=`realpath ../RapidWright` -DINTERCHANGE_SCHEMA_PATH=`realpath ../fpga-interchange-schema`
make
cmake . -DARCH=fpga_interchange -DRAPIDWRIGHT_PATH=`realpath ../RapidWright` -DINTERCHANGE_SCHEMA_PATH=`realpath ../fpga-interchange-schema` -DENABLE_NISP=ON
make -j `nproc`
echo '::endgroup::'
9 changes: 8 additions & 1 deletion fpgaperf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import signal
import sys
import yaml
import traceback
from terminaltables import AsciiTable

from toolchains.icestorm import NextpnrIcestorm
Expand Down Expand Up @@ -271,7 +272,13 @@ def run(
err = str(e)
if not verbose and len(err) > 1000:
err = f"[...]\n{err[-1000:]}"
logger.debug(f"ERROR: {err}")
logger.error(err)

if verbose:
trace = traceback.format_exc()
for line in trace.split("\n"):
logger.error(line)

err = err.split("\n")
else:
logger.debug("Printing Stats")
Expand Down
11 changes: 11 additions & 0 deletions toolchains/nextpnr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -699,8 +699,19 @@ def __init__(self, rootdir):

def configure(self):
super().configure()

self.tool_options['binary_path'] = self.toolchain_bin

nisp_data = os.path.join(
self.rootdir, 'env', 'interchange', 'devices', self.chip,
'{}_site_routability.json'.format(self.chip)
)

self.tool_options['nextpnr_options'].extend([
"--site-routing-graph",
nisp_data
])


class NextpnrXilinx(NextpnrGeneric):
'''nextpnr Xilinx variant using Yosys for synthesis'''
Expand Down