Changeset 706 for trunk/platforms/tsar_generic_xbar/top.cpp

Timestamp:

May 30, 2014, 5:07:05 PM (10 years ago)

Author:

meunier

Message:

• Replaced vci_dspin_local_crossbar with a vci_local_crossbar in tsar_generic_xbar
• Added the scripts/ directory in tsar_generic_xbar

Location:

trunk/platforms/tsar_generic_xbar

Files:

• . (modified) (1 prop)
• top.cpp (modified) (6 diffs)

trunk/platforms/tsar_generic_xbar/top.cpp

@@ -295 +295 @@
    // (Almos supports 32 bits physical addresses)
 
-   #define CLUSTER_IO_INC  (cluster_io_id * (0x80000000ULL / (X_SIZE * Y_SIZE) * 2))
-   #define MEMC_MAX_SIZE (0x40000000 / (X_SIZE * Y_SIZE))
+   #define CLUSTER_INC (0x80000000ULL / (X_SIZE * Y_SIZE) * 2)
+
+   #define CLUSTER_IO_INC (cluster_io_id * CLUSTER_INC)
+   #define MEMC_MAX_SIZE (0x40000000 / (X_SIZE * Y_SIZE)) // 0x40000000 : valeur totale souhaitée (ici : 1Go)
 
    #define BROM_BASE    0x00BFC00000
-   #define BROM_SIZE    0x0000100000   // 1 Mbytes
+   #define BROM_SIZE    0x0000100000 // 1 Mbytes
 
    #define MEMC_BASE    0x0000000000
    #define MEMC_SIZE    min(0x04000000, MEMC_MAX_SIZE)
 
-   #define XICU_BASE    MEMC_MAX_SIZE + (XICU_TGTID << 19)
-   #define XICU_SIZE    0x0000001000   // 4 Kbytes
+   #define XICU_BASE    (CLUSTER_INC >> 1) + (XICU_TGTID << 19)
+   #define XICU_SIZE    0x0000001000 // 4 Kbytes
    
-   #define MDMA_BASE    MEMC_MAX_SIZE + (MDMA_TGTID << 19)
-   #define MDMA_SIZE    (0x0000001000 * NB_DMA_CHANNELS)  // 4 Kbytes per channel  
-
-   #define BDEV_BASE    MEMC_MAX_SIZE + (BDEV_TGTID << 19) + (CLUSTER_IO_INC)
-   #define BDEV_SIZE    0x0000001000   // 4 Kbytes
-
-   #define MTTY_BASE    MEMC_MAX_SIZE + (MTTY_TGTID << 19) + (CLUSTER_IO_INC)
-   #define MTTY_SIZE    0x0000001000   // 4 Kbytes
-
-   #define FBUF_BASE    MEMC_MAX_SIZE + (FBUF_TGTID << 19) + (CLUSTER_IO_INC)
+   #define MDMA_BASE    (CLUSTER_INC >> 1) + (MDMA_TGTID << 19)
+   #define MDMA_SIZE    (0x0000001000 * NB_DMA_CHANNELS) // 4 Kbytes per channel  
+
+   #define BDEV_BASE    (CLUSTER_INC >> 1) + (BDEV_TGTID << 19) + (CLUSTER_IO_INC)
+   #define BDEV_SIZE    0x0000001000 // 4 Kbytes
+
+   #define MTTY_BASE    (CLUSTER_INC >> 1) + (MTTY_TGTID << 19) + (CLUSTER_IO_INC)
+   #define MTTY_SIZE    0x0000001000 // 4 Kbytes
+
+   #define FBUF_BASE    (CLUSTER_INC >> 1) + (FBUF_TGTID << 19) + (CLUSTER_IO_INC)
    #define FBUF_SIZE    (FBUF_X_SIZE * FBUF_Y_SIZE * 2) // Should be 0x80000
 
-   #define MNIC_BASE    MEMC_MAX_SIZE + (MNIC_TGTID << 19) + (CLUSTER_IO_INC)
+   #define MNIC_BASE    (CLUSTER_INC >> 1) + (MNIC_TGTID << 19) + (CLUSTER_IO_INC)
    #define MNIC_SIZE    0x0000080000
 
-   #define CDMA_BASE    MEMC_MAX_SIZE + (CDMA_TGTID << 19) + (CLUSTER_IO_INC)
+   #define CDMA_BASE    (CLUSTER_INC >> 1) + (CDMA_TGTID << 19) + (CLUSTER_IO_INC)
    #define CDMA_SIZE    (0x0000004000 * NB_CMA_CHANNELS)
 
-   #define SIMH_BASE    MEMC_MAX_SIZE + (SIMH_TGTID << 19) + (CLUSTER_IO_INC)
+   #define SIMH_BASE    (CLUSTER_INC >> 1) + (SIMH_TGTID << 19) + (CLUSTER_IO_INC)
    #define SIMH_SIZE    0x0000001000
 #endif
@@ -754 +756 @@
                 L1_DWAYS,
                 L1_DSETS,
+                IRQ_PER_PROCESSOR,
                 XRAM_LATENCY,
                 (cluster(x,y) == cluster_io_id),
@@ -979 +982 @@
             std::ostringstream m2p_signame;
             m2p_signame << "[SIG]PROC_" << x << "_" << y << "_" << l << " M2P" ;
-            std::ostringstream p_cmd_signame;
-            p_cmd_signame << "[SIG]PROC_" << x << "_" << y << "_" << l << " CMD" ;
-            std::ostringstream p_rsp_signame;
-            p_rsp_signame << "[SIG]PROC_" << x << "_" << y << "_" << l << " RSP" ;
-
-            //clusters[x][y]->wi_proc[l]->print_trace();
+
             //clusters[x][y]->signal_vci_ini_proc[l].print_trace(proc_signame.str());
             //clusters[x][y]->signal_dspin_p2m_proc[l].print_trace(p2m_signame.str());
             //clusters[x][y]->signal_dspin_m2p_proc[l].print_trace(m2p_signame.str());
-            //clusters[x][y]->signal_dspin_cmd_proc_i[l].print_trace(p_cmd_signame.str());
-            //clusters[x][y]->signal_dspin_rsp_proc_i[l].print_trace(p_rsp_signame.str());
-
-            //clusters[x][y]->xbar_rsp_d->print_trace();
-            //clusters[x][y]->xbar_cmd_d->print_trace();
+
             //clusters[x][y]->signal_dspin_cmd_l2g_d.print_trace("[SIG]L2G CMD");
             //clusters[x][y]->signal_dspin_cmd_g2l_d.print_trace("[SIG]G2L CMD");
@@ -1010 +1004 @@
             std::ostringstream sp2m;
             sp2m << "[SIG]MEMC_" << x << "_" << y << " P2M" ;
-            std::ostringstream m_cmd_signame;
-            m_cmd_signame << "[SIG]MEMC_" << x << "_" << y <<  " CMD" ;
-            std::ostringstream m_rsp_signame;
-            m_rsp_signame << "[SIG]MEMC_" << x << "_" << y <<  " RSP" ;
 
             //clusters[x][y]->memc->print_trace();
-            //clusters[x][y]->wt_memc->print_trace();
             //clusters[x][y]->signal_vci_tgt_memc.print_trace(smemc.str());
             //clusters[x][y]->signal_vci_xram.print_trace(sxram.str());
             //clusters[x][y]->signal_dspin_p2m_memc.print_trace(sp2m.str());
             //clusters[x][y]->signal_dspin_m2p_memc.print_trace(sm2p.str());
-            //clusters[x][y]->signal_dspin_cmd_memc_t.print_trace(m_cmd_signame.str());
-            //clusters[x][y]->signal_dspin_rsp_memc_t.print_trace(m_rsp_signame.str());
 
             // trace replicated peripherals
@@ -1035 +1022 @@
 
             //clusters[io_x][io_y]->brom->print_trace();
-            //clusters[io_x][io_y]->wt_brom->print_trace();
             //clusters[io_x][io_y]->signal_vci_tgt_brom.print_trace("[SIG]BROM");
-            //clusters[io_x][io_y]->signal_dspin_cmd_brom_t.print_trace("[SIG]BROM CMD");
-            //clusters[io_x][io_y]->signal_dspin_rsp_brom_t.print_trace("[SIG]BROM RSP");
 
             //clusters[io_x][io_y]->bdev->print_trace();
@@ -1093 +1077 @@
          ms1 = (uint64_t) t1.tv_sec * 1000ULL + (uint64_t) t1.tv_usec / 1000;
          ms2 = (uint64_t) t2.tv_sec * 1000ULL + (uint64_t) t2.tv_usec / 1000;
-         std::cerr << "cycle " << n << " platform clock frequency " << (double) nb_cycles / (double) (ms2 - ms1) << "Khz" << std::endl;
+         std::cerr << std::dec << "cycle " << n << " platform clock frequency " << (double) nb_cycles / (double) (ms2 - ms1) << "Khz" << std::endl;
       }
    }