diff options
| author | Tim Rogers <[email protected]> | 2020-07-12 23:07:43 -0400 |
|---|---|---|
| committer | Tim Rogers <[email protected]> | 2020-07-12 23:07:43 -0400 |
| commit | 4192a5df8c400d9fc19d15a9eaca74191e45d08e (patch) | |
| tree | ad6787a77c25f47a47faa7f195da9a011ff18bdc /src/cuda-sim/cuda-sim.cc | |
| parent | 4d64f31587569d4e8800aa81ececb9e809817d78 (diff) | |
| parent | 78a52b027e7ca30860fdf8366c08c0590f857810 (diff) | |
Merge remote-tracking branch 'gpgpu/dev' into dev-4.x
Diffstat (limited to 'src/cuda-sim/cuda-sim.cc')
| -rw-r--r-- | src/cuda-sim/cuda-sim.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cuda-sim/cuda-sim.cc b/src/cuda-sim/cuda-sim.cc index 75dd3c8..71f0703 100644 --- a/src/cuda-sim/cuda-sim.cc +++ b/src/cuda-sim/cuda-sim.cc @@ -1741,7 +1741,7 @@ void ptx_thread_info::ptx_exec_inst(warp_inst_t &inst, unsigned lane_id) { } else { const ptx_instruction *pI_saved = pI; ptx_instruction *pJ = NULL; - if (pI->get_opcode() == VOTE_OP) { + if (pI->get_opcode() == VOTE_OP || pI->get_opcode() == ACTIVEMASK_OP) { pJ = new ptx_instruction(*pI); *((warp_inst_t *)pJ) = inst; // copy active mask information pI = pJ; |