fix: use git commit directly from git

Signed-off-by: James McCorrie <[email protected]>

Author: machshev

src/dvsim/flow/base.py

@@ -7,7 +7,6 @@
 import json
 import os
 import pprint
-import re
 import sys
 from abc import ABC, abstractmethod
 from collections.abc import Mapping, Sequence
@@ -29,6 +28,7 @@
     rm_path,
     subst_wildcards,
 )
+from dvsim.utils.git import git_commit_hash
 
 if TYPE_CHECKING:
     from dvsim.job.deploy import Deploy
@@ -455,6 +455,9 @@ def gen_results(self, results: Sequence[CompletedJobStatus]) -> None:
 
         """
         reports_dir = Path(self.scratch_base_path) / "reports"
+        commit = git_commit_hash(path=Path(self.proj_root))
+        url = f"https://github.com/lowrisc/opentitan/tree/{commit}"
+
         all_flow_results: Mapping[str, FlowResults] = {}
 
         for item in self.cfgs:
@@ -464,7 +467,11 @@ def gen_results(self, results: Sequence[CompletedJobStatus]) -> None:
                 if res.block.name == item.name and res.block.variant == item.variant
             ]
 
-            flow_results: FlowResults = item._gen_json_results(item_results)
+            flow_results: FlowResults = item._gen_json_results(
+                run_results=item_results,
+                commit=commit,
+                url=url,
+            )
 
             # Convert to lowercase to match filename
             block_result_index = (
@@ -491,20 +498,13 @@ def gen_results(self, results: Sequence[CompletedJobStatus]) -> None:
                 .isoformat()
             )
 
-            # Extract Git properties.
-            m = re.search(
-                r"https://github.com/.+?/tree/([0-9a-fA-F]+)",
-                self.revision,
-            )
-            commit = m.group(1) if m else None
-
             results_summary = ResultsSummary(
                 top=IPMeta(
                     name=self.name,
                     variant=self.variant,
-                    commit=str(commit),
+                    commit=commit,
                     branch=self.branch,
-                    url=self.revision,
+                    url=url,
                 ),
                 timestamp=timestamp,
                 flow_results=all_flow_results,

src/dvsim/flow/sim.py

@@ -5,7 +5,6 @@
 """Class describing simulation configuration object."""
 
 import fnmatch
-import re
 import sys
 from collections import OrderedDict, defaultdict
 from collections.abc import Sequence
@@ -574,11 +573,18 @@ def cov_unr(self) -> None:
         for item in self.cfgs:
             item._cov_unr()
 
-    def _gen_json_results(self, run_results: Sequence[CompletedJobStatus]) -> FlowResults:
+    def _gen_json_results(
+        self,
+        run_results: Sequence[CompletedJobStatus],
+        commit: str,
+        url: str,
+    ) -> FlowResults:
         """Generate structured FlowResults from simulation run data.
 
         Args:
             run_results: completed job status.
+            commit: git commit Hash
+            url: for the IP source
 
         Returns:
             Flow results object.
@@ -591,15 +597,12 @@ def _gen_json_results(self, run_results: Sequence[CompletedJobStatus]) -> FlowRe
         # --- Metadata ---
         timestamp = datetime.strptime(self.timestamp, TS_FORMAT).replace(tzinfo=timezone.utc)
 
-        commit_match = re.search(r"github.com/.+?/tree/([0-9a-f]{7,40})", self.revision)
-        commit = commit_match.group(1) if commit_match else None
-
         block = IPMeta(
             name=self.name.lower(),
             variant=(self.variant or "").lower() or None,
-            commit=commit or "",
+            commit=commit,
             branch=self.branch or "",
-            url=f"https://github.com/lowrisc/opentitan/tree/{commit}" if commit else "",
+            url=url,
         )
         tool = ToolMeta(name=self.tool.lower(), version="unknown")