nextpnr: add ':icestorm' and ':prjtrellis'

hdl · Jan 3, 2021 · 9b7ad9a · 9b7ad9a
1 parent 3a3bc0c
commit 9b7ad9a
Show file tree

Hide file tree

Showing 6 changed files with 79 additions and 20 deletions.
diff --git a/.github/workflows/nextpnr.yml b/.github/workflows/nextpnr.yml
@@ -23,22 +23,41 @@ jobs:
         username: ${{ secrets.DOCKER_USER }}
         password: ${{ secrets.DOCKER_PASS }}
 
-    - name: Build images
-      run: |
-        docker build -t hdlc/nextpnr:ice40 --target=ice40 - < nextpnr.dockerfile
-        docker build -t hdlc/nextpnr:ecp5 --target=ecp5 - < nextpnr.dockerfile
-        docker build -t hdlc/nextpnr - < nextpnr.dockerfile
+    - name: Build nextpnr:ice40
+      run: docker build -t hdlc/nextpnr:ice40 --target=ice40 - < nextpnr.dockerfile
+
+    - name: Build nextpnr:icestorm
+      run: docker build -t hdlc/nextpnr:icestorm --target=icestorm - < nextpnr.dockerfile
+
+    - name: Build nextpnr:ecp5
+      run: docker build -t hdlc/nextpnr:ecp5 --target=ecp5 - < nextpnr.dockerfile
+
+    - name: Build nextpnr:prjtrellis
+      run: docker build -t hdlc/nextpnr:prjtrellis --target=prjtrellis - < nextpnr.dockerfile
+
+    - name: Build nextpnr:nextpnr
+      run: docker build -t hdlc/nextpnr - < nextpnr.dockerfile
 
     - run: docker run --rm -v $(pwd):/wrk hdlc/nextpnr:ice40 /wrk/test/nextpnr--ice40.sh
       #uses: docker://hdlc/nextpnr:ice40
       #with:
       #  args: ./test/nextpnr-ice40.sh
 
+    - run: docker run --rm -v $(pwd):/wrk hdlc/nextpnr:icestorm /wrk/test/nextpnr--icestorm.sh
+      #uses: docker://hdlc/nextpnr:icestorm
+      #with:
+      #  args: ./test/nextpnr-icestorm.sh
+
     - run: docker run --rm -v $(pwd):/wrk hdlc/nextpnr:ecp5 /wrk/test/nextpnr--ecp5.sh
       #uses: docker://hdlc/nextpnr:ecp5
       #with:
       #  args: ./test/nextpnr-ecp5.sh
 
+    - run: docker run --rm -v $(pwd):/wrk hdlc/nextpnr:prjtrellis /wrk/test/nextpnr--prjtrellis.sh
+      #uses: docker://hdlc/nextpnr:prjtrellis
+      #with:
+      #  args: ./test/nextpnr-prjtrellis.sh
+
     - run: docker run --rm -v $(pwd):/wrk hdlc/nextpnr /wrk/test/nextpnr.sh
       #uses: docker://hdlc/nextpnr
       #with:
@@ -47,5 +66,7 @@ jobs:
     - name: Deploy to DockerHub
       run: |
         docker push hdlc/nextpnr:ice40
+        docker push hdlc/nextpnr:icestorm
         docker push hdlc/nextpnr:ecp5
+        docker push hdlc/nextpnr:prjtrellis
         docker push hdlc/nextpnr
diff --git a/doc/gen_tool_table.py b/doc/gen_tool_table.py
@@ -47,17 +47,17 @@
             'prog'
         ],
         'otherin': [
-            'nextpnr',
-            'nextpnr:ice40',
-            'nextpnr:ecp5',
+            'nextpnr:icestorm',
         ]
     },
     'nextpnr': {
         'url': 'https://hdl.github.io/awesome/items/nextpnr',
         'use': [
             'nextpnr',
             'nextpnr:ice40',
-            'nextpnr:ecp5'
+            'nextpnr:ecp5',
+            'nextpnr:icestorm',
+            'nextpnr:prjtrellis'
         ],
         'in': ['impl']
     },
@@ -73,9 +73,7 @@
             'impl'
         ],
         'otherin': [
-            'nextpnr',
-            'nextpnr:ice40',
-            'nextpnr:ecp5',
+            'nextpnr:prjtrellis',
         ]
     },
     'symbiyosys': {

diff --git a/graph/graph.dot b/graph/graph.dot
@@ -32,7 +32,9 @@ digraph G {
       "ghdl:yosys"
       "icestorm"
       "nextpnr:ice40"
+      "nextpnr:icestorm"
       "nextpnr:ecp5"
+      "nextpnr:prjtrellis"
       "nextpnr"
       "prjtrellis"
       "yosys"
@@ -221,16 +223,25 @@ digraph G {
       "nextpnr"
     } [style=dotted];
 
+    { rank=same
+      "nextpnr:ice40",
+      "nextpnr:ecp5"
+    };
+
     { rank=same
       node [shape=folder, color=red, fontcolor=red];
       "t_nextpnr" [label="nextpnr"];
       "t_nextpnr:ice40" [label="nextpnr--ice40"];
       "t_nextpnr:ecp5" [label="nextpnr--ecp5"];
+      "t_nextpnr:icestorm" [label="nextpnr--icestorm"];
+      "t_nextpnr:prjtrellis" [label="nextpnr--prjtrellis"];
     }
 
     "nextpnr" -> "t_nextpnr";
     "nextpnr:ice40" -> "t_nextpnr:ice40";
+    "nextpnr:icestorm" -> "t_nextpnr:icestorm";
     "nextpnr:ecp5" -> "t_nextpnr:ecp5";
+    "nextpnr:prjtrellis" -> "t_nextpnr:prjtrellis";
   }
 
   subgraph cluster_prjtrellis {
@@ -405,6 +416,9 @@ digraph G {
       "nextpnr:ecp5"
     };
 
+    "nextpnr:ice40" -> "nextpnr:icestorm";
+    "nextpnr:ecp5" -> "nextpnr:prjtrellis";
+
     "p_formal_ghdl" -> "formal";
 
     "p_gtkwave_scratch" -> "pkg:gtkwave";
@@ -444,15 +458,9 @@ digraph G {
     "p_impl_pkg:ghdl-yosys-plugin" -> "impl";
     "p_impl_pkg:yosys" -> "impl";
 
-    "p_nextpnr_icestorm" -> {
-      "nextpnr",
-      "nextpnr:ice40"
-    };
+    "p_nextpnr_icestorm" -> "nextpnr:icestorm";
 
-    "p_nextpnr_prjtrellis" -> {
-      "nextpnr",
-      "nextpnr:ecp5"
-     };
+    "p_nextpnr_prjtrellis" -> "nextpnr:prjtrellis";
   }
 
 }
diff --git a/nextpnr.dockerfile b/nextpnr.dockerfile
@@ -73,10 +73,20 @@ COPY --from=build-ice40 /opt/nextpnr /
 
 #---
 
+FROM ice40 AS icestorm
+COPY --from=hdlc/pkg:icestorm /icestorm /
+
+#---
+
 FROM base AS ecp5
 COPY --from=build-ecp5 /opt/nextpnr /
 
 #---
 
+FROM ecp5 AS prjtrellis
+COPY --from=hdlc/pkg:prjtrellis /prjtrellis /
+
+#---
+
 FROM base AS all
 COPY --from=build-all /opt/nextpnr /
diff --git a/test/nextpnr--icestorm.sh b/test/nextpnr--icestorm.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+
+set -e
+
+cd $(dirname "$0")
+
+echo "CC: $CC"
+echo "CXX: $CXX"
+
+./nextpnr--ice40.sh
+./icestorm.sh
diff --git a/test/nextpnr--prjtrellis.sh b/test/nextpnr--prjtrellis.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+
+set -e
+
+cd $(dirname "$0")
+
+echo "CC: $CC"
+echo "CXX: $CXX"
+
+./nextpnr--ecp5.sh
+./prjtrellis.sh