default:
/* If it's used by any other instruction type (most likely a texture
- * instruction), consider it used.
+ * or call instruction), consider it used.
*/
return true;
}
* 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)) ||
+ if (!(deref->mode & (nir_var_function_temp | nir_var_shader_temp | nir_var_mem_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)
-{
- unsigned num_vars = nir_intrinsic_infos[instr->intrinsic].num_variables;
-
- switch (instr->intrinsic) {
- case nir_intrinsic_copy_var:
- _mesa_set_add(live, instr->variables[1]->var);
- /* Fall through */
- case nir_intrinsic_store_var: {
- /* The first source in both copy_var and store_var is the destination.
- * If the variable is a local that never escapes the shader, then we
- * don't mark it as live for just a store.
- */
- nir_variable_mode mode = instr->variables[0]->var->data.mode;
- if (!(mode & (nir_var_local | nir_var_global | nir_var_shared)))
- _mesa_set_add(live, instr->variables[0]->var);
- break;
- }
-
- /* This pass can't be used on I/O variables after they've been lowered. */
- case nir_intrinsic_load_input:
- assert(!(modes & nir_var_shader_in));
- break;
- case nir_intrinsic_store_output:
- assert(!(modes & nir_var_shader_out));
- break;
-
- default:
- for (unsigned i = 0; i < num_vars; i++) {
- _mesa_set_add(live, instr->variables[i]->var);
- }
- break;
- }
-}
-
-static void
-add_var_use_call(nir_call_instr *instr, struct set *live)
-{
- if (instr->return_deref != NULL) {
- nir_variable *var = instr->return_deref->var;
- _mesa_set_add(live, var);
- }
-
- for (unsigned i = 0; i < instr->num_params; i++) {
- nir_variable *var = instr->params[i]->var;
- _mesa_set_add(live, var);
- }
-}
-
-static void
-add_var_use_tex(nir_tex_instr *instr, struct set *live)
-{
- if (instr->texture != NULL) {
- nir_variable *var = instr->texture->var;
- _mesa_set_add(live, var);
- }
-
- if (instr->sampler != NULL) {
- nir_variable *var = instr->sampler->var;
- _mesa_set_add(live, var);
- }
-}
-
static void
add_var_use_shader(nir_shader *shader, struct set *live, nir_variable_mode modes)
{
if (function->impl) {
nir_foreach_block(block, function->impl) {
nir_foreach_instr(instr, block) {
- switch(instr->type) {
- case nir_instr_type_deref:
+ if (instr->type == 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);
- break;
-
- case nir_instr_type_call:
- add_var_use_call(nir_instr_as_call(instr), live);
- break;
-
- case nir_instr_type_tex:
- add_var_use_tex(nir_instr_as_tex(instr), live);
- break;
-
- default:
- break;
- }
}
}
}
if (!function->impl)
continue;
- nir_foreach_block(block, function->impl) {
- nir_foreach_instr_safe(instr, block) {
- if (instr->type != nir_instr_type_intrinsic)
- continue;
-
- nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
- if (intrin->intrinsic != nir_intrinsic_copy_var &&
- intrin->intrinsic != nir_intrinsic_store_var)
- continue;
-
- /* Stores to dead variables need to be removed */
- if (intrin->variables[0]->var->data.mode == 0)
- 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);
+ if (deref->deref_type == nir_deref_type_cast &&
+ !nir_deref_instr_parent(deref))
+ continue;
nir_variable_mode parent_mode;
if (deref->deref_type == nir_deref_type_var)
}
static bool
-remove_dead_vars(struct exec_list *var_list, struct set *live)
+remove_dead_vars(struct exec_list *var_list, nir_variable_mode modes,
+ struct set *live, bool (*can_remove_var)(nir_variable *var))
{
bool progress = false;
- foreach_list_typed_safe(nir_variable, var, node, var_list) {
+ nir_foreach_variable_in_list_safe(var, var_list) {
+ if (!(var->data.mode & modes))
+ continue;
+
+ if (can_remove_var && !can_remove_var(var))
+ continue;
+
struct set_entry *entry = _mesa_set_search(live, var);
if (entry == NULL) {
/* Mark this variable as used by setting the mode to 0 */
}
bool
-nir_remove_dead_variables(nir_shader *shader, nir_variable_mode modes)
+nir_remove_dead_variables(nir_shader *shader, nir_variable_mode modes,
+ bool (*can_remove_var)(nir_variable *var))
{
bool progress = false;
- struct set *live =
- _mesa_set_create(NULL, _mesa_hash_pointer, _mesa_key_pointer_equal);
+ struct set *live = _mesa_pointer_set_create(NULL);
add_var_use_shader(shader, live, modes);
- if (modes & nir_var_uniform)
- progress = remove_dead_vars(&shader->uniforms, live) || progress;
-
- if (modes & nir_var_shader_in)
- progress = remove_dead_vars(&shader->inputs, live) || progress;
-
- if (modes & nir_var_shader_out)
- progress = remove_dead_vars(&shader->outputs, live) || progress;
-
- if (modes & nir_var_global)
- progress = remove_dead_vars(&shader->globals, live) || progress;
-
- if (modes & nir_var_system_value)
- progress = remove_dead_vars(&shader->system_values, live) || progress;
-
- if (modes & nir_var_shared)
- progress = remove_dead_vars(&shader->shared, live) || progress;
+ if (modes & ~nir_var_function_temp) {
+ progress = remove_dead_vars(&shader->variables, modes,
+ live, can_remove_var) || progress;
+ }
- if (modes & nir_var_local) {
+ if (modes & nir_var_function_temp) {
nir_foreach_function(function, shader) {
if (function->impl) {
- if (remove_dead_vars(&function->impl->locals, live))
+ if (remove_dead_vars(&function->impl->locals,
+ nir_var_function_temp,
+ live, can_remove_var))
progress = true;
}
}
}
- if (progress) {
- remove_dead_var_writes(shader, live);
+ nir_foreach_function(function, shader) {
+ if (!function->impl)
+ continue;
- nir_foreach_function(function, shader) {
- if (function->impl) {
- nir_metadata_preserve(function->impl, nir_metadata_block_index |
- nir_metadata_dominance);
- }
+ if (progress) {
+ remove_dead_var_writes(shader, live);
+ nir_metadata_preserve(function->impl, nir_metadata_block_index |
+ nir_metadata_dominance);
+ } else {
+ nir_metadata_preserve(function->impl, nir_metadata_all);
}
}
projects / mesa.git / blobdiff