/**
* @file vc4_opt_coalesce_ff_writes.c
*
- * This modifies instructions that generate the value consumed by a VPM write
- * to write directly into the VPM.
+ * This modifies instructions that generate the value consumed by a VPM or TMU
+ * coordinate write to write directly into the VPM or TMU.
*/
#include "vc4_qir.h"
bool
qir_opt_coalesce_ff_writes(struct vc4_compile *c)
{
- if (c->stage == QSTAGE_FRAG)
- return false;
-
/* For now, only do this pass when we don't have control flow. */
struct qblock *block = qir_entry_block(c);
if (block != qir_exit_block(c))
if (mov_inst->src[0].file != QFILE_TEMP)
continue;
- if (mov_inst->dst.file != QFILE_VPM)
+ if (!(mov_inst->dst.file == QFILE_VPM ||
+ mov_inst->dst.file == QFILE_TLB_COLOR_WRITE ||
+ mov_inst->dst.file == QFILE_TLB_COLOR_WRITE_MS ||
+ qir_is_tex(mov_inst)))
continue;
uint32_t temp = mov_inst->src[0].index;
if (!inst)
continue;
+ /* Don't bother trying to fold in an ALU op using a uniform to
+ * a texture op, as we'll just have to lower the uniform back
+ * out.
+ */
+ if (qir_is_tex(mov_inst) && qir_has_uniform_read(inst))
+ continue;
+
if (qir_depends_on_flags(inst) || inst->sf)
continue;
if (qir_has_side_effects(c, inst) ||
- qir_has_side_effect_reads(c, inst)) {
+ qir_has_side_effect_reads(c, inst) ||
+ inst->op == QOP_TLB_COLOR_READ ||
+ inst->op == QOP_VARY_ADD_C) {
continue;
}
- /* Move the generating instruction to the end of the program
- * to maintain the order of the VPM writes.
+ /* Move the generating instruction into the position of the FF
+ * write.
*/
+ c->defs[inst->dst.index] = NULL;
+ inst->dst.file = mov_inst->dst.file;
+ inst->dst.index = mov_inst->dst.index;
+ if (qir_has_implicit_tex_uniform(mov_inst)) {
+ inst->src[qir_get_tex_uniform_src(inst)] =
+ mov_inst->src[qir_get_tex_uniform_src(mov_inst)];
+ }
+
list_del(&inst->link);
list_addtail(&inst->link, &mov_inst->link);
- qir_remove_instruction(c, mov_inst);
- c->defs[inst->dst.index] = NULL;
- inst->dst.file = QFILE_VPM;
- inst->dst.index = 0;
+ qir_remove_instruction(c, mov_inst);
progress = true;
}