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

nir/lower_io: Choose to set access based on intrinsic metadata 

This should be far more reliable than trying to keep opcode lists
up-to-date.

Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5927>
This commit is contained in:
Jason Ekstrand 2020-07-15 13:32:10 -05:00 committed by Marge Bot
parent c475e29be4
commit 3a2975db98
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/compiler/nir/nir_lower_io.c
View File

@ -873,7 +873,7 @@ build_explicit_io_load(nir_builder *b, nir_intrinsic_instr *intrin,
load->src[1] = nir_src_for_ssa(addr_to_offset(b, addr, addr_format));
}
if (mode == nir_var_mem_ssbo || mode == nir_var_mem_global || mode == nir_var_mem_ubo)
if (nir_intrinsic_infos[op].index_map[NIR_INTRINSIC_ACCESS] > 0)
nir_intrinsic_set_access(load, nir_intrinsic_access(intrin));
unsigned bit_size = intrin->dest.ssa.bit_size;
@ -989,7 +989,7 @@ build_explicit_io_store(nir_builder *b, nir_intrinsic_instr *intrin,
nir_intrinsic_set_write_mask(store, write_mask);
if (mode == nir_var_mem_ssbo || mode == nir_var_mem_global)
if (nir_intrinsic_infos[op].index_map[NIR_INTRINSIC_ACCESS] > 0)
nir_intrinsic_set_access(store, nir_intrinsic_access(intrin));
/* TODO: We should try and provide a better alignment. For OpenCL, we need
@ -1062,7 +1062,7 @@ build_explicit_io_atomic(nir_builder *b, nir_intrinsic_instr *intrin,
/* Global atomics don't have access flags because they assume that the
* address may be non-uniform.
*/
if (!addr_format_is_global(addr_format) && mode != nir_var_mem_shared)
if (nir_intrinsic_infos[op].index_map[NIR_INTRINSIC_ACCESS] > 0)
nir_intrinsic_set_access(atomic, nir_intrinsic_access(intrin));
assert(intrin->dest.ssa.num_components == 1);