[dvsim] Define a 'dv_root' variable and use it in hw/dv/data
This allows us to move the OpenTitan-specific paths into a single
place in the hw/dv subtree, which should make it easier to vendor the
code into Ibex.
Signed-off-by: Rupert Swarbrick <rswarbrick@lowrisc.org>
diff --git a/hw/dv/data/common_sim_cfg.hjson b/hw/dv/data/common_sim_cfg.hjson
index 0f61816..c3b4614 100644
--- a/hw/dv/data/common_sim_cfg.hjson
+++ b/hw/dv/data/common_sim_cfg.hjson
@@ -6,13 +6,16 @@
doc_server: docs.opentitan.org
results_server: reports.opentitan.org
+ // Where to find DV code
+ dv_root: "{proj_root}/hw/dv"
+
flow: sim
- flow_makefile: "{proj_root}/hw/dv/data/sim.mk"
+ flow_makefile: "{dv_root}/data/sim.mk"
import_cfgs: ["{proj_root}/hw/data/common_project_cfg.hjson",
- "{proj_root}/hw/dv/data/common_modes.hjson",
- "{proj_root}/hw/dv/data/fusesoc.hjson",
- "{proj_root}/hw/dv/data/{tool}/{tool}.hjson"]
+ "{dv_root}/data/common_modes.hjson",
+ "{dv_root}/data/fusesoc.hjson",
+ "{dv_root}/data/{tool}/{tool}.hjson"]
// Default directory structure for the output
build_dir: "{scratch_path}/{build_mode}"
@@ -133,7 +136,7 @@
// Add waves.tcl to the set of sources to be copied over to
// {tool_srcs_dir}. This can be sourced by the tool-specific TCL
// script to set up wave dumping.
- tool_srcs: ["{proj_root}/hw/dv/tools/waves.tcl"],
+ tool_srcs: ["{dv_root}/tools/waves.tcl"],
// Project defaults for VCS
vcs_cov_hier: "-cm_hier {tool_srcs_dir}/cover.cfg"
diff --git a/hw/dv/data/dsim/dsim.hjson b/hw/dv/data/dsim/dsim.hjson
index 43f7f97..54fb0a6 100644
--- a/hw/dv/data/dsim/dsim.hjson
+++ b/hw/dv/data/dsim/dsim.hjson
@@ -38,7 +38,7 @@
// Indicate the tool specific helper sources - these are copied over to the
// {tool_srcs_dir} before running the simulation.
// TODO, there is no dsim tool file, point to vcs for now to avoid error from script
- tool_srcs: ["{proj_root}/hw/dv/tools/vcs/*"]
+ tool_srcs: ["{dv_root}/tools/vcs/*"]
// TODO: refactor coverage configuration for DSim.
diff --git a/hw/dv/data/vcs/vcs.hjson b/hw/dv/data/vcs/vcs.hjson
index 39fe73a..3720d55 100644
--- a/hw/dv/data/vcs/vcs.hjson
+++ b/hw/dv/data/vcs/vcs.hjson
@@ -8,7 +8,7 @@
// Indicate the tool specific helper sources - these are copied over to the
// {tool_srcs_dir} before running the simulation.
- tool_srcs: ["{proj_root}/hw/dv/tools/vcs/*"]
+ tool_srcs: ["{dv_root}/tools/vcs/*"]
build_opts: ["-sverilog -full64 -licqueue -kdb -ntb_opts uvm-1.2",
"-timescale=1ns/1ps",
diff --git a/hw/dv/data/xcelium/xcelium.hjson b/hw/dv/data/xcelium/xcelium.hjson
index 9211647..090b349 100644
--- a/hw/dv/data/xcelium/xcelium.hjson
+++ b/hw/dv/data/xcelium/xcelium.hjson
@@ -7,7 +7,7 @@
// Indicate the tool specific helper sources - these are copied over to the
// {tool_srcs_dir} before running the simulation.
- tool_srcs: ["{proj_root}/hw/dv/tools/xcelium/*"]
+ tool_srcs: ["{dv_root}/tools/xcelium/*"]
build_opts: ["-elaborate -64bit -access +r -sv",
"-licqueue",
