summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/arch/hsail/insts/branch.hh3
-rw-r--r--src/gpu-compute/wavefront.cc2
2 files changed, 2 insertions, 3 deletions
diff --git a/src/arch/hsail/insts/branch.hh b/src/arch/hsail/insts/branch.hh
index 89bcc1277..3a520b216 100644
--- a/src/arch/hsail/insts/branch.hh
+++ b/src/arch/hsail/insts/branch.hh
@@ -133,7 +133,6 @@ namespace HsailISA
// Rpc and execution mask remain the same
w->pc(getTargetPc());
}
- w->discardFetch();
}
class BrnDirectInst : public BrnInstBase<LabelOperand>
@@ -293,7 +292,6 @@ namespace HsailISA
w->pushToReconvergenceStack(true_pc, rpc, true_mask);
}
assert(w->pc() != curr_pc);
- w->discardFetch();
}
@@ -405,7 +403,6 @@ namespace HsailISA
// Rpc and execution mask remain the same
w->pc(getTargetPc());
}
- w->discardFetch();
}
class BrDirectInst : public BrInstBase<LabelOperand>
diff --git a/src/gpu-compute/wavefront.cc b/src/gpu-compute/wavefront.cc
index caeed85a7..96f0d0e96 100644
--- a/src/gpu-compute/wavefront.cc
+++ b/src/gpu-compute/wavefront.cc
@@ -675,6 +675,8 @@ Wavefront::exec()
} else {
instructionBuffer.pop_front();
}
+ } else {
+ discardFetch();
}
if (computeUnit->shader->hsail_mode==Shader::SIMT) {