Fixup simple_system_cosim

Author: hcallahan-lowrisc

dv/verilator/simple_system_cosim/ibex_simple_system_cosim_checker.sv

@@ -8,7 +8,9 @@ module ibex_simple_system_cosim_checker #(
   parameter bit                 PMPEnable      = 1'b0,
   parameter int unsigned        PMPGranularity = 0,
   parameter int unsigned        PMPNumRegions  = 4,
-  parameter int unsigned        MHPMCounterNum  = 0
+  parameter int unsigned        MHPMCounterNum = 0,
+  parameter int unsigned        DmBaseAddr     = 32'h1A110000,
+  parameter int unsigned        DmAddrMask     = 32'h00000FFF
 ) (
   input clk_i,
   input rst_ni,
@@ -26,7 +28,8 @@ module ibex_simple_system_cosim_checker #(
 );
   import "DPI-C" function chandle get_spike_cosim;
   import "DPI-C" function void create_cosim(bit secure_ibex, bit icache_en,
-    bit [31:0] pmp_num_regions, bit [31:0] pmp_granularity, bit [31:0] mhpm_counter_num);
+    bit [31:0] pmp_num_regions, bit [31:0] pmp_granularity, bit [31:0] mhpm_counter_num,
+    bit [31:0] DmStartAddr, bit [31:0] DmEndAddr);
 
   import ibex_pkg::*;
 
@@ -35,8 +38,11 @@ module ibex_simple_system_cosim_checker #(
   initial begin
     localparam int unsigned LocalPMPGranularity = PMPEnable ? PMPGranularity : 0;
     localparam int unsigned LocalPMPNumRegions  = PMPEnable ? PMPNumRegions  : 0;
+    localparam int unsigned DmStartAddr = DmBaseAddr;
+    localparam int unsigned DmEndAddr = DmBaseAddr + (DmAddrMask + 1);
 
-    create_cosim(SecureIbex, ICache, LocalPMPNumRegions, LocalPMPGranularity, MHPMCounterNum);
+    create_cosim(SecureIbex, ICache, LocalPMPNumRegions, LocalPMPGranularity, MHPMCounterNum,
+                 DmStartAddr, DmEndAddr);
     cosim_handle = get_spike_cosim();
   end
 

dv/verilator/simple_system_cosim/simple_system_cosim.cc

@@ -20,14 +20,16 @@ class SimpleSystemCosim : public SimpleSystem {
   ~SimpleSystemCosim() {}
 
   void CreateCosim(bool secure_ibex, bool icache_en, uint32_t pmp_num_regions,
-                   uint32_t pmp_granularity, uint32_t mhpm_counter_num) {
+                   uint32_t pmp_granularity, uint32_t mhpm_counter_num,
+                   uint32_t DmStartAddr, uint32_t DmEndAddr) {
     _cosim = std::make_unique<SpikeCosim>(
         GetIsaString(), 0x100080, 0x100001, "simple_system_cosim.log",
         secure_ibex, icache_en, pmp_num_regions, pmp_granularity,
-        mhpm_counter_num);
+        mhpm_counter_num, DmStartAddr, DmEndAddr);
 
-    _cosim->add_memory(0x100000, 1024 * 1024);
-    _cosim->add_memory(0x20000, 4096);
+    // Add a memory device that covers the entire address space.
+    // This will only be sparsely populated.
+    _cosim->add_memory(0x00000000, 0xFFFF0000);
 
     CopyMemAreaToCosim(&_ram, 0x100000);
   }
@@ -70,10 +72,13 @@ void *get_spike_cosim() {
 void create_cosim(svBit secure_ibex, svBit icache_en,
                   const svBitVecVal *pmp_num_regions,
                   const svBitVecVal *pmp_granularity,
-                  const svBitVecVal *mhpm_counter_num) {
+                  const svBitVecVal *mhpm_counter_num,
+                  const svBitVecVal *DmStartAddr,
+                  const svBitVecVal *DmEndAddr) {
   assert(simple_system_cosim);
   simple_system_cosim->CreateCosim(secure_ibex, icache_en, pmp_num_regions[0],
-                                   pmp_granularity[0], mhpm_counter_num[0]);
+                                   pmp_granularity[0], mhpm_counter_num[0],
+                                   DmStartAddr[0], DmEndAddr[0]);
 }
 }