Changeset 739 for trunk/platforms

Timestamp:

Jul 7, 2014, 12:30:38 PM (10 years ago)

Author:

alain

Message:

Improve trace in tsar_generic_iob/top.cpp.
Fix a vicious bugs in the tsar_iob_cluster netlist: the signal_proc_it[] array was too small...

Location:

trunk/platforms/tsar_generic_iob

Files:

• top.cpp (modified) (3 diffs)
• tsar_iob_cluster/caba/source/include/tsar_iob_cluster.h (modified) (1 diff)
• tsar_iob_cluster/caba/source/src/tsar_iob_cluster.cpp (modified) (2 diffs)

trunk/platforms/tsar_generic_iob/top.cpp

@@ -47 +47 @@
 // 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 2 HWI IRQs
+// 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
@@ -1423 +1423 @@
 
         // Monitor a specific address for one L2 cache
-        // clusters[0][0]->memc->cache_monitor( 0x1542c0ULL, true );   // single word monitoring
+        // clusters[0][0]->memc->cache_monitor( 0x1542c0ULL, true );   // single word
 
         // Monitor a specific address for one XRAM
@@ -1451 +1451 @@
                 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());
-
-                if( clusters[x][y]->signal_proc_it[l].read() )
-                    std::cout << "### IRQ_PROC_" << std::dec
-                              << x << "_" << y << "_" << l << " ACTIVE" << std::endl;
+                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());
+
+                // local interrupts in cluster(x,y)
+                if( clusters[x][y]->signal_irq_memc.read() )
+                std::cout << "### IRQ_MMC_" << std::dec << x << "_" << y 
+                          << " ACTIVE" << std::endl;
+
+                for ( size_t c = 0 ; c < NB_DMA_CHANNELS ; c++ )
+                {
+                    if( clusters[x][y]->signal_irq_mdma[c].read() )
+                    std::cout << "### IRQ_DMA_" << std::dec << x << "_" << y << "_" << c 
+                              << " ACTIVE" << std::endl;
+                }
+ 
+                for ( size_t c = 0 ; c < NB_PROCS_MAX ; c++ )
+                {
+                    if( clusters[x][y]->signal_proc_it[c].read() )
+                    std::cout << "### IRQ_PROC_" << std::dec << x << "_" << y << "_" << c 
+                              << " ACTIVE" << std::endl;
+                }
             }
 

trunk/platforms/tsar_generic_iob/tsar_iob_cluster/caba/source/include/tsar_iob_cluster.h

@@ -70 +70 @@
     // interrupt signals
     sc_signal<bool>                       signal_false;
-    sc_signal<bool>                       signal_proc_it[8];
+    sc_signal<bool>                       signal_proc_it[16];
     sc_signal<bool>                       signal_irq_mdma[8];
     sc_signal<bool>                       signal_irq_memc;

trunk/platforms/tsar_generic_iob/tsar_iob_cluster/caba/source/src/tsar_iob_cluster.cpp

@@ -612 +612 @@
     }
 
-   SC_METHOD(init);
+    SC_METHOD(init);
+
 } // end constructor
 
@@ -618 +619 @@
 {
    signal_ram_dspin_cmd_false.write = false;
-   signal_ram_dspin_cmd_false.read = true;
-   signal_ram_dspin_rsp_false.write = false;
-   signal_ram_dspin_rsp_false.read = true;
+   signal_ram_dspin_rsp_false.read  = true;
 } // end init