KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nir: Return progress from nir_lower_to_source_mods(). 

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Matt Turner 2017-02-24 15:45:09 -08:00
parent 5a7e4ae23d
commit a539e05d00
2 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/compiler/nir/nir.h
View File

@ -2542,7 +2542,7 @@ void nir_lower_bitmap(nir_shader *shader, const nir_lower_bitmap_options *option
void nir_lower_atomics(nir_shader *shader, void nir_lower_atomics(nir_shader *shader,
const struct gl_shader_program *shader_program); const struct gl_shader_program *shader_program);
void nir_lower_to_source_mods(nir_shader *shader); bool nir_lower_to_source_mods(nir_shader *shader);
bool nir_lower_gs_intrinsics(nir_shader *shader); bool nir_lower_gs_intrinsics(nir_shader *shader);

33
src/compiler/nir/nir_lower_to_source_mods.c
View File

@ -36,6 +36,8 @@
static bool static bool
nir_lower_to_source_mods_block(nir_block *block) nir_lower_to_source_mods_block(nir_block *block)
{ {
bool progress = false;
nir_foreach_instr(instr, block) { nir_foreach_instr(instr, block) {
if (instr->type != nir_instr_type_alu) if (instr->type != nir_instr_type_alu)
continue; continue;
@ -91,6 +93,8 @@ nir_lower_to_source_mods_block(nir_block *block)
if (list_empty(&parent->dest.dest.ssa.uses) && if (list_empty(&parent->dest.dest.ssa.uses) &&
list_empty(&parent->dest.dest.ssa.if_uses)) list_empty(&parent->dest.dest.ssa.if_uses))
nir_instr_remove(&parent->instr); nir_instr_remove(&parent->instr);
progress = true;
} }
switch (alu->op) { switch (alu->op) {
@ -161,6 +165,7 @@ nir_lower_to_source_mods_block(nir_block *block)
continue; continue;
alu->dest.saturate = true; alu->dest.saturate = true;
progress = true;
nir_foreach_use(child_src, &alu->dest.dest.ssa) { nir_foreach_use(child_src, &alu->dest.dest.ssa) {
assert(child_src->is_ssa); assert(child_src->is_ssa);
@ -176,17 +181,35 @@ nir_lower_to_source_mods_block(nir_block *block)
} }
} }
return true; return progress;
} }
void static bool
nir_lower_to_source_mods_impl(nir_function_impl *impl)
{
bool progress = false;
nir_foreach_block(block, impl) {
progress |= nir_lower_to_source_mods_block(block);
}
if (progress)
nir_metadata_preserve(impl, nir_metadata_block_index |
nir_metadata_dominance);
return progress;
}
bool
nir_lower_to_source_mods(nir_shader *shader) nir_lower_to_source_mods(nir_shader *shader)
{ {
bool progress = false;
nir_foreach_function(function, shader) { nir_foreach_function(function, shader) {
if (function->impl) { if (function->impl) {
nir_foreach_block(block, function->impl) { progress |= nir_lower_to_source_mods_impl(function->impl);
nir_lower_to_source_mods_block(block);
}
} }
} }
return progress;
} }