Add nextpnr-fpga-interchange-const-seed-already_synth toolchain

kboronski-ant · kboronski-ant · commit 3d5b5da99be2 · 2022-12-12T18:16:27.000+01:00
Signed-off-by: Krzysztof Boronski &lt;kboronski@antmicro.com&gt;
diff --git a/.github/scripts/get_env_cmd.py b/.github/scripts/get_env_cmd.py
@@ -38,7 +38,9 @@
     "nextpnr-xilinx-fasm2bels"
 ]
 interchange = [
-    "nextpnr-fpga-interchange", "nextpnr-fpga-interchange-already-synth",
+    "nextpnr-fpga-interchange",
+    "nextpnr-fpga-interchange-consst-seed-already-synth",
+    "nextpnr-fpga-interchange-already-synth",
     "nextpnr-fpga-interchange-experimental-already-synth"
 ]
 quicklogic = ["quicklogic"]
diff --git a/.github/workflows/Suite.yml b/.github/workflows/Suite.yml
@@ -367,6 +367,30 @@ jobs:
             **/results*.gz
             **/plot_*.svg
 
+  NextpnrFPGAInterchangeConstSeedAlreadySynthesized:
+    needs: Matrix
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include: ${{ fromJson(needs.Matrix.outputs.matrices).nextpnr_fpga_interchange_const_seed_already_synth }}
+
+    env:
+      GHA_EXTERNAL_DISK: "tools"
+
+    container: ubuntu:focal
+
+    runs-on: [self-hosted, Linux, X64]
+
+    steps:
+      - {uses: actions/checkout@v3, with: { submodules: recursive }}
+      - uses: ./.github/RunTest
+        with:
+          environment: nextpnr
+          project: ${{ matrix.project }}
+          toolchain: ${{ matrix.toolchain }}
+          board: ${{ matrix.board }}
+          install: -v -l $(echo ${{needs.Matrix.outputs.link}})
 
   NextpnrIce40:
     needs: Matrix
diff --git a/assets/project/attosoc.yaml b/assets/project/attosoc.yaml
@@ -27,4 +27,5 @@ required_toolchains:
 skip_toolchains:
   - nextpnr-fpga-interchange-already-synth
   - nextpnr-fpga-interchange-experimental-already-synth
+  - nextpnr-fpga-interchange-const-seed-already-synth
   - vivado-already-synth
diff --git a/assets/project/axi-lite-reg.yaml b/assets/project/axi-lite-reg.yaml
@@ -13,6 +13,7 @@ skip_toolchains:
   - nextpnr-fpga-interchange
   - nextpnr-fpga-interchange-already-synth
   - nextpnr-fpga-interchange-experimental-already-synth
+  - nextpnr-fpga-interchange-const-seed-already-synth
   - vivado-already-synth
   - vpr-fasm2bels
   - yosys-vivado
diff --git a/assets/project/baselitex-nexus.yaml b/assets/project/baselitex-nexus.yaml
@@ -24,4 +24,5 @@ required_toolchains:
 skip_toolchains:
   - nextpnr-fpga-interchange-already-synth
   - nextpnr-fpga-interchange-experimental-already-synth
+  - nextpnr-fpga-interchange-const-seed-already-synth
   - vivado-already-synth
diff --git a/assets/project/baselitex-nexys-video.yaml b/assets/project/baselitex-nexys-video.yaml
@@ -31,4 +31,5 @@ required_toolchains:
 skip_toolchains:
   - nextpnr-fpga-interchange-already-synth
   - nextpnr-fpga-interchange-experimental-already-synth
+  - nextpnr-fpga-interchange-const-seed-already-synth
   - vivado-already-synth
diff --git a/assets/project/baselitex.yaml b/assets/project/baselitex.yaml
@@ -29,4 +29,5 @@ required_toolchains:
 skip_toolchains:
   - nextpnr-fpga-interchange-already-synth
   - nextpnr-fpga-interchange-experimental-already-synth
+  - nextpnr-fpga-interchange-const-seed-already-synth
   - vivado-already-synth
diff --git a/assets/project/blinky.yaml b/assets/project/blinky.yaml
@@ -21,4 +21,5 @@ required_toolchains:
 skip_toolchains:
   - nextpnr-fpga-interchange-already-synth
   - nextpnr-fpga-interchange-experimental-already-synth
+  - nextpnr-fpga-interchange-const-seed-already-synth
   - vivado-already-synth
diff --git a/assets/project/bram-n1.yaml b/assets/project/bram-n1.yaml
@@ -23,4 +23,5 @@ required_toolchains:
 skip_toolchains:
   - nextpnr-fpga-interchange-already-synth
   - nextpnr-fpga-interchange-experimental-already-synth
+  - nextpnr-fpga-interchange-const-seed-already-synth
   - vivado-already-synth
diff --git a/assets/project/bram-n2.yaml b/assets/project/bram-n2.yaml
@@ -23,4 +23,5 @@ required_toolchains:
 skip_toolchains:
   - nextpnr-fpga-interchange-already-synth
   - nextpnr-fpga-interchange-experimental-already-synth
+  - nextpnr-fpga-interchange-const-seed-already-synth
   - vivado-already-synth
diff --git a/assets/project/bram-n3.yaml b/assets/project/bram-n3.yaml
@@ -23,4 +23,5 @@ required_toolchains:
 skip_toolchains:
   - nextpnr-fpga-interchange-already-synth
   - nextpnr-fpga-interchange-experimental-already-synth
+  - nextpnr-fpga-interchange-const-seed-already-synth
   - vivado-already-synth
diff --git a/assets/project/daisho-usb3.yaml b/assets/project/daisho-usb3.yaml
@@ -33,4 +33,5 @@ skip_toolchains:
   - nextpnr-fpga-interchange
   - nextpnr-fpga-interchange-already-synth
   - nextpnr-fpga-interchange-experimental-already-synth
+  - nextpnr-fpga-interchange-const-seed-already-synth
   - vivado-already-synth
diff --git a/assets/project/dram-test-64x1d.yaml b/assets/project/dram-test-64x1d.yaml
@@ -26,4 +26,5 @@ required_toolchains:
 skip_toolchains:
   - nextpnr-fpga-interchange-already-synth
   - nextpnr-fpga-interchange-experimental-already-synth
+  - nextpnr-fpga-interchange-const-seed-already-synth
   - vivado-already-synth
diff --git a/assets/project/hamsternz-displayport.yaml b/assets/project/hamsternz-displayport.yaml
@@ -34,4 +34,5 @@ required_toolchains:
 skip_toolchains:
   - nextpnr-fpga-interchange-already-synth
   - nextpnr-fpga-interchange-experimental-already-synth
+  - nextpnr-fpga-interchange-const-seed-already-synth
   - vivado-already-synth
diff --git a/assets/project/hamsternz-hdmi.yaml b/assets/project/hamsternz-hdmi.yaml
@@ -32,5 +32,6 @@ required_toolchains:
   - vivado
 skip_toolchains:
   - nextpnr-fpga-interchange-already-synth
-  - nextpnr-fpga-interchange-experimental-already-synth
+  - nextpnr-fpga-interchange-experimental-already-synth-
+  - nextpnr-fpga-interchange-const-seed-already-synth
   - vivado-already-synth
diff --git a/assets/project/hps-accel-gen2-nexus.yaml b/assets/project/hps-accel-gen2-nexus.yaml
@@ -20,4 +20,5 @@ required_toolchains:
 skip_toolchains:
   - nextpnr-fpga-interchange-already-synth
   - nextpnr-fpga-interchange-experimental-already-synth
+  - nextpnr-fpga-interchange-const-seed-already-synth
   - vivado-already-synth
diff --git a/assets/project/ibex.yaml b/assets/project/ibex.yaml
@@ -46,4 +46,5 @@ required_toolchains:
 skip_toolchains:
   - nextpnr-fpga-interchange-already-synth
   - nextpnr-fpga-interchange-experimental-already-synth
+  - nextpnr-fpga-interchange-const-seed-already-synth
   - vivado-already-synth
diff --git a/assets/project/murax.yaml b/assets/project/murax.yaml
@@ -27,4 +27,5 @@ required_toolchains:
 skip_toolchains:
   - nextpnr-fpga-interchange-already-synth
   - nextpnr-fpga-interchange-experimental-already-synth
+  - nextpnr-fpga-interchange-const-seed-already-synth
   - vivado-already-synth
diff --git a/assets/project/oneblink-nosynth.yaml b/assets/project/oneblink-nosynth.yaml
@@ -12,6 +12,7 @@ vendors:
     - xczu7ev
 required_toolchains:
   - nextpnr-fpga-interchange-already-synth
+  - nextpnr-fpga-interchange-const-seed-already-synth
 skip_toolchains:
   - nextpnr-fpga-interchange
   - nextpnr-xilinx
diff --git a/assets/project/oneblink.yaml b/assets/project/oneblink.yaml
@@ -33,4 +33,5 @@ required_toolchains:
 skip_toolchains:
   - nextpnr-fpga-interchange-already-synth
   - nextpnr-fpga-interchange-experimental-already-synth
+  - nextpnr-fpga-interchange-const-seed-already-synth
   - vivado-already-synth
diff --git a/assets/project/picorv32.yaml b/assets/project/picorv32.yaml
@@ -22,4 +22,5 @@ required_toolchains:
 skip_toolchains:
   - nextpnr-fpga-interchange-already-synth
   - nextpnr-fpga-interchange-experimental-already-synth
+  - nextpnr-fpga-interchange-const-seed-already-synth
   - vivado-already-synth
diff --git a/assets/project/picosoc-simpleuart.yaml b/assets/project/picosoc-simpleuart.yaml
@@ -30,4 +30,5 @@ required_toolchains:
 skip_toolchains:
   - nextpnr-fpga-interchange-already-synth
   - nextpnr-fpga-interchange-experimental-already-synth
+  - nextpnr-fpga-interchange-const-seed-already-synth
   - vivado-already-synth
diff --git a/assets/project/picosoc-spimemio.yaml b/assets/project/picosoc-spimemio.yaml
@@ -25,4 +25,5 @@ required_toolchains:
 skip_toolchains:
   - nextpnr-fpga-interchange-already-synth
   - nextpnr-fpga-interchange-experimental-already-synth
+  - nextpnr-fpga-interchange-const-seed-already-synth
   - vivado-already-synth
diff --git a/assets/project/picosoc.yaml b/assets/project/picosoc.yaml
@@ -27,4 +27,5 @@ required_toolchains:
 skip_toolchains:
   - nextpnr-fpga-interchange-already-synth
   - nextpnr-fpga-interchange-experimental-already-synth
+  - nextpnr-fpga-interchange-const-seed-already-synth
   - vivado-already-synth
diff --git a/assets/project/vexriscv-smp.yaml b/assets/project/vexriscv-smp.yaml
@@ -20,4 +20,5 @@ required_toolchains:
 skip_toolchains:
   - nextpnr-fpga-interchange-already-synth
   - nextpnr-fpga-interchange-experimental-already-synth
+  - nextpnr-fpga-interchange-const-seed-already-synth
   - vivado-already-synth
diff --git a/assets/project/vexriscv.yaml b/assets/project/vexriscv.yaml
@@ -24,4 +24,5 @@ required_toolchains:
 skip_toolchains:
   - nextpnr-fpga-interchange-already-synth
   - nextpnr-fpga-interchange-experimental-already-synth
+  - nextpnr-fpga-interchange-const-seed-already-synth
   - vivado-already-synth
diff --git a/assets/project/zynq-ps7-counter.yaml b/assets/project/zynq-ps7-counter.yaml
@@ -18,4 +18,5 @@ required_toolchains:
 skip_toolchains:
   - nextpnr-fpga-interchange-already-synth
   - nextpnr-fpga-interchange-experimental-already-synth
+  - nextpnr-fpga-interchange-const-seed-already-synth
   - vivado-already-synth
diff --git a/assets/vendors.yaml b/assets/vendors.yaml
@@ -17,6 +17,7 @@ xilinx:
     - nextpnr-fpga-interchange
     - nextpnr-fpga-interchange-already-synth
     - nextpnr-fpga-interchange-experimental-already-synth
+    - nextpnr-fpga-interchange-const-seed-already-synth
     - nextpnr-xilinx-fasm2bels
 lattice-ice40:
   boards:
diff --git a/fpgaperf.py b/fpgaperf.py
@@ -30,7 +30,8 @@
 from toolchains.icestorm import NextpnrIcestorm
 from toolchains.nextpnr import (
     NextpnrOxide, NextpnrXilinx, NextpnrFPGAInterchange,
-    NextPnrInterchangeNoSynth, NextPnrInterchangeExperimentalNoSynth
+    NextpnrFPGAInterchangeNoSynthConstSeed, NextPnrInterchangeNoSynth,
+    NextPnrInterchangeExperimentalNoSynth
 )
 from toolchains.vivado import (
     Vivado, VivadoYosys, VivadoYosysUhdm, VivadoNoSynth
@@ -67,6 +68,8 @@
         NextpnrXilinxFasm2Bels,
     'nextpnr-fpga-interchange':
         NextpnrFPGAInterchange,
+    'nextpnr-fpga-interchange-const-seed-already-synth':
+        NextpnrFPGAInterchangeNoSynthConstSeed,
     'nextpnr-fpga-interchange-already-synth':
         NextPnrInterchangeNoSynth,
     'nextpnr-fpga-interchange-experimental-already-synth':
diff --git a/toolchains/nextpnr.py b/toolchains/nextpnr.py
@@ -702,6 +702,12 @@ def configure(self):
         self.tool_options['binary_path'] = self.toolchain_bin
 
 
+class NextpnrFPGAInterchangeNoSynthConstSeed(NextPnrInterchangeNoSynth):
+    def configure(self):
+        super().configure()
+        self.tool_options['nextpnr_options'] += ['--seed', '0']
+
+
 class NextpnrXilinx(NextpnrGeneric):
     '''nextpnr Xilinx variant using Yosys for synthesis'''
     def __init__(self, rootdir):

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,9 @@`
`38`	`38`	`"nextpnr-xilinx-fasm2bels"`
`39`	`39`	`]`
`40`	`40`	`interchange = [`
`41`		`- "nextpnr-fpga-interchange", "nextpnr-fpga-interchange-already-synth",`
	`41`	`+ "nextpnr-fpga-interchange",`
	`42`	`+ "nextpnr-fpga-interchange-consst-seed-already-synth",`
	`43`	`+ "nextpnr-fpga-interchange-already-synth",`
`42`	`44`	`"nextpnr-fpga-interchange-experimental-already-synth"`
`43`	`45`	`]`
`44`	`46`	`quicklogic = ["quicklogic"]`