Changeset 972 for trunk/platforms/tsar_generic_iob/tsar_iob_cluster/caba/source/include/tsar_iob_cluster.h

Timestamp:

Apr 11, 2015, 8:26:46 PM (9 years ago)

Author:

alain

Message:

Modify the tsar_generic_iob platform:
The vci_multi_dma component replicated in all cluster is replaced by a vci_mwmr_dma component.
This new component supports all hardware coprocessors respection the "coproc" interface.
Amongst the available coprocessors (defined in the SocLib? "coprocessor_components" directory)
the MWR_CPY coprocessor provide an improved memory copy service throughput x 2).

File:

• trunk/platforms/tsar_generic_iob/tsar_iob_cluster/caba/source/include/tsar_iob_cluster.h (modified) (8 diffs)

trunk/platforms/tsar_generic_iob/tsar_iob_cluster/caba/source/include/tsar_iob_cluster.h

@@ -28 +28 @@
 #include "dspin_router.h"
 #include "virtual_dspin_router.h"
-#include "vci_multi_dma.h"
+#include "vci_mwmr_dma.h"
 #include "vci_mem_cache.h"
 #include "vci_cc_vcache_wrapper.h"
 #include "vci_io_bridge.h"
+#include "coproc_signals.h"
+#include "coproc_gcd.h"
+#include "coproc_dct.h"
+#include "coproc_cpy.h"
 
 namespace soclib { namespace caba   {
@@ -71 +75 @@
     sc_signal<bool>                       signal_false;
     sc_signal<bool>                       signal_proc_it[32];
-    sc_signal<bool>                       signal_irq_mdma[8];
+    sc_signal<bool>                       signal_irq_mwmr;
     sc_signal<bool>                       signal_irq_memc;
     
+    // Coprocessor signals
+    CoprocSignals<uint32_t,uint8_t>       signal_to_coproc[8];
+    CoprocSignals<uint32_t,uint8_t>       signal_from_coproc[8];
+    sc_signal<uint32_t>                   signal_config_coproc[8];
+    sc_signal<uint32_t>                   signal_status_coproc[8];
+
     // INT network DSPIN signals between DSPIN routers and DSPIN local_crossbars
     DspinSignals<dspin_int_cmd_width>     signal_int_dspin_cmd_l2g_d; 
@@ -88 +98 @@
     // INT network VCI signals between VCI components and VCI local crossbar
     VciSignals<vci_param_int>             signal_int_vci_ini_proc[8]; 
-    VciSignals<vci_param_int>             signal_int_vci_ini_mdma; 
+    VciSignals<vci_param_int>             signal_int_vci_ini_mwmr; 
     VciSignals<vci_param_int>             signal_int_vci_ini_iobx; 
 
     VciSignals<vci_param_int>             signal_int_vci_tgt_memc;
     VciSignals<vci_param_int>             signal_int_vci_tgt_xicu;
-    VciSignals<vci_param_int>             signal_int_vci_tgt_mdma;
+    VciSignals<vci_param_int>             signal_int_vci_tgt_mwmr;
     VciSignals<vci_param_int>             signal_int_vci_tgt_iobx;
 
@@ -144 +154 @@
     VciXicu<vci_param_int>*                           xicu;
 
-    VciMultiDma<vci_param_int>*                       mdma;
+    VciMwmrDma<vci_param_int>*                        mwmr;
+
+    CoprocGcd*                                        gcd;
+    CoprocDct*                                        dct;
+    CoprocCpy*                                        cpy;
 
     VciLocalCrossbar<vci_param_int>*                  int_xbar_d;
@@ -188 +202 @@
     TsarIobCluster( sc_module_name                     insname,
                     size_t                             nb_procs,   
-                    size_t                             nb_dmas,  
                     size_t                             x,             // x coordinate
                     size_t                             y,             // y coordinate
@@ -205 +218 @@
                     size_t                             int_memc_tgt_id,
                     size_t                             int_xicu_tgt_id,
-                    size_t                             int_mdma_tgt_id,
+                    size_t                             int_mwmr_tgt_id,
                     size_t                             int_iobx_tgt_id,
                     size_t                             int_proc_ini_id,
-                    size_t                             int_mdma_ini_id,
+                    size_t                             int_mwmr_ini_id,
                     size_t                             int_iobx_ini_id,
 
@@ -231 +244 @@
                     size_t                             xcu_nb_irq,
 
+                    size_t                             coproc_type,
+
                     const Loader                       &loader,  // loader for XRAM
 
@@ -245 +260 @@
     void init();
  
-
 };