socx-cli 0.2.2__tar.gz → 0.2.4__tar.gz

{socx_cli-0.2.2 → socx_cli-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: socx-cli
-Version: 0.2.2
+Version: 0.2.4
 Summary: System on chip verification and tooling infrastructure.
 Project-URL: Homepage, https://github.com/runsonmymachine/socx
 Project-URL: Issues, https://github.com/runsonmymachine/socx/issues

socx_cli-0.2.4/assets/rgr/inputs/failed_tests_history.log

@@ -0,0 +1,3 @@
+socrun --flow sim --test vbat/pixie_fw_func_test_hws_basic_vbat.cfg --seed 732274191
+socrun --flow sim --test vbat/pixie_fw_radio_test_vbat.cfg --seed 249137077
+socrun --flow sim --test vbat/pixie_fw_radio_test_vbat.cfg --seed 824307247

socx_cli-0.2.4/assets/rgr/outputs/02-03-2025/13-53_failed.log

@@ -0,0 +1,3 @@
+socrun --flow sim --test vbat/pixie_fw_radio_test_vbat.cfg --seed 249137077
+socrun --flow sim --test vbat/pixie_fw_func_test_hws_basic_vbat.cfg --seed 732274191
+socrun --flow sim --test vbat/pixie_fw_radio_test_vbat.cfg --seed 824307247

socx_cli-0.2.4/assets/rgr/outputs/02-03-2025/13-54_passed.log

@@ -0,0 +1,3 @@
+socrun --flow sim --test vbat/pixie_fw_func_test_hws_basic_vbat.cfg --seed 732274191
+socrun --flow sim --test vbat/pixie_fw_radio_test_vbat.cfg --seed 249137077
+socrun --flow sim --test vbat/pixie_fw_radio_test_vbat.cfg --seed 824307247

socx_cli-0.2.4/assets/rgr/outputs/02-03-2025/13-55_passed.log

@@ -0,0 +1,3 @@
+socrun --flow sim --test vbat/pixie_fw_func_test_hws_basic_vbat.cfg --seed 732274191
+socrun --flow sim --test vbat/pixie_fw_radio_test_vbat.cfg --seed 249137077
+socrun --flow sim --test vbat/pixie_fw_radio_test_vbat.cfg --seed 824307247

socx_cli-0.2.4/assets/rgr/outputs/02-03-2025/13-58_passed.log

@@ -0,0 +1,3 @@
+socrun --flow sim --test vbat/pixie_fw_radio_test_vbat.cfg --seed 249137077
+socrun --flow sim --test vbat/pixie_fw_radio_test_vbat.cfg --seed 824307247
+socrun --flow sim --test vbat/pixie_fw_func_test_hws_basic_vbat.cfg --seed 732274191

socx_cli-0.2.4/assets/rgr/outputs/02-03-2025/16-54_passed.log

@@ -0,0 +1,3 @@
+socrun --flow sim --test vbat/pixie_fw_radio_test_vbat.cfg --seed 824307247
+socrun --flow sim --test vbat/pixie_fw_radio_test_vbat.cfg --seed 249137077
+socrun --flow sim --test vbat/pixie_fw_func_test_hws_basic_vbat.cfg --seed 732274191

{socx_cli-0.2.2 → socx_cli-0.2.4}/pyproject.toml

@@ -15,7 +15,7 @@ packages = ["src/socx", "src/socx_plugins", "src/socx_patches"]
 #
 [project]
 name = "socx-cli"
-version = "0.2.2"
+version = "0.2.4"
 readme = "README.md"
 license = "Apache-2.0 OR MIT"
 authors = [ { name = "Sagi Kimhi", email = "sagi.kim5@gmail.com" } ]

{socx_cli-0.2.2 → socx_cli-0.2.4}/src/socx/regression/regression.py

@@ -232,6 +232,7 @@ class Regression(TestBase):
             async with aio.TaskGroup() as tg:
                 for _ in range(self.run_limit):
                     tg.create_task(self._runner())
+                self._runner_advance()
             await self.pending.join()
             await self.messages.put("all tests completed. stopping runners.")
         except Exception:
@@ -244,9 +245,9 @@ class Regression(TestBase):
                 try:
                     test = await self.pending.get()
                     await self.messages.put(f"Runner({test.name}): running...")
-                    self._runner_advance()
                     await aio.create_task(test.start())
                     await self.messages.put(f"Runner({test.name}): done.")
+                    self._runner_advance()
                 finally:
                     self.pending.task_done()
         except Exception:
@@ -304,7 +305,7 @@ class Regression(TestBase):
                     self._scheduler_tid, advance=1, refresh=True
                 )
             if self.progress.tasks[self._scheduler_tid].finished:
-                self.scheduler_finish()
+                self._scheduler_finish()
 
     def _scheduler_finish(self) -> None:
         if self._scheduler_tid is not None:
@@ -333,7 +334,8 @@ class Regression(TestBase):
                     visible=True,
                     refresh=True,
                 )
-            self.progress.update(self._runner_tid, advance=1, refresh=True)
+            else:
+                self.progress.update(self._runner_tid, advance=1, refresh=True)
             if self.progress.tasks[self._runner_tid].finished:
                 self._runner_finish()
                 self._regression_finish()

{socx_cli-0.2.2 → socx_cli-0.2.4}/src/socx/regression/test.py

@@ -303,14 +303,24 @@ class Test(TestBase, UIDMixin):
         return self._proc.returncode
 
     @property
-    def rtp(self) -> Path:
+    def runtime_cfg(self):
+        """Get the simulation's runtime settings object."""
+        return settings.regression.runtime
+
+    @property
+    def runtime_path(self) -> Path:
         """
         Get the simulation's runtime path.
 
         The runtime referes to the path where compilation database and run logs
         are dumped by default by the simulator.
         """
-        return settings.regression.runtime.path / self.dirname
+        return self.runtime_cfg.path / self.dirname
+
+    @property
+    def runtime_logs(self):
+        """Get the simulation's configured runtime path for ouput logs."""
+        return self.runtime_path/self.runtime_cfg.logs.directory
 
     @property
     def dirname(self):
@@ -390,9 +400,9 @@ class Test(TestBase, UIDMixin):
             self.process.kill()
 
     def _parse_result(self) -> TestResult:
-        logger.debug(f"parsing result from {self.rtp}")
+        logger.debug(f"parsing result from {self.runtime_path}")
         result_hack = pp_simlog.TestResults()
-        result_hack.reset_log(self.rtp)
+        result_hack.reset_log(self.runtime_logs/"run.log")
         try:
             result_hack.parse_log()
         except ValueError:

{socx_cli-0.2.2 → socx_cli-0.2.4}/src/socx/static/settings/regression.toml

@@ -76,6 +76,13 @@ description = ""
 [regression.runtime]
 path = "@path @format {this.regression.path}/nightly"
 
+# -----------------------------------------------------------------------------
+# Runtime - Logs
+# -----------------------------------------------------------------------------
+
+[regression.runtime.logs]
+directory = "logs"
+
 # -----------------------------------------------------------------------------
 # Runtime - Files
 # -----------------------------------------------------------------------------

{socx_cli-0.2.2 → socx_cli-0.2.4}/src/socx_patches/post_process_sim_log.py

@@ -28,7 +28,7 @@ class TestResults:
         self.reset_log(None)
 
     def reset_log(self, log_path, out_log_path=None):
-        self.logPath = log_path
+        self.log_path = log_path
         self.outLogPath = out_log_path
         self.result = "NA"
         self.numErrors = 0
@@ -40,14 +40,14 @@ class TestResults:
 
     def parse_log(self):
         """Parse the log."""
-        if os.path.exists(self.logPath):
+        if os.path.exists(self.log_path):
             #             status = 'PASS'
             self.result = "FAIL"
             self.simEnded = False
 
             # open file to see if simulation was ended
 
-            with open(self.logPath) as f:
+            with open(self.log_path) as f:
                 log_dump = f.read()
                 if re.search("--- UVM Report Summary ---", log_dump):
                     self.simEnded = True
@@ -96,7 +96,7 @@ class TestResults:
                         )
 
         else:
-            err = f"log file doesnt exists {self.logPath}"
+            err = f"log file doesnt exists {self.log_path}"
             raise ValueError(err)
 
     def check_err(self, line):

{socx_cli-0.2.2 → socx_cli-0.2.4}/src/socx_plugins/regression/cli.py

@@ -1,5 +1,3 @@
-from pathlib import Path
-
 import rich_click as click
 
 from socx_plugins.regression._opts import input_opt
@@ -14,38 +12,35 @@ def cli():
 @cli.command()
 @input_opt()
 @output_opt()
-def run(input: str | Path, output: str | Path):  # noqa: A002
+def run(input, output):  # noqa: A002
     """Run a regression from a file of 'socrun' commands."""
     import asyncio
     from socx_plugins.regression._cli import _run_from_file
 
-    ctx = click.get_current_context()
-    with asyncio.runners.Runner() as runner:
-        runner.run(_run_from_file(input, output))
+    loop = asyncio.new_event_loop()
+    loop.run_until_complete(_run_from_file(input, output))
 
 
 @cli.command()
 @input_opt()
 @output_opt()
-def rrfh(input: str | Path, output: str | Path):  # noqa: A002
+def rrfh(input, output):  # noqa: A002
     """Command alias for rerun-failure-history."""
     import asyncio
     from socx_plugins.regression._cli import _run_from_file
 
-    ctx = click.get_current_context()
-    with asyncio.runners.Runner() as runner:
-        runner.run(_run_from_file(input, output))
+    loop = asyncio.new_event_loop()
+    loop.run_until_complete(_run_from_file(input, output))
 
 
 @cli.command()
 @input_opt()
 @output_opt()
-def rerun_failure_history(input: str | Path, output: str | Path) -> None:  # noqa: A002
+def rerun_failure_history(input, output):  # noqa: A002
     """Rerun failed tests from all past regressions."""
     import asyncio
     from socx_plugins.regression._cli import _run_from_file
 
-    ctx = click.get_current_context()
-    with asyncio.runners.Runner() as runner:
-        runner.run(_run_from_file(input, output))
+    loop = asyncio.new_event_loop()
+    loop.run_until_complete(_run_from_file(input, output))