fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 06:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nv50/ir: fix reg file conflicts with undefined-value placeholders

Browse source
This commit is contained in:
Christoph Bumiller 2012-04-06 19:18:05 +02:00
parent 51327a2df2
commit 054fab5b48
1 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/gallium/drivers/nv50/codegen/nv50_ir_ssa.cpp
View file

@ -293,11 +293,12 @@ public:
inline LValue *getStackTop(Value *);
LValue *mkUndefined(Value *);
private:
Stack *stack;
Function *func;
Program *prog;
Instruction *undef;
};
bool
@ -402,12 +403,6 @@ Function::convertToSSA()
RenamePass::RenamePass(Function *fn) : func(fn), prog(fn->getProgram())
{
BasicBlock *root = BasicBlock::get(func->cfg.getRoot());
undef = new_Instruction(func, OP_NOP, TYPE_U32);
undef->setDef(0, new_LValue(func, FILE_GPR));
root->insertHead(undef);
stack = new Stack[func->allLValues.getSize()];
}
@ -425,6 +420,18 @@ RenamePass::getStackTop(Value *val)
return reinterpret_cast<LValue *>(stack[val->id].peek().u.p);
}
LValue *
RenamePass::mkUndefined(Value *val)
{
LValue *lval = val->asLValue();
assert(lval);
LValue *ud = new_LValue(func, lval);
Instruction *nop = new_Instruction(func, OP_NOP, typeOfSize(lval->reg.size));
nop->setDef(0, ud);
BasicBlock::get(func->cfg.getRoot())->insertHead(nop);
return ud;
}
bool RenamePass::run()
{
if (!stack)
@ -463,7 +470,7 @@ void RenamePass::search(BasicBlock *bb)
continue;
lval = getStackTop(lval);
if (!lval)
lval = static_cast<LValue *>(undef->getDef(0));
lval = mkUndefined(stmt->getSrc(s));
stmt->setSrc(s, lval);
}
}
@ -494,7 +501,7 @@ void RenamePass::search(BasicBlock *bb)
for (phi = sb->getPhi(); phi && phi->op == OP_PHI; phi = phi->next) {
lval = getStackTop(phi->getSrc(p));
if (!lval)
lval = undef->getDef(0)->asLValue();
lval = mkUndefined(phi->getSrc(p));
phi->setSrc(p, lval);
}
}
@ -510,12 +517,14 @@ void RenamePass::search(BasicBlock *bb)
continue;
lval = getStackTop(lval);
if (!lval)
lval = static_cast<LValue *>(undef->getDef(0));
lval = mkUndefined(it->get());
it->set(lval);
}
}
for (Instruction *stmt = bb->getFirst(); stmt; stmt = stmt->next) {
if (stmt->op == OP_NOP)
continue;
for (d = 0; stmt->defExists(d); ++d)
stack[stmt->def(d).preSSA()->id].pop();
}