Changeset 435 for trunk/platforms/tsar_generic_xbar/tsar_xbar_cluster

Timestamp:

Jul 12, 2013, 12:35:10 PM (11 years ago)

Author:

alain

Message:

Adapt the tsar_xbar_cluster to the new DspinLocalCrossbar? constructor,
containing one more argument: CMD/RSP.

File:

• trunk/platforms/tsar_generic_xbar/tsar_xbar_cluster/caba/source/src/tsar_xbar_cluster.cpp (modified) (18 diffs)

trunk/platforms/tsar_generic_xbar/tsar_xbar_cluster/caba/source/src/tsar_xbar_cluster.cpp

@@ -93 +93 @@
     // Components definition
     /////////////////////////////////////////////////////////////////////////////
-    std::cout << "  - building proc_" << x_id << "_" << y_id << "-*" << std::endl;
 
     for (size_t p = 0; p < nb_procs; p++)
@@ -123 +122 @@
 
         std::ostringstream swip;
-        swip << "wi_proc_" << x_id << "_" << y_id << p;
+        swip << "wi_proc_" << x_id << "_" << y_id << "_" << p;
         wi_proc[p] = new VciDspinInitiatorWrapper<vci_param_int,
                                                   dspin_cmd_width,
@@ -132 +131 @@
 
     /////////////////////////////////////////////////////////////////////////////
-    std::cout << "  - building memc_" << x_id << "_" << y_id << std::endl;
-
     std::ostringstream smemc;
     smemc << "memc_" << x_id << "_" << y_id;
@@ -161 +158 @@
 
     /////////////////////////////////////////////////////////////////////////////
-    std::cout << "  - building xram_" << x_id << "_" << y_id << std::endl;
-
     std::ostringstream sxram;
     sxram << "xram_" << x_id << "_" << y_id;
@@ -173 +168 @@
 
     /////////////////////////////////////////////////////////////////////////////
-    std::cout << "  - building xicu_" << x_id << "_" << y_id << std::endl;
-
     std::ostringstream sxicu;
     sxicu << "xicu_" << x_id << "_" << y_id;
@@ -193 +186 @@
 
     /////////////////////////////////////////////////////////////////////////////
-    std::cout << "  - building mdma_" << x_id << "_" << y_id << std::endl;
-
     std::ostringstream smdma;
     smdma << "mdma_" << x_id << "_" << y_id;
@@ -218 +209 @@
 
     /////////////////////////////////////////////////////////////////////////////
-    std::cout << "  - building xbar_cmd_d_" << x_id << "_" << y_id << std::endl;
-
     size_t nb_direct_initiators      = nb_procs + 1;
     size_t nb_direct_targets         = 3;
@@ -234 +223 @@
                      x_width, y_width, l_width,
                      nb_direct_initiators,         // number of local of sources
-                     nb_direct_targets,            // number of local dests
-                     2, 2,                         // fifo depths
-                     true,                         // use local routing table
-                     false );                      // no broacast
-
-    /////////////////////////////////////////////////////////////////////////////
-    std::cout << "  - building xbar_rsp_d_" << x_id << "_" << y_id << std::endl;
-
+                     nb_direct_targets,            // number of local dests 
+                     2, 2,                         // fifo depths  
+                     true,                         // CMD
+                     true,                         // use local routing table 
+                     false );                      // no broadcast
+
+    /////////////////////////////////////////////////////////////////////////////
     xbar_rsp_d = new DspinLocalCrossbar<dspin_rsp_width>(
                      "xbar_rsp_d",
@@ -249 +237 @@
                      nb_direct_targets,            // number of local sources
                      nb_direct_initiators,         // number of local dests
-                     2, 2,                         // fifo depths
-                     false,                        // don't use local routing table
-                     false );                      // no broacast
-
-    /////////////////////////////////////////////////////////////////////////////
-    std::cout << "  - building xbar_m2p_c" << x_id << "_" << y_id << std::endl;
-
+                     2, 2,                         // fifo depths  
+                     false,                        // RSP
+                     false,                        // don't use local routing table 
+                     false );                      // no broadcast
+
+    /////////////////////////////////////////////////////////////////////////////
     xbar_m2p_c = new DspinLocalCrossbar<dspin_cmd_width>(
                      "xbar_m2p_c",
@@ -262 +249 @@
                      x_width, y_width, l_width,
                      1,                            // number of local sources
-                     nb_procs,                     // number of local targets
+                     nb_procs,                     // number of local targets 
                      2, 2,                         // fifo depths
+                     true,                         // CMD
                      false,                        // don't use local routing table
-                     true );                       // broacast
-
-    /////////////////////////////////////////////////////////////////////////////
-    std::cout << "  - building xbar_p2m_c_" << x_id << "_" << y_id << std::endl;
-
+                     true );                       // broadcast
+
+    /////////////////////////////////////////////////////////////////////////////
     xbar_p2m_c = new DspinLocalCrossbar<dspin_rsp_width>(
                      "xbar_p2m_c",
@@ -278 +264 @@
                      1,                            // number of local dests
                      2, 2,                         // fifo depths
+                     false,                        // RSP
                      false,                        // don't use local routing table
-                     false );                      // no broacast
-
-    /////////////////////////////////////////////////////////////////////////////
-    std::cout << "  - building router_cmd_" << x_id << "_" << y_id << std::endl;
-
+                     false );                      // no broadcast 
+
+    /////////////////////////////////////////////////////////////////////////////
     router_cmd = new VirtualDspinRouter<dspin_cmd_width>(
                      "router_cmd",
@@ -291 +276 @@
 
     /////////////////////////////////////////////////////////////////////////////
-    std::cout << "  - building router_rsp_" << x_id << "_" << y_id << std::endl;
-
     router_rsp = new VirtualDspinRouter<dspin_rsp_width>(
                      "router_rsp",
@@ -303 +286 @@
     {
         /////////////////////////////////////////////
-        std::cout << "  - building brom" << std::endl;
-
-        brom = new VciSimpleRam<vci_param_int>(
+        brom = new VciSimpleRom<vci_param_int>(
                      "brom",
                      IntTab(cluster_id, tgtid_brom),
@@ -318 +299 @@
 
         /////////////////////////////////////////////
-        std::cout << "  - building fbuf" << std::endl;
-
         fbuf = new VciFrameBuffer<vci_param_int>(
                      "fbuf",
@@ -333 +312 @@
 
         /////////////////////////////////////////////
-        std::cout << "  - building bdev" << std::endl;
-
         bdev = new VciBlockDeviceTsar<vci_param_int>(
                      "bdev",
@@ -357 +334 @@
 
         /////////////////////////////////////////////
-        std::cout << "  - building mnic" << std::endl;
-
         mnic = new VciMultiNic<vci_param_int>(
                      "mnic",
@@ -376 +351 @@
 
         /////////////////////////////////////////////
-        std::cout << "  - building mtty" << std::endl;
-
         std::vector<std::string> vect_names;
         for( size_t tid = 0 ; tid < (nb_ttys) ; tid++ )
@@ -397 +370 @@
                      x_width + y_width + l_width);
     }
-
-    std::cout << std::endl;
 
     ////////////////////////////////////