fix: restore variant to the report

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

Author: machshev

src/dvsim/flow/base.py

@@ -458,11 +458,20 @@ def gen_results(self, results: Sequence[CompletedJobStatus]) -> None:
         all_flow_results: Mapping[str, FlowResults] = {}
 
         for item in self.cfgs:
-            project = item.name
-            item_results = [r for r in results if r.block.name == project]
+            item_results = [
+                res
+                for res in results
+                if res.block.name == item.name and res.block.variant == item.variant
+            ]
 
             flow_results: FlowResults = item._gen_json_results(item_results)
-            all_flow_results[project] = flow_results
+
+            # Convert to lowercase to match filename
+            block_result_index = (
+                f"{item.name}_{item.variant}" if item.variant else item.name
+            ).lower()
+
+            all_flow_results[block_result_index] = flow_results
 
             # Write results to the report area.
             gen_block_report(
@@ -498,7 +507,6 @@ def gen_results(self, results: Sequence[CompletedJobStatus]) -> None:
                     url=self.revision,
                 ),
                 timestamp=timestamp,
-                report_index={item.name: f"{item.name}.html" for item in self.cfgs},
                 flow_results=all_flow_results,
                 report_path=reports_dir,
             )

src/dvsim/report/data.py

@@ -147,9 +147,6 @@ class ResultsSummary(BaseModel):
     flow_results: Mapping[str, FlowResults]
     """Flow results."""
 
-    report_index: Mapping[str, Path]
-    """Index of the IP block reports."""
-
     report_path: Path
     """Path to the report JSON file."""
 

src/dvsim/report/generate.py

@@ -24,15 +24,21 @@ def gen_block_report(results: FlowResults, path: Path) -> None:
         path: output directory path
 
     """
-    log.debug("generating report '%s'", results.block.name)
+    file_name = (
+        f"{results.block.name}_{results.block.variant}"
+        if results.block.variant
+        else results.block.name
+    )
+
+    log.debug("generating report '%s'", file_name)
 
     path.mkdir(parents=True, exist_ok=True)
 
     # Save the JSON version
-    (path / f"{results.block.name}.json").write_text(results.model_dump_json())
+    (path / f"{file_name}.json").write_text(results.model_dump_json())
 
     # Generate HTML report
-    (path / f"{results.block.name}.html").write_text(
+    (path / f"{file_name}.html").write_text(
         render_template(
             path="reports/block_report.html",
             data={"results": results},

src/dvsim/templates/reports/summary_report.html

@@ -105,7 +105,7 @@ <h2>Simulation Results: {{ top.name }}</h2>
                         {% set flow = summary.flow_results[block_name] %}
                         <tr>
                             <td>
-                                <a href="{{ summary.report_index[block_name] }}">
+                                <a href="{{ block_name }}.html">
                                     {{ block_name }}
                                 </a>
                             </td>