From 4d89e3dc79f7dda77eb19c5e3ce470da7e28df74 Mon Sep 17 00:00:00 2001 From: Andrea Belano Date: Fri, 18 Oct 2024 15:51:23 +0200 Subject: [PATCH 1/3] Move defines and interfaces --- Bender.yml | 4 ---- include/{ => pulp_cluster}/cluster_bus_defines.sv | 0 include/{ => pulp_cluster}/periph_bus_defines.sv | 0 include/{ => pulp_cluster}/pulp_interfaces.sv | 2 +- include/{ => pulp_cluster}/pulp_soc_defines.sv | 0 rtl/pulp_cluster.sv | 4 ++-- 6 files changed, 3 insertions(+), 7 deletions(-) rename include/{ => pulp_cluster}/cluster_bus_defines.sv (100%) rename include/{ => pulp_cluster}/periph_bus_defines.sv (100%) rename include/{ => pulp_cluster}/pulp_interfaces.sv (99%) rename include/{ => pulp_cluster}/pulp_soc_defines.sv (100%) diff --git a/Bender.yml b/Bender.yml index ff0fe717..90fd326f 100644 --- a/Bender.yml +++ b/Bender.yml @@ -87,7 +87,3 @@ sources: - tb/mock_uart_axi.sv - tb/pulp_cluster_tb.sv - - target: cluster_standalone - files: - - include/pulp_interfaces.sv - diff --git a/include/cluster_bus_defines.sv b/include/pulp_cluster/cluster_bus_defines.sv similarity index 100% rename from include/cluster_bus_defines.sv rename to include/pulp_cluster/cluster_bus_defines.sv diff --git a/include/periph_bus_defines.sv b/include/pulp_cluster/periph_bus_defines.sv similarity index 100% rename from include/periph_bus_defines.sv rename to include/pulp_cluster/periph_bus_defines.sv diff --git a/include/pulp_interfaces.sv b/include/pulp_cluster/pulp_interfaces.sv similarity index 99% rename from include/pulp_interfaces.sv rename to include/pulp_cluster/pulp_interfaces.sv index 1501c274..12229fc4 100644 --- a/include/pulp_interfaces.sv +++ b/include/pulp_cluster/pulp_interfaces.sv @@ -8,7 +8,7 @@ // CONDITIONS OF ANY KIND, either express or implied. See the License for the // specific language governing permissions and limitations under the License. -`include "pulp_soc_defines.sv" +`include "pulp_cluster/pulp_soc_defines.sv" interface XBAR_TCDM_BUS; diff --git a/include/pulp_soc_defines.sv b/include/pulp_cluster/pulp_soc_defines.sv similarity index 100% rename from include/pulp_soc_defines.sv rename to include/pulp_cluster/pulp_soc_defines.sv diff --git a/rtl/pulp_cluster.sv b/rtl/pulp_cluster.sv index f20ff077..1b56e6ca 100644 --- a/rtl/pulp_cluster.sv +++ b/rtl/pulp_cluster.sv @@ -19,8 +19,8 @@ `include "axi/typedef.svh" `include "axi/assign.svh" -`include "cluster_bus_defines.sv" -`include "pulp_interfaces.sv" +`include "pulp_cluster/cluster_bus_defines.sv" +`include "pulp_cluster/pulp_interfaces.sv" `include "register_interface/typedef.svh" module pulp_cluster From 29ef2da3130838f095027e2822a0f7d901631e0a Mon Sep 17 00:00:00 2001 From: Andrea Belano Date: Fri, 18 Oct 2024 15:52:56 +0200 Subject: [PATCH 2/3] Remove global includes --- rtl/cluster_interconnect_wrap.sv | 3 +-- rtl/hwpe_subsystem.sv | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/rtl/cluster_interconnect_wrap.sv b/rtl/cluster_interconnect_wrap.sv index 015e9dfc..ab731eb1 100644 --- a/rtl/cluster_interconnect_wrap.sv +++ b/rtl/cluster_interconnect_wrap.sv @@ -16,9 +16,8 @@ `include "hci_helpers.svh" -import hci_package::*; - module cluster_interconnect_wrap +import hci_package::*; #( parameter NB_CORES = 12, parameter HWPE_PRESENT = 1, diff --git a/rtl/hwpe_subsystem.sv b/rtl/hwpe_subsystem.sv index 372b4e4d..53576a45 100644 --- a/rtl/hwpe_subsystem.sv +++ b/rtl/hwpe_subsystem.sv @@ -15,10 +15,9 @@ `include "hci_helpers.svh" +module hwpe_subsystem import hci_package::*; import pulp_cluster_package::*; - -module hwpe_subsystem #( parameter hwpe_subsystem_cfg_t HWPE_CFG = '0, parameter int unsigned N_CORES = 8, From fb18898b87d914c71dae69b4eaf5a27860714115 Mon Sep 17 00:00:00 2001 From: Andrea Belano Date: Fri, 18 Oct 2024 15:59:28 +0200 Subject: [PATCH 3/3] Fix testbench --- tb/pulp_cluster_tb.sv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tb/pulp_cluster_tb.sv b/tb/pulp_cluster_tb.sv index 4b7976c6..ebc3fa66 100644 --- a/tb/pulp_cluster_tb.sv +++ b/tb/pulp_cluster_tb.sv @@ -16,7 +16,7 @@ `timescale 1ps/1ps -`include "pulp_soc_defines.sv" +`include "pulp_cluster/pulp_soc_defines.sv" `include "axi/assign.svh" `include "axi/typedef.svh"