From c8f254ab524238b93322546e4fd898a26cf0f42d Mon Sep 17 00:00:00 2001
From: Ayub Gubran <ayoubang@yahoo.com>
Date: Mon, 9 Jan 2012 13:17:27 -0800
Subject: Integrating the pure functional simulation Merging

//depot/gpgpu_sim_research/fermi_ayoub/distribution/src/gpgpu-sim/gpu-sim.cc
//depot/gpgpu_sim_research/fermi_ayoub/distribution/src/gpgpu-sim/gpu-sim.h
//depot/gpgpu_sim_research/fermi_ayoub/distribution/src/gpgpu-sim/shader.cc
//depot/gpgpu_sim_research/fermi_ayoub/distribution/src/gpgpu-sim/shader.h

to //depot/gpgpu_sim_research/fermi/distribution/src/gpgpu-sim/...

[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 11287]
---
 src/gpgpu-sim/gpu-sim.cc | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

(limited to 'src/gpgpu-sim/gpu-sim.cc')

diff --git a/src/gpgpu-sim/gpu-sim.cc b/src/gpgpu-sim/gpu-sim.cc
index 447c040..cc47da9 100644
--- a/src/gpgpu-sim/gpu-sim.cc
+++ b/src/gpgpu-sim/gpu-sim.cc
@@ -711,10 +711,10 @@ void shader_core_ctx::issue_block2core( kernel_info_t &kernel )
     warp_set_t warps;
     unsigned nthreads_in_block= 0;
     for (unsigned i = start_thread; i<end_thread; i++) {
-        m_thread[i].m_cta_id = free_cta_hw_id;
+        m_threadState[i].m_cta_id = free_cta_hw_id;
         unsigned warp_id = i/m_config->warp_size;
-        nthreads_in_block += ptx_sim_init_thread(kernel,&m_thread[i].m_functional_model_thread_state,m_sid,i,cta_size-(i-start_thread),m_config->n_thread_per_shader,this,free_cta_hw_id,warp_id,m_cluster->get_gpu());
-        m_thread[i].m_active = true; 
+        nthreads_in_block += ptx_sim_init_thread(kernel,&m_thread[i],m_sid,i,cta_size-(i-start_thread),m_config->n_thread_per_shader,this,free_cta_hw_id,warp_id,m_cluster->get_gpu());
+        m_threadState[i].m_active = true; 
         warps.set( warp_id );
     }
     assert( nthreads_in_block > 0 && nthreads_in_block <= m_config->n_thread_per_shader); // should be at least one, but less than max
@@ -971,6 +971,21 @@ void gpgpu_sim::dump_pipeline( int mask, int s, int m ) const
    fflush(stdout);
 }
 
+const struct shader_core_config * gpgpu_sim::getShaderCoreConfig()
+{
+   return m_shader_config;
+}
+
+const struct memory_config * gpgpu_sim::getMemoryConfig()
+{
+   return m_memory_config;
+}
+
+simt_core_cluster * gpgpu_sim::getSIMTCluster()
+{
+   return *m_cluster;
+}
+
 void memory_partition_unit::visualizer_print( gzFile visualizer_file )
 {
    m_dram->visualizer_print(visualizer_file);
-- 
cgit v1.3