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

radeonsi/nir: don't run si_nir_opts again if there is no change 

0.3% less overhead

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Reviewed-by: Connor Abbott <cwabbott0@gmail.com>
This commit is contained in:
Marek Olšák 2019-11-22 22:47:02 -05:00
parent 4675cb2019
commit b02e0d2604
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/amd/llvm/ac_nir_to_llvm.c
View File

@ -4783,17 +4783,19 @@ void ac_nir_translate(struct ac_llvm_context *ac, struct ac_shader_abi *abi,
ralloc_free(ctx.vars);
}
void
bool
ac_lower_indirect_derefs(struct nir_shader *nir, enum chip_class chip_class)
{
bool progress = false;
/* Lower large variables to scratch first so that we won't bloat the
* shader by generating large if ladders for them. We later lower
* scratch to alloca's, assuming LLVM won't generate VGPR indexing.
*/
NIR_PASS_V(nir, nir_lower_vars_to_scratch,
nir_var_function_temp,
256,
glsl_get_natural_size_align_bytes);
NIR_PASS(progress, nir, nir_lower_vars_to_scratch,
nir_var_function_temp,
256,
glsl_get_natural_size_align_bytes);
/* While it would be nice not to have this flag, we are constrained
* by the reality that LLVM 9.0 has buggy VGPR indexing on GFX9.
@ -4825,7 +4827,8 @@ ac_lower_indirect_derefs(struct nir_shader *nir, enum chip_class chip_class)
*/
indirect_mask |= nir_var_function_temp;
nir_lower_indirect_derefs(nir, indirect_mask);
progress |= nir_lower_indirect_derefs(nir, indirect_mask);
return progress;
}
static unsigned

2
src/amd/llvm/ac_nir_to_llvm.h
View File

@ -46,7 +46,7 @@ static inline unsigned ac_llvm_reg_index_soa(unsigned index, unsigned chan)
return (index * 4) + chan;
}
void ac_lower_indirect_derefs(struct nir_shader *nir, enum chip_class);
bool ac_lower_indirect_derefs(struct nir_shader *nir, enum chip_class);
bool ac_are_tessfactors_def_in_all_invocs(const struct nir_shader *nir);

11
src/gallium/drivers/radeonsi/si_shader_nir.c
View File

@ -1004,14 +1004,15 @@ static void si_lower_nir(struct si_screen *sscreen, struct nir_shader *nir)
*
* st/mesa calls finalize_nir twice, but we can't call this pass twice.
*/
bool changed = false;
if (!nir->constant_data) {
NIR_PASS_V(nir, nir_opt_large_constants,
glsl_get_natural_size_align_bytes, 16);
NIR_PASS(changed, nir, nir_opt_large_constants,
glsl_get_natural_size_align_bytes, 16);
}
ac_lower_indirect_derefs(nir, sscreen->info.chip_class);
si_nir_opts(nir);
changed |= ac_lower_indirect_derefs(nir, sscreen->info.chip_class);
if (changed)
si_nir_opts(nir);
NIR_PASS_V(nir, nir_lower_bool_to_int32);
NIR_PASS_V(nir, nir_remove_dead_variables, nir_var_function_temp);