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

nir: Add access flags to deref and SSBO atomics

Browse Source 
We will need them for a new ACCESS_NON_UNIFORM flag that's about to be
added in the next commit.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
This commit is contained in:
Jason Ekstrand
2019-03-04 13:04:45 -06:00
committed by Jason Ekstrand
parent 40074ebf74
commit e50ab2c0f2
2 changed files with 34 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/compiler/nir/nir_intrinsics.py
View File

@@ -391,20 +391,20 @@ intrinsic("load_vulkan_descriptor", src_comp=[-1], dest_comp=0,
# 1: The data parameter to the atomic function (i.e. the value to add
# in shared_atomic_add, etc).
# 2: For CompSwap only: the second data parameter.
intrinsic("deref_atomic_add", src_comp=[-1, 1], dest_comp=1)
intrinsic("deref_atomic_imin", src_comp=[-1, 1], dest_comp=1)
intrinsic("deref_atomic_umin", src_comp=[-1, 1], dest_comp=1)
intrinsic("deref_atomic_imax", src_comp=[-1, 1], dest_comp=1)
intrinsic("deref_atomic_umax", src_comp=[-1, 1], dest_comp=1)
intrinsic("deref_atomic_and", src_comp=[-1, 1], dest_comp=1)
intrinsic("deref_atomic_or", src_comp=[-1, 1], dest_comp=1)
intrinsic("deref_atomic_xor", src_comp=[-1, 1], dest_comp=1)
intrinsic("deref_atomic_exchange", src_comp=[-1, 1], dest_comp=1)
intrinsic("deref_atomic_comp_swap", src_comp=[-1, 1, 1], dest_comp=1)
intrinsic("deref_atomic_fadd", src_comp=[-1, 1], dest_comp=1)
intrinsic("deref_atomic_fmin", src_comp=[-1, 1], dest_comp=1)
intrinsic("deref_atomic_fmax", src_comp=[-1, 1], dest_comp=1)
intrinsic("deref_atomic_fcomp_swap", src_comp=[-1, 1, 1], dest_comp=1)
intrinsic("deref_atomic_add", src_comp=[-1, 1], dest_comp=1, indices=[ACCESS])
intrinsic("deref_atomic_imin", src_comp=[-1, 1], dest_comp=1, indices=[ACCESS])
intrinsic("deref_atomic_umin", src_comp=[-1, 1], dest_comp=1, indices=[ACCESS])
intrinsic("deref_atomic_imax", src_comp=[-1, 1], dest_comp=1, indices=[ACCESS])
intrinsic("deref_atomic_umax", src_comp=[-1, 1], dest_comp=1, indices=[ACCESS])
intrinsic("deref_atomic_and", src_comp=[-1, 1], dest_comp=1, indices=[ACCESS])
intrinsic("deref_atomic_or", src_comp=[-1, 1], dest_comp=1, indices=[ACCESS])
intrinsic("deref_atomic_xor", src_comp=[-1, 1], dest_comp=1, indices=[ACCESS])
intrinsic("deref_atomic_exchange", src_comp=[-1, 1], dest_comp=1, indices=[ACCESS])
intrinsic("deref_atomic_comp_swap", src_comp=[-1, 1, 1], dest_comp=1, indices=[ACCESS])
intrinsic("deref_atomic_fadd", src_comp=[-1, 1], dest_comp=1, indices=[ACCESS])
intrinsic("deref_atomic_fmin", src_comp=[-1, 1], dest_comp=1, indices=[ACCESS])
intrinsic("deref_atomic_fmax", src_comp=[-1, 1], dest_comp=1, indices=[ACCESS])
intrinsic("deref_atomic_fcomp_swap", src_comp=[-1, 1, 1], dest_comp=1, indices=[ACCESS])
# SSBO atomic intrinsics
#
@@ -421,20 +421,20 @@ intrinsic("deref_atomic_fcomp_swap", src_comp=[-1, 1, 1], dest_comp=1)
# 2: The data parameter to the atomic function (i.e. the value to add
# in ssbo_atomic_add, etc).
# 3: For CompSwap only: the second data parameter.
intrinsic("ssbo_atomic_add", src_comp=[1, 1, 1], dest_comp=1)
intrinsic("ssbo_atomic_imin", src_comp=[1, 1, 1], dest_comp=1)
intrinsic("ssbo_atomic_umin", src_comp=[1, 1, 1], dest_comp=1)
intrinsic("ssbo_atomic_imax", src_comp=[1, 1, 1], dest_comp=1)
intrinsic("ssbo_atomic_umax", src_comp=[1, 1, 1], dest_comp=1)
intrinsic("ssbo_atomic_and", src_comp=[1, 1, 1], dest_comp=1)
intrinsic("ssbo_atomic_or", src_comp=[1, 1, 1], dest_comp=1)
intrinsic("ssbo_atomic_xor", src_comp=[1, 1, 1], dest_comp=1)
intrinsic("ssbo_atomic_exchange", src_comp=[1, 1, 1], dest_comp=1)
intrinsic("ssbo_atomic_comp_swap", src_comp=[1, 1, 1, 1], dest_comp=1)
intrinsic("ssbo_atomic_fadd", src_comp=[1, 1, 1], dest_comp=1)
intrinsic("ssbo_atomic_fmin", src_comp=[1, 1, 1], dest_comp=1)
intrinsic("ssbo_atomic_fmax", src_comp=[1, 1, 1], dest_comp=1)
intrinsic("ssbo_atomic_fcomp_swap", src_comp=[1, 1, 1, 1], dest_comp=1)
intrinsic("ssbo_atomic_add", src_comp=[1, 1, 1], dest_comp=1, indices=[ACCESS])
intrinsic("ssbo_atomic_imin", src_comp=[1, 1, 1], dest_comp=1, indices=[ACCESS])
intrinsic("ssbo_atomic_umin", src_comp=[1, 1, 1], dest_comp=1, indices=[ACCESS])
intrinsic("ssbo_atomic_imax", src_comp=[1, 1, 1], dest_comp=1, indices=[ACCESS])
intrinsic("ssbo_atomic_umax", src_comp=[1, 1, 1], dest_comp=1, indices=[ACCESS])
intrinsic("ssbo_atomic_and", src_comp=[1, 1, 1], dest_comp=1, indices=[ACCESS])
intrinsic("ssbo_atomic_or", src_comp=[1, 1, 1], dest_comp=1, indices=[ACCESS])
intrinsic("ssbo_atomic_xor", src_comp=[1, 1, 1], dest_comp=1, indices=[ACCESS])
intrinsic("ssbo_atomic_exchange", src_comp=[1, 1, 1], dest_comp=1, indices=[ACCESS])
intrinsic("ssbo_atomic_comp_swap", src_comp=[1, 1, 1, 1], dest_comp=1, indices=[ACCESS])
intrinsic("ssbo_atomic_fadd", src_comp=[1, 1, 1], dest_comp=1, indices=[ACCESS])
intrinsic("ssbo_atomic_fmin", src_comp=[1, 1, 1], dest_comp=1, indices=[ACCESS])
intrinsic("ssbo_atomic_fmax", src_comp=[1, 1, 1], dest_comp=1, indices=[ACCESS])
intrinsic("ssbo_atomic_fcomp_swap", src_comp=[1, 1, 1, 1], dest_comp=1, indices=[ACCESS])
# CS shared variable atomic intrinsics
#

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

@@ -863,6 +863,12 @@ build_explicit_io_atomic(nir_builder *b, nir_intrinsic_instr *intrin,
atomic->src[src++] = nir_src_for_ssa(intrin->src[1 + i].ssa);
}
/* Global atomics don't have access flags because they assume that the
* address may be non-uniform.
*/
if (!addr_format_is_global(addr_format))
nir_intrinsic_set_access(atomic, nir_intrinsic_access(intrin));
assert(intrin->dest.ssa.num_components == 1);
nir_ssa_dest_init(&atomic->instr, &atomic->dest,
1, intrin->dest.ssa.bit_size, intrin->dest.ssa.name);