Changeset 360

Timestamp:

Apr 10, 2013, 11:54:18 AM (12 years ago)

Author:

joannou

Message:

In tsarv5_generic_mmu platform (tsarcluster):

• connected vci to dspin wrappers for previously unconnected components
• commented wt_xram wrapper for now
• now using nbdmas argument instead of nbprocs to build the mdma component

File:

• branches/v5/platforms/tsarv5_generic_mmu/tsarv5_cluster_mmu/caba/source/src/tsarv5_cluster_mmu.cpp (modified) (14 diffs)

branches/v5/platforms/tsarv5_generic_mmu/tsarv5_cluster_mmu/caba/source/src/tsarv5_cluster_mmu.cpp

@@ -167 +167 @@
                      loader,
                      xram_latency);
-
+/*
     std::ostringstream swtx;
     swtx << "wt_xram_" << x_id << "_" << y_id;
@@ -173 +173 @@
                      swtx.str().c_str(),
                      x_width + y_width );
-
+*/
     /////////////////////////////////////////////////////////////////////////////
     std::cout << "  - building xicu_" << x_id << "_" << y_id << std::endl;
@@ -205 +205 @@
                      IntTab(cluster_id, tgtid_mdma),      // TGTID
                      64,                                  // burst size
-                     nb_procs);                           // number of IRQs
+                     nb_dmas);                           // number of IRQs
 
     std::ostringstream swta;
@@ -489 +489 @@
     xbar_m2p_c->p_global_out                     (signal_dspin_m2p_l2g_c);
     xbar_m2p_c->p_global_in                      (signal_dspin_m2p_g2l_c);
-    xbar_m2p_c->p_local_in[nb_procs]             (signal_dspin_m2p_memc);
+    xbar_m2p_c->p_local_in[0]                    (signal_dspin_m2p_memc);
     for (size_t p = 0; p < nb_procs; p++) 
         xbar_m2p_c->p_local_out[p]               (signal_dspin_m2p_proc[p]);
@@ -500 +500 @@
     xbar_p2m_c->p_global_out                     (signal_dspin_p2m_l2g_c);
     xbar_p2m_c->p_global_in                      (signal_dspin_p2m_g2l_c);
-    xbar_p2m_c->p_local_out[nb_procs]            (signal_dspin_p2m_memc);
+    xbar_p2m_c->p_local_out[0]                   (signal_dspin_p2m_memc);
     for (size_t p = 0; p < nb_procs; p++) 
         xbar_p2m_c->p_local_in[p]                (signal_dspin_p2m_proc[p]);
@@ -558 +558 @@
 
     // wrapper XICU
-    wt_xicu->p_clk                      (this->p_clk);
-    wt_xicu->p_resetn                   (this->p_resetn);
-    wt_xicu->p_dspin_cmd                (signal_dspin_cmd_xicu_t);
-    wt_xicu->p_dspin_rsp                (signal_dspin_rsp_xicu_t);
-    wt_xicu->p_vci                      (signal_vci_tgt_xicu);
+    wt_xicu->p_clk                     (this->p_clk);
+    wt_xicu->p_resetn                  (this->p_resetn);
+    wt_xicu->p_dspin_cmd               (signal_dspin_cmd_xicu_t);
+    wt_xicu->p_dspin_rsp               (signal_dspin_rsp_xicu_t);
+    wt_xicu->p_vci                     (signal_vci_tgt_xicu);
 
     std::cout << "  - XICU connected" << std::endl;
@@ -575 +575 @@
 
     // wrapper MEMC
-    wt_xicu->p_clk                     (this->p_clk);
-    wt_xicu->p_resetn                  (this->p_resetn);
-    wt_xicu->p_dspin_cmd               (signal_dspin_cmd_memc_t);
-    wt_xicu->p_dspin_rsp               (signal_dspin_rsp_memc_t);
-    wt_xicu->p_vci                     (signal_vci_tgt_memc);
+    wt_memc->p_clk                     (this->p_clk);
+    wt_memc->p_resetn                  (this->p_resetn);
+    wt_memc->p_dspin_cmd               (signal_dspin_cmd_memc_t);
+    wt_memc->p_dspin_rsp               (signal_dspin_rsp_memc_t);
+    wt_memc->p_vci                     (signal_vci_tgt_memc);
 
     std::cout << "  - MEMC connected" << std::endl;
@@ -590 +590 @@
     std::cout << "  - XRAM connected" << std::endl;
 
-    ////////////////////////////////////////////// CDMA
+    ////////////////////////////////////////////// MDMA
     mdma->p_clk                         (this->p_clk);
     mdma->p_resetn                      (this->p_resetn);
@@ -597 +597 @@
     for (size_t i=0 ; i<nb_dmas ; i++)
         mdma->p_irq[i]                 (signal_irq_mdma[i]);
+
+    // wrapper tgt MDMA
+    wt_mdma->p_clk                     (this->p_clk);
+    wt_mdma->p_resetn                  (this->p_resetn);
+    wt_mdma->p_dspin_cmd               (signal_dspin_cmd_mdma_t);
+    wt_mdma->p_dspin_rsp               (signal_dspin_rsp_mdma_t);
+    wt_mdma->p_vci                     (signal_vci_tgt_mdma);
+
+    // wrapper ini MDMA
+    wi_mdma->p_clk                     (this->p_clk);
+    wi_mdma->p_resetn                  (this->p_resetn);
+    wi_mdma->p_dspin_cmd               (signal_dspin_cmd_mdma_i);
+    wi_mdma->p_dspin_rsp               (signal_dspin_rsp_mdma_i);
+    wi_mdma->p_vci                     (signal_vci_ini_mdma);
 
     std::cout << "  - MDMA connected" << std::endl;
@@ -611 +625 @@
         bdev->p_vci_initiator          (signal_vci_ini_bdev);
 
+        // wrapper tgt BDEV
+        wt_bdev->p_clk                 (this->p_clk);
+        wt_bdev->p_resetn              (this->p_resetn);
+        wt_bdev->p_dspin_cmd           (signal_dspin_cmd_bdev_t);
+        wt_bdev->p_dspin_rsp           (signal_dspin_rsp_bdev_t);
+        wt_bdev->p_vci                 (signal_vci_tgt_bdev);
+
+        // wrapper ini BDEV
+        wi_bdev->p_clk                 (this->p_clk);
+        wi_bdev->p_resetn              (this->p_resetn);
+        wi_bdev->p_dspin_cmd           (signal_dspin_cmd_bdev_i);
+        wi_bdev->p_dspin_rsp           (signal_dspin_rsp_bdev_i);
+        wi_bdev->p_vci                 (signal_vci_ini_bdev);
+
         std::cout << "  - BDEV connected" << std::endl;
 
@@ -617 +645 @@
         fbuf->p_resetn                 (this->p_resetn);
         fbuf->p_vci                    (signal_vci_tgt_fbuf);
+
+        // wrapper tgt FBUF
+        wt_fbuf->p_clk                 (this->p_clk);
+        wt_fbuf->p_resetn              (this->p_resetn);
+        wt_fbuf->p_dspin_cmd           (signal_dspin_cmd_fbuf_t);
+        wt_fbuf->p_dspin_rsp           (signal_dspin_rsp_fbuf_t);
+        wt_fbuf->p_vci                 (signal_vci_tgt_fbuf);
 
         std::cout << "  - FBUF connected" << std::endl;
@@ -630 +665 @@
         }
 
+        // wrapper tgt MNIC
+        wt_mnic->p_clk                 (this->p_clk);
+        wt_mnic->p_resetn              (this->p_resetn);
+        wt_mnic->p_dspin_cmd           (signal_dspin_cmd_mnic_t);
+        wt_mnic->p_dspin_rsp           (signal_dspin_rsp_mnic_t);
+        wt_mnic->p_vci                 (signal_vci_tgt_mnic);
+
         std::cout << "  - MNIC connected" << std::endl;
 
@@ -636 +678 @@
         brom->p_resetn                 (this->p_resetn);
         brom->p_vci                    (signal_vci_tgt_brom);
+
+        // wrapper tgt BROM
+        wt_brom->p_clk                 (this->p_clk);
+        wt_brom->p_resetn              (this->p_resetn);
+        wt_brom->p_dspin_cmd           (signal_dspin_cmd_brom_t);
+        wt_brom->p_dspin_rsp           (signal_dspin_rsp_brom_t);
+        wt_brom->p_vci                 (signal_vci_tgt_brom);
 
         std::cout << "  - BROM connected" << std::endl;
@@ -648 +697 @@
         }
 
+        // wrapper tgt MTTY
+        wt_mtty->p_clk                 (this->p_clk);
+        wt_mtty->p_resetn              (this->p_resetn);
+        wt_mtty->p_dspin_cmd           (signal_dspin_cmd_mtty_t);
+        wt_mtty->p_dspin_rsp           (signal_dspin_rsp_mtty_t);
+        wt_mtty->p_vci                 (signal_vci_tgt_mtty);
+
         std::cout << "  - MTTY connected" << std::endl;
    }