diff options
| author | Ahmed El-Shafiey <[email protected]> | 2014-08-06 20:08:15 -0800 |
|---|---|---|
| committer | Andrew Boktor <[email protected]> | 2014-08-14 13:51:00 -0700 |
| commit | ad5a3cf3480e3fa302382122af21278c881595d6 (patch) | |
| tree | 52c7edf0639ec380d9fe772db26842c0415fdfae /src/cuda-sim/instructions.cc | |
| parent | fd3c208f3c51c5520dcd7150d8a521a61577a9d5 (diff) | |
This should fix 2.3 regression and may fix others as well.
Remove redudant definition for some tokens which confuses the parser
[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 18462]
Diffstat (limited to 'src/cuda-sim/instructions.cc')
| -rw-r--r-- | src/cuda-sim/instructions.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/cuda-sim/instructions.cc b/src/cuda-sim/instructions.cc index 5d17f95..cf7f04a 100644 --- a/src/cuda-sim/instructions.cc +++ b/src/cuda-sim/instructions.cc @@ -1237,7 +1237,7 @@ void bar_impl( const ptx_instruction *pIin, ptx_thread_info *thread ) { ptx_instruction * pI = const_cast<ptx_instruction *>(pIin); unsigned bar_op = pI->barrier_op(); - unsigned red_op = pI->reduction_op(); + unsigned red_op = pI->get_atomic(); unsigned ctaid = thread->get_cta_uid(); switch(bar_op){ @@ -1288,13 +1288,13 @@ void bar_impl( const ptx_instruction *pIin, ptx_thread_info *thread ) pI->set_bar_id(op1_data.u32); pI->set_bar_count(op2_data.u32); switch(red_op){ - case POPC_REDUCTION: + case ATOMIC_POPC: thread->popc_reduction(ctaid,op1_data.u32,op3_data.u32); break; - case AND_REDUCTION: + case ATOMIC_AND: thread->and_reduction(ctaid,op1_data.u32,op3_data.u32); break; - case OR_REDUCTION: + case ATOMIC_OR: thread->or_reduction(ctaid,op1_data.u32,op3_data.u32); break; default: @@ -1311,13 +1311,13 @@ void bar_impl( const ptx_instruction *pIin, ptx_thread_info *thread ) op2_data.u32=!(op2_data.pred & 0x0001); pI->set_bar_id(op1_data.u32); switch(red_op){ - case POPC_REDUCTION: + case ATOMIC_POPC: thread->popc_reduction(ctaid,op1_data.u32,op2_data.u32); break; - case AND_REDUCTION: + case ATOMIC_AND: thread->and_reduction(ctaid,op1_data.u32,op2_data.u32); break; - case OR_REDUCTION: + case ATOMIC_OR: thread->or_reduction(ctaid,op1_data.u32,op2_data.u32); break; default: |