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

nir: Move constant folding of vote to opt_constant_folding

Browse source 
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7366>
This commit is contained in:
Jason Ekstrand 2020-10-29 10:08:15 -05:00
parent 9492ab2864
commit e59d6350d1
2 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/compiler/nir/nir_opt_constant_folding.c
View file

@ -264,6 +264,27 @@ try_fold_intrinsic(nir_builder *b, nir_intrinsic_instr *intrin,
return true;
}
case nir_intrinsic_vote_any:
case nir_intrinsic_vote_all:
if (nir_src_is_const(intrin->src[0])) {
nir_ssa_def_rewrite_uses(&intrin->dest.ssa,
nir_src_for_ssa(intrin->src[0].ssa));
nir_instr_remove(&intrin->instr);
return true;
}
return false;
case nir_intrinsic_vote_feq:
case nir_intrinsic_vote_ieq:
if (nir_src_is_const(intrin->src[0])) {
b->cursor = nir_before_instr(&intrin->instr);
nir_ssa_def_rewrite_uses(&intrin->dest.ssa,
nir_src_for_ssa(nir_imm_true(b)));
nir_instr_remove(&intrin->instr);
return true;
}
return false;
default:
return false;
}

19
src/compiler/nir/nir_opt_intrinsics.c
View file

@ -42,20 +42,9 @@ opt_intrinsics_impl(nir_function_impl *impl,
continue;
nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
nir_ssa_def *replacement = NULL;
b.cursor = nir_before_instr(instr);
switch (intrin->intrinsic) {
case nir_intrinsic_vote_any:
case nir_intrinsic_vote_all:
if (nir_src_is_const(intrin->src[0]))
replacement = nir_ssa_for_src(&b, intrin->src[0], 1);
break;
case nir_intrinsic_vote_feq:
case nir_intrinsic_vote_ieq:
if (nir_src_is_const(intrin->src[0]))
replacement = nir_imm_true(&b);
break;
case nir_intrinsic_load_sample_mask_in:
/* Transform:
* gl_SampleMaskIn == 0 ---> gl_HelperInvocation
@ -95,14 +84,6 @@ opt_intrinsics_impl(nir_function_impl *impl,
default:
break;
}
if (!replacement)
continue;
nir_ssa_def_rewrite_uses(&intrin->dest.ssa,
nir_src_for_ssa(replacement));
nir_instr_remove(instr);
progress = true;
}
}