[src] Add vPlan coverage to final summary report

Signed-off-by: martin-velay <mvelay@lowrisc.org>

Author: martin-velay

src/dvsim/job/deploy.py

@@ -1045,6 +1045,8 @@ class CovVPlan(Deploy):
 
     def __init__(self, cov_report_job, sim_cfg) -> None:
         self.report_job = cov_report_job
+        # Populated by post_finish() once the job completes successfully.
+        self.vplan_coverage: float | None = None
         super().__init__(sim_cfg)
         self.dependencies.append(cov_report_job)
 
@@ -1081,6 +1083,31 @@ def _set_attrs(self) -> None:
         self.gen_html = f"{self.odir}/vplan_annotated.html"
         self.output_dirs = [self.odir]
 
+    def post_finish(self) -> Callable[[JobStatus], None]:
+        """Get post finish callback."""
+
+        def callback(status: JobStatus) -> None:
+            """Extract the overall vPlan normalised coverage from the annotated HJSON."""
+            if self.dry_run or status != JobStatus.PASSED:
+                return
+            hjson_path = Path(self.annotated_hjson)
+            if not hjson_path.exists():
+                return
+            try:
+                import hjson  # noqa: PLC0415
+
+                with hjson_path.open() as f:
+                    data = hjson.load(f)
+                # HJSON vPlans are keyed: {dut_name: {fields...}}
+                root_node = next(iter(data.values()), {})
+                raw = root_node.get("Normalized_Coverage")
+                if raw is not None:
+                    self.vplan_coverage = float(str(raw).rstrip(" %"))
+            except Exception:  # noqa: BLE001
+                log.debug("Could not extract vPlan coverage from '%s'.", hjson_path)
+
+        return callback
+
     def _construct_cmd(self) -> str:
         """Construct the pure bash shell command, bypassing the base Makefile assumption."""
         import shlex

src/dvsim/sim/data.py

@@ -194,6 +194,8 @@ class SimFlowResults(BaseModel):
     """Optional path linking to the generated coverage report dashboard page."""
     vplan_report_page: Path | None
     """Optional path linking to the generated verification plan (vPlan) reports."""
+    vplan_coverage: float | None = None
+    """Overall normalised coverage (%) extracted from the back-annotated vPlan."""
 
     failed_jobs: BucketedFailures
     """Bucketed failed job overview."""

src/dvsim/sim/flow.py

@@ -834,8 +834,10 @@ def make_test_result(tr) -> TestResult | None:
             cov_report_page = Path(cov_report_dir, self.cov_report_page)
 
         vplan_report_page = None
+        vplan_coverage = None
         if getattr(self, "cov_vplan_deploy", None):
             vplan_report_page = Path(self.scratch_path) / CovVPlan.target / "vplan_annotated.html"
+            vplan_coverage = self.cov_vplan_deploy.vplan_coverage
 
         failures = BucketedFailures.from_job_status(results=run_results)
         if failures.buckets:
@@ -852,6 +854,7 @@ def make_test_result(tr) -> TestResult | None:
             coverage=coverage_model,
             cov_report_page=cov_report_page,
             vplan_report_page=vplan_report_page,
+            vplan_coverage=vplan_coverage,
             failed_jobs=failures,
             passed=total_passed,
             total=total_runs,

src/dvsim/sim/report.py

@@ -335,6 +335,8 @@ def render_coverage_table(self, results: SimFlowResults) -> str:
         report_md = "## Coverage Results"
         if results.vplan_report_page:
             report_md += f"\n### [vPlan Dashboard]({results.vplan_report_page})"
+            if results.vplan_coverage is not None:
+                report_md += f"\n\nVerification Plan Coverage: {results.vplan_coverage:.2f} %\n"
         if results.cov_report_page:
             report_md += f"\n### [Coverage Dashboard]({results.cov_report_page})"
         if cov_results: