Merge pull request #24 from FrancescoConti/master

Heterogeneous Cluster Interconnect in cluster

Bender.yml

@@ -17,7 +17,7 @@ dependencies:
   hier-icache:          { git: "[email protected]:pulp-platform/hier-icache.git", version: 1.2.0 }
   icache_mp_128_pf:     { git: "[email protected]:pulp-platform/icache_mp_128_pf.git", rev: "6f2e54102001230db9c82432bf9e011842419a48" }
   icache_private:       { git: "[email protected]:pulp-platform/icache_private.git", rev: "1d4cdbcbec3ab454c09d378fc55631b60450fccd" }
-  cluster_peripherals:  { git: "[email protected]:pulp-platform/cluster_peripherals.git", version: 2.0.0 }
+  cluster_peripherals:  { git: "[email protected]:pulp-platform/cluster_peripherals.git", version: 2.1.0 }
   fpu_interco:          { git: "[email protected]:pulp-platform/fpu_interco.git", rev: "83c7a1b690bffd006d8b925805aab3c1f8ba9ff1" }
   axi:                  { git: "[email protected]:pulp-platform/axi.git", version: 0.7.1 } # to be updated (now 0.24?)
   axi_node:             { git: "[email protected]:pulp-platform/axi_node.git", version: 1.1.4 } # deprecated, replaced by axi_xbar (in axi repo)
@@ -29,9 +29,7 @@ dependencies:
   riscv:                { git: "[email protected]:micprog/cv32e40p.git", rev: "pulpissimo-v3.4.1"} # To be updated to openhwgroup repository
   ibex:                 { git: "[email protected]:lowRISC/ibex.git", rev: "b148f3af51066ac3537c7c6eb4acbc17004bf868" }
   scm:                  { git: "[email protected]:pulp-platform/scm.git", version: 1.0.1}
-  hwpe-mac-engine:      { git: "[email protected]:micprog/hwpe-mac-engine.git", rev: "v1.2-bender" } # To be updated with pulp-platform dependency
-  # apu_cluster ?
-  # sp_icache ?
+  hwpe-datamover-example: { git: "https://github.com:pulp-platform/hwpe-datamover-example.git", version: 1.0 }
 
 sources:
     # Source files grouped in levels. Files in level 0 have no dependencies on files in this

ips_list.yml

@@ -47,13 +47,29 @@ icache_private:
   commit: 1d4cdbcbec3ab454c09d378fc55631b60450fccd
   domain: [cluster]
   group:  pulp-platform
+hwpe-ctrl:
+  commit: v1.5
+  group: pulp-platform
+  domain: [soc, cluster, pulp]
+hwpe-stream:
+  commit: v1.6.1
+  group: pulp-platform
+  domain: [soc, cluster, pulp]
+hci:
+  commit: v1.0.6
+  group: pulp-platform
+  domain: [cluster, pulp]
 cluster_peripherals:
-  commit: v2.0.0
+  commit: v2.1.0
   domain: [cluster]
   group:  pulp-platform
 fpu_interco:
-  commit: 83c7a1b690bffd006d8b925805aab3c1f8ba9ff1
+  commit: be7808b84a1dcdb1ecdb6e40814cc4864acd9451
   domain: [soc, cluster]
-  group:  pulp-platform
-
+  group: pulp-platform
+hwpe-datamover-example:
+  commit: v1.0
+  group: pulp-platform
+  domain: [cluster, pulp]
 
+

rtl/axi2mem_wrap.sv

@@ -29,7 +29,7 @@ module axi2mem_wrap
   input logic          rst_ni,
   input logic          test_en_i,
   AXI_BUS.Slave        axi_slave,
-  XBAR_TCDM_BUS.Master tcdm_master[NB_DMAS-1:0],
+  hci_core_intf.master tcdm_master[NB_DMAS-1:0],
   output logic         busy_o
 );
 
@@ -46,13 +46,15 @@ module axi2mem_wrap
     for (genvar i=0; i<NB_DMAS; i++) begin : TCDM_BIND
       assign tcdm_master[i].add    = s_tcdm_bus_add[i];
       assign tcdm_master[i].req    = s_tcdm_bus_req[i];
-      assign tcdm_master[i].wdata  = s_tcdm_bus_wdata[i];
+      assign tcdm_master[i].data   = s_tcdm_bus_wdata[i];
       assign tcdm_master[i].wen    = s_tcdm_bus_wen[i];
       assign tcdm_master[i].be     = s_tcdm_bus_be[i];
+      assign tcdm_master[i].boffs  = '0;
+      assign tcdm_master[i].lrdy   = '1;
 
       assign s_tcdm_bus_gnt[i]     = tcdm_master[i].gnt;
       assign s_tcdm_bus_r_valid[i] = tcdm_master[i].r_valid;
-      assign s_tcdm_bus_r_rdata[i] = tcdm_master[i].r_rdata;
+      assign s_tcdm_bus_r_rdata[i] = tcdm_master[i].r_data;
     end
   endgenerate