[topgen,rtl] Fix param handling for AlertSkewCycles for alert_handler

Previously AlertSkewCycles is only set for modules that have alert_connections.
However, the alert handler itself does not have alert_connections, so it was not
getting the AlertSkewCycles parameter set. Thus the alert handler was using the
default value of 1, causing an inconsistency if the parameter was set to a different
value.

This commit fixes this by adding AlertSkewCycles to the alert handler parameters.

Signed-off-by: Robert Schilling <[email protected]>

Author: Razer6

hw/top_darjeeling/rtl/autogen/top_darjeeling.sv

@@ -1349,6 +1349,7 @@ module top_darjeeling #(
       .rst_kmac_ni (rstmgr_aon_resets.rst_lc_n[rstmgr_pkg::Domain0Sel])
   );
   alert_handler #(
+    .AlertSkewCycles(top_pkg::AlertSkewCycles),
     .RndCnstLfsrSeed(RndCnstAlertHandlerLfsrSeed),
     .RndCnstLfsrPerm(RndCnstAlertHandlerLfsrPerm),
     .EscNumSeverities(AlertHandlerEscNumSeverities),

hw/top_darjeeling/templates/toplevel.sv.tpl

@@ -515,16 +515,13 @@ max_sigwidth = max(len(x.name) for x in port_list) if port_list else 0
 max_intrwidth = (max(len(x.name) for x in block.interrupts)
                  if block.interrupts else 0)
 alert_info = top["alert_connections"].get("module_" + m["name"], {})
+has_params, param_items = lib.get_params(top, m)
 %>\
-  % if m["param_list"] or alert_info or m.get("racl_mappings"):
+  % if has_params:
   ${m["type"]} #(
 <%include file="/toplevel_racl_parameters.tpl" args="module=m,top=top,block=block"/>\
-  % if alert_info:
-    .AlertAsyncOn(${alert_info["async_expr"]}),
-    .AlertSkewCycles(top_pkg::AlertSkewCycles)${"," if m["param_list"] else ""}
-  % endif
-    % for i in m["param_list"]:
-    .${i["name"]}(${i["name_top" if i.get("expose") == "true" or i.get("randtype", "none") != "none" else "default"]})${"," if not loop.last else ""}
+    % for param_name, param_value in param_items:
+    ${param_name}(${param_value})${"," if not loop.last else ""}
     % endfor
   ) u_${m["name"]} (
   % else:

hw/top_earlgrey/rtl/autogen/top_earlgrey.sv

@@ -1693,6 +1693,7 @@ module top_earlgrey #(
       .rst_kmac_ni (rstmgr_aon_resets.rst_lc_n[rstmgr_pkg::Domain0Sel])
   );
   alert_handler #(
+    .AlertSkewCycles(top_pkg::AlertSkewCycles),
     .RndCnstLfsrSeed(RndCnstAlertHandlerLfsrSeed),
     .RndCnstLfsrPerm(RndCnstAlertHandlerLfsrPerm),
     .EscNumSeverities(AlertHandlerEscNumSeverities),

hw/top_earlgrey/templates/toplevel.sv.tpl

@@ -488,16 +488,13 @@ max_sigwidth = max(len(x.name) for x in port_list) if port_list else 0
 max_intrwidth = (max(len(x.name) for x in block.interrupts)
                  if block.interrupts else 0)
 alert_info = top["alert_connections"].get("module_" + m["name"], {})
+has_params, param_items = lib.get_params(top, m)
 %>\
-  % if m["param_list"] or alert_info or m.get("racl_mappings"):
+  % if has_params:
   ${m["type"]} #(
 <%include file="/toplevel_racl_parameters.tpl" args="module=m,top=top,block=block"/>\
-  % if alert_info:
-    .AlertAsyncOn(${alert_info["async_expr"]}),
-    .AlertSkewCycles(top_pkg::AlertSkewCycles)${"," if m["param_list"] else ""}
-  % endif
-    % for i in m["param_list"]:
-    .${i["name"]}(${i["name_top" if i.get("expose") == "true" or i.get("randtype", "none") != "none" else "default"]})${"," if not loop.last else ""}
+    % for param_name, param_value in param_items:
+    ${param_name}(${param_value})${"," if not loop.last else ""}
     % endfor
   ) u_${m["name"]} (
   % else:

util/topgen/lib.py

@@ -16,6 +16,7 @@
 from basegen.typing import ConfigT, ParamsT
 from mako.template import Template
 from reggen.ip_block import IpBlock
+from reggen.lib import check_bool
 from version_file import VersionInformation
 
 # Ignore flake8 warning as the function is used in the template
@@ -760,6 +761,27 @@ def get_io_enum_literal(sig: Dict, prefix: str) -> str:
     return name.as_camel_case()
 
 
+def get_params(top: ConfigT, module: ConfigT) -> List[str]:
+    """Return the parameters for a given module including implicit parameters
+       but excluding RACL parameters, which are handled in a separate template.
+    """
+    param_items = []
+    alert_info = top["alert_connections"].get("module_" + module["name"], {})
+    has_racl_params = bool(module.get("racl_mappings"))
+    if alert_info:
+        param_items.append((".AlertAsyncOn", alert_info["async_expr"]))
+    if alert_info or module.get("template_type") == "alert_handler":
+        param_items.append((".AlertSkewCycles", "top_pkg::AlertSkewCycles"))
+    for param in module["param_list"]:
+        is_exposed = check_bool(param.get("expose", False), f"expose field of {param['name']}")
+        has_random_type = param.get("randtype")
+        param_key = "name_top" if (is_exposed or has_random_type) else "default"
+        param_items.append((f".{param['name']}", param[param_key]))
+
+    has_params = has_racl_params or len(param_items) > 0
+    return has_params, param_items
+
+
 def make_bit_concatenation(sig_name: str, indices: List[int],
                            end_indent: int) -> str:
     '''Return SV code for concatenating certain indices from a signal