Changeset 1030

Timestamp:

Jan 16, 2016, 7:44:23 PM (9 years ago)

Author:

alain

Message:

Fix a bug in debug_procid_id definition.
-This line, and those below, will be ignored--

M tsar_generic_iob/tsar_iob_cluster/caba/source/include/tsar_iob_cluster.h
M tsar_generic_iob/tsar_iob_cluster/caba/source/src/tsar_iob_cluster.cpp
M tsar_generic_iob/top.cpp

Location:

trunk/platforms/tsar_generic_iob

Files:

• top.cpp (modified) (6 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) (6 diffs)

trunk/platforms/tsar_generic_iob/top.cpp

@@ -338 +338 @@
    ssize_t  threads          = 1;                       // simulator's threads number
    bool     debug_ok         = false;                   // trace activated
-   size_t   debug_memc_id    = 0xFFFFFFFF;              // index of traced memc
-   size_t   debug_proc_id    = 0xFFFFFFFF;              // index of traced proc
-   size_t   debug_xram_id    = 0xFFFFFFFF;              // index of traced xram
+   uint32_t debug_memc_id    = 0xFFFFFFFF;              // index of traced memc
+   uint32_t debug_proc_id    = 0xFFFFFFFF;              // index of traced proc
    bool     debug_iob        = false;                   // trace iob0 & iob1 when true
    uint32_t debug_from       = 0;                       // trace start cycle
@@ -391 +390 @@
                 std::cout << " - XMAX   = " << std::hex << XMAX          << std::endl;
                 std::cout << " - YMAX   = " << std::hex << YMAX          << std::endl;
-                exit(0);
-            }
-         }
-         else if ((strcmp(argv[n],"-XRAMID") == 0) && (n+1<argc) )
-         {
-            debug_xram_id = atoi(argv[n+1]);
-            size_t x = debug_xram_id >> 4;
-            size_t y = debug_xram_id & 0xF;
-            if( (x>=XMAX) || (y>=YMAX) )
-            {
-                std::cout << "XRAMID parameter does'nt fit XMAX/YMAX" << std::endl;
                 exit(0);
             }
@@ -441 +429 @@
             std::cout << "     - DEBUG debug_start_cycle" << std::endl;
             std::cout << "     - THREADS simulator's threads number" << std::endl;
-            std::cout << "     - FROZEN max_number_of_lines" << std::endl;
+            std::cout << "     - FROZEN max_number_of_cycles" << std::endl;
             std::cout << "     - MEMCID index_memc_to_be_traced" << std::endl;
             std::cout << "     - PROCID index_proc_to_be_traced" << std::endl;
@@ -506 +494 @@
              << " - OPENMP THREADS  = " << threads << std::endl
              << " - DEBUG_PROCID    = " << debug_proc_id << std::endl
-             << " - DEBUG_MEMCID    = " << debug_memc_id << std::endl
-             << " - DEBUG_XRAMID    = " << debug_xram_id << std::endl
-             << " - DEBUG_XRAMID    = " << debug_xram_id << std::endl;
+             << " - DEBUG_MEMCID    = " << debug_memc_id << std::endl;
 
    std::cout << std::endl;
@@ -1228 +1214 @@
 
                 frozen_cycles,
+                debug_ok,
                 debug_from,
-                debug_ok and (cluster(x,y) == debug_memc_id),
-                debug_ok and (cluster(x,y) == debug_proc_id),
-                debug_ok and debug_iob
+                debug_proc_id,
+                debug_memc_id,
+                debug_iob
             );
 
@@ -1765 +1752 @@
                 sxram_tgt << "[SIG]XRAM_TGT_" << x << "_" << y;
                 clusters[x][y]->signal_ram_vci_tgt_xram.print_trace(sxram_tgt.str());
-            }
-
-
-            // trace XRAM and XRAM network routers in cluster[debug_xram_id]
-            if ( debug_xram_id != 0xFFFFFFFF )
-            {
-                size_t x = debug_xram_id >> 4;
-                size_t y = debug_xram_id & 0xF;
-
-                clusters[x][y]->xram->print_trace();
-                std::ostringstream sxram_tgt;
-                sxram_tgt << "[SIG]XRAM_TGT_" << x << "_" << y;
-                clusters[x][y]->signal_ram_vci_tgt_xram.print_trace(sxram_tgt.str());
-
-                clusters[x][y]->ram_router_cmd->print_trace();
-                clusters[x][y]->ram_router_rsp->print_trace();
+
+//              clusters[x][y]->ram_router_cmd->print_trace();
+//              clusters[x][y]->ram_router_rsp->print_trace();
             }
 

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

@@ -261 +261 @@
 
                     uint32_t                           frozen_cycles, 
-                    uint32_t                           start_debug_cycle,
-                    bool                               memc_debug_ok, 
-                    bool                               proc_debug_ok, 
-                    bool                               iob0_debug_ok ); 
+                    bool                               debug_ok,
+                    uint32_t                           debug_start_cycle,
+                    uint32_t                           debug_proc_id, 
+                    uint32_t                           debug_memc_id, 
+                    bool                               debug_iob ); 
 
   protected:

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

@@ -83 +83 @@
 
                     uint32_t                           frozen_cycles,
+                    bool                               debug_ok,
                     uint32_t                           debug_start_cycle,
-                    bool                               memc_debug_ok,
-                    bool                               proc_debug_ok,
-                    bool                               iob_debug_ok )
+                    uint32_t                           debug_proc_id,
+                    uint32_t                           debug_memc_id,
+                    bool                               debug_iob )
     : soclib::caba::BaseModule(insname),
       p_clk("clk"),
@@ -129 +130 @@
     //////////////////////////////////////////////////////////////////////////////////
 
+    size_t x_debug;
+    size_t y_debug;
+    size_t p_debug;
+
     ////////////  PROCS  /////////////////////////////////////////////////////////////
     for (size_t p = 0; p < nb_procs; p++)
     {
         std::ostringstream s_proc;
+        x_debug = (debug_proc_id >> (y_width + p_width)) & ((1<<x_width)-1);
+        y_debug = (debug_proc_id >> p_width            ) & ((1<<y_width)-1);
+        p_debug = (debug_proc_id                       ) & ((1<<p_width)-1);
+        
+        
         s_proc << "proc_" << x_id << "_" << y_id << "_" << p;
         proc[p] = new VciCcVCacheWrapper<vci_param_int,
@@ -155 +165 @@
                       frozen_cycles,                  // max frozen cycles
                       debug_start_cycle,
-                      proc_debug_ok);
+                      debug_ok and (x_id == x_debug) and (y_id == y_debug) and (p_debug == p) );
     }
 
@@ -161 +171 @@
     std::ostringstream s_memc;
     s_memc << "memc_" << x_id << "_" << y_id;
+    x_debug = (debug_memc_id >> y_width) & ((1<<x_width)-1);
+    y_debug = (debug_memc_id           ) & ((1<<y_width)-1);
     memc = new VciMemCache<vci_param_int,
                            vci_param_ext,
@@ -179 +191 @@
                      8,                                   // INVALIDATE TABLE DEPTH
                      debug_start_cycle,
-                     memc_debug_ok );
+                     debug_ok and (x_id == x_debug) and (y_id = y_debug) );
 
     std::ostringstream s_wi_memc;
@@ -437 +449 @@
                      8,                                     // IOTLB sets
                      debug_start_cycle,
-                     iob_debug_ok );
+                     debug_iob );
 
         std::ostringstream s_iob_ram_wi;