github-mirrors/vortex
1
0
Fork 0
mirror of https://github.com/vortexgpgpu/vortex.git synced 2025-04-23 21:39:10 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

split-join fix for unanimous branches

Browse source
This commit is contained in:
Meghana 2016-03-07 21:13:10 -05:00
parent 8e51332932
commit 4c13eaf8ce
2 changed files with 37 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/include/core.h
View file

@ -55,16 +55,17 @@ namespace Harp {
DomStackEntry(
unsigned p, const std::vector<std::vector<Reg<bool> > >& m,
std::vector<bool> &tm, Word pc
): pc(pc), fallThrough(false)
): pc(pc), fallThrough(false), uni(false)
{
for (unsigned i = 0; i < m.size(); ++i)
tmask.push_back(!bool(m[i][p]) && tm[i]);
}
DomStackEntry(const std::vector<bool> &tmask):
tmask(tmask), fallThrough(true) {}
tmask(tmask), fallThrough(true), uni(false) {}
bool fallThrough;
bool uni;
std::vector<bool> tmask;
Word pc;
};

36
src/instruction.cpp
View file

@ -112,6 +112,28 @@ ostream &Harp::operator<<(ostream& os, Instruction &inst) {
return os;
}
bool checkUnanimous(unsigned p, const std::vector<std::vector<Reg<bool> > >& m,
const std::vector<bool> &tm) {
bool same;
unsigned i;
for (i = 0; i < m.size(); ++i) {
if (tm[i]) {
same = m[i][p];
break;
}
}
if (i == m.size())
throw DivergentBranchException();
for (; i < m.size(); ++i) {
if (tm[i]) {
if (same != (bool(m[i][p]))) {
return false;
}
}
}
return true;
}
void Instruction::executeOn(Warp &c) {
D(3, "Begin instruction execute.");
@ -345,7 +367,12 @@ void Instruction::executeOn(Warp &c) {
break;
case SPLIT: if (sjOnce) {
sjOnce = false;
// TODO: if mask becomes all-zero, fall through
if (checkUnanimous(pred, c.pred, c.tmask)) {
DomStackEntry e(c.tmask);
e.uni = true;
c.domStack.push(e);
break;
}
DomStackEntry e(pred, c.pred, c.tmask, c.pc);
c.domStack.push(c.tmask);
c.domStack.push(e);
@ -355,7 +382,12 @@ void Instruction::executeOn(Warp &c) {
break;
case JOIN: if (sjOnce) {
sjOnce = false;
// TODO: if mask becomes all-zero, fall through
if (!c.domStack.empty() && c.domStack.top().uni) {
D(2, "Uni branch at join");
c.tmask = c.domStack.top().tmask;
c.domStack.pop();
break;
}
if (!c.domStack.top().fallThrough) {
if (!pcSet) nextPc = c.domStack.top().pc;
pcSet = true;