From 6d0fb5ce364e7e7092ccff7809b46571ced44e68 Mon Sep 17 00:00:00 2001 From: Paul Scheffler Date: Fri, 22 Oct 2021 17:58:07 +0200 Subject: [PATCH] occamy+cluster: Further fixes --- hw/ip/snitch_cluster/src/snitch_cluster.sv | 2 +- hw/ip/snitch_cluster/src/snitch_cluster_wrapper.sv.tpl | 2 +- hw/system/occamy/src/occamy_cluster_wrapper.sv | 2 +- hw/system/occamy/src/occamy_cva6.sv | 2 +- hw/system/occamy/src/occamy_cva6.sv.tpl | 2 +- hw/system/occamy/src/occamy_pkg.sv | 4 ++-- hw/system/occamy/src/occamy_pkg.sv.tpl | 4 ++-- hw/system/occamy/src/occamy_quadrant_s1.sv | 8 ++++---- hw/system/occamy/src/occamy_quadrant_s1.sv.tpl | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/hw/ip/snitch_cluster/src/snitch_cluster.sv b/hw/ip/snitch_cluster/src/snitch_cluster.sv index 0380bb0d66..c4f49bec80 100644 --- a/hw/ip/snitch_cluster/src/snitch_cluster.sv +++ b/hw/ip/snitch_cluster/src/snitch_cluster.sv @@ -641,7 +641,7 @@ module snitch_cluster .ByteWidth (8), .NumPorts (1), .Latency (1), - .impl_in_t (sram_cfg_t), + .impl_in_t (sram_cfg_t) ) i_data_mem ( .clk_i, .rst_ni, diff --git a/hw/ip/snitch_cluster/src/snitch_cluster_wrapper.sv.tpl b/hw/ip/snitch_cluster/src/snitch_cluster_wrapper.sv.tpl index 36189daa35..5017e04a1b 100644 --- a/hw/ip/snitch_cluster/src/snitch_cluster_wrapper.sv.tpl +++ b/hw/ip/snitch_cluster/src/snitch_cluster_wrapper.sv.tpl @@ -169,7 +169,7 @@ module ${cfg['name']}_wrapper ( input logic clk_d2_bypass_i, % endif % if cfg['sram_cfg_expose']: - input sram_cfgs_t sram_cfgs_i, + input ${cfg['pkg_name']}::sram_cfgs_t sram_cfgs_i, %endif input ${cfg['pkg_name']}::narrow_in_req_t narrow_in_req_i, output ${cfg['pkg_name']}::narrow_in_resp_t narrow_in_resp_o, diff --git a/hw/system/occamy/src/occamy_cluster_wrapper.sv b/hw/system/occamy/src/occamy_cluster_wrapper.sv index 6377453209..742cccba7b 100644 --- a/hw/system/occamy/src/occamy_cluster_wrapper.sv +++ b/hw/system/occamy/src/occamy_cluster_wrapper.sv @@ -337,7 +337,7 @@ module occamy_cluster_wrapper ( input logic [9:0] hart_base_id_i, input logic [47:0] cluster_base_addr_i, input logic clk_d2_bypass_i, - input sram_cfgs_t sram_cfgs_i, + input occamy_cluster_pkg::sram_cfgs_t sram_cfgs_i, input occamy_cluster_pkg::narrow_in_req_t narrow_in_req_i, output occamy_cluster_pkg::narrow_in_resp_t narrow_in_resp_o, output occamy_cluster_pkg::narrow_out_req_t narrow_out_req_o, diff --git a/hw/system/occamy/src/occamy_cva6.sv b/hw/system/occamy/src/occamy_cva6.sv index f287c5d700..d5bca4de88 100644 --- a/hw/system/occamy/src/occamy_cva6.sv +++ b/hw/system/occamy/src/occamy_cva6.sv @@ -136,7 +136,7 @@ module occamy_cva6 .axi_w_chan_t(axi_a48_d64_i4_u0_w_chan_t), .axi_req_t(axi_a48_d64_i4_u0_req_t), .axi_rsp_t(axi_a48_d64_i4_u0_resp_t), - .sram_cfg_t(sram_cfg_cva6_t) + .sram_cfg_t(sram_cfg_t) ) i_cva6 ( .clk_i, .rst_ni, diff --git a/hw/system/occamy/src/occamy_cva6.sv.tpl b/hw/system/occamy/src/occamy_cva6.sv.tpl index 37ae301e5d..00f772a5a1 100644 --- a/hw/system/occamy/src/occamy_cva6.sv.tpl +++ b/hw/system/occamy/src/occamy_cva6.sv.tpl @@ -78,7 +78,7 @@ module occamy_cva6 import occamy_pkg::*; ( .axi_w_chan_t(${soc_narrow_xbar.in_cva6.w_chan_type()}), .axi_req_t (${soc_narrow_xbar.in_cva6.req_type()}), .axi_rsp_t (${soc_narrow_xbar.in_cva6.rsp_type()}), - .sram_cfg_t (sram_cfg_cva6_t) + .sram_cfg_t (sram_cfg_t) ) i_cva6 ( .clk_i, .rst_ni, diff --git a/hw/system/occamy/src/occamy_pkg.sv b/hw/system/occamy/src/occamy_pkg.sv index d0efd7f2ef..4caba09523 100644 --- a/hw/system/occamy/src/occamy_pkg.sv +++ b/hw/system/occamy/src/occamy_pkg.sv @@ -42,8 +42,8 @@ package occamy_pkg; typedef struct packed { sram_cfg_t spm; - sram_cfg_cva6 cva6; - sram_cfg_quadrant quadrant; + sram_cfg_cva6_t cva6; + sram_cfg_quadrant_t quadrant; } sram_cfgs_t; localparam int unsigned SramCfgWidth = $bits(sram_cfg_t); diff --git a/hw/system/occamy/src/occamy_pkg.sv.tpl b/hw/system/occamy/src/occamy_pkg.sv.tpl index 0c48b4984f..8aeb588a8f 100644 --- a/hw/system/occamy/src/occamy_pkg.sv.tpl +++ b/hw/system/occamy/src/occamy_pkg.sv.tpl @@ -42,8 +42,8 @@ package occamy_pkg; typedef struct packed { sram_cfg_t spm; - sram_cfg_cva6 cva6; - sram_cfg_quadrant quadrant; + sram_cfg_cva6_t cva6; + sram_cfg_quadrant_t quadrant; } sram_cfgs_t; localparam int unsigned SramCfgWidth = $bits(sram_cfg_t); diff --git a/hw/system/occamy/src/occamy_quadrant_s1.sv b/hw/system/occamy/src/occamy_quadrant_s1.sv index 2d5ca6de59..d709320656 100644 --- a/hw/system/occamy/src/occamy_quadrant_s1.sv +++ b/hw/system/occamy/src/occamy_quadrant_s1.sv @@ -561,7 +561,7 @@ module occamy_quadrant_s1 .wide_out_resp_i(wide_out_0_rsp), .wide_in_req_i(wide_in_iwc_0_cut_req), .wide_in_resp_o(wide_in_iwc_0_cut_rsp), - .sram_cfg_i(sram_cfg_i.cluster) + .sram_cfgs_i(sram_cfg_i.cluster) ); /////////////// @@ -710,7 +710,7 @@ module occamy_quadrant_s1 .wide_out_resp_i(wide_out_1_rsp), .wide_in_req_i(wide_in_iwc_1_cut_req), .wide_in_resp_o(wide_in_iwc_1_cut_rsp), - .sram_cfg_i(sram_cfg_i.cluster) + .sram_cfgs_i(sram_cfg_i.cluster) ); /////////////// @@ -859,7 +859,7 @@ module occamy_quadrant_s1 .wide_out_resp_i(wide_out_2_rsp), .wide_in_req_i(wide_in_iwc_2_cut_req), .wide_in_resp_o(wide_in_iwc_2_cut_rsp), - .sram_cfg_i(sram_cfg_i.cluster) + .sram_cfgs_i(sram_cfg_i.cluster) ); /////////////// @@ -1008,7 +1008,7 @@ module occamy_quadrant_s1 .wide_out_resp_i(wide_out_3_rsp), .wide_in_req_i(wide_in_iwc_3_cut_req), .wide_in_resp_o(wide_in_iwc_3_cut_rsp), - .sram_cfg_i(sram_cfg_i.cluster) + .sram_cfgs_i(sram_cfg_i.cluster) ); endmodule diff --git a/hw/system/occamy/src/occamy_quadrant_s1.sv.tpl b/hw/system/occamy/src/occamy_quadrant_s1.sv.tpl index 521c005ed6..02cdee11c8 100644 --- a/hw/system/occamy/src/occamy_quadrant_s1.sv.tpl +++ b/hw/system/occamy/src/occamy_quadrant_s1.sv.tpl @@ -169,7 +169,7 @@ module occamy_quadrant_s1 .wide_out_resp_i (${wide_cluster_out.rsp_name()}), .wide_in_req_i (${wide_cluster_in.req_name()}), .wide_in_resp_o (${wide_cluster_in.rsp_name()}), - .sram_cfg_i (sram_cfg_i.cluster) + .sram_cfgs_i (sram_cfg_i.cluster) ); % endfor