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

nir/opt_if: limit rewrite_uniform_uses iand recursion

Browse source 
https://github.com/doitsujin/dxvk/issues/4970 has a shader
where unrolled loops caused large iand chains and if we don't
limit this  we won't finish compiling in reasonable time.

Cc: mesa-stable

Acked-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35312>
This commit is contained in:
Georg Lehmann 2025-06-03 14:09:54 +02:00 • committed by Marge Bot
parent eaeaf9554d
commit 1c4070f3e9
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/compiler/nir/nir_opt_if.c
View file

@ -1060,7 +1060,7 @@ rewrite_comp_uses_within_if(nir_builder *b, nir_if *nif, bool invert,
* use(d)
*/
static bool
opt_if_rewrite_uniform_uses(nir_builder *b, nir_if *nif, nir_scalar cond, bool accept_ine)
opt_if_rewrite_uniform_uses(nir_builder *b, nir_if *nif, nir_scalar cond, unsigned iand_depth)
{
bool progress = false;
@ -1068,13 +1068,13 @@ opt_if_rewrite_uniform_uses(nir_builder *b, nir_if *nif, nir_scalar cond, bool a
return false;
nir_op op = nir_scalar_alu_op(cond);
if (op == nir_op_iand) {
progress |= opt_if_rewrite_uniform_uses(b, nif, nir_scalar_chase_alu_src(cond, 0), false);
progress |= opt_if_rewrite_uniform_uses(b, nif, nir_scalar_chase_alu_src(cond, 1), false);
if (op == nir_op_iand && iand_depth < 10) {
progress |= opt_if_rewrite_uniform_uses(b, nif, nir_scalar_chase_alu_src(cond, 0), iand_depth + 1);
progress |= opt_if_rewrite_uniform_uses(b, nif, nir_scalar_chase_alu_src(cond, 1), iand_depth + 1);
return progress;
}
if (op != nir_op_ieq && (op != nir_op_ine || !accept_ine))
if (op != nir_op_ieq && (op != nir_op_ine || iand_depth != 0))
return false;
for (unsigned i = 0; i < 2; i++) {
@ -1416,7 +1416,7 @@ opt_if_safe_cf_list(nir_builder *b, struct exec_list *cf_list, nir_opt_if_option
progress |= opt_if_safe_cf_list(b, &nif->else_list, options);
progress |= opt_if_evaluate_condition_use(b, nif);
nir_scalar cond = nir_scalar_resolved(nif->condition.ssa, 0);
progress |= opt_if_rewrite_uniform_uses(b, nif, cond, true);
progress |= opt_if_rewrite_uniform_uses(b, nif, cond, 0);
progress |= opt_if_phi_src_unused(b, nif);
break;
}