diff options
| -rw-r--r-- | src/compiler/nir/nir_intrinsics.py | 56 | ||||
| -rw-r--r-- | src/compiler/nir/nir_lower_io.c | 6 |
2 files changed, 34 insertions, 28 deletions
diff --git a/src/compiler/nir/nir_intrinsics.py b/src/compiler/nir/nir_intrinsics.py index 148628645d0..fd06393d308 100644 --- a/src/compiler/nir/nir_intrinsics.py +++ b/src/compiler/nir/nir_intrinsics.py @@ -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 # diff --git a/src/compiler/nir/nir_lower_io.c b/src/compiler/nir/nir_lower_io.c index d39567ff1d1..98e2afe76ea 100644 --- a/src/compiler/nir/nir_lower_io.c +++ b/src/compiler/nir/nir_lower_io.c @@ -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); |