v3d: Drop the V3D 3.x vpm read dead code elimination.

We now have NIR dead code eliminating our VPM reads, so this shouldn't be
necessary.
This commit is contained in:
Eric Anholt 2019-02-26 21:37:47 -08:00
parent e8ee1f8eaf
commit 5c655c47db
1 changed files with 2 additions and 33 deletions

View File

@ -55,28 +55,8 @@ static bool
has_nonremovable_reads(struct v3d_compile *c, struct qinst *inst)
{
for (int i = 0; i < vir_get_nsrc(inst); i++) {
if (inst->src[i].file == QFILE_VPM) {
/* Instance ID, Vertex ID: Should have been removed at
* the NIR level
*/
if (inst->src[i].index == ~0)
return true;
uint32_t attr = inst->src[i].index / 4;
uint32_t offset = inst->src[i].index % 4;
if (c->vattr_sizes[attr] != offset)
return true;
/* Can't get rid of the last VPM read, or the
* simulator (at least) throws an error.
*/
uint32_t total_size = 0;
for (uint32_t i = 0; i < ARRAY_SIZE(c->vattr_sizes); i++)
total_size += c->vattr_sizes[i];
if (total_size == 1)
return true;
}
if (inst->src[i].file == QFILE_VPM)
return true;
}
return false;
@ -187,17 +167,6 @@ vir_opt_dead_code(struct v3d_compile *c)
continue;
}
for (int i = 0; i < vir_get_nsrc(inst); i++) {
if (inst->src[i].file != QFILE_VPM)
continue;
uint32_t attr = inst->src[i].index / 4;
uint32_t offset = (inst->src[i].index % 4);
if (c->vattr_sizes[attr] == offset) {
c->vattr_sizes[attr]--;
}
}
assert(inst != last_flags_write);
dce(c, inst);
progress = true;