fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-27 01:50:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nir: Support deref instructions in lower_global_vars_to_local

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-15 15:54:23 -07:00
parent 54e440945e
commit 21befc46ef
1 changed files with 39 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
src/compiler/nir/nir_lower_global_vars_to_local.c
View file

@ -32,31 +32,50 @@
#include "nir.h"
static void
register_var_use(nir_variable *var, nir_function_impl *impl,
struct hash_table *var_func_table)
{
if (var->data.mode != nir_var_global)
return;
struct hash_entry *entry =
_mesa_hash_table_search(var_func_table, var);
if (entry) {
if (entry->data != impl)
entry->data = NULL;
} else {
_mesa_hash_table_insert(var_func_table, var, impl);
}
}
static bool
mark_global_var_uses_block(nir_block *block, nir_function_impl *impl,
struct hash_table *var_func_table)
{
nir_foreach_instr(instr, block) {
if (instr->type != nir_instr_type_intrinsic)
continue;
switch (instr->type) {
case nir_instr_type_deref: {
nir_deref_instr *deref = nir_instr_as_deref(instr);
if (deref->deref_type == nir_deref_type_var)
register_var_use(deref->var, impl, var_func_table);
break;
}
nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
unsigned num_vars = nir_intrinsic_infos[intrin->intrinsic].num_variables;
case nir_instr_type_intrinsic: {
nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
unsigned num_vars =
nir_intrinsic_infos[intrin->intrinsic].num_variables;
for (unsigned i = 0; i < num_vars; i++) {
nir_variable *var = intrin->variables[i]->var;
if (var->data.mode != nir_var_global)
continue;
for (unsigned i = 0; i < num_vars; i++)
register_var_use(intrin->variables[i]->var, impl, var_func_table);
break;
}
struct hash_entry *entry =
_mesa_hash_table_search(var_func_table, var);
if (entry) {
if (entry->data != impl)
entry->data = NULL;
} else {
_mesa_hash_table_insert(var_func_table, var, impl);
}
default:
/* Nothing to do */
break;
}
}
@ -76,9 +95,6 @@ nir_lower_global_vars_to_local(nir_shader *shader)
_mesa_hash_table_create(NULL, _mesa_hash_pointer,
_mesa_key_pointer_equal);
nir_assert_lowered_derefs(shader, nir_lower_load_store_derefs | nir_lower_interp_derefs |
nir_lower_atomic_counter_derefs | nir_lower_atomic_derefs | nir_lower_image_derefs);
nir_foreach_function(function, shader) {
if (function->impl) {
nir_foreach_block(block, function->impl)
@ -106,5 +122,8 @@ nir_lower_global_vars_to_local(nir_shader *shader)
_mesa_hash_table_destroy(var_func_table, NULL);
if (progress)
nir_fixup_deref_modes(shader);
return progress;
}