Merge pull request #654 from bittide/rs/swCcTopologiesTest

Add in a software clock control DUT
bittide · Dec 16, 2024 · 171434f · 171434f
2 parents 1795a48 + 6559f4b
commit 171434f
Show file tree

Hide file tree

Showing 18 changed files with 703 additions and 1,840 deletions.
diff --git a/.github/synthesis/all.json b/.github/synthesis/all.json
@@ -16,10 +16,7 @@
   {"top": "boardTestSimple",               "stage": "test"},
   {"top": "dnaOverSerial",                 "stage": "test"},
   {"top": "fincFdecTests",                 "stage": "test"},
-  {"top": "fullMeshHwCcTest",              "stage": "test"},
-  {"top": "fullMeshHwCcWithRiscvTest",     "stage": "test"},
-  {"top": "fullMeshSwCcTest",              "stage": "test"},
-  {"top": "hwCcTopologyTest",              "stage": "test"},
+  {"top": "swCcTopologyTest",              "stage": "test"},
   {"top": "linkConfigurationTest",         "stage": "test"},
   {"top": "syncInSyncOut",                 "stage": "test"},
   {"top": "temperatureMonitor",            "stage": "test"},

diff --git a/.github/synthesis/staging.json b/.github/synthesis/staging.json
@@ -1,8 +1,6 @@
 [
   {"top": "safeDffSynchronizer",           "stage": "hdl" },
-
-  {"top": "fullMeshHwCcTest",              "stage": "test"},
-  {"top": "fullMeshSwCcTest",              "stage": "test"},
+  {"top": "swCcTopologyTest",              "stage": "test"},
   {"top": "linkConfigurationTest",         "stage": "test"},
   {"top": "transceiversUpTest",            "stage": "test"},
   {"top": "vexRiscvTcpTest",               "stage": "test"},

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -171,7 +171,8 @@ 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 hitl-topology-plots
+          export REPORTKIND="${{ needs.bittide-instances-hardware-in-the-loop-test-matrix.outputs.report_kind }}"
+          cabal run -- bittide-tools:cc-plot ${{ github.run_id }}:$REPORTKIND hitl-topology-plots
 
       - name: Generate clock control reports
         run: |
@@ -182,7 +183,8 @@ jobs:
             reports/HITLT-Report.pdf
           rm hitl-topology-plots/*/report.pdf
           mkdir -p plot-sources
-          mv hitl-topology-plots plot-sources/hwCcTopologyTest
+          export REPORTKIND="${{ needs.bittide-instances-hardware-in-the-loop-test-matrix.outputs.report_kind }}"
+          mv hitl-topology-plots plot-sources/$REPORTKIND
 
       - name: Upload Reports
         uses: actions/upload-artifact@v4
@@ -479,12 +481,23 @@ jobs:
 
           echo "check_matrix=$(cat checks.json | tr '\n' ' ')" | tee -a "$GITHUB_OUTPUT"
 
-          should_generate_report=$(jq 'map(select(.top == "hwCcTopologyTest")) | length > 0' checks.json)
+          should_generate_report=$(jq 'map(select(.top == "hwCcTopologyTest" or .top == "swCcTopologyTest")) | length > 0' checks.json)
+          if [ "${should_generate_report}" == 'true' ]; then
+            is_hwcc=$(jq 'map(select(.top == "hwCcTopologyTest")) | length > 0' checks.json)
+            report_kind=""
+            if [ "${is_hwcc}" == 'true' ]; then
+              report_kind="hwCcTopologyTest"
+            else
+              report_kind="swCcTopologyTest"
+            fi
+            echo "report_kind=${report_kind}" | tee -a "$GITHUB_OUTPUT"
+          fi
           echo "should_generate_report=${should_generate_report}" | tee -a "$GITHUB_OUTPUT"
 
     outputs:
       check_matrix: ${{ steps.set-matrix.outputs.check_matrix }}
       should_generate_report: ${{ steps.set-matrix.outputs.should_generate_report }}
+      report_kind: ${{ steps.set-matrix.outputs.report_kind }}
 
   bittide-instances-hdl:
     name: synth

diff --git a/bittide-instances/bittide-instances.cabal b/bittide-instances/bittide-instances.cabal
@@ -129,15 +129,13 @@ library
     Bittide.Instances.Hitl.DnaOverSerial
     Bittide.Instances.Hitl.Ethernet
     Bittide.Instances.Hitl.FincFdec
-    Bittide.Instances.Hitl.FullMeshHwCc
-    Bittide.Instances.Hitl.FullMeshSwCc
-    Bittide.Instances.Hitl.HwCcTopologies
     Bittide.Instances.Hitl.IlaPlot
     Bittide.Instances.Hitl.LinkConfiguration
     Bittide.Instances.Hitl.Post.BoardTestExtended
     Bittide.Instances.Hitl.Post.PostProcess
     Bittide.Instances.Hitl.Post.TcpServer
     Bittide.Instances.Hitl.Setup
+    Bittide.Instances.Hitl.SwCcTopologies
     Bittide.Instances.Hitl.SyncInSyncOut
     Bittide.Instances.Hitl.TemperatureMonitor
     Bittide.Instances.Hitl.Tests
@@ -154,7 +152,6 @@ library
     Bittide.Instances.Pnr.StabilityChecker
     Bittide.Instances.Pnr.Synchronizer
     Paths.Bittide.Instances
-    Project.FilePath
     Project.Handle
     Project.Programs
 
@@ -275,23 +272,6 @@ executable post-vex-riscv-tcp-test
 
   other-modules: Paths_bittide_instances
 
-executable post-fullMeshSwCcTest
-  import: common-options
-  ghc-options:
-    -Wall
-    -Wcompat
-    -threaded
-
-  main-is: exe/post-fullMeshSwCcTest/Main.hs
-  build-depends:
-    base,
-    bittide-instances,
-    bytestring,
-    cassava,
-    deepseq,
-    filepath,
-    vector,
-
 executable post-dna-over-serial
   import: common-options
   ghc-options:

diff --git a/bittide-instances/data/constraints/swCcTopologyTest.xdc b/bittide-instances/data/constraints/swCcTopologyTest.xdc
@@ -0,0 +1 @@
+fullMeshHwCcTest.xdc
diff --git a/bittide-instances/exe/post-fullMeshSwCcTest/Main.hs b/bittide-instances/exe/post-fullMeshSwCcTest/Main.hs