Changeset 707 for trunk/platforms/tsar_generic_iob/tsar_iob_cluster

Timestamp:

Jun 5, 2014, 11:27:33 AM (11 years ago)

Author:

alain

Message:

Bug Fix: in the special case of one single cluster
there is only one IOB component toa access IOX network (IOB1 does not exist).

Location:

trunk/platforms/tsar_generic_iob/tsar_iob_cluster/caba/source

Files:

• include/tsar_iob_cluster.h (modified) (1 diff)
• src/tsar_iob_cluster.cpp (modified) (12 diffs)

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

@@ -61 +61 @@
     soclib::caba::DspinInput<dspin_ram_rsp_width>*     p_dspin_iob_rsp_in;  
 
-    // These ports are used to connect hard IRQ from external peripherals to IOB0
-    sc_in<bool>*                                       p_irq[32];
-
     // These arrays of ports are used to connect the INT & RAM networks in top cell
     soclib::caba::DspinOutput<dspin_int_cmd_width>**   p_dspin_int_cmd_out;

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

@@ -110 +110 @@
         p_dspin_iob_cmd_out = new soclib::caba::DspinOutput<dspin_ram_cmd_width>;
         p_dspin_iob_rsp_in  = new soclib::caba::DspinInput<dspin_ram_rsp_width>;
-    }
-
-    // IRQ ports in cluster_iob0 only
-    if ( cluster_id == cluster_iob0 )
-    {
-        for ( size_t n=0 ; n<32 ; n++ ) p_irq[n] = new sc_in<bool>;
     }
 
@@ -192 +186 @@
                      32,                                // number of hard IRQs
                      32,                                // number of soft IRQs
-                     nb_procs);                         // number of output IRQs
+                     32);                               // number of output IRQs
 
     ////////////  MDMA
@@ -241 +235 @@
                      s_int_dspin_tgt_wrapper_gate_d.str().c_str(),
                      x_width + y_width + l_width);
-
 
     ////////////  Coherence LOCAL_XBAR(S)
@@ -283 +276 @@
                      1, 1,                         // fifo depths
                      true,                         // CMD
-                     false,                        // don't use local routing table
+                     false,                        // no routing table
                      false);                       // broadcast
 
@@ -359 +352 @@
         size_t iox_local_id;
         size_t global_id;
-        bool   has_irqs;
         if ( cluster_id == cluster_iob0 ) 
         {
             iox_local_id = 0;
             global_id    = cluster_iob0;
-            has_irqs     = true;
         }
         else
@@ -370 +361 @@
             iox_local_id = 1;
             global_id    = cluster_iob1;
-            has_irqs     = false;
         }
 
@@ -384 +374 @@
                      IntTab( global_id, iobx_int_srcid ),  // INT SRCID
                      IntTab( global_id, iox_local_id   ),  // IOX TGTID
-                     has_irqs, 
                      16,                                   // cache line words
                      8,                                    // IOTLB ways
@@ -511 +500 @@
         proc[p]->p_dspin_p2m                     (signal_int_dspin_p2m_proc[p]);
         proc[p]->p_dspin_clack                   (signal_int_dspin_clack_proc[p]);
-        proc[p]->p_irq[0]                        (signal_proc_it[p]);
-        for ( size_t j = 1 ; j < 6 ; j++)
+
+        for ( size_t j = 0 ; j < 6 ; j++)
         {
-            proc[p]->p_irq[j]                    (signal_false);
+            if ( j < 4 ) proc[p]->p_irq[j]       (signal_proc_it[4*p + j]);
+            else         proc[p]->p_irq[j]       (signal_false);
         }
     }
@@ -522 +512 @@
     xicu->p_resetn                               (this->p_resetn);
     xicu->p_vci                                  (signal_int_vci_tgt_xicu);
-    for ( size_t p=0 ; p<nb_procs ; p++)
+    for ( size_t p=0 ; p < 32  ; p++)
     {
         xicu->p_irq[p]                           (signal_proc_it[p]);
@@ -528 +518 @@
     for ( size_t i=0 ; i<32 ; i++)
     {
-        if (cluster_id == cluster_iob0) 
-            xicu->p_hwi[i]                       (*(this->p_irq[i]));
-        else  
-            xicu->p_hwi[i]                       (signal_false);
+        if      ( i == 0 )       xicu->p_hwi[i]  (signal_irq_memc);
+        else if ( i <= nb_dmas ) xicu->p_hwi[i]  (signal_irq_mdma[i-1]);
+        else                     xicu->p_hwi[i]  (signal_false);
     }                     
 
@@ -572 +561 @@
 
     //////////////////////////// RAM network CMD & RSP routers
-    ram_router_cmd->p_clk                    (this->p_clk);
-    ram_router_cmd->p_resetn                 (this->p_resetn);
-    ram_router_rsp->p_clk                    (this->p_clk);
-    ram_router_rsp->p_resetn                 (this->p_resetn);
+    ram_router_cmd->p_clk                        (this->p_clk);
+    ram_router_cmd->p_resetn                     (this->p_resetn);
+    ram_router_rsp->p_clk                        (this->p_clk);
+    ram_router_rsp->p_resetn                     (this->p_resetn);
     for( size_t n=0 ; n<4 ; n++)
     {
-        ram_router_cmd->p_out[n]             (this->p_dspin_ram_cmd_out[n]);
-        ram_router_cmd->p_in[n]              (this->p_dspin_ram_cmd_in[n]);
-        ram_router_rsp->p_out[n]             (this->p_dspin_ram_rsp_out[n]);
-        ram_router_rsp->p_in[n]              (this->p_dspin_ram_rsp_in[n]);
-    }
-    ram_router_cmd->p_out[4]                 (signal_ram_dspin_cmd_xram_t);
-    ram_router_cmd->p_in[4]                  (signal_ram_dspin_cmd_memc_i);
-    ram_router_rsp->p_out[4]                 (signal_ram_dspin_rsp_memc_i);
-    ram_router_rsp->p_in[4]                  (signal_ram_dspin_rsp_xram_t);
+        ram_router_cmd->p_out[n]                 (this->p_dspin_ram_cmd_out[n]);
+        ram_router_cmd->p_in[n]                  (this->p_dspin_ram_cmd_in[n]);
+        ram_router_rsp->p_out[n]                 (this->p_dspin_ram_rsp_out[n]);
+        ram_router_rsp->p_in[n]                  (this->p_dspin_ram_rsp_in[n]);
+    }
+    ram_router_cmd->p_out[4]                     (signal_ram_dspin_cmd_xram_t);
+    ram_router_cmd->p_in[4]                      (signal_ram_dspin_cmd_memc_i);
+    ram_router_rsp->p_out[4]                     (signal_ram_dspin_rsp_memc_i);
+    ram_router_rsp->p_in[4]                      (signal_ram_dspin_rsp_xram_t);
    
     ///////////////////////// IOB exists only in cluster_iob0 & cluster_iob1. 
@@ -600 +589 @@
         iob->p_vci_ini_ram                       (signal_ram_vci_ini_iobx);
 
-        if ( cluster_id == cluster_iob0 )
-               for ( size_t n=0 ; n<32 ; n++ )
-                   (*iob->p_irq[n])                 (*(this->p_irq[n]));
-
         // initiator wrapper to RAM network
         iob_ram_wi->p_clk                        (this->p_clk);