summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/abstract_hardware_model.cc3
-rw-r--r--src/abstract_hardware_model.h1
2 files changed, 1 insertions, 3 deletions
diff --git a/src/abstract_hardware_model.cc b/src/abstract_hardware_model.cc
index 1dddecd..733d602 100644
--- a/src/abstract_hardware_model.cc
+++ b/src/abstract_hardware_model.cc
@@ -709,7 +709,6 @@ void warp_inst_t::completed( unsigned long long cycle ) const
ptx_file_line_stats_add_latency(pc, latency * active_count());
}
-unsigned kernel_info_t::m_next_uid = 1;
/*A snapshot of the texture mappings needs to be stored in the kernel's info as
kernels should use the texture bindings seen at the time of launch and textures
@@ -724,7 +723,7 @@ kernel_info_t::kernel_info_t( dim3 gridDim, dim3 blockDim, class function_info *
m_next_cta.z=0;
m_next_tid=m_next_cta;
m_num_cores_running=0;
- m_uid = m_next_uid++;
+ m_uid = (entry->gpgpu_ctx->kernel_info_m_next_uid)++;
m_param_mem = new memory_space_impl<8192>("param",64*1024);
//Jin: parent and child kernel management for CDP
diff --git a/src/abstract_hardware_model.h b/src/abstract_hardware_model.h
index 519416d..d13b8c6 100644
--- a/src/abstract_hardware_model.h
+++ b/src/abstract_hardware_model.h
@@ -299,7 +299,6 @@ private:
class function_info *m_kernel_entry;
unsigned m_uid;
- static unsigned m_next_uid;
//These maps contain the snapshot of the texture mappings at kernel launch
std::map<std::string, const struct cudaArray*> m_NameToCudaArray;