[tools/dv] updated UNR flow to support xcelium/jg
Signed-off-by: Rasmus Madsen <rasmus.madsen@wdc.com>
diff --git a/hw/dv/tools/dvsim/sim.mk b/hw/dv/tools/dvsim/sim.mk
index 5624284..4eef2bf 100644
--- a/hw/dv/tools/dvsim/sim.mk
+++ b/hw/dv/tools/dvsim/sim.mk
@@ -120,10 +120,24 @@
@echo "[make]: cov_unr_build"
cd ${sv_flist_gen_dir} && ${cov_unr_build_cmd} ${cov_unr_build_opts}
-cov_unr: cov_unr_build
+cov_unr_vcs: cov_unr_build
@echo "[make]: cov_unr"
cd ${sv_flist_gen_dir} && ${cov_unr_run_cmd} ${cov_unr_run_opts}
+cov_unr_xcelium:
+ @echo "[make]: cov_unr"
+ mkdir -p ${cov_unr_dir}
+ cd ${cov_unr_dir} && ${cov_unr_run_cmd} ${cov_unr_run_opts}
+
+cov_unr_merge:
+ cd ${cov_unr_dir} && ${cov_merge_cmd} -init ${cov_unr_dir}/jgproject/sessionLogs/session_0/unr_imc_coverage_merge.cmd
+
+ifeq (${SIMULATOR}, xcelium)
+ cov_unr: cov_unr_xcelium cov_unr_merge
+else
+ cov_unr: cov_unr_vcs
+endif
+
# Merge coverage if there are multiple builds.
cov_merge:
@echo "[make]: cov_merge"
diff --git a/hw/dv/tools/dvsim/xcelium.hjson b/hw/dv/tools/dvsim/xcelium.hjson
index 7afdc8b..8a9fe0b 100644
--- a/hw/dv/tools/dvsim/xcelium.hjson
+++ b/hw/dv/tools/dvsim/xcelium.hjson
@@ -80,6 +80,10 @@
// Export the cov_report path so that the tcl file can read these as env vars.
{ cov_merge_db_dir: "{cov_merge_db_dir}" },
{ cov_report_dir: "{cov_report_dir}" }
+
+ // Export unr related paths for make
+ {cov_unr_dir: "{cov_unr_dir}" }
+ {cov_merge_cmd: "{cov_merge_cmd}"}
]
// Supported wave dumping formats (in order of preference).
diff --git a/hw/dv/tools/xcelium/unr.cfg b/hw/dv/tools/xcelium/unr.cfg
index 43c8f18..9dbea90 100644
--- a/hw/dv/tools/xcelium/unr.cfg
+++ b/hw/dv/tools/xcelium/unr.cfg
@@ -5,11 +5,10 @@
#Setup the clock and reset the design
clock -infer
-reset rst_n
+reset ~dut.rst_ni
get_reset_info
set_prove_time_limit 5m
-
check_unr -prove
check_unr -list -type unreachable
database -export_unicov
