Use cva6.py in github ci

MarioOpenHWGroup · Feb 26, 2024 · 20a7228 · 20a7228
1 parent 1dec794
commit 20a7228
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,22 +20,21 @@ jobs:
     - name: Prepare
       run: |
           ci/setup.sh
-          tar -cf tools.tar tools
-          tar -cf tmp.tar tmp
+          tar cf tools.tar tools/
     - name: Archive production artifacts
       uses: actions/upload-artifact@v3
       with:
         name: compiled-tools
         path: |
           tools.tar
-          tmp.tar
+
   execute-riscv-tests:
     name: execute-riscv-tests
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        testcase: [asm-tests, mul, amo, fp, benchmarks]
-        target: [cv64a6_imafdc_sv39, cv64a6_imafdc_sv39_wb, cv64a6_imafdc_sv39_hpdcache]
+        testcase: [ verif/regress/dv-riscv-arch-test.sh , verif/regress/smoke-test.sh ]
+        target: [ veri-testharness ]
     env:
       RISCV: /riscv
     needs:
@@ -48,10 +47,12 @@ jobs:
       uses: actions/download-artifact@v3
       with:
         name: compiled-tools
+    - uses: actions/checkout@v2
+      with:
+        submodules: recursive
     - name: Run Tests
       run: |
           set -x
           tar xf tools.tar
-          tar xf tmp.tar
           source verif/sim/setup-env.sh
-          make run-${{ matrix.testcase}}-verilator target=${{ matrix.target }}
+          DV_SIMULATORS=${{matrix.target}} bash ${{matrix.testcase}}
diff --git a/ci/setup.sh b/ci/setup.sh
@@ -26,6 +26,7 @@ tar -x -f $RISCV64_UNKNOWN_ELF_GCC --strip-components=1 -C $RISCV
 
 sudo apt install libfl-dev help2man
 
-bash verif/regress/install-verilator.sh
-(source verif/sim/setup-env.sh; bash verif/regress/install-spike.sh)
-ci/build-riscv-tests.sh
+source verif/sim/setup-env.sh
+bash verif/regress/install-verilator.sh && make -C tools/verilator-v5.018/verilator/ clean
+bash verif/regress/install-spike.sh && make -C ${SPIKE_SRC_DIR}/build clean
+bash ci/build-riscv-tests.sh
diff --git a/verif/sim/setup-env.sh b/verif/sim/setup-env.sh
@@ -30,7 +30,7 @@ fi
 
 # Set verilator and spike related variables
 if [ -z "$VERILATOR_INSTALL_DIR" ]; then
-    export VERILATOR_INSTALL_DIR="$ROOT_PROJECT"/tools/$(ls $ROOT_PROJECT/tools | grep verilator | head -n 1)
+    export VERILATOR_INSTALL_DIR="$ROOT_PROJECT"/tools/verilator-v5.018/
 fi
 
 if [ -z "$SPIKE_SRC_DIR" -o "$SPIKE_INSTALL_DIR" = "__local__" ]; then