[dv] Fix for `--run-only` switch
This change fixes the `--run-only` switch when waves are enabled, and
the simulation executable does not need to be rebuilt. It adds the
`copy-tool-sources' step as a dependency to the `run` target as well
(and an associated fix in Deploy.py).
Signed-off-by: Srikrishna Iyer <sriyer@google.com>
diff --git a/hw/dv/tools/dvsim/sim.mk b/hw/dv/tools/dvsim/sim.mk
index b31c44b..702f3e6 100644
--- a/hw/dv/tools/dvsim/sim.mk
+++ b/hw/dv/tools/dvsim/sim.mk
@@ -19,11 +19,11 @@
mkdir -p ${tool_srcs_dir}
${LOCK_TOOL_SRCS_DIR} "cp -Ru ${tool_srcs} ${tool_srcs_dir}/."
-pre_compile:
+pre_compile: prep_tool_srcs
@echo "[make]: pre_compile"
mkdir -p ${build_dir}
-gen_sv_flist: pre_compile prep_tool_srcs
+gen_sv_flist: pre_compile
@echo "[make]: gen_sv_flist"
cd ${build_dir} && ${sv_flist_gen_cmd} ${sv_flist_gen_opts}
@@ -39,7 +39,7 @@
run: run_result
-pre_run:
+pre_run: prep_tool_srcs
@echo "[make]: pre_run"
mkdir -p ${run_dir}
ifneq (${sw_test},)
diff --git a/util/dvsim/Deploy.py b/util/dvsim/Deploy.py
index 7974f60..b945fe1 100644
--- a/util/dvsim/Deploy.py
+++ b/util/dvsim/Deploy.py
@@ -752,6 +752,10 @@
self.fail_patterns = []
self.mandatory_cmd_attrs.update({
+ # tool srcs
+ "tool_srcs": False,
+ "tool_srcs_dir": False,
+
"proj_root": False,
"uvm_test": False,
"uvm_test_seq": False,
