fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 07:28:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

nir/load_store_vectorize: Fix shared atomic info

Browse source 
These were clearly copied and pasted from SSBOs.  The shared atomics
don't have an SSBO index so their offset is src0 and data is src1.

Fixes: ce9205c03b "nir: add a load/store vectorization pass"
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4367>
(cherry picked from commit 04d08ea149)
This commit is contained in:
Jason Ekstrand 2020-03-31 03:19:39 -05:00 • committed by Dylan Baker
parent 8afe06115f
commit e70e9d4e78
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -2146,7 +2146,7 @@
"description": "nir/load_store_vectorize: Fix shared atomic info",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "ce9205c03bd20d26af23ca891e97a9f848a612d1"
},

28
src/compiler/nir/nir_opt_load_store_vectorize.c
View file

@ -106,20 +106,20 @@ case nir_intrinsic_##op: {\
ATOMIC(0, deref, fmin, -1, -1, 0, 1)
ATOMIC(0, deref, fmax, -1, -1, 0, 1)
ATOMIC(0, deref, fcomp_swap, -1, -1, 0, 1)
ATOMIC(nir_var_mem_shared, shared, add, 0, 1, -1, 2)
ATOMIC(nir_var_mem_shared, shared, imin, 0, 1, -1, 2)
ATOMIC(nir_var_mem_shared, shared, umin, 0, 1, -1, 2)
ATOMIC(nir_var_mem_shared, shared, imax, 0, 1, -1, 2)
ATOMIC(nir_var_mem_shared, shared, umax, 0, 1, -1, 2)
ATOMIC(nir_var_mem_shared, shared, and, 0, 1, -1, 2)
ATOMIC(nir_var_mem_shared, shared, or, 0, 1, -1, 2)
ATOMIC(nir_var_mem_shared, shared, xor, 0, 1, -1, 2)
ATOMIC(nir_var_mem_shared, shared, exchange, 0, 1, -1, 2)
ATOMIC(nir_var_mem_shared, shared, comp_swap, 0, 1, -1, 2)
ATOMIC(nir_var_mem_shared, shared, fadd, 0, 1, -1, 2)
ATOMIC(nir_var_mem_shared, shared, fmin, 0, 1, -1, 2)
ATOMIC(nir_var_mem_shared, shared, fmax, 0, 1, -1, 2)
ATOMIC(nir_var_mem_shared, shared, fcomp_swap, 0, 1, -1, 2)
ATOMIC(nir_var_mem_shared, shared, add, -1, 0, -1, 1)
ATOMIC(nir_var_mem_shared, shared, imin, -1, 0, -1, 1)
ATOMIC(nir_var_mem_shared, shared, umin, -1, 0, -1, 1)
ATOMIC(nir_var_mem_shared, shared, imax, -1, 0, -1, 1)
ATOMIC(nir_var_mem_shared, shared, umax, -1, 0, -1, 1)
ATOMIC(nir_var_mem_shared, shared, and, -1, 0, -1, 1)
ATOMIC(nir_var_mem_shared, shared, or, -1, 0, -1, 1)
ATOMIC(nir_var_mem_shared, shared, xor, -1, 0, -1, 1)
ATOMIC(nir_var_mem_shared, shared, exchange, -1, 0, -1, 1)
ATOMIC(nir_var_mem_shared, shared, comp_swap, -1, 0, -1, 1)
ATOMIC(nir_var_mem_shared, shared, fadd, -1, 0, -1, 1)
ATOMIC(nir_var_mem_shared, shared, fmin, -1, 0, -1, 1)
ATOMIC(nir_var_mem_shared, shared, fmax, -1, 0, -1, 1)
ATOMIC(nir_var_mem_shared, shared, fcomp_swap, -1, 0, -1, 1)
default:
break;
#undef ATOMIC