From d018d4a69b8b07b6db2bbd6cbed8ab7c413c1356 Mon Sep 17 00:00:00 2001 From: Lorenzo Leone Date: Thu, 3 Oct 2024 17:07:46 +0200 Subject: [PATCH] Add Cfg as input parameter to Chimera as it is done in Cheshire. --- hw/chimera_clu_domain.sv | 2 +- hw/chimera_pkg.sv | 87 ++++++++++++++++++--------- hw/chimera_top_wrapper.sv | 7 +-- target/sim/src/fixture_chimera_soc.sv | 4 +- 4 files changed, 66 insertions(+), 34 deletions(-) diff --git a/hw/chimera_clu_domain.sv b/hw/chimera_clu_domain.sv index 83943e3..395c03c 100644 --- a/hw/chimera_clu_domain.sv +++ b/hw/chimera_clu_domain.sv @@ -76,7 +76,7 @@ module chimera_clu_domain for (genvar extClusterIdx = 0; extClusterIdx < ExtClusters; extClusterIdx++) begin : gen_clusters - if (IsolateClusters == 1) begin : gen_cluster_iso + if (Cfg.IsolateClusters == 1) begin : gen_cluster_iso // Add AXI isolation at the Narrow Input Interface axi_isolate #( .NumPending (Cfg.ChsCfg.AxiMaxSlvTrans), diff --git a/hw/chimera_pkg.sv b/hw/chimera_pkg.sv index a673d4e..2f9de90 100644 --- a/hw/chimera_pkg.sv +++ b/hw/chimera_pkg.sv @@ -10,16 +10,18 @@ package chimera_pkg; `include "apb/typedef.svh" - // ACCEL CFG - localparam int ExtClusters = 5; - localparam int ExtClustersBaseIdx = 0; - // Bit vector types for parameters. //We limit range to keep parameters sane. typedef bit [7:0] byte_bt; typedef bit [63:0] doub_bt; typedef bit [15:0] shrt_bt; + // -------------------------- + // | Cluster domain config | + // -------------------------- + + localparam int ExtClusters = 5; + typedef struct packed { logic [iomsb(ExtClusters):0] hasWideMasterPort; byte_bt [iomsb(ExtClusters):0] NrCores; @@ -36,7 +38,13 @@ package chimera_pkg; sum += vector[i]; end return sum; - endfunction + endfunction : _sumVector + + localparam int ExtCores = _sumVector(ChimeraClusterCfg.NrCores, ExtClusters); + + // -------------------------- + // | Soc config | + // -------------------------- // Configuration struct for Chimer: it includes the Cheshire Cfg typedef struct packed { @@ -49,37 +57,59 @@ package chimera_pkg; byte_bt MemIslWidePorts; byte_bt MemIslNumWideBanks; shrt_bt MemIslWordsPerBank; + int unsigned IsolateClusters; } chimera_cfg_t; - localparam int ExtCores = _sumVector(ChimeraClusterCfg.NrCores, ExtClusters); - // SoC Config localparam bit SnitchBootROM = 1; localparam bit TopLevelCfgRegs = 1; localparam bit ExtCfgRegs = 1; + // ------------------------------- + // | External Register Interface | + // ------------------------------- + // SCHEREMO: Shared Snitch bootrom, one clock gate per cluster, External regs (PADs, FLLs etc...) localparam int ExtRegNum = SnitchBootROM + TopLevelCfgRegs + ExtCfgRegs; localparam int ClusterDataWidth = 64; - localparam int SnitchBootROMIdx = 0; + localparam byte_bt SnitchBootROMIdx = 8'h0; localparam doub_bt SnitchBootROMRegionStart = 64'h3000_0000; localparam doub_bt SnitchBootROMRegionEnd = 64'h3000_1000; - localparam int TopLevelCfgRegsIdx = 1; + localparam byte_bt TopLevelCfgRegsIdx = 8'h1; localparam doub_bt TopLevelCfgRegsRegionStart = 64'h3000_1000; localparam doub_bt TopLevelCfgRegsRegionEnd = 64'h3000_2000; // External configuration registers: PADs, FLLs, PMU Controller - localparam int ExtCfgRegsIdx = 2; + localparam byte_bt ExtCfgRegsIdx = 8'h2; localparam doub_bt ExtCfgRegsRegionStart = 64'h3000_2000; localparam doub_bt ExtCfgRegsRegionEnd = 64'h3000_5000; - // Parameters for Memory Island - localparam int MemIslandIdx = ExtClustersBaseIdx + ExtClusters; + // -------------------------- + // | External AXI ports | + // -------------------------- + + // Cluster domain + localparam byte_bt [iomsb(ExtClusters):0] ClusterIdx = {8'h4, 8'h3, 8'h2, 8'h1, 8'h0}; + localparam doub_bt [iomsb( +ExtClusters +):0] ClusterRegionStart = { + 64'h4080_0000, 64'h4060_0000, 64'h4040_0000, 64'h4020_0000, 64'h4000_0000 + }; + localparam doub_bt [iomsb( +ExtClusters +):0] ClusterRegionEnd = { + 64'h40A0_0000, 64'h4080_0000, 64'h4060_0000, 64'h4040_0000, 64'h4020_0000 + }; + + localparam aw_bt ClusterNarrowAxiMstIdWidth = 1; + // Parameters for Memory Island + localparam int MemIslandIdx = ClusterIdx[ExtClusters-1] + 1; localparam doub_bt MemIslRegionStart = 64'h4800_0000; localparam doub_bt MemIslRegionEnd = 64'h4804_0000; + localparam aw_bt MemIslAxiMstIdWidth = 1; localparam byte_bt MemIslNarrowToWideFactor = 4; localparam byte_bt MemIslNarrowPorts = 1; @@ -87,10 +117,9 @@ package chimera_pkg; localparam byte_bt MemIslNumWideBanks = 2; localparam shrt_bt MemIslWordsPerBank = 1024; - localparam aw_bt ClusterNarrowAxiMstIdWidth = 1; - - // Isolate Clusters from SoC - localparam int unsigned IsolateClusters = 0; + // ------------------- + // | Generate Cfg | + // -------------------- function automatic chimera_cfg_t gen_chimera_cfg(); localparam int AddrWidth = DefaultCfg.AddrWidth; @@ -123,18 +152,14 @@ package chimera_pkg; cfg.AxiExtNumSlv = ExtClusters + MemoryIsland; cfg.AxiExtNumRules = ExtClusters + MemoryIsland; - cfg.AxiExtRegionIdx = {8'h5, 8'h4, 8'h3, 8'h2, 8'h1, 8'h0}; - cfg.AxiExtRegionStart = { - MemIslRegionStart, 64'h4080_0000, 64'h4060_0000, 64'h4040_0000, 64'h4020_0000, 64'h4000_0000 - }; - cfg.AxiExtRegionEnd = { - MemIslRegionEnd, 64'h40A0_0000, 64'h4080_0000, 64'h4060_0000, 64'h4040_0000, 64'h4020_0000 - }; + cfg.AxiExtRegionIdx = {MemIslandIdx, ClusterIdx}; + cfg.AxiExtRegionStart = {MemIslRegionStart, ClusterRegionStart}; + cfg.AxiExtRegionEnd = {MemIslRegionEnd, ClusterRegionEnd}; // REG CFG cfg.RegExtNumSlv = ExtRegNum; cfg.RegExtNumRules = ExtRegNum; - cfg.RegExtRegionIdx = {8'h3, 8'h2, 8'h1, 8'h0}; // SnitchBootROM + cfg.RegExtRegionIdx = {ExtCfgRegsIdx, TopLevelCfgRegsIdx, SnitchBootROMIdx}; cfg.RegExtRegionStart = { ExtCfgRegsRegionStart, TopLevelCfgRegsRegionStart, SnitchBootROMRegionStart }; @@ -161,11 +186,19 @@ package chimera_pkg; return chimera_cfg; endfunction : gen_chimera_cfg - localparam int NumCfgs = 1; + function automatic chimera_cfg_t gen_chimera_cfg_UPF; + chimera_cfg_t chimera_cfg; + chimera_cfg = gen_chimera_cfg(); + // Override the isolation params + chimera_cfg.IsolateClusters = 1; + + return chimera_cfg; + endfunction : gen_chimera_cfg_UPF + + localparam int NumCfgs = 2; - localparam chimera_cfg_t [NumCfgs-1:0] ChimeraCfg = {gen_chimera_cfg()}; + localparam chimera_cfg_t [NumCfgs-1:0] ChimeraCfg = {gen_chimera_cfg(), gen_chimera_cfg_UPF}; - // To move into cheshire TYPEDEF localparam int unsigned RegDataWidth = 32; localparam type addr_t = logic [ChimeraCfg[0].ChsCfg.AddrWidth-1:0]; localparam type data_t = logic [RegDataWidth-1:0]; diff --git a/hw/chimera_top_wrapper.sv b/hw/chimera_top_wrapper.sv index 3e237e0..574b621 100644 --- a/hw/chimera_top_wrapper.sv +++ b/hw/chimera_top_wrapper.sv @@ -9,7 +9,7 @@ module chimera_top_wrapper import chimera_pkg::*; import chimera_reg_pkg::*; #( - parameter int unsigned SelectedCfg = 0 + parameter chimera_cfg_t Cfg = '0 ) ( input logic soc_clk_i, input logic clu_clk_i, @@ -70,7 +70,6 @@ module chimera_top_wrapper `include "chimera/typedef.svh" // Cheshire config - localparam chimera_cfg_t Cfg = ChimeraCfg[SelectedCfg]; localparam cheshire_cfg_t ChsCfg = Cfg.ChsCfg; `CHESHIRE_TYPEDEF_ALL(, ChsCfg) @@ -340,8 +339,8 @@ module chimera_top_wrapper .xeip_i (xeip_ext), .mtip_i (mtip_ext), .msip_i (msip_ext), - .narrow_in_req_i (axi_slv_req[ExtClustersBaseIdx+:ExtClusters]), - .narrow_in_resp_o (axi_slv_rsp[ExtClustersBaseIdx+:ExtClusters]), + .narrow_in_req_i (axi_slv_req[ClusterIdx[0]+:ExtClusters]), + .narrow_in_resp_o (axi_slv_rsp[ClusterIdx[0]+:ExtClusters]), .narrow_out_req_o (axi_mst_req), .narrow_out_resp_i(axi_mst_rsp), .wide_out_req_o (axi_wide_mst_req), diff --git a/target/sim/src/fixture_chimera_soc.sv b/target/sim/src/fixture_chimera_soc.sv index e2ec0d1..46ed987 100644 --- a/target/sim/src/fixture_chimera_soc.sv +++ b/target/sim/src/fixture_chimera_soc.sv @@ -19,7 +19,7 @@ module fixture_chimera_soc #( import tb_cheshire_pkg::*; import chimera_pkg::*; - localparam chimera_cfg_t DutCfg = ChimeraCfg[SelectedCfg]; + localparam chimera_cfg_t DutCfg = ChimeraCfg[1]; localparam cheshire_cfg_t ChsCfg = DutCfg.ChsCfg; `CHESHIRE_TYPEDEF_ALL(, ChsCfg) @@ -61,7 +61,7 @@ module fixture_chimera_soc #( logic [ 3:0] spih_sd_en; chimera_top_wrapper #( - .SelectedCfg(SelectedCfg) + .Cfg(DutCfg) ) dut ( .soc_clk_i (soc_clk), .clu_clk_i (clu_clk),