Changeset 1051 for trunk/platforms/tsar_generic_iob/top.cpp

Timestamp:

Apr 11, 2017, 11:50:57 PM (7 years ago)

Author:

alain

Message:

Replace the vci_mwmr_dma hardware component by the vci_multi_dma component.

File:

• trunk/platforms/tsar_generic_iob/top.cpp (modified) (14 diffs)

trunk/platforms/tsar_generic_iob/top.cpp

@@ -50 +50 @@
 // - One L2 cache controller
 // - One XICU component,
-// - One - optional - single channel DMA controler,
-// - One - optional - hardware coprocessor 
+// - One multi channels DMA controler (number of channels is defined by nprocs)
 // The XICU component is mainly used to handle WTI IRQs, as at most 
-// 2 HWI IRQs are connected to XICU in each cluster:
+// (nprocs + 1) HWI IRQs are connected to XICU in each cluster:
 // - IRQ_IN[0]            : MMC
-// - IRQ_IN[1]            : MWR 
+// - IRQ_IN[1 to nprocs]  : DMA 
 //
 // All clusters are identical, but cluster(0,0) and cluster(XMAX-1,YMAX-1)
@@ -151 +150 @@
 
 //////////////////////////////////////////////////////////////////
-//    Coprocessor type (must be replicated in tsar_iob_cluster)
-//////////////////////////////////////////////////////////////////
-
-#define MWR_COPROC_CPY  0
-#define MWR_COPROC_DCT  1
-#define MWR_COPROC_GCD  2
-
-//////////////////////////////////////////////////////////////////
 //      Virtual disk selection => OS selection
 //////////////////////////////////////////////////////////////////
@@ -271 +262 @@
 // Two different initiators cannot have the same SRCID, but a given
 // initiator can have two alias SRCIDs:
-// - Internal initiators (procs, mwmr) are replicated in all clusters,
+// - Internal initiators (procs, mdma) are replicated in all clusters,
 //   and each initiator has one single SRCID.
 // - External initiators (disk, cdma) are not replicated, but can be
@@ -285 +276 @@
 
 #define PROC_LOCAL_SRCID             0x0    // from 0 to 7
-#define MWMR_LOCAL_SRCID             0x8
+#define MDMA_LOCAL_SRCID             0x8
 #define IOBX_LOCAL_SRCID             0x9
 #define MEMC_LOCAL_SRCID             0xA
@@ -299 +290 @@
 #define INT_MEMC_TGT_ID              0
 #define INT_XICU_TGT_ID              1
-#define INT_MWMR_TGT_ID              2
+#define INT_MDMA_TGT_ID              2
 #define INT_IOBX_TGT_ID              3
 
 #define INT_PROC_INI_ID              0   // from 0 to (NB_PROCS_MAX-1)
-#define INT_MWMR_INI_ID              (NB_PROCS_MAX)
+#define INT_MDMA_INI_ID              (NB_PROCS_MAX)
 #define INT_IOBX_INI_ID              (NB_PROCS_MAX+1)
 
@@ -478 +469 @@
    "Error in tsar_generic_iob : You must have X_WIDTH == Y_WIDTH == 4");
 
-   assert(  ((USE_MWR_CPY + USE_MWR_GCD + USE_MWR_DCT) == 1) and
-   "Error in tsar_generic_iob : No MWR coprocessor found in hard_config.h");
-
    assert(  ((USE_IOC_HBA + USE_IOC_BDV + USE_IOC_SDC) == 1) and
    "Error in tsar_generic_iob : NoIOC controller found in hard_config.h");
@@ -536 +524 @@
    // - two levels address decoding for commands
    // - two levels srcid decoding for responses
-   // - NB_PROCS_MAX + 2 (MWMR, IOBX) local initiators per cluster
-   // - 4 local targets (MEMC, XICU, MWMR, IOBX) per cluster
+   // - NB_PROCS_MAX + 2 (MDMA, IOBX) local initiators per cluster
+   // - 4 local targets (MEMC, XICU, MDMA, IOBX) per cluster
    /////////////////////////////////////////////////////////////////////
    MappingTable maptab_int( vci_address_width,
@@ -570 +558 @@
                      IntTab(cluster(x,y), INT_XICU_TGT_ID), not cacheable));
 
-         std::ostringstream    smwmr;
-         smwmr << "int_seg_mwmr_" << x << "_" << y;
-         maptab_int.add(Segment(smwmr.str(), SEG_MWR_BASE+offset, SEG_MWR_SIZE,
-                     IntTab(cluster(x,y), INT_MWMR_TGT_ID), not cacheable));
+         std::ostringstream    smdma;
+         smdma << "int_seg_mdma_" << x << "_" << y;
+         maptab_int.add(Segment(smdma.str(), SEG_DMA_BASE+offset, SEG_DMA_SIZE,
+                     IntTab(cluster(x,y), INT_MDMA_TGT_ID), not cacheable));
 
          // the following segments are only defined in cluster_iob0 or in cluster_iob1
@@ -618 +606 @@
          // and the port index on the local interconnect.
 
-         maptab_int.srcid_map( IntTab( cluster(x,y), MWMR_LOCAL_SRCID ),
-                               IntTab( cluster(x,y), INT_MWMR_INI_ID ) );
+         maptab_int.srcid_map( IntTab( cluster(x,y), MDMA_LOCAL_SRCID ),
+                               IntTab( cluster(x,y), INT_MDMA_INI_ID ) );
 
          maptab_int.srcid_map( IntTab( cluster(x,y), IOBX_LOCAL_SRCID ),
@@ -1114 +1102 @@
                    dspin_ram_rsp_width>* clusters[XMAX][YMAX];
 
-    unsigned int coproc_type;
-    if ( USE_MWR_CPY ) coproc_type = MWR_COPROC_CPY;
-    if ( USE_MWR_DCT ) coproc_type = MWR_COPROC_DCT;
-    if ( USE_MWR_GCD ) coproc_type = MWR_COPROC_GCD;
+    unsigned int coproc_type = 0;
 
 #if USE_OPENMP
@@ -1176 +1161 @@
                 INT_MEMC_TGT_ID,
                 INT_XICU_TGT_ID,
-                INT_MWMR_TGT_ID,
+                INT_MDMA_TGT_ID,
                 INT_IOBX_TGT_ID,
 
                 INT_PROC_INI_ID,
-                INT_MWMR_INI_ID,
+                INT_MDMA_INI_ID,
                 INT_IOBX_INI_ID,
 
@@ -1692 +1677 @@
                 clusters[x][y]->signal_int_vci_ini_proc[l].print_trace(proc_signame.str());
 
+                // XICU
                 clusters[x][y]->xicu->print_trace(1);
                 std::ostringstream xicu_signame;
@@ -1697 +1683 @@
                 clusters[x][y]->signal_int_vci_tgt_xicu.print_trace(xicu_signame.str());
 
-                // coprocessor in cluster(x,y)
-//              clusters[x][y]->mwmr->print_trace();
-//              std::ostringstream mwmr_tgt_signame;
-//              mwmr_tgt_signame << "[SIG]MWMR_TGT_" << x << "_" << y;
-//              clusters[x][y]->signal_int_vci_tgt_mwmr.print_trace(mwmr_tgt_signame.str());
-//              std::ostringstream mwmr_ini_signame;
-//              mwmr_ini_signame << "[SIG]MWMR_INI_" << x << "_" << y;
-//              clusters[x][y]->signal_int_vci_ini_mwmr.print_trace(mwmr_ini_signame.str());
-//              if ( USE_MWR_CPY ) clusters[x][y]->cpy->print_trace();
-//              if ( USE_MWR_DCT ) clusters[x][y]->dct->print_trace();
-//              if ( USE_MWR_GCD ) clusters[x][y]->gcd->print_trace();
+                // MDMA
+//              clusters[x][y]->mdma->print_trace();
+//              std::ostringstream mdma_tgt_signame;
+//              mdma_tgt_signame << "[SIG]MDMA_TGT_" << x << "_" << y;
+//              clusters[x][y]->signal_int_vci_tgt_mdma.print_trace(mdma_tgt_signame.str());
+//              std::ostringstream mdma_ini_signame;
+//              mdma_ini_signame << "[SIG]MDMA_INI_" << x << "_" << y;
+//              clusters[x][y]->signal_int_vci_ini_mdma.print_trace(mdma_ini_signame.str());
 
                 // local interrupts in cluster(x,y)
@@ -1714 +1697 @@
                           << " ACTIVE" << std::endl;
 
-                if( clusters[x][y]->signal_irq_mwmr.read() )
-                std::cout << "### IRQ_MWR_" << std::dec << x << "_" << y 
-                          << " ACTIVE" << std::endl;
-
-                for ( size_t c = 0 ; c < NB_PROCS_MAX ; c++ )
+                for( size_t i = 0 ; i < NB_PROCS_MAX ; i++ )
                 {
-                    if( clusters[x][y]->signal_proc_it[c<<2].read() )
-                    std::cout << "### IRQ_PROC_" << std::dec << x << "_" << y << "_" << c
+                    if( clusters[x][y]->signal_irq_mdma[i].read() )
+                    std::cout << "### IRQ_DMA_" << std::dec << x << "_" << y << "_" << i 
+                              << " ACTIVE" << std::endl;
+
+                    if( clusters[x][y]->signal_proc_it[i<<2].read() )
+                    std::cout << "### IRQ_PROC_" << std::dec << x << "_" << y << "_" << i
                               << " ACTIVE" << std::endl;
                 }