[dvsim] Remove process_exports() from the code
- Not required if the exports key in the HJson is built as a list of
dict to begin with
Signed-off-by: Srikrishna Iyer <sriyer@google.com>
diff --git a/hw/dv/tools/dvsim/dsim.hjson b/hw/dv/tools/dvsim/dsim.hjson
index 33d0784..f8b4684 100644
--- a/hw/dv/tools/dvsim/dsim.hjson
+++ b/hw/dv/tools/dvsim/dsim.hjson
@@ -72,7 +72,9 @@
"-elfile {vcs_cov_excl_files}"]
// Vars that need to exported to the env.
- exports: []
+ exports: [
+ { LD_LIBRARY_PATH: "{DSIM_HOME}/lib:{LD_LIBRARY_PATH}" }
+ ]
// Defaults for DSim
// TODO: there is currently no equivalent of "all" coverage metrics in DSim
diff --git a/util/dvsim/Deploy.py b/util/dvsim/Deploy.py
index bdb6516..627798a 100644
--- a/util/dvsim/Deploy.py
+++ b/util/dvsim/Deploy.py
@@ -75,7 +75,7 @@
self.renew_odir = False
# List of vars required to be exported to sub-shell
- self.exports = {}
+ self.exports = None
# Deploy sub commands
self.sub = []
@@ -157,9 +157,36 @@
self.odir_ln = os.path.basename(os.path.normpath(self.odir))
self.log = self.odir + "/" + self.target + ".log"
+ # Make exports more easily mergeable with the current process' env.
+ self._process_exports()
+
# If using LSF, redirect stdout and err to the log file
self.cmd = self.construct_cmd()
+ def _process_exports(self):
+ '''Convert 'exports' as a list of dicts in the HJson to a dict.
+
+ Exports is a list of key-value pairs that are to be exported to the
+ subprocess' environment so that the tools can lookup those options.
+ DVSim limits how the data is presented in the HJson (the value of a
+ HJson member cannot be an object). This method converts a list of dicts
+ into a dict variable, which makes it easy to merge the list of exports
+ with the subprocess' env where the ASIC tool is invoked.
+ '''
+ exports_dict = {}
+ if self.exports:
+ try:
+ exports_dict = {
+ k: str(v)
+ for item in self.exports for k, v in item.items()
+ }
+ except ValueError as e:
+ log.error(
+ "%s: exports: \'%s\' Exports key must be a list of dicts!",
+ e, str(self.exports))
+ sys.exit(1)
+ self.exports = exports_dict
+
def construct_cmd(self):
cmd = "make -f " + self.flow_makefile + " " + self.target
if self.dry_run is True:
@@ -216,7 +243,11 @@
return True
def dispatch_cmd(self):
- self.exports.update(os.environ)
+ # Update the shell's env vars with self.exports. Values in exports must
+ # replace the values in the shell's env vars if the keys match.
+ exports = os.environ.copy()
+ exports.update(self.exports)
+
args = shlex.split(self.cmd)
try:
# If renew_odir flag is True - then move it.
@@ -228,8 +259,8 @@
"w",
encoding="UTF-8",
errors="surrogateescape") as f:
- for var in sorted(self.exports.keys()):
- f.write("{}={}\n".format(var, self.exports[var]))
+ for var in sorted(exports.keys()):
+ f.write("{}={}\n".format(var, exports[var]))
f.close()
os.system("ln -s " + self.odir + " " + self.sim_cfg.links['D'] +
'/' + self.odir_ln)
@@ -241,7 +272,7 @@
universal_newlines=True,
stdout=f,
stderr=f,
- env=self.exports)
+ env=exports)
self.log_fd = f
self.status = "D"
Deploy.dispatch_counter += 1
diff --git a/util/dvsim/FlowCfg.py b/util/dvsim/FlowCfg.py
index 75ff17d..584d2ac 100644
--- a/util/dvsim/FlowCfg.py
+++ b/util/dvsim/FlowCfg.py
@@ -379,25 +379,6 @@
log.error("Override key \"%s\" not found in the cfg!", ov_name)
sys.exit(1)
- def _process_exports(self):
- # Convert 'exports' to dict
- exports_dict = {}
- if self.exports != []:
- for item in self.exports:
- if type(item) is dict:
- exports_dict.update(item)
- elif type(item) is str:
- [key, value] = item.split(':', 1)
- if type(key) is not str:
- key = str(key)
- if type(value) is not str:
- value = str(value)
- exports_dict.update({key.strip(): value.strip()})
- else:
- log.error("Type error in \"exports\": %s", str(item))
- sys.exit(1)
- self.exports = exports_dict
-
def _purge(self):
'''Purge the existing scratch areas in preperation for the new run.'''
return
diff --git a/util/dvsim/OneShotCfg.py b/util/dvsim/OneShotCfg.py
index e79e837..6e407ec 100644
--- a/util/dvsim/OneShotCfg.py
+++ b/util/dvsim/OneShotCfg.py
@@ -109,8 +109,6 @@
if not hasattr(self, "build_mode"):
setattr(self, "build_mode", "default")
- self._process_exports()
-
# Create objects from raw dicts - build_modes, sim_modes, run_modes,
# tests and regressions, only if not a primary cfg obj
self._create_objects()
diff --git a/util/dvsim/SimCfg.py b/util/dvsim/SimCfg.py
index e9f8499..ebea603 100644
--- a/util/dvsim/SimCfg.py
+++ b/util/dvsim/SimCfg.py
@@ -172,7 +172,7 @@
# the configuration format because our choice might depend on the
# chosen tool.
self.dump_fmt = (resolve_dump_format(self.tool, args.dump)
- if self.waves else 'none')
+ if self.waves and not self.is_primary_cfg else 'none')
# If build_unique is set, then add current timestamp to uniquify it
if self.build_unique:
@@ -225,8 +225,6 @@
if not hasattr(self, "build_mode"):
self.build_mode = 'default'
- self._process_exports()
-
# Create objects from raw dicts - build_modes, sim_modes, run_modes,
# tests and regressions, only if not a primary cfg obj
self._create_objects()
