Changeset 547 for trunk/platforms/tsar_generic_xbar/tsar_xbar_cluster/caba/source/src/tsar_xbar_cluster.cpp

Timestamp:

Oct 7, 2013, 5:31:08 PM (11 years ago)

Author:

meunier

Message:

Rajout du Sim Helper dans la plateforme tsar_generic_xbar.

File:

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

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

@@ -59 +59 @@
          size_t                             tgtid_chbuf,
          size_t                             tgtid_bdev,
+         size_t                             tgtid_simh,
          size_t                             memc_ways,
          size_t                             memc_sets,
@@ -222 +223 @@
     {
         nb_direct_initiators         = nb_procs + 3;
-        nb_direct_targets            = 9;
+        nb_direct_targets            = 10;
     }
 
@@ -357 +358 @@
 
         /////////////////////////////////////////////
-        int mac = 0xBEEF0000;
-        mnic = new VciMultiNic<vci_param_int>(
-                     "mnic",
-                     IntTab(cluster_id, tgtid_mnic),
-                     mtd,
-                     nic_channels,
-                     nic_rx_name,
-                     nic_tx_name,
-                     mac,             // mac_4 address
-                     0xBABE );           // mac_2 address
+        // Commented for almos; we don't want the nic; replaced by a rom
+        //int mac = 0xBEEF0000;
+        //mnic = new VciMultiNic<vci_param_int>(
+        //             "mnic",
+        //             IntTab(cluster_id, tgtid_mnic),
+        //             mtd,
+        //             nic_channels,
+        //             nic_rx_name,
+        //             nic_tx_name,
+        //             mac,             // mac_4 address
+        //             0xBABE );           // mac_2 address
+        mnic = new VciSimpleRom<vci_param_int>(
+                    "mnic",
+                    IntTab(cluster_id, tgtid_mnic),
+                    mtd,
+                    loader);
 
         wt_mnic = new VciDspinTargetWrapper<vci_param_int,
@@ -414 +421 @@
                      "wt_mtty",
                      x_width + y_width + l_width);
+
+        simhelper = new VciSimhelper<vci_param_int>(
+                     "sim_helper",
+                     IntTab(cluster_id, tgtid_simh),
+                     mtd);
+
+        wt_simhelper = new VciDspinTargetWrapper<vci_param_int,
+                                                 dspin_cmd_width,
+                                                 dspin_rsp_width>(
+                     "wt_simhelper",
+                     x_width + y_width + l_width);
     }
 
@@ -479 +497 @@
         xbar_cmd_d->p_local_out[tgtid_mnic]      (signal_dspin_cmd_mnic_t);
         xbar_cmd_d->p_local_out[tgtid_chbuf]     (signal_dspin_cmd_chbuf_t);
+        xbar_cmd_d->p_local_out[tgtid_simh]      (signal_dspin_cmd_simh_t);
 
         xbar_cmd_d->p_local_in[nb_procs + 1]     (signal_dspin_cmd_bdev_i);
@@ -509 +528 @@
         xbar_rsp_d->p_local_in[tgtid_mnic]       (signal_dspin_rsp_mnic_t);
         xbar_rsp_d->p_local_in[tgtid_chbuf]      (signal_dspin_rsp_chbuf_t);
+        xbar_rsp_d->p_local_in[tgtid_simh]       (signal_dspin_rsp_simh_t);
 
         xbar_rsp_d->p_local_out[nb_procs + 1]    (signal_dspin_rsp_bdev_i);
@@ -706 +726 @@
         for (size_t i = 0; i < nic_channels; i++)
         {
-            mnic->p_rx_irq[i]          (signal_irq_mnic_rx[i]);
-            mnic->p_tx_irq[i]          (signal_irq_mnic_tx[i]);
+            //mnic->p_rx_irq[i]          (signal_irq_mnic_rx[i]);
+            //mnic->p_tx_irq[i]          (signal_irq_mnic_tx[i]);
         }
 
@@ -774 +794 @@
         wt_mtty->p_dspin_rsp           (signal_dspin_rsp_mtty_t);
         wt_mtty->p_vci                 (signal_vci_tgt_mtty);
+
+
+        // Sim Helper
+        simhelper->p_clk               (this->p_clk);
+        simhelper->p_resetn            (this->p_resetn);
+        simhelper->p_vci               (signal_vci_tgt_simh);
+        
+        // wrapper tgt Sim Helper
+        wt_simhelper->p_clk            (this->p_clk);
+        wt_simhelper->p_resetn         (this->p_resetn);
+        wt_simhelper->p_dspin_cmd      (signal_dspin_cmd_simh_t);
+        wt_simhelper->p_dspin_rsp      (signal_dspin_rsp_simh_t);
+        wt_simhelper->p_vci            (signal_vci_tgt_simh);
 
         std::cout << "  - MTTY connected" << std::endl;
@@ -831 +864 @@
         delete mtty;
         delete wt_mtty;
+        delete simhelper;
+        delete wt_simhelper;
     }
 }