fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 19:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

vc4: Prevent copy propagating out the MOVs from r4.

Browse source 
Copy propagating these might result in reading the r4 after some other
instruction has written r4.  Just prevent all copy propagation of this for
now.

Fixes bad rendering with upcoming indirect register access support, where
the copy propagation was consistently happening across another read.
This commit is contained in:
Eric Anholt 2014-10-09 16:36:45 +02:00
parent c4b0dd5356
commit 93cac2637b
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/gallium/drivers/vc4/vc4_opt_copy_propagation.c
View file

@ -41,10 +41,14 @@ qir_opt_copy_propagation(struct vc4_compile *c)
struct simple_node *node;
bool debug = false;
struct qreg *movs = calloc(c->num_temps, sizeof(struct qreg));
struct qinst **defs = calloc(c->num_temps, sizeof(struct qreg));
foreach(node, &c->instructions) {
struct qinst *inst = (struct qinst *)node;
if (inst->dst.file == QFILE_TEMP)
defs[inst->dst.index] = inst;
/* A single instruction can only read one uniform value. (It
* could maybe read the same uniform value in two operands,
* but that doesn't seem important to do).
@ -81,10 +85,16 @@ qir_opt_copy_propagation(struct vc4_compile *c)
}
}
if (inst->op == QOP_MOV && inst->dst.file == QFILE_TEMP)
if (inst->op == QOP_MOV &&
inst->dst.file == QFILE_TEMP &&
(inst->src[0].file != QFILE_TEMP ||
(defs[inst->src[0].index]->op != QOP_TEX_RESULT &&
defs[inst->dst.index]->op != QOP_TLB_COLOR_READ))) {
movs[inst->dst.index] = inst->src[0];
}
}
free(movs);
free(defs);
return progress;
}