Fix questa vopt and rvfi_tracer veri build

MarioOpenHWGroup · Mar 20, 2024 · 1e91391 · 1e91391
1 parent 6a2d03d
commit 1e91391
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -250,7 +250,7 @@ incdir := $(CVA6_REPO_DIR)/vendor/pulp-platform/common_cells/include/ $(CVA6_REP
           $(SPIKE_INSTALL_DIR)/include/disasm/
 
 # Compile and sim flags
-compile_flag     += -incr -64 -nologo -quiet -suppress 13262 -suppress 8607 -permissive -svinputport=compat +define+$(defines)
+compile_flag     += -incr -64 -nologo -quiet -suppress 13262 -suppress 8607 -permissive -svinputport=compat +define+$(defines) -suppress 8386
 vopt_flag +=  -incr -64 -nologo -quiet -suppress 13262 -permissive -svinputport=compat -t 1ns
 
 uvm-flags        += +UVM_NO_RELNOTES +UVM_VERBOSITY=UVM_LOW
@@ -314,7 +314,7 @@ vcs: vcs_build
 # Build the TB and module using QuestaSim
 build: $(library) $(library)/.build-srcs $(library)/.build-tb $(dpi-library)/ariane_dpi.so
 	# Optimize top level
-	$(VOPT) $(vopt_flags) -work $(library)  $(top_level) -o $(top_level)_optimized +acc -check_synthesis -dpilib $(SPIKE_INSTALL_DIR)/lib/libriscv -dpilib $(SPIKE_INSTALL_DIR)/lib/lifesvr -suppress 2085 -suppress 7063
+	$(VOPT) $(vopt_flags) -64 -work $(library)  $(top_level) -o $(top_level)_optimized +acc -check_synthesis -dpilib $(SPIKE_INSTALL_DIR)/lib/libriscv -dpilib $(SPIKE_INSTALL_DIR)/lib/lifesvr -suppress 2085 -suppress 7063
 
 # src files
 $(library)/.build-srcs: $(library)

diff --git a/corev_apu/tb/rvfi_tracer.sv b/corev_apu/tb/rvfi_tracer.sv
@@ -36,7 +36,7 @@ module rvfi_tracer #(
   output logic[31:0]                    end_of_test_o
 );
 
-  logic[CVA6Cfg.PLEN-1:0] TOHOST_ADDR;
+  longint unsigned TOHOST_ADDR;
   string binary;
   int f;
   int unsigned SIM_FINISH;
@@ -46,7 +46,6 @@ module rvfi_tracer #(
     if (!$value$plusargs("time_out=%d", SIM_FINISH)) SIM_FINISH = 2000000;
     if (!$value$plusargs("tohost_addr=%h", TOHOST_ADDR)) TOHOST_ADDR = '0;
     if (TOHOST_ADDR == '0) begin
-
         if (!$value$plusargs("elf_file=%s", binary)) binary = "";
         if (binary != "") begin
             read_elf(binary);

diff --git a/verif/core-v-verif b/verif/core-v-verif
diff --git a/verif/sim/Makefile b/verif/sim/Makefile
@@ -308,7 +308,7 @@ questa_uvm_run:
 	  -c -do "log -r /*; run -all; " \
 	  -work $(VSIM_WORK_DIR) -t 1ns \
 	  -suppress vsim-8451 \
-	  -suppress 3829 \
+	  -suppress 3829 -suppress vsim-8386\
 	  +permissive \
 	  -sv_seed 0 \
 	  $(cov-comp-opt) +define+UNSUPPORTED_WITH+ $(isscomp_opts)\