From 847f2fd8fca95bf9b2ea3bdbd0fb6c2ae6b5f4f7 Mon Sep 17 00:00:00 2001 From: Olivier Betschi Date: Wed, 11 Dec 2024 15:16:29 +0100 Subject: [PATCH] Remove uvm_test option and associated include in uvm package --- verif/regress/pmp_cv32a65x_tests.sh | 19 +------------------ verif/tb/uvmt/uvmt_cva6_pkg.sv | 3 --- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/verif/regress/pmp_cv32a65x_tests.sh b/verif/regress/pmp_cv32a65x_tests.sh index 098c9045a..254ea4486 100644 --- a/verif/regress/pmp_cv32a65x_tests.sh +++ b/verif/regress/pmp_cv32a65x_tests.sh @@ -15,21 +15,13 @@ fi # Install the required tools source ./verif/regress/install-verilator.sh -source ./verif/regress/install-spike.sh # Setup sim env source ./verif/sim/setup-env.sh -echo "$SPIKE_INSTALL_DIR$" if ! [ -n "$DV_SIMULATORS" ]; then - # DV_SIMULATORS=vcs-testharness,spike - # DV_SIMULATORS=vcs-uvm,spike - # DV_SIMULATORS=xrun-uvm,spike - # DV_SIMULATORS=vcs-testharness - # DV_SIMULATORS=vcs-uvm - DV_SIMULATORS=xrun-uvm - # DV_SIMULATORS=spike + DV_SIMULATORS=vcs-uvm fi if ! [ -n "$UVM_VERBOSITY" ]; then @@ -75,7 +67,6 @@ python3 cva6.py \ --iss_yaml=cva6.yaml \ --iss=$DV_SIMULATORS \ --asm_tests ../tests/custom/pmp_cv32a65x/pmp_cv32a65x_granularity_test.S \ - --uvm_test uvmt_cva6_pmp_test_c \ --linker=../../config/gen_from_riscv_config/cv32a65x/linker/link.ld \ --gcc_opts="-static -mcmodel=medany -fvisibility=hidden -nostdlib -nostartfiles \ -g ../tests/custom/common/syscalls.c ../tests/custom/common/crt.S -lgcc \ @@ -100,7 +91,6 @@ python3 cva6.py \ --iss_yaml=cva6.yaml \ --iss=$DV_SIMULATORS \ --asm_tests ../tests/custom/pmp_cv32a65x/pmp_cv32a65x_exact_csrr_test.S \ - --uvm_test uvmt_cva6_pmp_test_c \ --linker=../../config/gen_from_riscv_config/cv32a65x/linker/link.ld \ --gcc_opts="-static -mcmodel=medany -fvisibility=hidden -nostdlib -nostartfiles \ -g ../tests/custom/common/syscalls.c ../tests/custom/common/crt.S -lgcc \ @@ -124,7 +114,6 @@ python3 cva6.py \ --iss_yaml=cva6.yaml \ --iss=$DV_SIMULATORS \ --asm_tests ../tests/custom/pmp_cv32a65x/pmp_cv32a65x_lsu_tor_test.S \ - --uvm_test uvmt_cva6_pmp_test_c \ --linker=../../config/gen_from_riscv_config/cv32a65x/linker/link.ld \ --gcc_opts="-static -mcmodel=medany -fvisibility=hidden -nostdlib -nostartfiles \ -g ../tests/custom/common/syscalls.c ../tests/custom/common/crt.S -lgcc \ @@ -150,7 +139,6 @@ python3 cva6.py \ --iss_yaml=cva6.yaml \ --iss=$DV_SIMULATORS \ --asm_tests ../tests/custom/pmp_cv32a65x/pmp_cv32a65x_lsu_napot_test.S \ - --uvm_test uvmt_cva6_pmp_test_c \ --linker=../../config/gen_from_riscv_config/cv32a65x/linker/link.ld \ --gcc_opts="-static -mcmodel=medany -fvisibility=hidden -nostdlib -nostartfiles \ -g ../tests/custom/common/syscalls.c ../tests/custom/common/crt.S -lgcc \ @@ -176,7 +164,6 @@ python3 cva6.py \ --iss_yaml=cva6.yaml \ --iss=$DV_SIMULATORS \ --asm_tests ../tests/custom/pmp_cv32a65x/pmp_cv32a65x_decreasing_entries_test.S \ - --uvm_test uvmt_cva6_pmp_test_c \ --linker=../../config/gen_from_riscv_config/cv32a65x/linker/link.ld \ --gcc_opts="-static -mcmodel=medany -fvisibility=hidden -nostdlib -nostartfiles \ -g ../tests/custom/common/syscalls.c ../tests/custom/common/crt.S -lgcc \ @@ -200,7 +187,6 @@ python3 cva6.py \ --iss_yaml=cva6.yaml \ --iss=$DV_SIMULATORS \ --asm_tests ../tests/custom/pmp_cv32a65x/pmp_cv32a65x_defined_matches_test.S \ - --uvm_test uvmt_cva6_pmp_test_c \ --linker=../../config/gen_from_riscv_config/cv32a65x/linker/link.ld \ --gcc_opts="-static -mcmodel=medany -fvisibility=hidden -nostdlib -nostartfiles \ -g ../tests/custom/common/syscalls.c ../tests/custom/common/crt.S -lgcc \ @@ -226,7 +212,6 @@ python3 cva6.py \ --iss_yaml=cva6.yaml \ --iss=$DV_SIMULATORS \ --asm_tests ../tests/custom/pmp_cv32a65x/pmp_cv32a65x_double_entries_test.S \ - --uvm_test uvmt_cva6_pmp_test_c \ --linker=../../config/gen_from_riscv_config/cv32a65x/linker/link.ld \ --gcc_opts="-static -mcmodel=medany -fvisibility=hidden -nostdlib -nostartfiles \ -g ../tests/custom/common/syscalls.c ../tests/custom/common/crt.S -lgcc \ @@ -252,7 +237,6 @@ python3 cva6.py \ --iss_yaml=cva6.yaml \ --iss=$DV_SIMULATORS \ --asm_tests ../tests/custom/pmp_cv32a65x/pmp_cv32a65x_locked_outside_napot_test.S \ - --uvm_test uvmt_cva6_pmp_test_c \ --linker=../../config/gen_from_riscv_config/cv32a65x/linker/link.ld \ --gcc_opts="-static -mcmodel=medany -fvisibility=hidden -nostdlib -nostartfiles \ -g ../tests/custom/common/syscalls.c ../tests/custom/common/crt.S -lgcc \ @@ -276,7 +260,6 @@ python3 cva6.py \ --iss_yaml=cva6.yaml \ --iss=$DV_SIMULATORS \ --asm_tests ../tests/custom/pmp_cv32a65x/pmp_cv32a65x_locked_outside_tor_test.S \ - --uvm_test uvmt_cva6_pmp_test_c \ --linker=../../config/gen_from_riscv_config/cv32a65x/linker/link.ld \ --gcc_opts="-static -mcmodel=medany -fvisibility=hidden -nostdlib -nostartfiles \ -g ../tests/custom/common/syscalls.c ../tests/custom/common/crt.S -lgcc \ diff --git a/verif/tb/uvmt/uvmt_cva6_pkg.sv b/verif/tb/uvmt/uvmt_cva6_pkg.sv index 491557932..9641dfc41 100644 --- a/verif/tb/uvmt/uvmt_cva6_pkg.sv +++ b/verif/tb/uvmt/uvmt_cva6_pkg.sv @@ -64,9 +64,6 @@ package uvmt_cva6_pkg; // Compilance tests `include "uvmt_cva6_firmware_test.sv" - // PMP tests - `include "uvmt_cva6_pmp_test.sv" - endpackage : uvmt_cva6_pkg // All Interfaces used by the CVA6 TB are here