diff options
| author | Ahmed El-Shafiey <[email protected]> | 2013-05-20 14:08:21 -0800 |
|---|---|---|
| committer | Andrew Boktor <[email protected]> | 2014-08-14 13:50:47 -0700 |
| commit | a223bc92293cf4c8d0e45ca6f15acdc571755ee5 (patch) | |
| tree | 561f7edca64d4865eb8dbf02b2a1cecab2f0aa89 /src/gpgpu-sim/shader.h | |
| parent | 6d4f367f91dfaf9ea235f9fef25afb04de008c86 (diff) | |
Fixing bug 59 + cleaning some code related to the power model
Review ID:32001
[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 16205]
Diffstat (limited to 'src/gpgpu-sim/shader.h')
| -rw-r--r-- | src/gpgpu-sim/shader.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/gpgpu-sim/shader.h b/src/gpgpu-sim/shader.h index f2d38a0..f4d300b 100644 --- a/src/gpgpu-sim/shader.h +++ b/src/gpgpu-sim/shader.h @@ -556,10 +556,10 @@ private: else if( m_cu ) return m_cu->get_active_mask(); else abort(); } - unsigned get_op3() const + unsigned get_sp_op() const { - if( m_warp ) return m_warp->op3; - else if( m_cu ) return m_cu->get_op3(); + if( m_warp ) return m_warp->sp_op; + else if( m_cu ) return m_cu->get_sp_op(); else abort(); } unsigned get_oc_id() const { return m_cu->get_id(); } @@ -754,7 +754,7 @@ private: unsigned get_warp_id() const { return m_warp_id; } unsigned get_active_count() const { return m_warp->active_count(); } const active_mask_t & get_active_mask() const { return m_warp->get_active_mask(); } - unsigned get_op3() const { return m_warp->op3; } + unsigned get_sp_op() const { return m_warp->sp_op; } unsigned get_id() const { return m_cuid; } // returns CU hw id // modifiers @@ -1871,8 +1871,6 @@ public: } virtual void push(mem_fetch *mf) { - if( !mf->get_inst().empty() ) - m_core->mem_instruction_stats(mf->get_inst()); // not I$-fetch if ( mf && mf->isatomic() ) mf->do_atomic(); // execute atomic inside the "memory subsystem" m_cluster->push_response_fifo(mf); |