Enable Questa support

openhwgroup · Oct 14, 2024 · 022ba87 · 022ba87
1 parent 7ae870e
commit 022ba87
Show file tree

Hide file tree

Showing 7 changed files with 118 additions and 91 deletions.
diff --git a/...include/cv32a60x_config_pkg_deprecated.sv → core/include/cv32a60x_config_pkg.sv b/...include/cv32a60x_config_pkg_deprecated.sv → core/include/cv32a60x_config_pkg.sv
@@ -78,6 +78,7 @@ package cva6_config_pkg;
       XLEN: unsigned'(CVA6ConfigXlen),
       FpgaEn: bit'(CVA6ConfigFpgaEn),
       TechnoCut: bit'(0),
+      SuperscalarEn: bit'(0),
       NrCommitPorts: unsigned'(CVA6ConfigNrCommitPorts),
       AxiAddrWidth: unsigned'(CVA6ConfigAxiAddrWidth),
       AxiDataWidth: unsigned'(CVA6ConfigAxiDataWidth),

diff --git a/verif/env/uvme/uvme_cva6_sb.sv b/verif/env/uvme/uvme_cva6_sb.sv
@@ -323,7 +323,7 @@ endfunction : check_mepc
 function bit [XLEN:0] uvme_cva6_sb_c::check_mcycle_h(uvma_isacov_instr_c instr, uvma_isacov_instr_c instr_prev, int cycle_count);
 
    // Check mcycle value after a CSR read
-   if (instr_prev == null) return;
+   if (instr_prev == null) return 32'd0;
 
    write_in_mcycle  = (instr_prev.is_csr_write() && instr_prev.csr_val == 12'hb00) ? 1 : 0;
    if (cfg.xlen == 32) begin
@@ -489,7 +489,7 @@ task uvme_cva6_sb_c::run_phase(uvm_phase phase);
               end
               // Move instructions down the pipeline
               instr_prev = instr_trn.instr;
-          end    
+          end
       end
   join_none
 

diff --git a/verif/sim/Makefile b/verif/sim/Makefile
@@ -358,12 +358,18 @@ questa_uvm_run:
 	@echo "[QUESTA] Running Model"
 	vsim -64  \
 	  $(COMMON_RUN_UVM_FLAGS) \
+	  -sv_lib $(SPIKE_INSTALL_DIR)/lib/libyaml-cpp \
+	  -sv_lib $(SPIKE_INSTALL_DIR)/lib/libriscv \
+	  -sv_lib $(SPIKE_INSTALL_DIR)/lib/libfesvr \
+	  -sv_lib $(SPIKE_INSTALL_DIR)/lib/libdisasm \
 	  -sv_lib $(QUESTASIM_HOME)/uvm-1.2/linux_x86_64/uvm_dpi \
-	  -c -do "run -all; " \
+	  -c -do "run -all;" \
 	  -work $(VSIM_WORK_DIR) -t 1ns \
 	  -suppress vsim-8451 \
 	  -suppress 3829 -suppress vsim-8386\
 	  +permissive \
+		+elf_file=$(elf) \
+	  +UVM_TESTNAME=uvmt_cva6_firmware_test_c	\
 	  -sv_seed 0 \
 	  $(cov-run-opt) $(issrun_opts) \
 	  +define+UNSUPPORTED_WITH+ \

diff --git a/verif/sim/cva6.py b/verif/sim/cva6.py
@@ -1174,8 +1174,8 @@ def check_spike_version():
 
   logging.info(f"Spike Version: {user_spike_stderr_string}")
 
-  if user_spike_stderr_string != spike_version:
-    incorrect_version_exit("Spike", user_spike_stderr_string, spike_version)
+  #if user_spike_stderr_string != spike_version:
+  #  incorrect_version_exit("Spike", user_spike_stderr_string, spike_version)
 
 
 def check_verilator_version():
@@ -1185,8 +1185,8 @@ def check_verilator_version():
   logging.info(f"Verilator Version: {verilator_version_string.strip()}")
   verilator_version = verilator_version_string.split(" ")[1]
 
-  if REQUIRED_VERILATOR_VERSION != verilator_version:
-    incorrect_version_exit("Verilator", verilator_version, REQUIRED_VERILATOR_VERSION)
+  #if REQUIRED_VERILATOR_VERSION != verilator_version:
+  #  incorrect_version_exit("Verilator", verilator_version, REQUIRED_VERILATOR_VERSION)
 
 
 def check_tools_version():

diff --git a/verif/tb/uvmt/cva6_tb_wrapper.sv b/verif/tb/uvmt/cva6_tb_wrapper.sv
@@ -37,7 +37,7 @@ import uvm_pkg::*;
 import "DPI-C" function void read_elf(input string filename);
 import "DPI-C" function byte read_symbol(input string symbol_name, inout longint unsigned address);
 import "DPI-C" function byte get_section(output longint address, output longint len);
-import "DPI-C" context function read_section_sv(input longint address, inout byte buffer[]);
+import "DPI-C" context function void read_section_sv(input longint address, inout byte buffer[]);
 `endif
 
 module cva6_tb_wrapper import uvmt_cva6_pkg::*; #(

diff --git a/verif/tb/uvmt/uvmt_cva6_macros.sv b/verif/tb/uvmt/uvmt_cva6_macros.sv
@@ -21,32 +21,34 @@
 
 // Assign for RVFI CSR interface
 `define RVFI_CSR_ASSIGN(csr_name) \
-      uvma_rvfi_csr_if#(uvme_cva6_pkg::XLEN)  rvfi_csr_``csr_name``_if [RVFI_NRET-1:0](); \
-   for (genvar i = 0; i < RVFI_NRET; i++) begin \
-      assign  rvfi_csr_``csr_name``_if[i].clk              = clknrst_if.clk; \
-      assign  rvfi_csr_``csr_name``_if[i].reset_n          = clknrst_if.reset_n; \
-      assign  rvfi_csr_``csr_name``_if[i].rvfi_csr_rmask   = rvfi_if.rvfi_csr_o.``csr_name``.rmask; \
-      assign  rvfi_csr_``csr_name``_if[i].rvfi_csr_wmask   = rvfi_if.rvfi_csr_o.``csr_name``.wmask; \
-      assign  rvfi_csr_``csr_name``_if[i].rvfi_csr_rdata   = rvfi_if.rvfi_csr_o.``csr_name``.rdata; \
-      assign  rvfi_csr_``csr_name``_if[i].rvfi_csr_wdata   = rvfi_if.rvfi_csr_o.``csr_name``.wdata; \
+   for (genvar i = 0; i < RVFI_NRET; i++) begin : rvfi_csr_if_blk_``csr_name``\
+      uvma_rvfi_csr_if#(uvme_cva6_pkg::XLEN)  rvfi_csr_``csr_name``_if (\
+         .clk              ( clknrst_if.clk ), \
+         .reset_n          ( clknrst_if.reset_n ),\
+         .rvfi_csr_rmask   ( rvfi_if.rvfi_csr_o.``csr_name``.rmask ),\
+         .rvfi_csr_wmask   ( rvfi_if.rvfi_csr_o.``csr_name``.wmask ),\
+         .rvfi_csr_rdata   ( rvfi_if.rvfi_csr_o.``csr_name``.rdata ),\
+         .rvfi_csr_wdata   ( rvfi_if.rvfi_csr_o.``csr_name``.wdata ) \
+      );\
    end \
 
 `define RVFI_CSR_SUFFIX_ASSIGN(csr_name, idx) \
-      uvma_rvfi_csr_if#(uvme_cva6_pkg::XLEN)  rvfi_csr_``csr_name````idx``_if [RVFI_NRET-1:0](); \
-   for (genvar i = 0; i < RVFI_NRET; i++) begin \
-      assign  rvfi_csr_``csr_name````idx``_if[i].clk              = clknrst_if.clk; \
-      assign  rvfi_csr_``csr_name````idx``_if[i].reset_n          = clknrst_if.reset_n; \
-      assign  rvfi_csr_``csr_name````idx``_if[i].rvfi_csr_rmask   = rvfi_if.rvfi_csr_o.``csr_name``[``idx``].rmask; \
-      assign  rvfi_csr_``csr_name````idx``_if[i].rvfi_csr_wmask   = rvfi_if.rvfi_csr_o.``csr_name``[``idx``].wmask; \
-      assign  rvfi_csr_``csr_name````idx``_if[i].rvfi_csr_rdata   = rvfi_if.rvfi_csr_o.``csr_name``[``idx``].rdata; \
-      assign  rvfi_csr_``csr_name````idx``_if[i].rvfi_csr_wdata   = rvfi_if.rvfi_csr_o.``csr_name``[``idx``].wdata; \
+   for (genvar i = 0; i < RVFI_NRET; i++) begin : rvfi_csr_if_blk_``csr_name````idx`` \
+      uvma_rvfi_csr_if#(uvme_cva6_pkg::XLEN)  rvfi_csr_``csr_name````idx``_if (\
+      .clk               (clknrst_if.clk), \
+      .reset_n           (clknrst_if.reset_n), \
+      .rvfi_csr_rmask    (rvfi_if.rvfi_csr_o.``csr_name``[``idx``].rmask), \
+      .rvfi_csr_wmask    (rvfi_if.rvfi_csr_o.``csr_name``[``idx``].wmask), \
+      .rvfi_csr_rdata    (rvfi_if.rvfi_csr_o.``csr_name``[``idx``].rdata), \
+      .rvfi_csr_wdata    (rvfi_if.rvfi_csr_o.``csr_name``[``idx``].wdata) \
+      ); \
    end \
 
 // Create uvm_config_db::set call for a CSR interface
 `define RVFI_CSR_UVM_CONFIG_DB_SET(csr_name, idx) \
-  uvm_config_db#(virtual uvma_rvfi_csr_if)::set(.cntxt(null), \
-                                                .inst_name("*"), \
-                                                .field_name({"csr_", `"csr_name`", "_vif", $sformatf("%0d", ``idx``)}), \
-                                                .value(rvfi_csr_``csr_name``_if[``idx``])); \
+uvm_config_db#(virtual uvma_rvfi_csr_if)::set(.cntxt(null), \
+                                              .inst_name("*"), \
+                                              .field_name({"csr_", `"csr_name`", "_vif", $sformatf("%0d", ``idx``)}), \
+                                              .value(rvfi_csr_if_blk_``csr_name``[``idx``].rvfi_csr_``csr_name``_if)); \
 
 `endif // __UVMT_CVA6_MACROS_SV__