[ipgen,otp_ctrl] Fix core files

The template core files use instance_vlnv, and declare a virtual target. Part of lowRISC#25019 Signed-off-by: Guillermo Maturana <[email protected]>
matutem · Nov 25, 2024 · 3497084 · 3497084
1 parent 121e813
commit 3497084
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 12 deletions.
diff --git a/...mplates/otp_ctrl/dv/env/otp_ctrl_env.core → ...tes/otp_ctrl/dv/env/otp_ctrl_env.core.tpl b/...mplates/otp_ctrl/dv/env/otp_ctrl_env.core → ...tes/otp_ctrl/dv/env/otp_ctrl_env.core.tpl
@@ -2,8 +2,11 @@ CAPI=2:
 # Copyright lowRISC contributors (OpenTitan project).
 # Licensed under the Apache License, Version 2.0, see LICENSE for details.
 # SPDX-License-Identifier: Apache-2.0
-name: "lowrisc:dv:otp_ctrl_env:0.1"
+name: ${instance_vlnv("lowrisc:dv:otp_ctrl_env:0.1")}
 description: "OTP_CTRL DV UVM environment"
+virtual:
+  - lowrisc:ip_interfaces:otp_ctrl_env
+
 filesets:
   files_dv:
     depend:

diff --git a/...p_templates/otp_ctrl/dv/otp_ctrl_sim.core → ...mplates/otp_ctrl/dv/otp_ctrl_sim.core.tpl b/...p_templates/otp_ctrl/dv/otp_ctrl_sim.core → ...mplates/otp_ctrl/dv/otp_ctrl_sim.core.tpl
@@ -2,19 +2,22 @@ CAPI=2:
 # Copyright lowRISC contributors (OpenTitan project).
 # Licensed under the Apache License, Version 2.0, see LICENSE for details.
 # SPDX-License-Identifier: Apache-2.0
-name: "lowrisc:dv:otp_ctrl_sim:0.1"
+name: ${instance_vlnv("lowrisc:dv:otp_ctrl_sim:0.1")}
 description: "OTP_CTRL DV sim target"
+virtual:
+  - lowrisc:ip_interfaces:otp_ctrl_sim
+
 filesets:
   files_rtl:
     depend:
-      - lowrisc:ip:otp_ctrl
+      - ${instance_vlnv("lowrisc:ip:otp_ctrl")}
 
   files_dv:
     depend:
       - lowrisc:dv:mem_bkdr_util
-      - lowrisc:dv:otp_ctrl_test
-      - lowrisc:dv:otp_ctrl_sva
-      - lowrisc:dv:otp_ctrl_cov
+      - ${instance_vlnv("lowrisc:dv:otp_ctrl_test")}
+      - ${instance_vlnv("lowrisc:dv:otp_ctrl_sva")}
+      - ${instance_vlnv("lowrisc:dv:otp_ctrl_cov")}
     files:
       - tb.sv
     file_type: systemVerilogSource

diff --git a/...mplates/otp_ctrl/dv/sva/otp_ctrl_sva.core → ...tes/otp_ctrl/dv/sva/otp_ctrl_sva.core.tpl b/...mplates/otp_ctrl/dv/sva/otp_ctrl_sva.core → ...tes/otp_ctrl/dv/sva/otp_ctrl_sva.core.tpl
@@ -2,8 +2,11 @@ CAPI=2:
 # Copyright lowRISC contributors (OpenTitan project).
 # Licensed under the Apache License, Version 2.0, see LICENSE for details.
 # SPDX-License-Identifier: Apache-2.0
-name: "lowrisc:dv:otp_ctrl_sva:0.1"
+name: ${instance_vlnv("lowrisc:dv:otp_ctrl_sva:0.1")}
 description: "OTP_CTRL assertion modules and bind file."
+virtual:
+  - lowrisc:ip_interfaces:otp_ctrl_sva
+
 filesets:
   files_dv:
     depend:

diff --git a/...ates/otp_ctrl/dv/tests/otp_ctrl_test.core → .../otp_ctrl/dv/tests/otp_ctrl_test.core.tpl b/...ates/otp_ctrl/dv/tests/otp_ctrl_test.core → .../otp_ctrl/dv/tests/otp_ctrl_test.core.tpl
@@ -2,12 +2,15 @@ CAPI=2:
 # Copyright lowRISC contributors (OpenTitan project).
 # Licensed under the Apache License, Version 2.0, see LICENSE for details.
 # SPDX-License-Identifier: Apache-2.0
-name: "lowrisc:dv:otp_ctrl_test:0.1"
+name: ${instance_vlnv("lowrisc:dv:otp_ctrl_test:0.1")}
 description: "OTP_CTRL DV UVM test"
+virtual:
+  - lowrisc:ip_interfaces:otp_ctrl_test
+
 filesets:
   files_dv:
     depend:
-      - lowrisc:dv:otp_ctrl_env
+      - ${instance_vlnv("lowrisc:dv:otp_ctrl_env")}
     files:
       - otp_ctrl_test_pkg.sv
       - otp_ctrl_base_test.sv: {is_include_file: true}

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

diff --git a/hw/ip_templates/otp_ctrl/otp_ctrl_pkg.core → ..._templates/otp_ctrl/otp_ctrl_pkg.core.tpl b/hw/ip_templates/otp_ctrl/otp_ctrl_pkg.core → ..._templates/otp_ctrl/otp_ctrl_pkg.core.tpl
@@ -2,8 +2,11 @@ CAPI=2:
 # Copyright lowRISC contributors (OpenTitan project).
 # Licensed under the Apache License, Version 2.0, see LICENSE for details.
 # SPDX-License-Identifier: Apache-2.0
-name: "lowrisc:ip:otp_ctrl_pkg:1.0"
+name: ${instance_vlnv("lowrisc:ip:otp_ctrl_pkg:1.0")}
 description: "OTP Controller Package"
+virtual:
+  - lowrisc:ip_interfaces:otp_ctrl_pkg
+
 filesets:
   files_rtl:
     depend:

diff --git a/...lates/otp_ctrl/otp_ctrl_prim_reg_top.core → ...s/otp_ctrl/otp_ctrl_prim_reg_top.core.tpl b/...lates/otp_ctrl/otp_ctrl_prim_reg_top.core → ...s/otp_ctrl/otp_ctrl_prim_reg_top.core.tpl
@@ -2,8 +2,11 @@ CAPI=2:
 # Copyright lowRISC contributors (OpenTitan project).
 # Licensed under the Apache License, Version 2.0, see LICENSE for details.
 # SPDX-License-Identifier: Apache-2.0
-name: "lowrisc:ip:otp_ctrl_prim_reg_top:1.0"
+name: ${instance_vlnv("lowrisc:ip:otp_ctrl_prim_reg_top:1.0")}
 description: "Generic register top for the OTP wrapper"
+virtual:
+  - lowrisc:ip_interfaces:otp_ctrl_prim_reg_top
+
 filesets:
   files_rtl:
     depend: