This fixes two issues. First, we had a use-after-free in the case where the instruction got deleted and we tried to return mov->dest.write_mask. Second, in the case where we are doing a self-mov of a register, we delete those channels that are moved to themselves from the write-mask. This means that those channels aren't reported as being handled even though they are. We now stash off the write-mask before remove unneeded channels so that they still get reported as handled. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94073 Reviewed-by: Matt Turner <mattst88@gmail.com> Cc: "11.0 11.1" <mesa-stable@lists.freedesktop.org>tags/11.2-branchpoint
@@ -83,6 +83,8 @@ insert_mov(nir_alu_instr *vec, unsigned start_idx, nir_shader *shader) | |||
} | |||
} | |||
unsigned channels_handled = mov->dest.write_mask; | |||
/* In some situations (if the vecN is involved in a phi-web), we can end | |||
* up with a mov from a register to itself. Some of those channels may end | |||
* up doing nothing and there's no reason to have them as part of the mov. | |||
@@ -103,7 +105,7 @@ insert_mov(nir_alu_instr *vec, unsigned start_idx, nir_shader *shader) | |||
ralloc_free(mov); | |||
} | |||
return mov->dest.write_mask; | |||
return channels_handled; | |||
} | |||
static bool |