Simulator compatibility updates

tests/conftest.py

@@ -1,7 +1,7 @@
 def pytest_addoption(parser):
     parser.addoption(
         "--sim-tool",
-        choices=["questa", "xilinx", "stub", "skip", "auto"],
+        choices=["questa", "xsim", "stub", "skip", "auto"],
         default="auto",
         help="""
         Select the simulator to use.
@@ -12,6 +12,29 @@ def pytest_addoption(parser):
         """
     )
 
+    parser.addoption(
+        "--gui",
+        default=False,
+        action="store_true",
+        help=""",
+        Launch sim tool in GUI mode
+
+        Only use this option when running a single test
+        """
+    )
+
+
+    parser.addoption(
+        "--rerun",
+        default=False,
+        action="store_true",
+        help=""",
+        Re-run simulation in-place without re-exporting regblock
+
+        Useful if hand-editing a testcase interactively.
+        """
+    )
+
     parser.addoption(
         "--synth-tool",
         choices=["vivado", "skip", "auto"],