Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 10 additions & 8 deletions .github/workflows/Suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,22 +45,22 @@ jobs:
run: |
python3 -m pip install -r conf/requirements.txt
PYTHONPATH=$(pwd) python3 ./.github/scripts/generate_job_matrix.py all

Build_nextpnr-fpga_interchange-experimental:

container: ubuntu:focal
runs-on: [self-hosted, Linux, X64]

steps:
- uses: actions/checkout@v3
with:
submodules: recursive

- name: Build Tools
run: |
bash .github/scripts/build_nextpnr_fpga_interchange.sh
mv ./third_party/nextpnr/nextpnr-fpga_interchange ./third_party/nextpnr/nextpnr-fpga_interchange.this_is_a_file

- name: Upload nextpnr-fpga_interchange-experimental
uses: actions/upload-artifact@v3
if: always()
Expand Down Expand Up @@ -367,7 +367,7 @@ jobs:
path: |
**/results*.gz
**/plot_*.svg

NextpnrFPGAInterchangeAlreadySynthesized:
needs: Matrix

Expand Down Expand Up @@ -396,6 +396,7 @@ jobs:
run: >
source env.sh nextpnr &&
python3 exhaust.py
--verbose
--project ${{ matrix.project }}
--toolchain ${{ matrix.toolchain }}
--board ${{ matrix.board }}
Expand All @@ -409,7 +410,7 @@ jobs:
path: |
**/results*.gz
**/plot_*.svg

NextpnrFPGAInterchangeExperimentalAlreadySynthesized:
needs:
- Matrix
Expand All @@ -431,13 +432,13 @@ jobs:
- uses: actions/checkout@v3
with:
submodules: recursive

- name: Download nextpnr-fpga_interchange-experimental
uses: actions/download-artifact@v3
with:
name: nextpnr-fpga_interchange-experimental
path: ./download/

- name: Install nextpnr-fpga_interchange-experimental
run: |
mv ./download/nextpnr-fpga_interchange.this_is_a_file /usr/bin/nextpnr-fpga_interchange-experimental
Expand All @@ -455,6 +456,7 @@ jobs:
run: >
source env.sh nextpnr &&
python3 exhaust.py
--verbose
--project ${{ matrix.project }}
--toolchain ${{ matrix.toolchain }}
--board ${{ matrix.board }}
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ env:: | $(CONDA_ENV_PYTHON)

install_f4pga: | $(CONDA_ENV_PYTHON)
mkdir -p env/f4pga
curl -fsSL https://storage.googleapis.com/symbiflow-arch-defs/artifacts/prod/foss-fpga-tools/symbiflow-arch-defs/continuous/install/20220901-121844/symbiflow-arch-defs-install-xc7-75e2533.tar.xz | tar -xJC env/f4pga
curl -fsSL ${F4PGA_LATEST_URL} | xargs curl -fsSL | tar -xJC env/f4pga
# Adapt the environment file from f4pga-arch-defs
test -e env/f4pga/xc7_env/xc7_environment.yml && \
sed -i 's/name: xc7/name: f4pga-env/g' env/f4pga/xc7_env/xc7_environment.yml
Expand All @@ -62,7 +62,7 @@ install_f4pga: | $(CONDA_ENV_PYTHON)
@$(CONDA_ACTIVATE) f4pga-env && conda list
# Install all devices
for device in ${F4PGA_DEVICES}; do \
curl -fsSL https://storage.googleapis.com/symbiflow-arch-defs/artifacts/prod/foss-fpga-tools/symbiflow-arch-defs/continuous/install/20220901-121844/symbiflow-arch-defs-$${device}_test-75e2533.tar.xz | tar -xJC env/f4pga; \
curl -fsSL ${F4PGA_LATEST_URL_BASE}/symbiflow-$${device}_test-latest | xargs curl -fsSL | tar -xJC env/f4pga; \
done

install_interchange:
Expand Down
2 changes: 1 addition & 1 deletion conf/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ termcolor
terminaltables
yapf==0.31.0
git+https://github.com/antmicro/edalize.git@fpga-tool-perf-custom_nextpnr#egg=edalize
https://github.com/chipsalliance/f4pga/archive/de9ed1f3dba34d641c354bdb070232887254b142.zip#subdirectory=f4pga
https://github.com/chipsalliance/f4pga/archive/main.zip#subdirectory=f4pga
8 changes: 8 additions & 0 deletions fpgaperf.py
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,15 @@ def get_combinations():

if board_info is None or b not in board_info:
continue

if t == 'vpr' and project_name != 'baselitex':
continue

if t == 'vpr-fasm2bels' and project_name not in ['blinky', 'oneblink']:
continue

combs.append((project_name, t, b))

return combs


Expand Down