[autogen,testutils] Fix isr_tstutils for multitop

The template was still using earlgrey types. This requires to pass top information to the generator and templates. Signed-off-by: Amaury Pouly <[email protected]>
lowRISC · Mar 5, 2025 · 45b349b · 45b349b
1 parent e475b7c
commit 45b349b
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 14 deletions.
diff --git a/util/autogen_testutils/gen.py b/util/autogen_testutils/gen.py
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 from pathlib import Path
-from typing import List
+from typing import Dict, List
 
 from autogen_banner import get_autogen_banner
 from make_new_dif.ip import Ip
@@ -15,7 +15,9 @@
 REPO_TOP = Path(__file__).resolve().parent.parent.parent
 
 
-def gen_testutils(outdir: Path, ips_with_difs: List[Ip]) -> List[Path]:
+def gen_testutils(outdir: Path,
+                  completecfg: Dict[str, object],
+                  ips_with_difs: List[Ip]) -> List[Path]:
     """Generate testutils libraries that are rendered from Mako templates.
 
     Args:
@@ -44,10 +46,15 @@ def gen_testutils(outdir: Path, ips_with_difs: List[Ip]) -> List[Path]:
             testutils_template = Template(testutils_template_path.read_text())
             testutils = outdir / testutils_template_path.stem
             testutils.write_text(
-                testutils_template.render(ips_with_difs=ips_with_difs,
-                                          autogen_banner=get_autogen_banner(
-                                              "util/autogen_testutils.py",
-                                              comment=comment_syntax)))
+                testutils_template.render(
+                    ips_with_difs=ips_with_difs,
+                    autogen_banner=get_autogen_banner(
+                        "util/autogen_testutils.py",
+                        comment=comment_syntax
+                    ),
+                    top = completecfg,
+                )
+            )
             testutilses += [testutils]
 
     return testutilses
diff --git a/util/autogen_testutils/templates/isr_testutils.c.tpl b/util/autogen_testutils/templates/isr_testutils.c.tpl
@@ -3,6 +3,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 ${autogen_banner}
+<%
+  top_name = top["name"]
+%>
 
 #include "sw/device/lib/testing/autogen/isr_testutils.h"
 #include "sw/device/lib/dif/dif_base.h"
@@ -16,8 +19,6 @@ ${autogen_banner}
 % endfor
 #include "sw/device/lib/testing/test_framework/check.h"
 
-#include "hw/top_earlgrey/sw/autogen/top_earlgrey.h" // Generated.
-
 % for ip in ips_with_difs:
   % if ip.irqs:
     void isr_testutils_${ip.name_snake}_isr(
@@ -26,7 +27,7 @@ ${autogen_banner}
     % if ip.has_status_type_irqs():
       bool mute_status_irq,
     % endif
-      top_earlgrey_plic_peripheral_t *peripheral_serviced,
+      top_${top_name}_plic_peripheral_t *peripheral_serviced,
       dif_${ip.name_snake}_irq_t *irq_serviced) {
 
       // Claim the IRQ at the PLIC.
@@ -37,8 +38,8 @@ ${autogen_banner}
         &plic_irq_id));
 
       // Get the peripheral the IRQ belongs to.
-      *peripheral_serviced = (top_earlgrey_plic_peripheral_t)
-        top_earlgrey_plic_interrupt_for_peripheral[plic_irq_id];
+      *peripheral_serviced = (top_${top_name}_plic_peripheral_t)
+        top_${top_name}_plic_interrupt_for_peripheral[plic_irq_id];
 
       // Get the IRQ that was fired from the PLIC IRQ ID.
       dif_${ip.name_snake}_irq_t irq = (dif_${ip.name_snake}_irq_t)(plic_irq_id -

diff --git a/util/autogen_testutils/templates/isr_testutils.h.tpl b/util/autogen_testutils/templates/isr_testutils.h.tpl
@@ -6,6 +6,9 @@
 #define OPENTITAN_SW_DEVICE_LIB_TESTING_AUTOGEN_ISR_TESTUTILS_H_
 
 ${autogen_banner}
+<%
+  top_name = top["name"]
+%>
 
 /**
  * @file
@@ -19,7 +22,7 @@ ${autogen_banner}
   % endif
 % endfor
 
-#include "hw/top_earlgrey/sw/autogen/top_earlgrey.h" // Generated.
+#include "hw/top_${top_name}/sw/autogen/top_${top_name}.h" // Generated.
 
 /**
  * A handle to a PLIC ISR context struct.
@@ -81,7 +84,7 @@ typedef struct plic_isr_ctx {
     % if ip.has_status_type_irqs():
       bool mute_status_irq,
     % endif
-      top_earlgrey_plic_peripheral_t *peripheral_serviced,
+      top_${top_name}_plic_peripheral_t *peripheral_serviced,
       dif_${ip.name_snake}_irq_t *irq_serviced);
 
   % endif

diff --git a/util/gen_testutils.py b/util/gen_testutils.py
@@ -102,7 +102,7 @@ def main():
         ips.append(Ip(ipname, "AUTOGEN", hjson_file))
 
     # Auto-generate testutils files.
-    testutilses = gen_testutils(outdir, ips)
+    testutilses = gen_testutils(outdir, topcfg, ips)
 
     # Format autogenerated file with clang-format.
     try: