Skip to content
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

Jump to bottom

[WIP] Add nextpnr-xilinx-already-synth toolchain #504

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

[WIP] Add nextpnr-xilinx-already-synth toolchain #504

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
1718e32
Added nextpnr-xilinx-already-synth toolchain, added oneblink-nosynth …
mkurc-ant Oct 13, 2022
c1603e5
Added skipping nextpnr-xilinx-already-synth for non-already synth des…
mkurc-ant Oct 20, 2022
31360ee
Added gnl-* test designs to be used with nextpnr-xilinx-already-synth…
mkurc-ant Oct 20, 2022
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
1 change: 1 addition & 0 deletions assets/project/attosoc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,4 @@ required_toolchains:
skip_toolchains:
- nextpnr-fpga-interchange-already-synth
- nextpnr-fpga-interchange-experimental-already-synth
- nextpnr-xilinx-already-synth
1 change: 1 addition & 0 deletions assets/project/axi-lite-reg.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ skip_toolchains:
- vpr-fasm2bels
- nextpnr-fpga-interchange-already-synth
- nextpnr-fpga-interchange-experimental-already-synth
- nextpnr-xilinx-already-synth
1 change: 1 addition & 0 deletions assets/project/baselitex-nexus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,4 @@ required_toolchains:
skip_toolchains:
- nextpnr-fpga-interchange-already-synth
- nextpnr-fpga-interchange-experimental-already-synth
- nextpnr-xilinx-already-synth
1 change: 1 addition & 0 deletions assets/project/baselitex-nexys-video.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,4 @@ required_toolchains:
skip_toolchains:
- nextpnr-fpga-interchange-already-synth
- nextpnr-fpga-interchange-experimental-already-synth
- nextpnr-xilinx-already-synth
1 change: 1 addition & 0 deletions assets/project/baselitex.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,4 @@ required_toolchains:
skip_toolchains:
- nextpnr-fpga-interchange-already-synth
- nextpnr-fpga-interchange-experimental-already-synth
- nextpnr-xilinx-already-synth
1 change: 1 addition & 0 deletions assets/project/blinky.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@ required_toolchains:
skip_toolchains:
- nextpnr-fpga-interchange-already-synth
- nextpnr-fpga-interchange-experimental-already-synth
- nextpnr-xilinx-already-synth
1 change: 1 addition & 0 deletions assets/project/bram-n1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ required_toolchains:
skip_toolchains:
- nextpnr-fpga-interchange-already-synth
- nextpnr-fpga-interchange-experimental-already-synth
- nextpnr-xilinx-already-synth
1 change: 1 addition & 0 deletions assets/project/bram-n2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ required_toolchains:
skip_toolchains:
- nextpnr-fpga-interchange-already-synth
- nextpnr-fpga-interchange-experimental-already-synth
- nextpnr-xilinx-already-synth
1 change: 1 addition & 0 deletions assets/project/bram-n3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ required_toolchains:
skip_toolchains:
- nextpnr-fpga-interchange-already-synth
- nextpnr-fpga-interchange-experimental-already-synth
- nextpnr-xilinx-already-synth
1 change: 1 addition & 0 deletions assets/project/daisho-usb3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,4 @@ skip_toolchains:
- nextpnr-fpga-interchange
- nextpnr-fpga-interchange-already-synth
- nextpnr-fpga-interchange-experimental-already-synth
- nextpnr-xilinx-already-synth
1 change: 1 addition & 0 deletions assets/project/dram-test-64x1d.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@ required_toolchains:
skip_toolchains:
- nextpnr-fpga-interchange-already-synth
- nextpnr-fpga-interchange-experimental-already-synth
- nextpnr-xilinx-already-synth
1 change: 1 addition & 0 deletions assets/project/gnl-2-4-3-1.3-gnl-2000-03-3-80-80.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
srcs:
- src/gnl-2-4-3-1.3-gnl-2000-03-3-80-80/gnl_2_4_3_1.3_gnl_2000_03_3_80_80.netlist
- src/gnl-2-4-3-1.3-gnl-2000-03-3-80-80/gnl_2_4_3_1.3_gnl_2000_03_3_80_80.json
top: top
name: gnl-2-4-3-1.3-gnl-2000-03-3-80-80
clocks:
Expand Down
1 change: 1 addition & 0 deletions assets/project/gnl-2-4-5-1.3-gnl-2500-03-5-80-80.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
srcs:
- src/gnl-2-4-5-1.3-gnl-2500-03-5-80-80/gnl_2_4_5_1.3_gnl_2500_03_5_80_80.netlist
- src/gnl-2-4-5-1.3-gnl-2500-03-5-80-80/gnl_2_4_5_1.3_gnl_2500_03_5_80_80.json
top: top
name: gnl-2-4-5-1.3-gnl-2500-03-5-80-80
clocks:
Expand Down
1 change: 1 addition & 0 deletions assets/project/gnl-2-4-5-2.0-gnl-2000-08-5-80-80.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
srcs:
- src/gnl-2-4-5-2.0-gnl-2000-08-5-80-80/gnl_2_4_5_2.0_gnl_2000_08_5_80_80.netlist
- src/gnl-2-4-5-2.0-gnl-2000-08-5-80-80/gnl_2_4_5_2.0_gnl_2000_08_5_80_80.json
top: top
name: gnl-2-4-5-2.0-gnl-2000-08-5-80-80
clocks:
Expand Down
1 change: 1 addition & 0 deletions assets/project/hamsternz-displayport.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,4 @@ required_toolchains:
skip_toolchains:
- nextpnr-fpga-interchange-already-synth
- nextpnr-fpga-interchange-experimental-already-synth
- nextpnr-xilinx-already-synth
1 change: 1 addition & 0 deletions assets/project/hamsternz-hdmi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,4 @@ required_toolchains:
skip_toolchains:
- nextpnr-fpga-interchange-already-synth
- nextpnr-fpga-interchange-experimental-already-synth
- nextpnr-xilinx-already-synth
1 change: 1 addition & 0 deletions assets/project/hps-accel-gen1-nexus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ vendors:
- lifcl-17
required_toolchains:
- nextpnr-nexus
- nextpnr-xilinx-already-synth
1 change: 1 addition & 0 deletions assets/project/hps-accel-gen2-nexus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ required_toolchains:
skip_toolchains:
- nextpnr-fpga-interchange-already-synth
- nextpnr-fpga-interchange-experimental-already-synth
- nextpnr-xilinx-already-synth
1 change: 1 addition & 0 deletions assets/project/ibex.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,4 @@ required_toolchains:
skip_toolchains:
- nextpnr-fpga-interchange-already-synth
- nextpnr-fpga-interchange-experimental-already-synth
- nextpnr-xilinx-already-synth
2 changes: 2 additions & 0 deletions assets/project/iir.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@ vendors:
- chandalar
- quickfeather
required_toolchains: []
skip_toolchains:
- nextpnr-xilinx-already-synth
1 change: 1 addition & 0 deletions assets/project/jpeg-qnr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ vendors:
- quickfeather
required_toolchains:
- quicklogic
- nextpnr-xilinx-already-synth
1 change: 1 addition & 0 deletions assets/project/murax.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,4 @@ required_toolchains:
skip_toolchains:
- nextpnr-fpga-interchange-already-synth
- nextpnr-fpga-interchange-experimental-already-synth
- nextpnr-xilinx-already-synth
2 changes: 1 addition & 1 deletion assets/project/oneblink-nosynth.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
srcs:
- src/oneblink-nosynth/oneblink.netlist
- src/oneblink-nosynth/oneblink.json
top: top
name: oneblink-nosynth
clocks:
Expand All @@ -9,7 +10,6 @@ vendors:
- arty-a35t
- arty-a100t
- nexys-video
- xczu7ev
required_toolchains:
- nextpnr-fpga-interchange-already-synth
skip_toolchains:
Expand Down
1 change: 1 addition & 0 deletions assets/project/oneblink.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,4 @@ required_toolchains:
skip_toolchains:
- nextpnr-fpga-interchange-already-synth
- nextpnr-fpga-interchange-experimental-already-synth
- nextpnr-xilinx-already-synth
1 change: 1 addition & 0 deletions assets/project/picorv32.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@ required_toolchains:
skip_toolchains:
- nextpnr-fpga-interchange-already-synth
- nextpnr-fpga-interchange-experimental-already-synth
- nextpnr-xilinx-already-synth
1 change: 1 addition & 0 deletions assets/project/picosoc-simpleuart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,4 @@ required_toolchains:
skip_toolchains:
- nextpnr-fpga-interchange-already-synth
- nextpnr-fpga-interchange-experimental-already-synth
- nextpnr-xilinx-already-synth
1 change: 1 addition & 0 deletions assets/project/picosoc-spimemio.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,4 @@ required_toolchains:
skip_toolchains:
- nextpnr-fpga-interchange-already-synth
- nextpnr-fpga-interchange-experimental-already-synth
- nextpnr-xilinx-already-synth
1 change: 1 addition & 0 deletions assets/project/picosoc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,4 @@ required_toolchains:
skip_toolchains:
- nextpnr-fpga-interchange-already-synth
- nextpnr-fpga-interchange-experimental-already-synth
- nextpnr-xilinx-already-synth
1 change: 1 addition & 0 deletions assets/project/rsdecoder.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ vendors:
- quickfeather
required_toolchains:
- quicklogic
- nextpnr-xilinx-already-synth
2 changes: 2 additions & 0 deletions assets/project/up5k-nes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,5 @@ vendors:
# TODO: yosys seems to infer more RAM blocks than the available ones
#required_toolchains:
# - nextpnr-ice40
skip_toolchains:
- nextpnr-xilinx-already-synth
1 change: 1 addition & 0 deletions assets/project/vexriscv-smp.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ required_toolchains:
skip_toolchains:
- nextpnr-fpga-interchange-already-synth
- nextpnr-fpga-interchange-experimental-already-synth
- nextpnr-xilinx-already-synth
1 change: 1 addition & 0 deletions assets/project/vexriscv.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,4 @@ required_toolchains:
skip_toolchains:
- nextpnr-fpga-interchange-already-synth
- nextpnr-fpga-interchange-experimental-already-synth
- nextpnr-xilinx-already-synth
1 change: 1 addition & 0 deletions assets/project/zynq-ps7-counter.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ required_toolchains:
skip_toolchains:
- nextpnr-fpga-interchange-already-synth
- nextpnr-fpga-interchange-experimental-already-synth
- nextpnr-xilinx-already-synth
1 change: 1 addition & 0 deletions assets/vendors.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ xilinx:
- vpr
- vpr-fasm2bels
- nextpnr-xilinx
- nextpnr-xilinx-already-synth
- nextpnr-fpga-interchange
- nextpnr-fpga-interchange-already-synth
- nextpnr-fpga-interchange-experimental-already-synth
Expand Down
11 changes: 9 additions & 2 deletions fpgaperf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import glob
import logging
from pathlib import Path
import traceback
import os
import re
import signal
Expand All @@ -29,7 +30,7 @@

from toolchains.icestorm import NextpnrIcestorm
from toolchains.nextpnr import (
NextpnrOxide, NextpnrXilinx, NextpnrFPGAInterchange,
NextpnrOxide, NextpnrXilinx, NextpnrXilinxNoSynth, NextpnrFPGAInterchange,
NextPnrInterchangeNoSynth, NextPnrInterchangeExperimentalNoSynth
)
from toolchains.vivado import Vivado, VivadoYosys, VivadoYosysUhdm
Expand Down Expand Up @@ -61,6 +62,8 @@
NextpnrXilinx,
'nextpnr-xilinx-fasm2bels':
NextpnrXilinxFasm2Bels,
'nextpnr-xilinx-already-synth':
NextpnrXilinxNoSynth,
'nextpnr-fpga-interchange':
NextpnrFPGAInterchange,
'nextpnr-fpga-interchange-already-synth':
Expand Down Expand Up @@ -263,10 +266,14 @@ def run(
tch.run()
signal.alarm(0)
except Exception as e:
stacktrace = traceback.format_exc()
stacktrace = stacktrace.split("\n")
err = str(e)
if not verbose and len(err) > 1000:
err = f"[...]\n{err[-1000:]}"
logger.debug(f"ERROR: {err}")
for line in stacktrace:
logger.error(f"ERROR: {line}")
logger.error(f"ERROR: {err}")
err = err.split("\n")
else:
logger.debug("Printing Stats")
Expand Down
Loading