commit 085e2fbc092b63104842f1fec0541cb48e795125
author Weicai Yang <weicai@google.com> Fri Apr 09 18:03:59 2021 -0700
committer weicaiyang <49293026+weicaiyang@users.noreply.github.com> Mon Apr 12 10:00:38 2021 -0700
tree b62a545345d3843efde28b1dbec1f0ad6cd8ca3d
parent 88e17589060c786fb1253182669d9252d01cd24a

[dv] Fix tl_error failure

Thanks @cindychip for finding this failure

Signed-off-by: Weicai Yang <weicai@google.com>

hw/dv/sv/cip_lib/seq_lib/cip_base_vseq__tl_errors.svh

diff --git a/hw/dv/sv/cip_lib/seq_lib/cip_base_vseq__tl_errors.svh b/hw/dv/sv/cip_lib/seq_lib/cip_base_vseq__tl_errors.svh
index 8e94d0d..fc12576 100644
--- a/hw/dv/sv/cip_lib/seq_lib/cip_base_vseq__tl_errors.svh
+++ b/hw/dv/sv/cip_lib/seq_lib/cip_base_vseq__tl_errors.svh
@@ -24,8 +24,8 @@
   end
 
 virtual task tl_access_unmapped_addr(string ral_name);
-  bit [BUS_AW-1:0] normalized_csr_addrs[] = new[cfg.csr_addrs.size()];
-  bit [BUS_AW-1:0] csr_base_addr = cfg.ral.default_map.get_base_addr();
+  bit [BUS_AW-1:0] normalized_csr_addrs[] = new[cfg.csr_addrs[ral_name].size()];
+  bit [BUS_AW-1:0] csr_base_addr = cfg.ral_models[ral_name].default_map.get_base_addr();
 
   // calculate normalized address outside the loop to improve perf
   foreach (cfg.csr_addrs[ral_name][i]) begin
@@ -120,7 +120,8 @@
     // if more than one memories, randomly select one memory
     mem_idx = $urandom_range(0, loc_mem_ranges.size - 1);
     // only test when mem doesn't support partial write
-    `downcast(mem, get_mem_by_addr(ral, cfg.mem_ranges[ral_name][mem_idx].start_addr))
+    `downcast(mem, get_mem_by_addr(cfg.ral_models[ral_name],
+                                   cfg.mem_ranges[ral_name][mem_idx].start_addr))
     if (mem.get_mem_partial_write_support()) continue;
 
     `create_tl_access_error_case(
@@ -141,7 +142,8 @@
     if (cfg.under_reset) return;
     // if more than one memories, randomly select one memory
     mem_idx = $urandom_range(0, loc_mem_ranges.size - 1);
-    if (get_mem_access_by_addr(ral, cfg.mem_ranges[ral_name][mem_idx].start_addr) != "WO") continue;
+    if (get_mem_access_by_addr(cfg.ral_models[ral_name],
+        cfg.mem_ranges[ral_name][mem_idx].start_addr) != "WO") continue;
     `create_tl_access_error_case(
         tl_read_mem_err,
         opcode == tlul_pkg::Get;
@@ -160,12 +162,12 @@
 virtual task run_tl_errors_vseq_sub(int num_times = 1, bit do_wait_clk = 0, string ral_name);
   addr_range_t loc_mem_range[$] = cfg.mem_ranges[ral_name];
   bit has_mem = (loc_mem_range.size > 0);
-  bit [BUS_AW-1:0] csr_base_addr = cfg.ral.default_map.get_base_addr();
+  bit [BUS_AW-1:0] csr_base_addr = cfg.ral_models[ral_name].default_map.get_base_addr();
   bit has_unmapped_addr;
 
   // get_addr_mask returns address map size - 1 and get_max_offset return the offset of high byte
   // in address map. The difference btw them is unmapped address
-  csr_addr_mask[ral_name] = cfg.ral.get_addr_mask();
+  csr_addr_mask[ral_name] = cfg.ral_models[ral_name].get_addr_mask();
   has_unmapped_addr = csr_addr_mask[ral_name] > cfg.ral_models[ral_name].get_max_offset();
 
   // word aligned. This is used to constrain the random address and LSB 2 bits are masked out

hw/dv/sv/dv_lib/dv_base_env_cfg.sv

diff --git a/hw/dv/sv/dv_lib/dv_base_env_cfg.sv b/hw/dv/sv/dv_lib/dv_base_env_cfg.sv
index e37d258..9acdbfa 100644
--- a/hw/dv/sv/dv_lib/dv_base_env_cfg.sv
+++ b/hw/dv/sv/dv_lib/dv_base_env_cfg.sv
@@ -115,8 +115,6 @@
 
     if (ral_model_names.size > 0) begin
       `DV_CHECK_FATAL(ral_models.exists(RAL_T::type_name))
-      `downcast(ral, ral_models[RAL_T::type_name])
-      `DV_CHECK_NE_FATAL(ral, null)
     end
   endfunction