[ipgen.pwrmgr] Change core files to vlnv naming and label as virtual

The core files affected are the pwrmgr cores that are templetized. All other core files referring to the the files above need to depend on the virtual name instead. Signed-off-by: Guillermo Maturana <[email protected]>
lowRISC · Jan 18, 2024 · 0d3125e · 0d3125e
1 parent 1107cdf
commit 0d3125e
Show file tree

Hide file tree

Showing 35 changed files with 195 additions and 1,219 deletions.
diff --git a/hw/ip/clkmgr/dv/env/clkmgr_env.core b/hw/ip/clkmgr/dv/env/clkmgr_env.core
@@ -9,7 +9,7 @@ filesets:
     depend:
       - lowrisc:dv:ralgen
       - lowrisc:dv:cip_lib
-      - lowrisc:ip:pwrmgr_pkg
+      - lowrisc:ip_interfaces:pwrmgr_pkg
       - lowrisc:systems:clkmgr_pkg
     files:
       - clkmgr_csrs_if.sv

diff --git a/hw/ip/flash_ctrl/data/flash_ctrl.sv.tpl b/hw/ip/flash_ctrl/data/flash_ctrl.sv.tpl
@@ -97,7 +97,6 @@ module flash_ctrl
                                  (RdFifoDepth <= MaxFifoDepth))
 
 
-  import flash_ctrl_reg_pkg::*;
   import prim_mubi_pkg::mubi4_t;
 
   flash_ctrl_core_reg2hw_t reg2hw;

diff --git a/hw/ip/flash_ctrl/flash_ctrl_pkg.core b/hw/ip/flash_ctrl/flash_ctrl_pkg.core
@@ -11,7 +11,7 @@ filesets:
       - lowrisc:constants:top_pkg
       - lowrisc:prim:util
       - lowrisc:ip:lc_ctrl_pkg
-      - lowrisc:ip:pwrmgr_pkg
+      - lowrisc:ip_interfaces:pwrmgr_pkg
       - lowrisc:ip:jtag_pkg
       - lowrisc:ip:edn_pkg
       - "fileset_partner  ? (partner:systems:ast_pkg)"

diff --git a/hw/ip/flash_ctrl/rtl/flash_ctrl.sv b/hw/ip/flash_ctrl/rtl/flash_ctrl.sv
@@ -97,7 +97,6 @@ module flash_ctrl
                                  (RdFifoDepth <= MaxFifoDepth))
 
 
-  import flash_ctrl_reg_pkg::*;
   import prim_mubi_pkg::mubi4_t;
 
   flash_ctrl_core_reg2hw_t reg2hw;

diff --git a/hw/ip/lc_ctrl/lc_ctrl.core b/hw/ip/lc_ctrl/lc_ctrl.core
@@ -17,7 +17,7 @@ filesets:
       - lowrisc:prim:sparse_fsm
       - lowrisc:ip:lc_ctrl_pkg
       - lowrisc:ip:tlul
-      - lowrisc:ip:pwrmgr_pkg
+      - lowrisc:ip_interfaces:pwrmgr_pkg
       - lowrisc:ip:otp_ctrl_pkg
       - lowrisc:ip:kmac_pkg
       - lowrisc:ip:rv_dm

diff --git a/hw/ip/otp_ctrl/otp_ctrl.core b/hw/ip/otp_ctrl/otp_ctrl.core
@@ -22,7 +22,7 @@ filesets:
       - lowrisc:prim:secded
       - lowrisc:prim:edn_req
       - lowrisc:prim:sec_anchor
-      - lowrisc:ip:pwrmgr_pkg
+      - lowrisc:ip_interfaces:pwrmgr_pkg
       - lowrisc:ip:edn_pkg
       - lowrisc:prim:sparse_fsm
       - "fileset_partner  ? (partner:systems:ast_pkg)"

diff --git a/hw/ip/rstmgr/dv/sva/rstmgr_sva_ifs.core b/hw/ip/rstmgr/dv/sva/rstmgr_sva_ifs.core
@@ -8,7 +8,7 @@ filesets:
   files_dv:
     depend:
       - lowrisc:ip:lc_ctrl_pkg
-      - lowrisc:ip:pwrmgr_pkg
+      - lowrisc:ip_interfaces:pwrmgr_pkg
       - lowrisc:ip:rstmgr
 
     files:

diff --git a/hw/ip/rstmgr/rstmgr_pkg.core b/hw/ip/rstmgr/rstmgr_pkg.core
@@ -9,7 +9,7 @@ filesets:
   files_rtl:
     depend:
       - lowrisc:ip:alert_handler_component
-      - lowrisc:ip:pwrmgr_pkg
+      - lowrisc:ip_interfaces:pwrmgr_pkg
       - lowrisc:ip:rstmgr_reg
       - lowrisc:ip_interfaces:alert_handler_reg
       - "fileset_top    ? (lowrisc:systems:rstmgr_pkg)"

diff --git a/hw/ip/rv_core_ibex/rv_core_ibex.core b/hw/ip/rv_core_ibex/rv_core_ibex.core
@@ -10,7 +10,7 @@ filesets:
       - lowrisc:ibex:ibex_top
       - lowrisc:ip:lc_ctrl_pkg
       - lowrisc:ip:otp_ctrl_pkg
-      - lowrisc:ip:pwrmgr_pkg
+      - lowrisc:ip_interfaces:pwrmgr_pkg
       - lowrisc:ip:rv_core_ibex_pkg
       - lowrisc:ip:tlul
       - lowrisc:ip_interfaces:alert_handler_reg

diff --git a/hw/ip_templates/pwrmgr/dv/env/pwrmgr_env.core b/hw/ip_templates/pwrmgr/dv/env/pwrmgr_env.core
@@ -9,7 +9,7 @@ filesets:
     depend:
       - lowrisc:dv:ralgen
       - lowrisc:dv:cip_lib
-      - lowrisc:ip:pwrmgr_pkg
+      - lowrisc:ip_interfaces:pwrmgr_pkg
     files:
       - pwrmgr_env_pkg.sv
       - pwrmgr_env_cfg.sv: {is_include_file: true}

diff --git a/hw/ip_templates/pwrmgr/dv/sva/pwrmgr_rstmgr_sva_if.core b/hw/ip_templates/pwrmgr/dv/sva/pwrmgr_rstmgr_sva_if.core
@@ -7,7 +7,7 @@ description: "PWRMGR to RSTMGR assertion interface."
 filesets:
   files_dv:
     depend:
-      - lowrisc:ip:pwrmgr_pkg
+      - lowrisc:ip_interfaces:pwrmgr_pkg
       - lowrisc:prim:assert
     files:
       - pwrmgr_rstmgr_sva_if.sv

diff --git a/hw/ip_templates/pwrmgr/dv/sva/pwrmgr_sva.core b/hw/ip_templates/pwrmgr/dv/sva/pwrmgr_sva.core
@@ -9,7 +9,7 @@ filesets:
     depend:
       - lowrisc:tlul:headers
       - lowrisc:fpv:csr_assert_gen
-      - lowrisc:ip:pwrmgr_pkg
+      - lowrisc:ip_interfaces:pwrmgr_pkg
       - lowrisc:dv:clkmgr_pwrmgr_sva_if
       - lowrisc:dv:pwrmgr_rstmgr_sva_if
     files:

diff --git a/hw/ip_templates/pwrmgr/pwrmgr.core.tpl b/hw/ip_templates/pwrmgr/pwrmgr.core.tpl
@@ -0,0 +1,66 @@
+CAPI=2:
+# Copyright lowRISC contributors.
+# Licensed under the Apache License, Version 2.0, see LICENSE for details.
+# SPDX-License-Identifier: Apache-2.0
+name: ${instance_vlnv("lowrisc:ip:pwrmgr:0.1")}
+description: "Power manager RTL"
+virtual:
+  - lowrisc:ip_interfaces:pwrmgr
+
+filesets:
+  files_rtl:
+    depend:
+      - ${instance_vlnv("lowrisc:ip:pwrmgr_pkg:0.1")}
+      - ${instance_vlnv("lowrisc:ip:pwrmgr_reg:0.1")}
+      - lowrisc:ip:pwrmgr_component
+    file_type: systemVerilogSource
+
+  files_verilator_waiver:
+    depend:
+      # common waivers
+      - lowrisc:lint:common
+      - lowrisc:lint:comportable
+    files:
+      - lint/pwrmgr.vlt
+    file_type: vlt
+
+  files_ascentlint_waiver:
+    depend:
+      # common waivers
+      - lowrisc:lint:common
+      - lowrisc:lint:comportable
+    files:
+      - lint/pwrmgr.waiver
+    file_type: waiver
+
+  files_veriblelint_waiver:
+    depend:
+      # common waivers
+      - lowrisc:lint:common
+      - lowrisc:lint:comportable
+
+parameters:
+  SYNTHESIS:
+    datatype: bool
+    paramtype: vlogdefine
+
+
+targets:
+  default: &default_target
+    filesets:
+      - tool_verilator   ? (files_verilator_waiver)
+      - tool_ascentlint  ? (files_ascentlint_waiver)
+      - tool_veriblelint ? (files_veriblelint_waiver)
+      - files_rtl
+    toplevel: pwrmgr
+
+  lint:
+    <<: *default_target
+    default_tool: verilator
+    parameters:
+      - SYNTHESIS=true
+    tools:
+      verilator:
+        mode: lint-only
+        verilator_options:
+          - "-Wall"
diff --git a/hw/ip_templates/pwrmgr/pwrmgr.core → ...p_templates/pwrmgr/pwrmgr_components.core b/hw/ip_templates/pwrmgr/pwrmgr.core → ...p_templates/pwrmgr/pwrmgr_components.core
@@ -2,7 +2,7 @@ CAPI=2:
 # Copyright lowRISC contributors.
 # Licensed under the Apache License, Version 2.0, see LICENSE for details.
 # SPDX-License-Identifier: Apache-2.0
-name: "lowrisc:ip:pwrmgr:0.1"
+name: "lowrisc:ip:pwrmgr_component:0.1"
 description: "Power manager RTL"
 
 filesets:
@@ -20,8 +20,7 @@ filesets:
       - lowrisc:prim:clock_buf
       - lowrisc:prim:measure
       - lowrisc:ip_interfaces:alert_handler_reg
-      - lowrisc:ip:pwrmgr_pkg
-      - lowrisc:ip:pwrmgr_reg
+      - lowrisc:ip_interfaces:pwrmgr_pkg
     files:
       - rtl/pwrmgr_cdc.sv
       - rtl/pwrmgr_slow_fsm.sv

diff --git a/hw/ip_templates/pwrmgr/pwrmgr_pkg.core → hw/ip_templates/pwrmgr/pwrmgr_pkg.core.tpl b/hw/ip_templates/pwrmgr/pwrmgr_pkg.core → hw/ip_templates/pwrmgr/pwrmgr_pkg.core.tpl
@@ -2,13 +2,15 @@ CAPI=2:
 # Copyright lowRISC contributors.
 # Licensed under the Apache License, Version 2.0, see LICENSE for details.
 # SPDX-License-Identifier: Apache-2.0
-name: "lowrisc:ip:pwrmgr_pkg:0.1"
+name: ${instance_vlnv("lowrisc:ip:pwrmgr_pkg:0.1")}
 description: "Power manager package"
+virtual:
+  - lowrisc:ip_interfaces:pwrmgr_pkg
 
 filesets:
   files_rtl:
     depend:
-      - lowrisc:ip:pwrmgr_reg
+      - ${instance_vlnv("lowrisc:ip:pwrmgr_reg")}
     files:
       - rtl/pwrmgr_pkg.sv
     file_type: systemVerilogSource

diff --git a/hw/ip_templates/pwrmgr/pwrmgr_reg.core → hw/ip_templates/pwrmgr/pwrmgr_reg.core.tpl b/hw/ip_templates/pwrmgr/pwrmgr_reg.core → hw/ip_templates/pwrmgr/pwrmgr_reg.core.tpl
@@ -2,8 +2,10 @@ CAPI=2:
 # Copyright lowRISC contributors.
 # Licensed under the Apache License, Version 2.0, see LICENSE for details.
 # SPDX-License-Identifier: Apache-2.0
-name: "lowrisc:ip:pwrmgr_reg:0.1"
+name: ${instance_vlnv("lowrisc:ip:pwrmgr_reg:0.1")}
 description: "Power manager registers"
+virtual:
+  - lowrisc:ip_interfaces:pwrmgr_reg
 
 filesets:
   files_rtl: