Add new core-v-verif commit

MarioOpenHWGroup · Mar 15, 2024 · 3bf7cb4 · 3bf7cb4
1 parent 0beedc8
commit 3bf7cb4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/corev_apu/tb/ariane_tb.sv b/corev_apu/tb/ariane_tb.sv
@@ -23,9 +23,12 @@ import uvm_pkg::*;
 `define MAIN_MEM(P) dut.i_sram.gen_cut[0].i_tc_sram_wrapper.i_tc_sram.init_val[(``P``)]
 // `define USER_MEM(P) dut.i_sram.gen_cut[0].gen_mem.gen_mem_user.i_tc_sram_wrapper_user.i_tc_sram.init_val[(``P``)]
 
+`ifndef READ_ELF_T
+`define READ_ELF_T
 import "DPI-C" function void read_elf(input string filename);
 import "DPI-C" function byte get_section(output longint address, output longint len);
 import "DPI-C" context function void read_section_sv(input longint address, inout byte buffer[]);
+`endif
 
 module ariane_tb;
 

diff --git a/corev_apu/tb/rvfi_tracer.sv b/corev_apu/tb/rvfi_tracer.sv
@@ -7,9 +7,18 @@
 //
 // Original Author: Jean-Roch COULON - Thales
 //
+`ifndef READ_SYMBOL_T
+`define READ_SYMBOL_T
 import "DPI-C" function byte read_symbol (input string symbol_name, inout longint unsigned address);
+`endif
 
+`ifndef READ_ELF_T
+`define READ_ELF_T
 import "DPI-C" function void read_elf(input string filename);
+import "DPI-C" function byte get_section(output longint address, output longint len);
+import "DPI-C" context function void read_section_sv(input longint address, inout byte buffer[]);
+`endif
+
 
 module rvfi_tracer #(
   parameter config_pkg::cva6_cfg_t CVA6Cfg = config_pkg::cva6_cfg_empty,

diff --git a/verif/core-v-verif b/verif/core-v-verif
+4 −3		lib/uvm_agents/uvma_rvfi/uvma_rvfi_tdefs.sv
+5 −18		lib/uvm_components/uvmc_rvfi_reference_model/rvfi_spike.sv
+24 −8		vendor/patches/riscv/riscv-isa-sim/0017-more-csr-size-and-move-isa-parser.patch
+8 −8		vendor/riscv/riscv-isa-sim/riscv/riscv_dpi.cc