Mesa (master): nir/load_store_vectorize: Fix shared atomic info
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri Apr 3 20:51:09 UTC 2020
Module: Mesa
Branch: master
Commit: 04d08ea149c05e4d5dad819269d74713aac270da
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=04d08ea149c05e4d5dad819269d74713aac270da
Author: Jason Ekstrand <jason at jlekstrand.net>
Date: Tue Mar 31 03:19:39 2020 -0500
nir/load_store_vectorize: Fix shared atomic info
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: ce9205c03bd20 "nir: add a load/store vectorization pass"
Reviewed-by: Rhys Perry <pendingchaos02 at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4367>
---
src/compiler/nir/nir_opt_load_store_vectorize.c | 28 ++++++++++++-------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/compiler/nir/nir_opt_load_store_vectorize.c b/src/compiler/nir/nir_opt_load_store_vectorize.c
index 414a97fec45..b0d3a7d0d90 100644
--- a/src/compiler/nir/nir_opt_load_store_vectorize.c
+++ b/src/compiler/nir/nir_opt_load_store_vectorize.c
@@ -108,20 +108,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
More information about the mesa-commit
mailing list