Changeset 571 for trunk/softs/test_llsc/top.cpp

Timestamp:

Oct 31, 2013, 5:47:51 PM (11 years ago)

Author:

meunier

Message:

Correction of the "double barrier" problem from the user point of view for the generated llsc tests (use of 2 distinct barriers)

File:

• trunk/softs/test_llsc/top.cpp (modified) (4 diffs)

trunk/softs/test_llsc/top.cpp

@@ -231 +231 @@
 //////////////////////i/////////////////////////////////////
 
-#define MAX_FROZEN_CYCLES     1000000
+#define MAX_FROZEN_CYCLES     100000000
 
 /////////////////////////////////////////////////////////
@@ -725 +725 @@
                 loader,
                 frozen_cycles,
-                debug_from   ,
+                debug_from,
                 debug_ok and (cluster(x,y) == debug_memc_id),
                 debug_ok and (cluster(x,y) == debug_proc_id) 
@@ -921 +921 @@
         p_rsp_signame << "[SIG]PROC_" << x << "_" << y << "_" << l << " RSP" ;
 
-        clusters[x][y]->proc[l]->print_trace();
-        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");
-        clusters[x][y]->signal_dspin_rsp_l2g_d.print_trace("[SIG]L2G RSP");
-        clusters[x][y]->signal_dspin_rsp_g2l_d.print_trace("[SIG]G2L RSP");
+        for (int _x = 0, _y = 0; _x != XMAX; (_y == YMAX - 1 ? _x++, _y = 0 : _y++)) {
+           for (int _l = 0; _l < NB_PROCS_MAX; _l++) {
+              clusters[_x][_y]->proc[_l]->print_trace();
+           }
+        }
+        //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");
+        //clusters[x][y]->signal_dspin_rsp_l2g_d.print_trace("[SIG]L2G RSP");
+        //clusters[x][y]->signal_dspin_rsp_g2l_d.print_trace("[SIG]G2L RSP");
 
         // trace memc[debug_memc_id] 
@@ -954 +958 @@
 
         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());
+        //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
-//        clusters[1][1]->mdma->print_trace();
-//        clusters[1][1]->signal_vci_tgt_mdma.print_trace("[SIG]MDMA_TGT_1_1");
-//        clusters[1][1]->signal_vci_ini_mdma.print_trace("[SIG]MDMA_INI_1_1");
+        //clusters[1][1]->mdma->print_trace();
+        //clusters[1][1]->signal_vci_tgt_mdma.print_trace("[SIG]MDMA_TGT_1_1");
+        //clusters[1][1]->signal_vci_ini_mdma.print_trace("[SIG]MDMA_INI_1_1");
         
 
         // trace external peripherals
-        size_t io_x   = cluster_io_id / YMAX;
-        size_t io_y   = cluster_io_id % YMAX;
+        //size_t io_x   = cluster_io_id / YMAX;
+        //size_t io_y   = cluster_io_id % YMAX;
         
-        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();
-//        clusters[io_x][io_y]->signal_vci_tgt_bdev.print_trace("[SIG]BDEV_TGT");
-//        clusters[io_x][io_y]->signal_vci_ini_bdev.print_trace("[SIG]BDEV_INI");
+        //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();
+        //clusters[io_x][io_y]->signal_vci_tgt_bdev.print_trace("[SIG]BDEV_TGT");
+        //clusters[io_x][io_y]->signal_vci_ini_bdev.print_trace("[SIG]BDEV_INI");
       }