commit c612bb08d82a7f1982ce9bcfeb81c03f65cc9859
author Srikrishna Iyer <sriyer@google.com> Tue May 12 00:33:27 2020 -0700
committer sriyerg <46467186+sriyerg@users.noreply.github.com> Tue May 12 17:46:52 2020 -0700
tree 3c7f9f956edc2e33b734e3908d2f1f757f6f9fc9
parent 5c0cafc0bffa40ce0556c65e57e980932580ac0f

[dvsim] Support for running pre-built SW tests

This PR adds support for running pre-built SW tests, with a few
optimizations:
- Removed `sw_dir` var from hjson - paths to SW tests relative to
`REPO_TOP` are to be indicated now with `sw_test` instead
- Renamed `sw_name` with `sw_test` instead
- Added `sw_test_is_prebuilt` flag to indicate that it is prebuilt
- Supporting updates in `sim.mk` to decide what to do based on the
above flag

Signed-off-by: Srikrishna Iyer <sriyer@google.com>

util/dvsim/Deploy.py

diff --git a/util/dvsim/Deploy.py b/util/dvsim/Deploy.py
index 0b1b2d6..0a53397 100644
--- a/util/dvsim/Deploy.py
+++ b/util/dvsim/Deploy.py
@@ -659,8 +659,8 @@
             "uvm_test": False,
             "uvm_test_seq": False,
             "run_opts": False,
-            "sw_dir": False,
-            "sw_name": False,
+            "sw_test": False,
+            "sw_test_is_prebuilt": False,
             "sw_build_device": False,
             "sw_build_dir": False,
             "run_dir": False,

util/dvsim/Modes.py

diff --git a/util/dvsim/Modes.py b/util/dvsim/Modes.py
index 0432702..2d3a60e 100644
--- a/util/dvsim/Modes.py
+++ b/util/dvsim/Modes.py
@@ -271,8 +271,8 @@
         self.uvm_test_seq = ""
         self.build_mode = ""
         self.en_run_modes = []
-        self.sw_dir = ""
-        self.sw_name = ""
+        self.sw_test = ""
+        self.sw_test_is_prebuilt = ""
         self.sw_build_device = ""
 
         super().__init__(rdict)
@@ -298,8 +298,8 @@
         "uvm_test": "",
         "uvm_test_seq": "",
         "build_mode": "",
-        "sw_dir": "",
-        "sw_name": "",
+        "sw_test": "",
+        "sw_test_is_prebuilt": "",
         "sw_build_device": "",
     }
 

util/dvsim/SimCfg.py

diff --git a/util/dvsim/SimCfg.py b/util/dvsim/SimCfg.py
index 1afa573..fe94210 100644
--- a/util/dvsim/SimCfg.py
+++ b/util/dvsim/SimCfg.py
@@ -124,7 +124,7 @@
         # TODO: Find a way to set these in sim cfg instead
         ignored_wildcards = [
             "build_mode", "index", "test", "seed", "uvm_test", "uvm_test_seq",
-            "cov_db_dirs", "sw_dir", "sw_name", "sw_build_device"
+            "cov_db_dirs", "sw_test", "sw_test_is_prebuilt", "sw_build_device"
         ]
         self.__dict__ = find_and_substitute_wildcards(self.__dict__,
                                                       self.__dict__,