Changeset 135 for trunk

Timestamp:

Jan 28, 2011, 2:16:55 PM (14 years ago)

Author:

choichil

Message:

Initiator with bug correction in latency computing

Location:

trunk/modules/vci_synthetic_initator/caba/sources

Files:

• include/vci_synthetic_initiator.h (modified) (1 diff)
• src/vci_synthetic_initiator.cpp (modified) (7 diffs)

trunk/modules/vci_synthetic_initator/caba/sources/include/vci_synthetic_initiator.h

@@ -133 +133 @@
       const size_t                m_ymax;
       const size_t                m_srcid;
-      static const int            m_tab_size = 1 << vci_param::T;
+      static const size_t         m_tab_size = 1 << vci_param::T;
 
 

trunk/modules/vci_synthetic_initator/caba/sources/src/vci_synthetic_initiator.cpp

@@ -34 +34 @@
 
 
-#define DETERMINISTIC
+//#define DETERMINISTIC
 
 namespace soclib { namespace caba {
@@ -68 +68 @@
     p_resetn("resetn"),
     p_vci("vci_ini"),
-
+    //  FIFOs 
     m_srcid( mt.indexForId(vci_index) ),
-    //  FIFOs 
     m_length(length),
     m_rho(rho),
@@ -163 +162 @@
   {
         std::cout << name() << " : "<< std::dec << r_cpt_cycles.read() << " cycles, " << r_nb_single.read() << " packets sent" << std::endl;
+        if (m_rho) 
+        {
+          std::cout << "Average latency : " << (double)(r_latency_single.read())/(double)(r_nb_single.read()) << std::endl;
+        }
         if(m_bc_period)
         {
           std::cout << "Number of broadcast sent and received : " << r_nb_bc.read() << std::endl;
-          std::cout << ((double)r_latency_bc.read()/(double)r_nb_bc.read()) << std::endl;
+          std::cout << "Average latency : " << ((double)r_latency_bc.read()/(double)r_nb_bc.read()) << std::endl;
         }
   }
@@ -192 +195 @@
 
       // Initializing the instrumentation registers
-      r_latency_single          = 0 ;
+      r_latency_single          = 0;
       r_nb_single               = 0;
-      r_latency_bc              = 0 ;
+      r_latency_bc              = 0;
       r_nb_bc                   = 0;
       r_cpt_cycles              = 0;
       r_cpt_period              = 0;
       
-      r_cmd_seed        = (uint32_t)m_srcid;
+      r_cmd_seed                = (uint32_t)m_srcid;
 
       return;
@@ -206 +209 @@
     bool    fifo_put = false;
     bool    fifo_get = false;
-    bool    fifo_bc;
-
+    bool    fifo_bc  = false;
+
+
+#ifdef DETERMINISTIC
     uint32_t m_local_seed ;
+#endif
 
     //////////////////
@@ -229 +235 @@
             {
               int id = -1;
-              for(int i = 1; i < m_tab_size; i++){      // ID 0 reserved for broadcast transactions
+              for(size_t i = 1; i < m_tab_size; i++){   // ID 0 reserved for broadcast transactions
                 if(r_pending_fsm[i].read() == false)
                 {
-                  id = i;
+                  id = (int)i;
                   break;
                 }
@@ -259 +265 @@
             if (r_cmd_count.read() == m_length-1) 
             {
-              r_nb_single = r_nb_single.read() + 1;
+              //r_nb_single = r_nb_single.read() + 1;
               r_cmd_fsm = VCI_SINGLE_REGISTER ;
             }