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

Timestamp:

Mar 27, 2015, 5:21:52 PM (9 years ago)

Author:

alain

Message:

Fix a bug in platform tsar_generic_iob to support more than 4 processors per cluster.
The hard_config.h file format has also been enriched.

File:

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

trunk/platforms/tsar_generic_iob/top.cpp

@@ -50 +50 @@
 // Besides the external peripherals, each cluster contains one XICU component,
 // and one multi channels DMA component.
-// The XICU component is mainly used to handle WTI IRQs, as only 5 HWI IRQs
-// are connected to XICU in each cluster:
-// - IRQ_IN[0] : MMC
-// - IRQ_IN[1] : DMA channel 0
-// - IRQ_IN[2] : DMA channel 1
-// - IRQ_IN[3] : DMA channel 2
-// - IRQ_IN[4] : DMA channel 3
+// The XICU component is mainly used to handle WTI IRQs, as only 
+// 1 + NB_PROCS_MAX HWI IRQs are connected to XICU in each cluster:
+// - IRQ_IN[0]            : MMC
+// - IRQ_IN[1]            : DMA channel 0
+// - IRQ_IN[2]            : DMA channel 1
+// - ...                    ...    
+// - IRQ_IN[NB_PROCS_MAX] : DMA channel NB_PROCS_MAX
 //
 // All clusters are identical, but cluster(0,0) and cluster(XMAX-1,YMAX-1)
@@ -80 +80 @@
 // - X_SIZE           : number of clusters in a row
 // - Y_SIZE           : number of clusters in a column
-// - NB_PROCS_MAX     : number of processors per cluster (power of 2)
-// - NB_DMA_CHANNELS  : number of DMA channels per cluster    (up to 8)
+// - NB_PROCS_MAX     : number of processors per cluster (up to 8)
+// - NB_DMA_CHANNELS  : number of DMA channels per cluster    (>= NB_PROCS_MAX)
 // - NB_TTY_CHANNELS  : number of TTY channels in I/O network (up to 16)
 // - NB_NIC_CHANNELS  : number of NIC channels in I/O network (up to 2)
@@ -87 +87 @@
 // - FBUF_X_SIZE      : width of frame buffer (pixels)
 // - FBUF_Y_SIZE      : heigth of frame buffer (lines)
-// - XCU_NB_INPUTS    : number of HWIs = number of WTIs = number of PTIs
+// - XCU_NB_HWI       : number of XCU HWIs (>= NB_PROCS_MAX + 1)
+// - XCU_NB_PTI       : number of XCU PTIs (>= NB_PROCS_MAX)
+// - XCU_NB_WTI       : number of XCU WTIs (>= 4*NB_PROCS_MAX)
+// - XCU_NB_OUT       : number of XCU output IRQs (>= 4*NB_PROCS_MAX)
 //
 // Some secondary hardware parameters must be defined in this top.cpp file:
@@ -445 +448 @@
            "The YMAX parameter cannot be larger than 16" );
 
-   assert( (NB_PROCS_MAX <= (1 << P_WIDTH)) and
-           "NB_PROCS_MAX parameter cannot be larger than 2^P_WIDTH" );
-
-   assert( (NB_DMA_CHANNELS <= 8) and
+   assert( (NB_PROCS_MAX <= 8) and
+           "NB_PROCS_MAX parameter cannot be larger than 8" );
+
+   assert( (XCU_NB_HWI > NB_PROCS_MAX) and
+           "XCU_NB_HWI must be larger than NB_PROCS_MAX" );
+
+   assert( (XCU_NB_PTI >= NB_PROCS_MAX) and
+           "XCU_NB_PTI cannot be smaller than NB_PROCS_MAX" );
+
+   assert( (XCU_NB_WTI >= 4*NB_PROCS_MAX) and
+           "XCU_NB_WTI cannot be smaller than 4*NB_PROCS_MAX" );
+
+   assert( (XCU_NB_OUT >= 4*NB_PROCS_MAX) and
+           "XCU_NB_OUT cannot be smaller than 4*NB_PROCS_MAX" );
+   
+   assert( (NB_DMA_CHANNELS >= NB_PROCS_MAX) and
            "The NB_DMA_CHANNELS parameter cannot be larger than 8" );
 
@@ -1070 +1085 @@
                 L1_DSETS,
                 XRAM_LATENCY,
-                XCU_NB_INPUTS,
+                XCU_NB_HWI,
+                XCU_NB_PTI,
+                XCU_NB_WTI,
+                XCU_NB_OUT,
 
                 loader,
@@ -1431 +1449 @@
 
         // Monitor a specific address for one L1 cache
-        // clusters[0][0]->proc[0]->cache_monitor(0x600800ULL);
+        // clusters[0][0]->proc[0]->cache_monitor(0x800080ULL);
 
         // Monitor a specific address for one L2 cache
-        // clusters[0][0]->memc->cache_monitor( 0x600800ULL, false );   // full line
+        // clusters[0][0]->memc->cache_monitor( 0x800080ULL, false );   // full line
 
         // Monitor a specific address for one XRAM
@@ -1457 +1475 @@
                 clusters[x][y]->signal_int_vci_ini_proc[l].print_trace(proc_signame.str());
 
-//              clusters[x][y]->xicu->print_trace(l);
-//              std::ostringstream xicu_signame;
-//              xicu_signame << "[SIG]XICU_" << x << "_" << y;
-//              clusters[x][y]->signal_int_vci_tgt_xicu.print_trace(xicu_signame.str());
+                clusters[x][y]->xicu->print_trace(1);
+                std::ostringstream xicu_signame;
+                xicu_signame << "[SIG]XICU_" << x << "_" << y;
+                clusters[x][y]->signal_int_vci_tgt_xicu.print_trace(xicu_signame.str());
 
                 clusters[x][y]->mdma->print_trace();
-                std::ostringstream mdma_signame;
-                mdma_signame << "[SIG]MDMA_" << x << "_" << y;
-                clusters[x][y]->signal_int_vci_tgt_mdma.print_trace(mdma_signame.str());
+                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)