nir/opt_intrinsics: Refactor a bit

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-23 16:05:29 -05:00
parent 3b281861c1
commit 2f5b56ae23

View File

@@ -29,30 +29,19 @@
*/
static bool
opt_intrinsics_impl(nir_function_impl *impl,
opt_intrinsics_intrin(nir_builder *b, nir_intrinsic_instr *intrin,
const struct nir_shader_compiler_options *options)
{
nir_builder b;
nir_builder_init(&b, impl);
bool progress = false;
nir_foreach_block(block, impl) {
nir_foreach_instr_safe(instr, block) {
if (instr->type != nir_instr_type_intrinsic)
continue;
nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
b.cursor = nir_before_instr(instr);
switch (intrin->intrinsic) {
case nir_intrinsic_load_sample_mask_in:
case nir_intrinsic_load_sample_mask_in: {
/* Transform:
* gl_SampleMaskIn == 0 ---> gl_HelperInvocation
* gl_SampleMaskIn != 0 ---> !gl_HelperInvocation
*/
if (!options->optimize_sample_mask_in)
continue;
return false;
bool progress = false;
nir_foreach_use_safe(use_src, &intrin->dest.ssa) {
if (use_src->parent_instr->type == nir_instr_type_alu) {
nir_alu_instr *alu = nir_instr_as_alu(use_src->parent_instr);
@@ -67,20 +56,45 @@ opt_intrinsics_impl(nir_function_impl *impl,
if (!const_val || const_val->i32 != 0)
continue;
nir_ssa_def *new_expr = nir_load_helper_invocation(&b, 1);
nir_ssa_def *new_expr = nir_load_helper_invocation(b, 1);
if (alu->op == nir_op_ine)
new_expr = nir_inot(&b, new_expr);
new_expr = nir_inot(b, new_expr);
nir_ssa_def_rewrite_uses(&alu->dest.dest.ssa,
nir_src_for_ssa(new_expr));
nir_instr_remove(&alu->instr);
progress = true;
continue;
}
}
}
continue;
return progress;
}
default:
return false;
}
}
static bool
opt_intrinsics_impl(nir_function_impl *impl,
const struct nir_shader_compiler_options *options)
{
nir_builder b;
nir_builder_init(&b, impl);
bool progress = false;
nir_foreach_block(block, impl) {
nir_foreach_instr_safe(instr, block) {
b.cursor = nir_before_instr(instr);
switch (instr->type) {
case nir_instr_type_intrinsic:
if (opt_intrinsics_intrin(&b, nir_instr_as_intrinsic(instr),
options))
progress = true;
break;
default:
break;
}