Update Dockerfile.use-installer to install the compiler for the QORC toolchain in a container, and test it with sample apps in qorc-sdk.

.github/workflows/docker-publish-tagged-qorc-base.yml

@@ -0,0 +1,49 @@
+name: Docker
+
+on:
+  push:
+    tags: [ v* ]
+  workflow_dispatch:
+
+env:
+  IMAGE_NAME: qorc-base
+
+jobs:
+  push:
+    runs-on: ubuntu-latest
+    if: github.event_name == 'push'
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Build image
+        run:  |
+          # Strip git ref prefix from version
+          VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
+
+          docker build --build-arg TAG=$VERSION --target qorc-base . --file Dockerfile.use-installer --tag $IMAGE_NAME
+
+      - name: Log into registry
+        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u ${{ github.actor }} --password-stdin
+
+      - name: Push image
+        run: |
+          IMAGE_ID=docker.pkg.github.com/${{ github.repository }}/$IMAGE_NAME
+
+          # Change all uppercase to lowercase
+          IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
+
+          # Strip git ref prefix from version
+          VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
+
+          # Strip "v" prefix from tag name
+          [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
+
+          # Use Docker `latest` tag convention
+          [ "$VERSION" == "master" ] && VERSION=latest
+
+          echo IMAGE_ID=$IMAGE_ID
+          echo VERSION=$VERSION
+
+          docker tag $IMAGE_NAME $IMAGE_ID:$VERSION
+          docker push $IMAGE_ID:$VERSION

.github/workflows/docker-publish-tagged-qorc.yml

@@ -0,0 +1,49 @@
+name: Docker
+
+on:
+  push:
+    tags: [ v* ]
+  workflow_dispatch:
+
+env:
+  IMAGE_NAME: qorc
+
+jobs:
+  push:
+    runs-on: ubuntu-latest
+    if: github.event_name == 'push'
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Build image
+        run:  |
+          # Strip git ref prefix from version
+          VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
+
+          docker build --build-arg TAG=$VERSION . --file Dockerfile.use-installer --tag $IMAGE_NAME
+
+      - name: Log into registry
+        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u ${{ github.actor }} --password-stdin
+
+      - name: Push image
+        run: |
+          IMAGE_ID=docker.pkg.github.com/${{ github.repository }}/$IMAGE_NAME
+
+          # Change all uppercase to lowercase
+          IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
+
+          # Strip git ref prefix from version
+          VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
+
+          # Strip "v" prefix from tag name
+          [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
+
+          # Use Docker `latest` tag convention
+          [ "$VERSION" == "master" ] && VERSION=latest
+
+          echo IMAGE_ID=$IMAGE_ID
+          echo VERSION=$VERSION
+
+          docker tag $IMAGE_NAME $IMAGE_ID:$VERSION
+          docker push $IMAGE_ID:$VERSION

.github/workflows/docker-publish-tagged.yml

@@ -21,7 +21,7 @@ jobs:
           # Strip git ref prefix from version
           VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
 
-          docker build --build-arg TAG=$VERSION . --file Dockerfile.use-installer --tag $IMAGE_NAME
+          docker build --build-arg TAG=$VERSION --target symbiflow-ql . --file Dockerfile.use-installer --tag $IMAGE_NAME
 
       - name: Log into registry
         run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u ${{ github.actor }} --password-stdin

.github/workflows/docker-publish.yml

@@ -44,4 +44,6 @@ jobs:
           echo VERSION=$VERSION
 
           docker tag $IMAGE_NAME $IMAGE_ID:$VERSION
-          docker push $IMAGE_ID:$VERSION
+          docker push $IMAGE_ID:$VERSION
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Dockerfile

@@ -14,6 +14,7 @@ RUN apt-get update -qq \
     git \
     libffi-dev \
     libreadline-dev \
+    libtbb-dev \
     tcl-dev \
     graphviz \
     wget \
@@ -40,35 +41,35 @@ RUN apt-get update -qq \
     iverilog \
     pkg-config
 
-#Checkout *yosys* repository (https://github.com/QuickLogic-Corp/yosys.git), branch: **quicklogic-rebased**. 
+#Checkout *yosys* repository (https://github.com/QuickLogic-Corp/yosys.git), branch: **quicklogic-rebased**.
 RUN git clone https://github.com/QuickLogic-Corp/yosys.git -b quicklogic-rebased quicklogic-yosys
-RUN cd quicklogic-yosys
 WORKDIR /quicklogic-yosys
+
 RUN make config-gcc
 RUN make install PREFIX=${INSTALL_DIR}/install
 RUN cd -
 
 #Checkout *yosys-symbiflow-plugins* (https://github.com/QuickLogic-Corp/yosys-symbiflow-plugins), branch: **ql-ios**.
 WORKDIR /
 RUN git clone https://github.com/QuickLogic-Corp/yosys-symbiflow-plugins -b ql-ios
-RUN cd yosys-symbiflow-plugins
+
 WORKDIR /yosys-symbiflow-plugins
 # export PATH='specify Yosys installation path as specified in PREFIX in previous step':$PATH
 RUN make
 RUN make install
 RUN cd -
 
-#Checkout *vpr* repository (https://github.com/QuickLogic-Corp/vtr-verilog-to-routing.git), branch: **blackbox_timing**.
+#Checkout *vpr* repository (https://github.com/SymbiFlow/vtr-verilog-to-routing.git), branch: **master**.
 WORKDIR /
-RUN git clone https://github.com/QuickLogic-Corp/vtr-verilog-to-routing -b blackbox_timing
+RUN git clone https://github.com/SymbiFlow/vtr-verilog-to-routing -b master
 RUN cd vtr-verilog-to-routing
 WORKDIR /vtr-verilog-to-routing
 RUN make
 
-#Checkout *symbiflow-arch-defs* repository (https://github.com/QuickLogic-Corp/symbiflow-arch-defs.git), branch: **quicklogic-upstream-rebase**. 
+#Checkout *symbiflow-arch-defs* repository (https://github.com/QuickLogic-Corp/symbiflow-arch-defs.git), branch: **quicklogic-upstream-rebase**.
 WORKDIR /
 RUN git clone https://github.com/QuickLogic-Corp/symbiflow-arch-defs.git -b quicklogic-upstream-rebase
-RUN cd symbiflow-arch-defs
+
 WORKDIR /symbiflow-arch-defs
 
 RUN make env
@@ -86,6 +87,11 @@ COPY --from=build /symbiflow-arch-defs /symbiflow-arch-defs/
 COPY --from=build /yosys-symbiflow-plugins /yosys-symbiflow-plugins/
 COPY --from=build /vtr-verilog-to-routing /vtr-verilog-to-routing/
 
+# Probably should add these to the release candidate:
+# ENV YOSYS='path to Yosys binary, installed in first step'
+# ENV VPR='path to vpr binary built'
+# ENV GENFASM='path to genfasm binary built'
+
 FROM release-candidate AS all_quick_tests
 
 WORKDIR /symbiflow-arch-defs/build/quicklogic/pp3/tests