intel/fs: rerun divergence analysis prior to convert_from_ssa

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/9964
Cc: mesa-stable
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26235>
This commit is contained in:
Lionel Landwerlin 2023-11-16 21:24:31 +02:00 committed by Marge Bot
parent cd543c94fd
commit 6dbb5f1e07

View file

@ -1738,6 +1738,13 @@ brw_postprocess_nir(nir_shader *nir, const struct brw_compiler *compiler,
nir_validate_ssa_dominance(nir, "before nir_convert_from_ssa");
/* Rerun the divergence analysis before convert_from_ssa as this pass has
* some assert on consistent divergence flags.
*/
NIR_PASS(_, nir, nir_convert_to_lcssa, true, true);
NIR_PASS_V(nir, nir_divergence_analysis);
OPT(nir_opt_remove_phis);
OPT(nir_convert_from_ssa, true);
if (!is_scalar) {