[topgen] Add GPIO to the list of uniquified ipgen IPs

Razer6 · a-will · commit f995b5639fe7 · 2025-03-14T16:23:30.000-07:00
Signed-off-by: Robert Schilling &lt;rschilling@rivosinc.com&gt;
diff --git a/hw/top_darjeeling/ip_autogen/ac_range_check/data/top_darjeeling_ac_range_check.ipconfig.hjson b/hw/top_darjeeling/ip_autogen/ac_range_check/data/top_darjeeling_ac_range_check.ipconfig.hjson
@@ -12,6 +12,7 @@
     topname: darjeeling
     uniquified_modules:
     {
+      gpio: gpio
       racl_ctrl: racl_ctrl
       ac_range_check: ac_range_check
       alert_handler: alert_handler
diff --git a/hw/top_darjeeling/ip_autogen/alert_handler/data/top_darjeeling_alert_handler.ipconfig.hjson b/hw/top_darjeeling/ip_autogen/alert_handler/data/top_darjeeling_alert_handler.ipconfig.hjson
@@ -227,6 +227,7 @@
     topname: darjeeling
     uniquified_modules:
     {
+      gpio: gpio
       racl_ctrl: racl_ctrl
       ac_range_check: ac_range_check
       alert_handler: alert_handler
diff --git a/hw/top_darjeeling/ip_autogen/clkmgr/data/top_darjeeling_clkmgr.ipconfig.hjson b/hw/top_darjeeling/ip_autogen/clkmgr/data/top_darjeeling_clkmgr.ipconfig.hjson
@@ -248,6 +248,7 @@
     topname: darjeeling
     uniquified_modules:
     {
+      gpio: gpio
       racl_ctrl: racl_ctrl
       ac_range_check: ac_range_check
       alert_handler: alert_handler
diff --git a/hw/top_darjeeling/ip_autogen/gpio/data/top_darjeeling_gpio.ipconfig.hjson b/hw/top_darjeeling/ip_autogen/gpio/data/top_darjeeling_gpio.ipconfig.hjson
@@ -10,6 +10,7 @@
     topname: darjeeling
     uniquified_modules:
     {
+      gpio: gpio
       racl_ctrl: racl_ctrl
       ac_range_check: ac_range_check
       alert_handler: alert_handler
diff --git a/hw/top_darjeeling/ip_autogen/otp_ctrl/data/top_darjeeling_otp_ctrl.ipconfig.hjson b/hw/top_darjeeling/ip_autogen/otp_ctrl/data/top_darjeeling_otp_ctrl.ipconfig.hjson
@@ -2007,6 +2007,7 @@
     topname: darjeeling
     uniquified_modules:
     {
+      gpio: gpio
       racl_ctrl: racl_ctrl
       ac_range_check: ac_range_check
       alert_handler: alert_handler
diff --git a/hw/top_darjeeling/ip_autogen/pinmux/data/top_darjeeling_pinmux.ipconfig.hjson b/hw/top_darjeeling/ip_autogen/pinmux/data/top_darjeeling_pinmux.ipconfig.hjson
@@ -20,6 +20,7 @@
     topname: darjeeling
     uniquified_modules:
     {
+      gpio: gpio
       racl_ctrl: racl_ctrl
       ac_range_check: ac_range_check
       alert_handler: alert_handler
diff --git a/hw/top_darjeeling/ip_autogen/pwrmgr/data/top_darjeeling_pwrmgr.ipconfig.hjson b/hw/top_darjeeling/ip_autogen/pwrmgr/data/top_darjeeling_pwrmgr.ipconfig.hjson
@@ -75,6 +75,7 @@
     topname: darjeeling
     uniquified_modules:
     {
+      gpio: gpio
       racl_ctrl: racl_ctrl
       ac_range_check: ac_range_check
       alert_handler: alert_handler
diff --git a/hw/top_darjeeling/ip_autogen/racl_ctrl/data/top_darjeeling_racl_ctrl.ipconfig.hjson b/hw/top_darjeeling/ip_autogen/racl_ctrl/data/top_darjeeling_racl_ctrl.ipconfig.hjson
@@ -65,6 +65,7 @@
     topname: darjeeling
     uniquified_modules:
     {
+      gpio: gpio
       racl_ctrl: racl_ctrl
       ac_range_check: ac_range_check
       alert_handler: alert_handler
diff --git a/hw/top_darjeeling/ip_autogen/rstmgr/data/top_darjeeling_rstmgr.ipconfig.hjson b/hw/top_darjeeling/ip_autogen/rstmgr/data/top_darjeeling_rstmgr.ipconfig.hjson
@@ -549,6 +549,7 @@
     topname: darjeeling
     uniquified_modules:
     {
+      gpio: gpio
       racl_ctrl: racl_ctrl
       ac_range_check: ac_range_check
       alert_handler: alert_handler
diff --git a/hw/top_darjeeling/ip_autogen/rv_plic/data/top_darjeeling_rv_plic.ipconfig.hjson b/hw/top_darjeeling/ip_autogen/rv_plic/data/top_darjeeling_rv_plic.ipconfig.hjson
@@ -12,6 +12,7 @@
     topname: darjeeling
     uniquified_modules:
     {
+      gpio: gpio
       racl_ctrl: racl_ctrl
       ac_range_check: ac_range_check
       alert_handler: alert_handler
diff --git a/hw/top_earlgrey/ip_autogen/alert_handler/data/top_earlgrey_alert_handler.ipconfig.hjson b/hw/top_earlgrey/ip_autogen/alert_handler/data/top_earlgrey_alert_handler.ipconfig.hjson
@@ -151,6 +151,7 @@
     topname: earlgrey
     uniquified_modules:
     {
+      gpio: gpio
       alert_handler: alert_handler
       rv_plic: rv_plic
     }
diff --git a/hw/top_earlgrey/ip_autogen/clkmgr/data/top_earlgrey_clkmgr.ipconfig.hjson b/hw/top_earlgrey/ip_autogen/clkmgr/data/top_earlgrey_clkmgr.ipconfig.hjson
@@ -263,6 +263,7 @@
     topname: earlgrey
     uniquified_modules:
     {
+      gpio: gpio
       alert_handler: alert_handler
       rv_plic: rv_plic
     }
diff --git a/hw/top_earlgrey/ip_autogen/flash_ctrl/data/top_earlgrey_flash_ctrl.ipconfig.hjson b/hw/top_earlgrey/ip_autogen/flash_ctrl/data/top_earlgrey_flash_ctrl.ipconfig.hjson
@@ -27,6 +27,7 @@
     topname: earlgrey
     uniquified_modules:
     {
+      gpio: gpio
       alert_handler: alert_handler
       rv_plic: rv_plic
     }
diff --git a/hw/top_earlgrey/ip_autogen/gpio/data/top_earlgrey_gpio.ipconfig.hjson b/hw/top_earlgrey/ip_autogen/gpio/data/top_earlgrey_gpio.ipconfig.hjson
@@ -10,6 +10,7 @@
     topname: earlgrey
     uniquified_modules:
     {
+      gpio: gpio
       alert_handler: alert_handler
       rv_plic: rv_plic
     }
diff --git a/hw/top_earlgrey/ip_autogen/otp_ctrl/data/top_earlgrey_otp_ctrl.ipconfig.hjson b/hw/top_earlgrey/ip_autogen/otp_ctrl/data/top_earlgrey_otp_ctrl.ipconfig.hjson
@@ -1988,6 +1988,7 @@
     topname: earlgrey
     uniquified_modules:
     {
+      gpio: gpio
       alert_handler: alert_handler
       rv_plic: rv_plic
     }
diff --git a/hw/top_earlgrey/ip_autogen/pinmux/data/top_earlgrey_pinmux.ipconfig.hjson b/hw/top_earlgrey/ip_autogen/pinmux/data/top_earlgrey_pinmux.ipconfig.hjson
@@ -20,6 +20,7 @@
     topname: earlgrey
     uniquified_modules:
     {
+      gpio: gpio
       alert_handler: alert_handler
       rv_plic: rv_plic
     }
diff --git a/hw/top_earlgrey/ip_autogen/pwrmgr/data/top_earlgrey_pwrmgr.ipconfig.hjson b/hw/top_earlgrey/ip_autogen/pwrmgr/data/top_earlgrey_pwrmgr.ipconfig.hjson
@@ -85,6 +85,7 @@
     topname: earlgrey
     uniquified_modules:
     {
+      gpio: gpio
       alert_handler: alert_handler
       rv_plic: rv_plic
     }
diff --git a/hw/top_earlgrey/ip_autogen/rstmgr/data/top_earlgrey_rstmgr.ipconfig.hjson b/hw/top_earlgrey/ip_autogen/rstmgr/data/top_earlgrey_rstmgr.ipconfig.hjson
@@ -696,6 +696,7 @@
     topname: earlgrey
     uniquified_modules:
     {
+      gpio: gpio
       alert_handler: alert_handler
       rv_plic: rv_plic
     }
diff --git a/hw/top_earlgrey/ip_autogen/rv_plic/data/top_earlgrey_rv_plic.ipconfig.hjson b/hw/top_earlgrey/ip_autogen/rv_plic/data/top_earlgrey_rv_plic.ipconfig.hjson
@@ -12,6 +12,7 @@
     topname: earlgrey
     uniquified_modules:
     {
+      gpio: gpio
       alert_handler: alert_handler
       rv_plic: rv_plic
     }
diff --git a/hw/top_englishbreakfast/ip_autogen/clkmgr/data/top_englishbreakfast_clkmgr.ipconfig.hjson b/hw/top_englishbreakfast/ip_autogen/clkmgr/data/top_englishbreakfast_clkmgr.ipconfig.hjson
@@ -240,6 +240,7 @@
     topname: englishbreakfast
     uniquified_modules:
     {
+      gpio: gpio
       rv_plic: rv_plic
     }
   }
diff --git a/hw/top_englishbreakfast/ip_autogen/flash_ctrl/data/top_englishbreakfast_flash_ctrl.ipconfig.hjson b/hw/top_englishbreakfast/ip_autogen/flash_ctrl/data/top_englishbreakfast_flash_ctrl.ipconfig.hjson
@@ -27,6 +27,7 @@
     topname: englishbreakfast
     uniquified_modules:
     {
+      gpio: gpio
       rv_plic: rv_plic
     }
   }
diff --git a/hw/top_englishbreakfast/ip_autogen/gpio/data/top_englishbreakfast_gpio.ipconfig.hjson b/hw/top_englishbreakfast/ip_autogen/gpio/data/top_englishbreakfast_gpio.ipconfig.hjson
@@ -10,6 +10,7 @@
     topname: englishbreakfast
     uniquified_modules:
     {
+      gpio: gpio
       rv_plic: rv_plic
     }
   }
diff --git a/hw/top_englishbreakfast/ip_autogen/pinmux/data/top_englishbreakfast_pinmux.ipconfig.hjson b/hw/top_englishbreakfast/ip_autogen/pinmux/data/top_englishbreakfast_pinmux.ipconfig.hjson
@@ -20,6 +20,7 @@
     topname: englishbreakfast
     uniquified_modules:
     {
+      gpio: gpio
       rv_plic: rv_plic
     }
   }
diff --git a/hw/top_englishbreakfast/ip_autogen/pwrmgr/data/top_englishbreakfast_pwrmgr.ipconfig.hjson b/hw/top_englishbreakfast/ip_autogen/pwrmgr/data/top_englishbreakfast_pwrmgr.ipconfig.hjson
@@ -64,6 +64,7 @@
     topname: englishbreakfast
     uniquified_modules:
     {
+      gpio: gpio
       rv_plic: rv_plic
     }
   }
diff --git a/hw/top_englishbreakfast/ip_autogen/rstmgr/data/top_englishbreakfast_rstmgr.ipconfig.hjson b/hw/top_englishbreakfast/ip_autogen/rstmgr/data/top_englishbreakfast_rstmgr.ipconfig.hjson
@@ -456,6 +456,7 @@
     topname: englishbreakfast
     uniquified_modules:
     {
+      gpio: gpio
       rv_plic: rv_plic
     }
   }
diff --git a/hw/top_englishbreakfast/ip_autogen/rv_plic/data/top_englishbreakfast_rv_plic.ipconfig.hjson b/hw/top_englishbreakfast/ip_autogen/rv_plic/data/top_englishbreakfast_rv_plic.ipconfig.hjson
@@ -12,6 +12,7 @@
     topname: englishbreakfast
     uniquified_modules:
     {
+      gpio: gpio
       rv_plic: rv_plic
     }
   }
diff --git a/util/topgen.py b/util/topgen.py
@@ -784,13 +784,14 @@ def generate_racl(top: ConfigT, module: ConfigT, out_path: Path) -> None:
 
 def _get_gpio_params(top: ConfigT) -> ParamsT:
     """Extracts parameters for GPIO ipgen."""
+    module = lib.find_module(top["module"], "gpio")
+    uniquified_modules.add_module(module["template_type"], module["type"])
 
-    gpio = lib.find_module(top["module"], "gpio")
     params = {
         # TODO(#26553): Remove the following code once topgen automatically
         # incorporates template parameters.
-        "num_inp_period_counters": gpio.get("ipgen_param", {}).get("num_inp_period_counters", 0),
-        "module_instance_name": gpio["type"]
+        "num_inp_period_counters": module.get("ipgen_param", {}).get("num_inp_period_counters", 0),
+        "module_instance_name": module["type"]
     }
     return params
 

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`topname: darjeeling`
`13`	`13`	`uniquified_modules:`
`14`	`14`	`{`
	`15`	`+ gpio: gpio`
`15`	`16`	`racl_ctrl: racl_ctrl`
`16`	`17`	`ac_range_check: ac_range_check`
`17`	`18`	`alert_handler: alert_handler`
Original file line number	Diff line number	Diff line change
`@@ -227,6 +227,7 @@`
`227`	`227`	`topname: darjeeling`
`228`	`228`	`uniquified_modules:`
`229`	`229`	`{`
	`230`	`+ gpio: gpio`
`230`	`231`	`racl_ctrl: racl_ctrl`
`231`	`232`	`ac_range_check: ac_range_check`
`232`	`233`	`alert_handler: alert_handler`
Original file line number	Diff line number	Diff line change
`@@ -248,6 +248,7 @@`
`248`	`248`	`topname: darjeeling`
`249`	`249`	`uniquified_modules:`
`250`	`250`	`{`
	`251`	`+ gpio: gpio`
`251`	`252`	`racl_ctrl: racl_ctrl`
`252`	`253`	`ac_range_check: ac_range_check`
`253`	`254`	`alert_handler: alert_handler`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`topname: darjeeling`
`11`	`11`	`uniquified_modules:`
`12`	`12`	`{`
	`13`	`+ gpio: gpio`
`13`	`14`	`racl_ctrl: racl_ctrl`
`14`	`15`	`ac_range_check: ac_range_check`
`15`	`16`	`alert_handler: alert_handler`
Original file line number	Diff line number	Diff line change
`@@ -2007,6 +2007,7 @@`
`2007`	`2007`	`topname: darjeeling`
`2008`	`2008`	`uniquified_modules:`
`2009`	`2009`	`{`
	`2010`	`+ gpio: gpio`
`2010`	`2011`	`racl_ctrl: racl_ctrl`
`2011`	`2012`	`ac_range_check: ac_range_check`
`2012`	`2013`	`alert_handler: alert_handler`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`topname: darjeeling`
`21`	`21`	`uniquified_modules:`
`22`	`22`	`{`
	`23`	`+ gpio: gpio`
`23`	`24`	`racl_ctrl: racl_ctrl`
`24`	`25`	`ac_range_check: ac_range_check`
`25`	`26`	`alert_handler: alert_handler`
Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,7 @@`
`75`	`75`	`topname: darjeeling`
`76`	`76`	`uniquified_modules:`
`77`	`77`	`{`
	`78`	`+ gpio: gpio`
`78`	`79`	`racl_ctrl: racl_ctrl`
`79`	`80`	`ac_range_check: ac_range_check`
`80`	`81`	`alert_handler: alert_handler`
Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@`
`65`	`65`	`topname: darjeeling`
`66`	`66`	`uniquified_modules:`
`67`	`67`	`{`
	`68`	`+ gpio: gpio`
`68`	`69`	`racl_ctrl: racl_ctrl`
`69`	`70`	`ac_range_check: ac_range_check`
`70`	`71`	`alert_handler: alert_handler`
Original file line number	Diff line number	Diff line change
`@@ -549,6 +549,7 @@`
`549`	`549`	`topname: darjeeling`
`550`	`550`	`uniquified_modules:`
`551`	`551`	`{`
	`552`	`+ gpio: gpio`
`552`	`553`	`racl_ctrl: racl_ctrl`
`553`	`554`	`ac_range_check: ac_range_check`
`554`	`555`	`alert_handler: alert_handler`
Original file line number	Diff line number	Diff line change
`@@ -151,6 +151,7 @@`
`151`	`151`	`topname: earlgrey`
`152`	`152`	`uniquified_modules:`
`153`	`153`	`{`
	`154`	`+ gpio: gpio`
`154`	`155`	`alert_handler: alert_handler`
`155`	`156`	`rv_plic: rv_plic`
`156`	`157`	`}`