Fix for bug 9: Now querying the state of the pdom stack in call_imp and callp_imp using a core_t function, thus moving the querying function into the abstract model of the core instead of shader_core_ctx which represents the performance mode. This code simplify the querying and also avoid the unnecessary calling hierarchy that was used.

[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 13375]

3 files changed, 0 insertions, 22 deletions

diff --git a/src/gpgpu-sim/gpu-sim.h b/src/gpgpu-sim/gpu-sim.h
index 2c0fed8..ac2be00 100644
--- a/src/gpgpu-sim/gpu-sim.h
+++ b/src/gpgpu-sim/gpu-sim.h
@@ -245,8 +245,6 @@ public:
    void update_stats();
    void deadlock_check();
 
-   void get_pdom_stack_top_info( unsigned sid, unsigned tid, unsigned *pc, unsigned *rpc );
-
    int shared_mem_size() const;
    int num_registers_per_core() const;
    int wrp_size() const;
diff --git a/src/gpgpu-sim/shader.cc b/src/gpgpu-sim/shader.cc
index 8ed907d..ddb544a 100644
--- a/src/gpgpu-sim/shader.cc
+++ b/src/gpgpu-sim/shader.cc
@@ -289,18 +289,6 @@ address_type shader_core_ctx::next_pc( int tid ) const
     return the_thread->get_pc(); // PC should already be updatd to next PC at this point (was set in shader_decode() last time thread ran)
 }
 
-void gpgpu_sim::get_pdom_stack_top_info( unsigned sid, unsigned tid, unsigned *pc, unsigned *rpc )
-{
-    unsigned cluster_id = m_shader_config->sid_to_cluster(sid);
-    m_cluster[cluster_id]->get_pdom_stack_top_info(sid,tid,pc,rpc);
-}
-
-void shader_core_ctx::get_pdom_stack_top_info( unsigned tid, unsigned *pc, unsigned *rpc ) const
-{
-    unsigned warp_id = tid/m_config->warp_size;
-    m_simt_stack[warp_id]->get_pdom_stack_top_info(pc,rpc);
-}
-
 void shader_core_stats::print( FILE* fout ) const
 {
     unsigned icount_uarch=0;
@@ -2449,12 +2437,6 @@ void simt_core_cluster::icnt_cycle()
     }
 }
 
-void simt_core_cluster::get_pdom_stack_top_info( unsigned sid, unsigned tid, unsigned *pc, unsigned *rpc ) const
-{
-    unsigned cid = m_config->sid_to_cid(sid);
-    m_core[cid]->get_pdom_stack_top_info(tid,pc,rpc);
-}
-
 void simt_core_cluster::display_pipeline( unsigned sid, FILE *fout, int print_mem, int mask )
 {
     m_core[m_config->sid_to_cid(sid)]->display_pipeline(fout,print_mem,mask);
diff --git a/src/gpgpu-sim/shader.h b/src/gpgpu-sim/shader.h
index 5612150..558335e 100644
--- a/src/gpgpu-sim/shader.h
+++ b/src/gpgpu-sim/shader.h
@@ -1227,7 +1227,6 @@ public:
     
     // accessors
     virtual bool warp_waiting_at_barrier( unsigned warp_id ) const;
-    void get_pdom_stack_top_info( unsigned tid, unsigned *pc, unsigned *rpc ) const;
 
 // used by pipeline timing model components:
     // modifiers
@@ -1360,7 +1359,6 @@ public:
         m_response_fifo.push_back(mf);
     }
 
-    void get_pdom_stack_top_info( unsigned sid, unsigned tid, unsigned *pc, unsigned *rpc ) const;
     unsigned max_cta( const kernel_info_t &kernel );
     unsigned get_not_completed() const;
     void print_not_completed( FILE *fp ) const;