Enable VeeR User mode tests in GitHub CI

Signed-off-by: Maciej Kurc <[email protected]>
chipsalliance · Jun 12, 2024 · 07461fe · 07461fe
1 parent bcdb512
commit 07461fe
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/.github/scripts/run_regression_test.sh b/.github/scripts/run_regression_test.sh
@@ -21,15 +21,19 @@ run_regression_test(){
     echo -e "${COLOR_WHITE} NAME        = ${NAME}${COLOR_CLEAR}"
     echo -e "${COLOR_WHITE} COVERAGE    = ${COVERAGE}${COLOR_CLEAR}"
 
+    COMMON_PARAMS="-set=user_mode=1 -set=smepmp=1"
+
     if [[ "${BUS}" == "axi" ]]; then
-        PARAMS="-set build_axi4"
+        PARAMS="-set build_axi4 ${COMMON_PARAMS}"
     elif [[ "${BUS}" == "ahb" ]]; then
-        PARAMS="-set build_ahb_lite"
+        PARAMS="-set build_ahb_lite ${COMMON_PARAMS}"
     else
         echo -e "${COLOR_RED}Unknown system bus type '${BUS}'${COLOR_CLEAR}"
         exit 1
     fi
 
+    echo -e "${COLOR_WHITE} CONF PARAMS = ${PARAMS}${COLOR_CLEAR}"
+
     mkdir -p ${RESULTS_DIR}
     LOG="${RESULTS_DIR}/test_${NAME}_${COVERAGE}.log"
     touch ${LOG}

diff --git a/.github/workflows/test-regression.yml b/.github/workflows/test-regression.yml
@@ -11,7 +11,8 @@ jobs:
     strategy:
       matrix:
         bus: ["axi", "ahb"]
-        test: ["hello_world", "hello_world_dccm", "hello_world_iccm", "cmark", "cmark_dccm", "cmark_iccm", "dhry", "pmp"]
+        test: ["hello_world", "hello_world_dccm", "hello_world_iccm", "cmark", "cmark_dccm", "cmark_iccm", "dhry",
+               "csr_misa", "csr_access", "csr_mstatus", "csr_mseccfg", "modesw", "insns", "irq", "perf_counters", "pmp"]
         coverage: ["branch", "toggle"] #TODO: add functional coverage
     env:
       DEBIAN_FRONTEND: "noninteractive"

diff --git a/.github/workflows/test-riscof.yml b/.github/workflows/test-riscof.yml
@@ -126,7 +126,7 @@ jobs:
           export RV_ROOT=`pwd`
           pushd riscof
             $RV_ROOT/configs/veer.config
-            make -f $RV_ROOT/tools/Makefile verilator-build COVERAGE=${{ matrix.coverage }}
+            make -f $RV_ROOT/tools/Makefile verilator-build CONF_PARAMS="-set build_axi4 -set=user_mode=1 -set=smepmp=1" COVERAGE=${{ matrix.coverage }}
           popd
 
       - name: Run tests, collect coverage

diff --git a/tools/riscv-dv/Makefile b/tools/riscv-dv/Makefile
@@ -12,7 +12,9 @@ SIM_DIR         = $(TEST_DIR)/hdl_sim
 
 VEER_TARGET     = default
 VEER_CONF       = -set build_axi4 \
-                  -set reset_vec=0x80000000
+                  -set reset_vec=0x80000000 \
+                  -set=user_mode=1 \
+                  -set=smepmp=1
 
 # Coverage reporting
 ifeq ("$(COVERAGE)", "all")