commit ee472e9f0c70126004d433c9c2b4ab05f4528b38
author Weicai Yang <weicai@google.com> Tue Mar 23 22:46:26 2021 -0700
committer weicaiyang <49293026+weicaiyang@users.noreply.github.com> Tue Mar 30 15:04:07 2021 -0700
tree 54c112201896fe3586b690ed3b490bff90f03481
parent 63ebea223a80c9b088090d3c7547dd7db3af5bbb

[dv] Fix reg backdoor

3 fixes in this PR
1. Fix hier_path not used in top reg
2. Fix path check didn't run properly as path types weren't given
3. Fix wrong error message `does not have hdl path defined for
abstraction 'RTL'`, we don't use `RTL` as hdl path, it should be
`BkdrRegPathRtl`

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

hw/dv/sv/csr_utils/csr_seq_lib.sv

diff --git a/hw/dv/sv/csr_utils/csr_seq_lib.sv b/hw/dv/sv/csr_utils/csr_seq_lib.sv
index 3782218..6fa0ba6 100644
--- a/hw/dv/sv/csr_utils/csr_seq_lib.sv
+++ b/hw/dv/sv/csr_utils/csr_seq_lib.sv
@@ -169,8 +169,16 @@
 
     // check all hdl paths are valid
     if (!test_backdoor_path_done) begin
+      bkdr_reg_path_e path_kind;
       uvm_reg_mem_hdl_paths_seq hdl_check_seq;
       hdl_check_seq = uvm_reg_mem_hdl_paths_seq::type_id::create("hdl_check_seq");
+
+      // add all the supported path types
+      do begin
+        hdl_check_seq.abstractions.push_back(path_kind.name);
+        path_kind = path_kind.next;
+      end while (path_kind != path_kind.first);
+
       foreach (models[i]) begin
         hdl_check_seq.model = models[i];
         hdl_check_seq.start(null);

hw/dv/sv/csr_utils/csr_utils_pkg.sv

diff --git a/hw/dv/sv/csr_utils/csr_utils_pkg.sv b/hw/dv/sv/csr_utils/csr_utils_pkg.sv
index 292c123..2e42bec 100644
--- a/hw/dv/sv/csr_utils/csr_utils_pkg.sv
+++ b/hw/dv/sv/csr_utils/csr_utils_pkg.sv
@@ -353,7 +353,7 @@
     if (check == UVM_CHECK && status != UVM_IS_OK) begin
       string str;
       uvm_hdl_path_concat paths[$];
-      csr_or_fld.csr.get_full_hdl_path(paths);
+      csr_or_fld.csr.get_full_hdl_path(paths, kind.name);
       foreach (paths[0].slices[i]) str = $sformatf("%0s\n%0s", str, paths[0].slices[i].path);
       `uvm_fatal(msg_id, $sformatf("poke failed for %0s, check below paths %0s",
                                    ptr.get_full_name(), str))

util/reggen/top_uvm_reg.sv.tpl

diff --git a/util/reggen/top_uvm_reg.sv.tpl b/util/reggen/top_uvm_reg.sv.tpl
index 5e4d9b9..c8ea5e9 100644
--- a/util/reggen/top_uvm_reg.sv.tpl
+++ b/util/reggen/top_uvm_reg.sv.tpl
@@ -36,6 +36,7 @@
       esc_if_name = block.name.lower() + if_suffix
       if_desc = '' if if_name is None else '; interface {}'.format(if_name)
       reg_block_path = 'u_reg' + if_suffix
+      reg_block_path = reg_block_path if block.hier_path is None else block.hier_path + "." + reg_block_path
 %>\
 // Block: ${block.name.lower()}${if_desc}
 ${make_ral_pkg(dv_base_prefix, top.regwidth, reg_block_path, rb, esc_if_name)}