OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir: Support deref instructions in remove_dead_variables

Browse Source 
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Acked-by: Rob Clark <robdclark@gmail.com>
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Acked-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Jason Ekstrand
2018-03-20 14:16:06 -07:00
parent f03a33a19a
commit f917814c14
1 changed files with 92 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
src/compiler/nir/nir_remove_dead_variables.c
View File

@@ -27,6 +27,55 @@
#include "nir.h"
static bool
deref_used_for_not_store(nir_deref_instr *deref)
{
nir_foreach_use(src, &deref->dest.ssa) {
switch (src->parent_instr->type) {
case nir_instr_type_deref:
if (deref_used_for_not_store(nir_instr_as_deref(src->parent_instr)))
return true;
break;
case nir_instr_type_intrinsic: {
nir_intrinsic_instr *intrin =
nir_instr_as_intrinsic(src->parent_instr);
/* The first source of copy and store intrinsics is the deref to
* write. Don't record those.
*/
if ((intrin->intrinsic != nir_intrinsic_store_deref &&
intrin->intrinsic != nir_intrinsic_copy_deref) ||
src != &intrin->src[0])
return true;
break;
}
default:
/* If it's used by any other instruction type (most likely a texture
* instruction), consider it used.
*/
return true;
}
}
return false;
}
static void
add_var_use_deref(nir_deref_instr *deref, struct set *live)
{
if (deref->deref_type != nir_deref_type_var)
return;
/* If it's not a local that never escapes the shader, then any access at
* all means we need to keep it alive.
*/
assert(deref->mode == deref->var->data.mode);
if (!(deref->mode & (nir_var_local | nir_var_global | nir_var_shared)) ||
deref_used_for_not_store(deref))
_mesa_set_add(live, deref->var);
}
static void
add_var_use_intrinsic(nir_intrinsic_instr *instr, struct set *live,
nir_variable_mode modes)
@@ -100,6 +149,10 @@ add_var_use_shader(nir_shader *shader, struct set *live, nir_variable_mode modes
nir_foreach_block(block, function->impl) {
nir_foreach_instr(instr, block) {
switch(instr->type) {
case nir_instr_type_deref:
add_var_use_deref(nir_instr_as_deref(instr), live);
break;
case nir_instr_type_intrinsic:
add_var_use_intrinsic(nir_instr_as_intrinsic(instr), live,
modes);
@@ -144,6 +197,45 @@ remove_dead_var_writes(nir_shader *shader, struct set *live)
nir_instr_remove(instr);
}
}
nir_foreach_block(block, function->impl) {
nir_foreach_instr_safe(instr, block) {
switch (instr->type) {
case nir_instr_type_deref: {
nir_deref_instr *deref = nir_instr_as_deref(instr);
nir_variable_mode parent_mode;
if (deref->deref_type == nir_deref_type_var)
parent_mode = deref->var->data.mode;
else
parent_mode = nir_deref_instr_parent(deref)->mode;
/* If the parent mode is 0, then it references a dead variable.
* Flag this deref as dead and remove it.
*/
if (parent_mode == 0) {
deref->mode = 0;
nir_instr_remove(&deref->instr);
}
break;
}
case nir_instr_type_intrinsic: {
nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
if (intrin->intrinsic != nir_intrinsic_copy_deref &&
intrin->intrinsic != nir_intrinsic_store_deref)
break;
if (nir_src_as_deref(intrin->src[0])->mode == 0)
nir_instr_remove(instr);
break;
}
default:
break; /* Nothing to do */
}
}
}
}
}
@@ -172,8 +264,6 @@ nir_remove_dead_variables(nir_shader *shader, nir_variable_mode modes)
struct set *live =
_mesa_set_create(NULL, _mesa_hash_pointer, _mesa_key_pointer_equal);
nir_assert_lowered_derefs(shader, nir_lower_all_derefs);
add_var_use_shader(shader, live, modes);
if (modes & nir_var_uniform)