Changeset 959 for trunk/platforms/tsar_generic_iob/tsar_iob_cluster/caba

Timestamp:

Mar 27, 2015, 5:21:52 PM (10 years ago)

Author:

alain

Message:

Fix a bug in platform tsar_generic_iob to support more than 4 processors per cluster.
The hard_config.h file format has also been enriched.

Location:

trunk/platforms/tsar_generic_iob/tsar_iob_cluster/caba/source

Files:

• include/tsar_iob_cluster.h (modified) (3 diffs)
• src/tsar_iob_cluster.cpp (modified) (3 diffs)

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

@@ -70 +70 @@
     // interrupt signals
     sc_signal<bool>                       signal_false;
-    sc_signal<bool>                       signal_proc_it[16];
+    sc_signal<bool>                       signal_proc_it[32];
     sc_signal<bool>                       signal_irq_mdma[8];
     sc_signal<bool>                       signal_irq_memc;
@@ -198 +198 @@
                     const soclib::common::MappingTable &mt_iox,
 
-                    size_t                             x_width,       // x field  bits
-                    size_t                             y_width,       // y field  bits
-                    size_t                             l_width,       // l field  bits
-                    size_t                             p_width,       // p field  bits
+                    size_t                             x_width,   // x field  bits
+                    size_t                             y_width,   // y field  bits
+                    size_t                             l_width,   // l field  bits
+                    size_t                             p_width,   // p field  bits
 
                     size_t                             int_memc_tgt_id,
@@ -226 +226 @@
                     size_t                             l1_d_sets,   
                     size_t                             xram_latency, 
-                    size_t                             xcu_nb_inputs,
-
-                    const Loader                       &loader,       // loader for XRAM
+                    size_t                             xcu_nb_hwi,
+                    size_t                             xcu_nb_pti,
+                    size_t                             xcu_nb_wti,
+                    size_t                             xcu_nb_irq,
+
+                    const Loader                       &loader,  // loader for XRAM
 
                     uint32_t                           frozen_cycles, 

trunk/platforms/tsar_generic_iob/tsar_iob_cluster/caba/source/src/tsar_iob_cluster.cpp

@@ -72 +72 @@
                     size_t                             l1_d_sets,
                     size_t                             xram_latency,
-                    size_t                             xcu_nb_inputs,
+                    size_t                             xcu_nb_hwi,
+                    size_t                             xcu_nb_pti,
+                    size_t                             xcu_nb_wti,
+                    size_t                             xcu_nb_out,
 
                     const Loader                      &loader,
@@ -178 +181 @@
                      mt_int,                              // mapping table INT network
                      IntTab(cluster_id, int_xicu_tgt_id), // TGTID direct space
-                     xcu_nb_inputs,                       // number of timer IRQs
-                     xcu_nb_inputs,                       // number of hard IRQs
-                     xcu_nb_inputs,                       // number of soft IRQs
-                     16);                                 // number of output IRQs
+                     xcu_nb_pti,                          // number of timer IRQs
+                     xcu_nb_hwi,                          // number of hard IRQs
+                     xcu_nb_wti,                          // number of soft IRQs
+                     xcu_nb_out);                         // number of output IRQs
 
     ////////////  MDMA
@@ -503 +506 @@
     xicu->p_resetn                               (this->p_resetn);
     xicu->p_vci                                  (signal_int_vci_tgt_xicu);
-    for ( size_t i=0 ; i < 16  ; i++)
+    for ( size_t i=0 ; i < xcu_nb_out  ; i++)
     {
         xicu->p_irq[i]                           (signal_proc_it[i]);
     }
-    for ( size_t i=0 ; i < xcu_nb_inputs ; i++)
+    for ( size_t i=0 ; i < xcu_nb_hwi ; i++)
     {
         if      ( i == 0 )       xicu->p_hwi[i]  (signal_irq_memc);