diff options
| author | Tim Rogers <[email protected]> | 2011-10-27 16:39:10 -0800 |
|---|---|---|
| committer | Andrew Boktor <[email protected]> | 2014-08-14 13:18:23 -0700 |
| commit | b4dcac15e64b9007930824409ca3ed901da37ef3 (patch) | |
| tree | 7742ecd2dfd90b61c68658254feab51a3a3598e5 /src/abstract_hardware_model.h | |
| parent | 332f225a945acd9c884dc0fb7cb993e6865dc415 (diff) | |
Fixing the atomics I broke with the insn count fix
[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 10754]
Diffstat (limited to 'src/abstract_hardware_model.h')
| -rw-r--r-- | src/abstract_hardware_model.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/abstract_hardware_model.h b/src/abstract_hardware_model.h index d0822d0..a314300 100644 --- a/src/abstract_hardware_model.h +++ b/src/abstract_hardware_model.h @@ -654,12 +654,15 @@ public: } // modifiers - void do_atomic() + void do_atomic() { + do_atomic( m_warp_active_mask ); + } + void do_atomic( const active_mask_t& access_mask ) { assert( m_isatomic && !m_empty ); for( unsigned i=0; i < m_config->warp_size; i++ ) { - if( m_warp_active_mask.test(i) ) + if( access_mask.test(i) ) { dram_callback_t &cb = m_per_scalar_thread[i].callback; if( cb.thread ) |