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

vc4: Drop dependency on r3 for color packing. 

We can avoid it by carefully ordering the packing.  This is important as a
step in giving r3 to the register allocator.

total instructions in shared programs: 56087 -> 55957 (-0.23%)
instructions in affected programs:     18368 -> 18238 (-0.71%)
This commit is contained in:
Eric Anholt 2014-09-07 14:38:24 -07:00
parent dfbf58c439
commit 24c5ab7bbb
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/gallium/drivers/vc4/vc4_qpu_emit.c
View File

@ -296,17 +296,40 @@ vc4_generate_code(struct vc4_context *vc4, struct vc4_compile *c)
break;
case QOP_PACK_COLORS:
case QOP_PACK_COLORS: {
/* We have to be careful not to start writing over one
* of our source values when incrementally writing the
* destination. So, if the dst is one of the srcs, we
* pack that one first (and we pack 4 channels at once
* for the first pack).
*/
struct qpu_reg first_pack = src[0];
for (int i = 0; i < 4; i++) {
queue(c, qpu_m_MOV(qpu_r3(), src[i]));
if (src[i].mux == dst.mux &&
src[i].addr == dst.addr) {
first_pack = dst;
break;
}
}
queue(c, qpu_m_MOV(dst, first_pack));
*last_inst(c) |= QPU_PM;
*last_inst(c) |= QPU_SET_FIELD(QPU_PACK_MUL_8888,
QPU_PACK);
for (int i = 0; i < 4; i++) {
if (src[i].mux == first_pack.mux &&
src[i].addr == first_pack.addr) {
continue;
}
queue(c, qpu_m_MOV(dst, src[i]));
*last_inst(c) |= QPU_PM;
*last_inst(c) |= QPU_SET_FIELD(QPU_PACK_MUL_8A + i,
QPU_PACK);
}
queue(c, qpu_a_MOV(dst, qpu_r3()));
break;
}
case QOP_FRAG_X:
queue(c, qpu_a_ITOF(dst,