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/cuda-sim.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/cuda-sim.cc')
| -rw-r--r-- | src/cuda-sim/cuda-sim.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/cuda-sim/cuda-sim.cc b/src/cuda-sim/cuda-sim.cc index 1ccc156..ab54121 100644 --- a/src/cuda-sim/cuda-sim.cc +++ b/src/cuda-sim/cuda-sim.cc @@ -556,14 +556,14 @@ void ptx_instruction::set_bar_type() break; case RED_OPTION: bar_type = RED; - switch(m_reduction_op){ - case POPC_REDUCTION: + switch(m_atomic_spec){ + case ATOMIC_POPC: red_type = POPC_RED; break; - case AND_REDUCTION: + case ATOMIC_AND: red_type = AND_RED; break; - case OR_REDUCTION: + case ATOMIC_OR: red_type = OR_RED; break; } |