Merge pull request #536 from bittide/vivado-wrapper

Move test control logic to Haskell
bittide · Sep 10, 2024 · c9507c1 · c9507c1
2 parents 1be068e + 8ce4978
commit c9507c1
Show file tree

Hide file tree

Showing 44 changed files with 2,572 additions and 2,104 deletions.
diff --git a/.github/synthesis/all.json b/.github/synthesis/all.json
@@ -12,17 +12,17 @@
   {"top": "switchCalendar1k",              "stage": "hdl"},
   {"top": "switchCalendar1kReducedPins",   "stage": "pnr"},
 
-  {"top": "boardTestExtended",             "stage": "test",   "targets": "All"          },
-  {"top": "boardTestSimple",               "stage": "test",   "targets": "All"          },
-  {"top": "extraProbesTest",               "stage": "test",   "targets": "Specific [0]" },
-  {"top": "fincFdecTests",                 "stage": "test",   "targets": "Specific [-1]"},
-  {"top": "fullMeshHwCcTest",              "stage": "test",   "targets": "All"          },
-  {"top": "fullMeshHwCcWithRiscvTest",     "stage": "test",   "targets": "All"          },
-  {"top": "fullMeshSwCcTest",              "stage": "test",   "targets": "All"          },
-  {"top": "hwCcTopologyTest",              "stage": "test",   "targets": "All"          },
-  {"top": "linkConfigurationTest",         "stage": "test",   "targets": "All"          },
-  {"top": "syncInSyncOut",                 "stage": "test",   "targets": "All"          },
-  {"top": "temperatureMonitor",            "stage": "test",   "targets": "All"          },
-  {"top": "transceiversUpTest",            "stage": "test",   "targets": "All"          },
-  {"top": "vexRiscvTest",                  "stage": "test",   "targets": "Specific [-1]"}
+  {"top": "boardTestExtended",             "stage": "test"},
+  {"top": "boardTestSimple",               "stage": "test"},
+  {"top": "fincFdecTests",                 "stage": "test"},
+  {"top": "fullMeshHwCcTest",              "stage": "test"},
+  {"top": "fullMeshHwCcWithRiscvTest",     "stage": "test"},
+  {"top": "fullMeshSwCcTest",              "stage": "test"},
+  {"top": "hwCcTopologyTest",              "stage": "test"},
+  {"top": "linkConfigurationTest",         "stage": "test"},
+  {"top": "safeDffSynchronizer",           "stage": "hdl" },
+  {"top": "syncInSyncOut",                 "stage": "test"},
+  {"top": "temperatureMonitor",            "stage": "test"},
+  {"top": "transceiversUpTest",            "stage": "test"},
+  {"top": "vexRiscvTest",                  "stage": "test"}
 ]
diff --git a/.github/synthesis/staging.json b/.github/synthesis/staging.json
@@ -1,8 +1,8 @@
 [
-  {"top": "fullMeshHwCcTest",              "stage": "test", "targets": "All"},
-  {"top": "fullMeshSwCcTest",              "stage": "test", "targets": "All"},
-  {"top": "linkConfigurationTest",         "stage": "test", "targets": "All"},
+  {"top": "fullMeshHwCcTest",              "stage": "test"},
+  {"top": "fullMeshSwCcTest",              "stage": "test"},
+  {"top": "linkConfigurationTest",         "stage": "test"},
   {"top": "safeDffSynchronizer",           "stage": "hdl"},
-  {"top": "transceiversUpTest",            "stage": "test", "targets": "All"},
-  {"top": "vexRiscvTest",                  "stage": "test", "targets": "Specific [-1]"}
+  {"top": "transceiversUpTest",            "stage": "test"},
+  {"top": "vexRiscvTest",                  "stage": "test"}
 ]
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -171,7 +171,7 @@ jobs:
           ./cargo.sh build --frozen --release
           export BITTIDE_ARTIFACT_ACCESS_TOKEN="${{ secrets.GITHUB_TOKEN }}"
           export RUNREF="${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
-          cabal run -- bittide-tools:cc-plot ${{ github.run_id }}:hwCcTopologyTest _build/plot hitl-topology-plots
+          cabal run -- bittide-tools:cc-plot ${{ github.run_id }}:hwCcTopologyTest hitl-topology-plots
 
       - name: Generate clock control reports
         run: |
@@ -641,7 +641,7 @@ jobs:
       - name: Run tests on hardware
         run: |
           .github/scripts/with_vivado.sh \
-            shake ${{ matrix.target.top }}:test --hardware-targets="${{ matrix.target.targets}}"
+            shake ${{ matrix.target.top }}:test
 
       - name: Archive ILA data
         if: ${{ !cancelled() }}

diff --git a/bittide-experiments/bittide-experiments.cabal b/bittide-experiments/bittide-experiments.cabal
@@ -76,6 +76,7 @@ common common-options
     ghc-typelits-extra,
     ghc-typelits-knownnat,
     ghc-typelits-natnormalise,
+    template-haskell,
 
 library
   import: common-options