Changeset 106 for trunk/modules/vci_synthetic_initator/caba/sources/include

Timestamp:

Oct 14, 2010, 2:58:27 PM (14 years ago)

Author:

choichil

Message:

Vci_Synthetic_Initiator correction of some bugs... some may still exist

File:

• trunk/modules/vci_synthetic_initator/caba/sources/include/vci_synthetic_initiator.h (modified) (8 diffs)

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

@@ -47 +47 @@
       : public soclib::caba::BaseModule
     {
-      typedef sc_dt::sc_uint<40> addr_t;
-      typedef typename vci_param::fast_addr_t vci_addr_t;
+      typedef uint32_t addr_t;
       typedef uint32_t data_t;
       typedef uint32_t tag_t;
@@ -54 +53 @@
       typedef uint32_t be_t;
       typedef uint32_t copy_t;
-
-      // Type of the addr_t and access of the fields
-      //typedef union{
-      //  PACKED_BITFIELD(
-      //    vci_addr_t srcid:vci_param::S,
-      //    vci_addr_t null:(8*sizeof(vci_addr_t)-(2*vci_param::S)),
-      //  ) normal_address;
-      //  PACKED_BITFIELD(
-      //    vci_addr_t xmin:vci_param::S,
-      //    vci_addr_t xmax:vci_param::S,
-      //    vci_addr_t ymin:vci_param::S,
-      //    vci_addr_t ymax:vci_param::S,
-      //    vci_addr_t null_:(8*sizeof(vci_addr_t)-(4*vci_param::S)),
-      //    vci_addr_t bc:2,
-      //  ) broadcast_address;
-      //} addr_t;
 
 
@@ -85 +68 @@
       };
 
-      uint64_t     m_cpt_cycles;            // Counter of cycles 
+      uint32_t     m_cpt_cycles;            // Counter of cycles 
       
 
@@ -102 +85 @@
                 const soclib::common::IntTab       &vci_index,
                 const uint32_t length,    // Packet length (flit numbers)
-                const float  rho,       // Packets ratio on the network
+                const uint32_t rho,       // Packets ratio on the network
+                //const float    rho,       // Packets ratio on the network
                 const uint32_t depth,     // Fifo depth
                 const uint32_t xmesh,   
@@ -121 +105 @@
       size_t destAdress();
 
+      void printStats();
+
+      void print_trace();
+
     private:
 
       // Component attributes
       const size_t                        m_length;             // Number of words to write
-      const float                         m_rho;                // Rate of packets in the network wanted
+      const size_t                        m_rho;                // Rate of packets in the network wanted
+      //const float                       m_rho;                // Rate of packets in the network wanted
       const size_t                        m_depth;              // Fifo depth
       const size_t                        m_xmesh;      
@@ -135 +124 @@
       const size_t                        m_ymax;
       const size_t                        m_srcid;
-      const size_t                        m_coord;
 
       size_t                              m_count;                  // Numbers of words sent
@@ -141 +129 @@
       uint64_t                            m_start_latency1;         // Start time of sending packet wanted
       uint64_t                            m_start_latency2;         // Start time of sending packet
-      float                               m_rhos;                   // Effective Rho during the simulation
+//      float                             m_rhos;                   // Effective Rho during the simulation
       size_t                              m_bc_nrsp;                // Expected number of responses for a broadcast command
+      addr_t                              m_address_to_send;        // Address to send the write command
 
       // Fifo transmitting date to the VCI FSM
-      GenericFifo<uint64_t>    m_date_fifo;
+      GenericFifo<uint32_t>    m_date_fifo;
 
       sc_signal<int>           r_vci_fsm;
@@ -153 +142 @@
       sc_signal<bool>          r_broadcast_req;
 
-      sc_signal<addr_t>        r_address_to_send;        // Address to send the write command
 
     }; // end class VciSyntheticInitiator