Merge branch 'dev' of github.com:purdue-aalp/gpgpu-sim_distribution into dev

1 files changed, 3 insertions, 2 deletions

diff --git a/src/gpgpu-sim/mem_fetch.cc b/src/gpgpu-sim/mem_fetch.cc
index a260a35..c9b0484 100644
--- a/src/gpgpu-sim/mem_fetch.cc
+++ b/src/gpgpu-sim/mem_fetch.cc
@@ -40,6 +40,7 @@ mem_fetch::mem_fetch( const mem_access_t &access,
                       unsigned sid, 
                       unsigned tpc, 
                       const struct memory_config *config,
+					  unsigned long long cycle,
 					  mem_fetch *m_original_mf,
 					  mem_fetch *m_original_wr_mf)
 
@@ -58,10 +59,10 @@ mem_fetch::mem_fetch( const mem_access_t &access,
    config->m_address_mapping.addrdec_tlx(access.get_addr(),&m_raw_addr);
    m_partition_addr = config->m_address_mapping.partition_address(access.get_addr());
    m_type = m_access.is_write()?WRITE_REQUEST:READ_REQUEST;
-   m_timestamp = gpu_sim_cycle + gpu_tot_sim_cycle;
+   m_timestamp = cycle;
    m_timestamp2 = 0;
    m_status = MEM_FETCH_INITIALIZED;
-   m_status_change = gpu_sim_cycle + gpu_tot_sim_cycle;
+   m_status_change = cycle;
    m_mem_config = config;
    icnt_flit_size = config->icnt_flit_size;
    original_mf = m_original_mf;