Update smt-switch and cvc4 so pono can compile

YosysHQ · May 26, 2021 · a455eb5 · a455eb5
1 parent 4f19215
commit a455eb5
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 4 deletions.
diff --git a/.github/workflows/darwin-x64.yml b/.github/workflows/darwin-x64.yml
@@ -678,6 +678,7 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
   darwin-x64-pono:
     runs-on: ubuntu-latest
+    continue-on-error: true
     needs: [ darwin-x64-boolector, darwin-x64-cvc4, darwin-x64-smt-switch ]
     steps:
       - uses: actions/checkout@v2

diff --git a/.github/workflows/linux-arm.yml b/.github/workflows/linux-arm.yml
@@ -747,6 +747,7 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
   linux-arm-pono:
     runs-on: ubuntu-latest
+    continue-on-error: true
     needs: [ linux-arm-boolector, linux-arm-cvc4, linux-arm-smt-switch ]
     steps:
       - uses: actions/checkout@v2

diff --git a/.github/workflows/linux-arm64.yml b/.github/workflows/linux-arm64.yml
@@ -747,6 +747,7 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
   linux-arm64-pono:
     runs-on: ubuntu-latest
+    continue-on-error: true
     needs: [ linux-arm64-boolector, linux-arm64-cvc4, linux-arm64-smt-switch ]
     steps:
       - uses: actions/checkout@v2

diff --git a/.github/workflows/linux-riscv64.yml b/.github/workflows/linux-riscv64.yml
@@ -747,6 +747,7 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
   linux-riscv64-pono:
     runs-on: ubuntu-latest
+    continue-on-error: true
     needs: [ linux-riscv64-boolector, linux-riscv64-cvc4, linux-riscv64-smt-switch ]
     steps:
       - uses: actions/checkout@v2

diff --git a/.github/workflows/linux-x64.yml b/.github/workflows/linux-x64.yml
@@ -916,6 +916,7 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
   linux-x64-pono:
     runs-on: ubuntu-latest
+    continue-on-error: true
     needs: [ linux-x64-boolector, linux-x64-cvc4, linux-x64-smt-switch ]
     steps:
       - uses: actions/checkout@v2

diff --git a/.github/workflows/windows-x64.yml b/.github/workflows/windows-x64.yml
@@ -8,6 +8,39 @@ on:
       - completed
 
 jobs:
+  windows-x64-graphviz:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          repository: 'yosyshq/oss-cad-suite-build'
+      - name: Cache sources
+        id: cache-sources
+        uses: actions/cache@v2
+        with:
+          path: _sources
+          key: cache-sources-graphviz
+      - name: Download previous build
+        run: |
+          URL="https://github.com/yosyshq/oss-cad-suite-build/releases/download/bucket-windows-x64/windows-x64-graphviz.tgz"
+          if wget --spider "${URL}" 2>/dev/null; then
+              wget -qO- "${URL}" | tar xvfz -
+          else
+              echo "Previous version not found in bucket"
+          fi
+      - name: Build
+        run: ./builder.py build --arch=windows-x64 --target=graphviz --single --tar
+      - uses: ncipollo/release-action@v1
+        if: hashFiles('windows-x64-graphviz.tgz') != ''
+        with:
+          allowUpdates: True
+          prerelease: True
+          omitBody: True
+          omitBodyDuringUpdate: True
+          omitNameDuringUpdate: True
+          tag: bucket-windows-x64
+          artifacts: "windows-x64-graphviz.tgz"
+          token: ${{ secrets.GITHUB_TOKEN }}
   windows-x64-yosys:
     runs-on: ubuntu-latest
     steps:
@@ -609,6 +642,7 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
   windows-x64-pono:
     runs-on: ubuntu-latest
+    continue-on-error: true
     needs: [ windows-x64-boolector, windows-x64-cvc4, windows-x64-smt-switch ]
     steps:
       - uses: actions/checkout@v2
@@ -1154,7 +1188,7 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
   windows-x64-default:
     runs-on: ubuntu-latest
-    needs: [ windows-x64-avy, windows-x64-boolector, windows-x64-dfu-util, windows-x64-ecpdap, windows-x64-ecpprog, windows-x64-flask, windows-x64-fujprog, windows-x64-gtkwave, windows-x64-icesprog, windows-x64-icestorm, windows-x64-iverilog, windows-x64-litex, windows-x64-mcy, windows-x64-nextpnr-ecp5, windows-x64-nextpnr-generic, windows-x64-nextpnr-ice40, windows-x64-nextpnr-machxo2, windows-x64-nextpnr-nexus, windows-x64-openfpgaloader, windows-x64-openocd, windows-x64-pono, windows-x64-prjtrellis, windows-x64-python-programmers, windows-x64-python3, windows-x64-sby, windows-x64-sby-gui, windows-x64-system-resources, windows-x64-verilator, windows-x64-yices, windows-x64-yosys, windows-x64-z3 ]
+    needs: [ windows-x64-avy, windows-x64-boolector, windows-x64-dfu-util, windows-x64-ecpdap, windows-x64-ecpprog, windows-x64-flask, windows-x64-fujprog, windows-x64-graphviz, windows-x64-gtkwave, windows-x64-icesprog, windows-x64-icestorm, windows-x64-iverilog, windows-x64-litex, windows-x64-mcy, windows-x64-nextpnr-ecp5, windows-x64-nextpnr-generic, windows-x64-nextpnr-ice40, windows-x64-nextpnr-machxo2, windows-x64-nextpnr-nexus, windows-x64-openfpgaloader, windows-x64-openocd, windows-x64-pono, windows-x64-prjtrellis, windows-x64-python-programmers, windows-x64-python3, windows-x64-sby, windows-x64-sby-gui, windows-x64-system-resources, windows-x64-verilator, windows-x64-yices, windows-x64-yosys, windows-x64-z3 ]
     steps:
       - name: Get current date
         id: date
@@ -1176,6 +1210,8 @@ jobs:
         run: wget -qO- "https://github.com/yosyshq/oss-cad-suite-build/releases/download/bucket-windows-x64/windows-x64-flask.tgz" | tar xvfz -
       - name: Download windows-x64-fujprog
         run: wget -qO- "https://github.com/yosyshq/oss-cad-suite-build/releases/download/bucket-windows-x64/windows-x64-fujprog.tgz" | tar xvfz -
+      - name: Download windows-x64-graphviz
+        run: wget -qO- "https://github.com/yosyshq/oss-cad-suite-build/releases/download/bucket-windows-x64/windows-x64-graphviz.tgz" | tar xvfz -
       - name: Download windows-x64-gtkwave
         run: wget -qO- "https://github.com/yosyshq/oss-cad-suite-build/releases/download/bucket-windows-x64/windows-x64-gtkwave.tgz" | tar xvfz -
       - name: Download windows-x64-icesprog

diff --git a/default/rules/solvers.py b/default/rules/solvers.py
@@ -58,7 +58,7 @@
 	name = 'smt-switch',
 	vcs = 'git',
 	location = 'https://github.com/makaimann/smt-switch',
-	revision = 'c3957b2e7fec8af4fab24df089230c88e523c0e6'
+	revision = 'a2af6ea75b994d666c9c175793a70c8945208ba5'
 )
 
 SourceLocation(
@@ -72,7 +72,7 @@
 	name = 'cvc4',
 	vcs = 'git',
 	location = 'https://github.com/CVC4/CVC4.git',
-	revision = '35d080bfb56ff96fd41b31ce7025c019193f6abc'
+	revision = '3dda54ba7e6952060766775c56969ab920430a8a'
 )
 
 Target(
@@ -93,6 +93,7 @@
 	sources = [ 'pono' ],
 	dependencies = [ 'smt-switch', 'cvc4', 'boolector' ],
 	license_file = 'pono/LICENSE',
+	continue_on_error = True,
 )
 
 # suprove
@@ -142,5 +143,5 @@
 	name = 'z3',
 	sources = [ 'z3' ],
 	license_file = 'z3/LICENSE.txt',
-	continue_on_error = True
+	continue_on_error = True,
 )