KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nv50/ir: fix moves to/from flags 

Noticed this when looking at a trace that caused flags to spill to/from
registers. The flags source/destination wasn't encoded correctly
according to both envydis and nvdisasm.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
This commit is contained in:
Ilia Mirkin 2015-11-25 23:36:23 -05:00
parent 101e315cc1
commit 6c6f28c35e
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nv50.cpp
View File

@ -756,10 +756,10 @@ CodeEmitterNV50::emitMOV(const Instruction *i)
assert(sf == FILE_GPR || df == FILE_GPR);
if (sf == FILE_FLAGS) {
assert(i->flagsSrc >= 0);
code[0] = 0x00000001;
code[1] = 0x20000000;
defId(i->def(0), 2);
srcId(i->src(0), 12);
emitFlagsRd(i);
} else
if (sf == FILE_ADDRESS) {
@ -770,11 +770,12 @@ CodeEmitterNV50::emitMOV(const Instruction *i)
emitFlagsRd(i);
} else
if (df == FILE_FLAGS) {
assert(i->flagsDef >= 0);
code[0] = 0x00000001;
code[1] = 0xa0000000;
defId(i->def(0), 4);
srcId(i->src(0), 9);
emitFlagsRd(i);
emitFlagsWr(i);
} else
if (sf == FILE_IMMEDIATE) {
code[0] = 0x10008001;

4
src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp
View File

@ -1599,6 +1599,8 @@ SpillCodeInserter::spill(Instruction *defi, Value *slot, LValue *lval)
st = new_Instruction(func, OP_CVT, ty);
st->setDef(0, slot);
st->setSrc(0, lval);
if (lval->reg.file == FILE_FLAGS)
st->flagsSrc = 0;
}
defi->bb->insertAfter(defi, st);
}
@ -1640,6 +1642,8 @@ SpillCodeInserter::unspill(Instruction *usei, LValue *lval, Value *slot)
}
ld->setDef(0, lval);
ld->setSrc(0, slot);
if (lval->reg.file == FILE_FLAGS)
ld->flagsDef = 0;
usei->bb->insertBefore(usei, ld);
return lval;