update ci

chipsalliance · Oct 10, 2024 · eb7ab32 · eb7ab32
1 parent 795eb58
commit eb7ab32
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 388 deletions.
diff --git a/.github/workflows/build-verilator.yml b/.github/workflows/build-verilator.yml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,60 +8,36 @@ on:
 
 jobs:
 
-  Build-Verilator:
-    name: Build-Verilator
-    uses: ./.github/workflows/build-verilator.yml
-
-  Build-Spike:
-    name: Build-Spike
-    uses: ./.github/workflows/build-spike.yml
-
-  Get-Renode:
-    name: Get-Renode
-    uses: ./.github/workflows/get-renode.yml
-
-  Build-OpenOCD:
-    name: Build-OpenOCD
-    uses: ./.github/workflows/build-openocd.yml
-
   Test-Regression:
     name: Test-Regression
-    needs: [Build-Verilator]
     uses: ./.github/workflows/test-regression.yml
 
   Test-Verification:
     name: Test-Verification
-    needs: [Build-Verilator]
     uses: ./.github/workflows/test-verification.yml
 
   Test-Microarchitectural:
     name: Test-Microarchitectural
-    needs: [Build-Verilator]
     uses: ./.github/workflows/test-uarch.yml
 
   Test-RISCV-DV:
     name: Test-RISCV-DV
-    needs: [Build-Verilator, Build-Spike, Get-Renode]
     uses: ./.github/workflows/test-riscv-dv.yml
 
   Test-RISCOF:
     name: Test-RISCOF
-    needs: [Build-Verilator, Build-Spike]
     uses: ./.github/workflows/test-riscof.yml
 
   Test-UVM:
     name: Test-UVM
-    needs: [Build-Verilator]
     uses: ./.github/workflows/test-uvm.yml
 
   Test-Renode:
     name: Test-Renode
-    needs: [Get-Renode]
     uses: ./.github/workflows/test-renode.yml
 
   Test-OpenOCD:
     name: Test-OpenOCD
-    needs: [Build-Verilator, Build-OpenOCD]
     uses: ./.github/workflows/test-openocd.yml
 
   Report-Coverage:

diff --git a/.github/workflows/get-renode.yml b/.github/workflows/get-renode.yml
diff --git a/.github/workflows/test-openocd.yml b/.github/workflows/test-openocd.yml
@@ -8,6 +8,7 @@ jobs:
   tests:
     name: Run OpenOCD tests
     runs-on: ubuntu-latest
+    container: ghcr.io/antmicro/cores-veer-el2:latest
     strategy:
       fail-fast: false
       matrix:
@@ -16,7 +17,6 @@ jobs:
     env:
       DEBIAN_FRONTEND: "noninteractive"
       CCACHE_DIR: "/opt/openocd-tests/.cache/"
-      VERILATOR_VERSION: v5.024
 
     steps:
       - name: Install utils
@@ -31,40 +31,13 @@ jobs:
         run: |
           date=$(date +"%Y_%m_%d")
           time=$(date +"%Y%m%d_%H%M%S_%N")
-          cache_verilator_restore_key=cache_verilator_
-          cache_verilator_key=${cache_verilator_restore_key}${{ env.VERILATOR_VERSION }}_${{ env.VERILATOR_COMMIT }}
-          cache_openocd_restore_key=cache_openocd_
-          cache_openocd_key=${cache_openocd_restore_key}
           cache_test_restore_key=${{ matrix.coverage }}_
           cache_test_key=${cache_test_restore_key}${time}
           echo "date=$date" | tee -a "$GITHUB_ENV"
           echo "time=$time" | tee -a "$GITHUB_ENV"
-          echo "cache_verilator_restore_key=$cache_verilator_restore_key" | tee -a "$GITHUB_ENV"
-          echo "cache_verilator_key=$cache_verilator_key" | tee -a "$GITHUB_ENV"
-          echo "cache_openocd_restore_key=$cache_openocd_restore_key" | tee -a "$GITHUB_ENV"
-          echo "cache_openocd_key=$cache_openocd_key" | tee -a "$GITHUB_ENV"
           echo "cache_test_restore_key=$cache_test_restore_key" | tee -a "$GITHUB_ENV"
           echo "cache_test_key=$cache_test_key" | tee -a "$GITHUB_ENV"
 
-      - name: Restore Verilator cache
-        id: cache-verilator-restore
-        uses: actions/cache/restore@v3
-        with:
-          path: |
-            /opt/verilator
-            /opt/verilator/.cache
-          key: ${{ env.cache_verilator_key }}
-
-      - name: Restore OpenOCD cache
-        id: cache-openocd-restore
-        uses: actions/cache/restore@v3
-        with:
-          path: |
-            /opt/openocd
-            /opt/openocd/.cache
-          key: ${{ env.cache_openocd_key }}
-          restore-keys: ${{ env.cache_openocd_restore_key }}
-
       - name: Setup repository
         uses: actions/checkout@v3
         with:

diff --git a/.github/workflows/test-regression.yml b/.github/workflows/test-regression.yml
@@ -8,6 +8,7 @@ jobs:
   regression-tests:
     name: Regression tests
     runs-on: ubuntu-latest
+    container: ghcr.io/antmicro/cores-veer-el2:latest
     strategy:
       matrix:
         bus: ["axi", "ahb"]
@@ -21,7 +22,6 @@ jobs:
     env:
       DEBIAN_FRONTEND: "noninteractive"
       CCACHE_DIR: "/opt/regression/.cache/"
-      VERILATOR_VERSION: v5.024
 
     steps:
       - name: Install utils
@@ -37,28 +37,14 @@ jobs:
         run: |
           date=$(date +"%Y_%m_%d")
           time=$(date +"%Y%m%d_%H%M%S_%N")
-          cache_verilator_restore_key=cache_verilator_
-          cache_verilator_key=${cache_verilator_restore_key}${{ env.VERILATOR_VERSION }}_${{ env.VERILATOR_COMMIT }}
           cache_test_restore_key=${{ matrix.test }}_${{ matrix.coverage }}_
           cache_test_key=${cache_test_restore_key}${time}
 
           echo "date=$date" | tee -a "$GITHUB_ENV"
           echo "time=$time" | tee -a "$GITHUB_ENV"
-          echo "cache_verilator_restore_key=$cache_verilator_restore_key" | tee -a "$GITHUB_ENV"
-          echo "cache_verilator_key=$cache_verilator_key" | tee -a "$GITHUB_ENV"
           echo "cache_test_restore_key=$cache_test_restore_key" | tee -a "$GITHUB_ENV"
           echo "cache_test_key=$cache_test_key" | tee -a "$GITHUB_ENV"
 
-
-      - name: Restore verilator cache
-        id: cache-verilator-restore
-        uses: actions/cache/restore@v3
-        with:
-          path: |
-            /opt/verilator
-            /opt/verilator/.cache
-          key: ${{ env.cache_verilator_key }}
-
       - name: Setup tests cache
         uses: actions/cache@v3
         id: cache-test-setup

diff --git a/.github/workflows/test-renode.yml b/.github/workflows/test-renode.yml
@@ -6,40 +6,17 @@ on:
 jobs:
   tests:
     runs-on: ubuntu-latest
+    container: ghcr.io/antmicro/cores-veer-el2:latest
     strategy:
       fail-fast: false
     env:
-      RENODE_VERSION: latest
       DEBIAN_FRONTEND: "noninteractive"
     steps:
       - name: Clone repository
         uses: actions/checkout@v4
         with:
           submodules: recursive
 
-      - name: Setup Cache Metadata
-        id: cache_metadata
-        run: |
-          date=$(date +"%Y_%m_%d")
-          time=$(date +"%Y%m%d_%H%M%S_%N")
-          cache_renode_restore_key=cache_renode_
-          cache_renode_key=${cache_renode_restore_key}${{ env.RENODE_VERSION }}
-
-          echo "date=$date" | tee -a "$GITHUB_ENV"
-          echo "time=$time" | tee -a "$GITHUB_ENV"
-          echo "cache_renode_restore_key=$cache_renode_restore_key" | tee -a "$GITHUB_ENV"
-          echo "cache_renode_key=$cache_renode_key" | tee -a "$GITHUB_ENV"
-
-      - name: Restore Renode cache
-        id: cache-renode-restore
-        uses: actions/cache/restore@v3
-        with:
-          path: |
-            /opt/renode
-          key: ${{ env.cache_renode_key }}
-          restore-keys: ${{ env.cache_renode_restore_key }}
-          fail-on-cache-miss: true
-
       - name: Install dependencies
         run: |
           sudo apt -qqy update && sudo apt -qqy --no-install-recommends install \

diff --git a/.github/workflows/test-riscof.yml b/.github/workflows/test-riscof.yml
@@ -8,6 +8,7 @@ jobs:
   tests:
     name: Run RISCOF tests
     runs-on: ubuntu-latest
+    container: ghcr.io/antmicro/cores-veer-el2:latest
     strategy:
       fail-fast: false
       matrix:
@@ -16,8 +17,6 @@ jobs:
     env:
       DEBIAN_FRONTEND: "noninteractive"
       CCACHE_DIR: "/opt/riscof/.cache/"
-      VERILATOR_VERSION: v5.024
-      SPIKE_VERSION: d70ea67d
 
     steps:
       - name: Install utils
@@ -32,40 +31,13 @@ jobs:
         run: |
           date=$(date +"%Y_%m_%d")
           time=$(date +"%Y%m%d_%H%M%S_%N")
-          cache_verilator_restore_key=cache_verilator_
-          cache_verilator_key=${cache_verilator_restore_key}${{ env.VERILATOR_VERSION }}_${{ env.VERILATOR_COMMIT }}
-          cache_spike_restore_key=cache_spike_
-          cache_spike_key=${cache_spike_restore_key}${{ env.SPIKE_VERSION }}
           cache_test_restore_key=${{ matrix.test }}_${{ matrix.coverage }}_
           cache_test_key=${cache_test_restore_key}${time}
           echo "date=$date" | tee -a "$GITHUB_ENV"
           echo "time=$time" | tee -a "$GITHUB_ENV"
-          echo "cache_verilator_restore_key=$cache_verilator_restore_key" | tee -a "$GITHUB_ENV"
-          echo "cache_verilator_key=$cache_verilator_key" | tee -a "$GITHUB_ENV"
-          echo "cache_spike_restore_key=$cache_spike_restore_key" | tee -a "$GITHUB_ENV"
-          echo "cache_spike_key=$cache_spike_key" | tee -a "$GITHUB_ENV"
           echo "cache_test_restore_key=$cache_test_restore_key" | tee -a "$GITHUB_ENV"
           echo "cache_test_key=$cache_test_key" | tee -a "$GITHUB_ENV"
 
-      - name: Restore Verilator cache
-        id: cache-verilator-restore
-        uses: actions/cache/restore@v3
-        with:
-          path: |
-            /opt/verilator
-            /opt/verilator/.cache
-          key: ${{ env.cache_verilator_key }}
-
-      - name: Restore Spike cache
-        id: cache-spike-restore
-        uses: actions/cache/restore@v3
-        with:
-          path: |
-            /opt/spike
-            /opt/spike/.cache
-          key: ${{ env.cache_spike_key }}
-          restore-keys: ${{ env.cache_spike_restore_key }}
-
       - name: Setup tests cache
         uses: actions/cache@v3
         id: cache-test-setup