# Node ID 28636ac9878f21689e52213d4e5176b15b468cba # Parent 38a348e3e014c1e18d6a72fc0551d197fbb7dc98 diff --git a/src/arch/hsail/insts/branch.hh b/src/arch/hsail/insts/branch.hh --- a/src/arch/hsail/insts/branch.hh +++ b/src/arch/hsail/insts/branch.hh @@ -133,7 +133,6 @@ // Rpc and execution mask remain the same w->pc(getTargetPc()); } - w->discardFetch(); } class BrnDirectInst : public BrnInstBase @@ -293,7 +292,6 @@ w->pushToReconvergenceStack(true_pc, rpc, true_mask); } assert(w->pc() != curr_pc); - w->discardFetch(); } @@ -405,7 +403,6 @@ // Rpc and execution mask remain the same w->pc(getTargetPc()); } - w->discardFetch(); } class BrDirectInst : public BrInstBase diff --git a/src/gpu-compute/wavefront.cc b/src/gpu-compute/wavefront.cc --- a/src/gpu-compute/wavefront.cc +++ b/src/gpu-compute/wavefront.cc @@ -675,6 +675,8 @@ } else { instructionBuffer.pop_front(); } + } else { + discardFetch(); } if (computeUnit->shader->hsail_mode==Shader::SIMT) {