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

nir: Add missing nir_var_mem_global to various passes

Browse Source 
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3322>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3322>
This commit is contained in:
Caio Marcelo de Oliveira Filho
2020-01-10 23:52:30 -08:00
parent d8440a3d2f
commit 3cc501be69
4 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/compiler/nir/nir_opt_access.c
View File

@@ -138,7 +138,8 @@ gather_intrinsic(struct access_state *state, nir_intrinsic_instr *instr)
/* TODO: Could be more granular if we had nir_var_mem_image. */
if (nir_intrinsic_memory_modes(instr) & (nir_var_mem_ubo |
nir_var_mem_ssbo |
nir_var_uniform)) {
nir_var_uniform |
nir_var_mem_global)) {
state->buffer_barriers = true;
state->image_barriers = true;
}

17
src/compiler/nir/nir_opt_combine_stores.c
View File

@@ -287,10 +287,11 @@ combine_stores_block(struct combine_stores_state *state, nir_block *block)
nir_foreach_instr_safe(instr, block) {
if (instr->type == nir_instr_type_call) {
combine_stores_with_modes(state, nir_var_shader_out |
nir_var_shader_temp |
nir_var_function_temp |
nir_var_mem_ssbo |
nir_var_mem_shared);
nir_var_shader_temp |
nir_var_function_temp |
nir_var_mem_ssbo |
nir_var_mem_shared |
nir_var_mem_global);
continue;
}
@@ -307,12 +308,14 @@ combine_stores_block(struct combine_stores_state *state, nir_block *block)
case nir_intrinsic_group_memory_barrier:
case nir_intrinsic_memory_barrier:
combine_stores_with_modes(state, nir_var_shader_out |
nir_var_mem_ssbo |
nir_var_mem_shared);
nir_var_mem_ssbo |
nir_var_mem_shared |
nir_var_mem_global);
break;
case nir_intrinsic_memory_barrier_buffer:
combine_stores_with_modes(state, nir_var_mem_ssbo);
combine_stores_with_modes(state, nir_var_mem_ssbo |
nir_var_mem_global);
break;
case nir_intrinsic_memory_barrier_shared:

15
src/compiler/nir/nir_opt_copy_prop_vars.c
View File

@@ -155,7 +155,8 @@ gather_vars_written(struct copy_prop_var_state *state,
nir_var_shader_temp |
nir_var_function_temp |
nir_var_mem_ssbo |
nir_var_mem_shared;
nir_var_mem_shared |
nir_var_mem_global;
continue;
}
@@ -168,7 +169,8 @@ gather_vars_written(struct copy_prop_var_state *state,
case nir_intrinsic_memory_barrier:
written->modes |= nir_var_shader_out |
nir_var_mem_ssbo |
nir_var_mem_shared;
nir_var_mem_shared |
nir_var_mem_global;
break;
case nir_intrinsic_scoped_memory_barrier:
@@ -788,7 +790,8 @@ copy_prop_vars_block(struct copy_prop_var_state *state,
nir_var_shader_temp |
nir_var_function_temp |
nir_var_mem_ssbo |
nir_var_mem_shared);
nir_var_mem_shared |
nir_var_mem_global);
if (debug) dump_copy_entries(copies);
continue;
}
@@ -804,13 +807,15 @@ copy_prop_vars_block(struct copy_prop_var_state *state,
apply_barrier_for_modes(copies, nir_var_shader_out |
nir_var_mem_ssbo |
nir_var_mem_shared);
nir_var_mem_shared |
nir_var_mem_global);
break;
case nir_intrinsic_memory_barrier_buffer:
if (debug) dump_instr(instr);
apply_barrier_for_modes(copies, nir_var_mem_ssbo);
apply_barrier_for_modes(copies, nir_var_mem_ssbo |
nir_var_mem_global);
break;
case nir_intrinsic_memory_barrier_shared:

9
src/compiler/nir/nir_opt_dead_write_vars.c
View File

@@ -122,7 +122,8 @@ remove_dead_write_vars_local(void *mem_ctx, nir_block *block)
nir_var_shader_temp |
nir_var_function_temp |
nir_var_mem_ssbo |
nir_var_mem_shared);
nir_var_mem_shared |
nir_var_mem_global);
continue;
}
@@ -135,12 +136,14 @@ remove_dead_write_vars_local(void *mem_ctx, nir_block *block)
case nir_intrinsic_memory_barrier: {
clear_unused_for_modes(&unused_writes, nir_var_shader_out |
nir_var_mem_ssbo |
nir_var_mem_shared);
nir_var_mem_shared |
nir_var_mem_global);
break;
}
case nir_intrinsic_memory_barrier_buffer:
clear_unused_for_modes(&unused_writes, nir_var_mem_ssbo);
clear_unused_for_modes(&unused_writes, nir_var_mem_ssbo |
nir_var_mem_global);
break;
case nir_intrinsic_memory_barrier_shared: