Mesa (staging/20.3): nir/load_store_vectorize: don't ignore subgroup memory barriers

[GitLab Mirror]

Module: Mesa
Branch: staging/20.3
Commit: eec614e0f31d283bc1acf325fd00a3152aed1e45
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=eec614e0f31d283bc1acf325fd00a3152aed1e45

Author: Rhys Perry <pendingchaos02 at gmail.com>
Date:   Fri Mar 13 16:07:26 2020 +0000

nir/load_store_vectorize: don't ignore subgroup memory barriers

Not sure why I thought this was correct, but we should consider them for
optimization purposes.

Fixes: ce9205c03bd ('nir: add a load/store vectorization pass')
Signed-off-by: Rhys Perry <pendingchaos02 at gmail.com>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4202>
(cherry picked from commit f4eb833a12523142d908bf67e08904f4e8a866e9)

---

 .pick_status.json                               | 2 +-
 src/compiler/nir/nir_opt_load_store_vectorize.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 4332beebea0..62df7c8e3b8 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1957,7 +1957,7 @@
         "description": "nir/load_store_vectorize: don't ignore subgroup memory barriers",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "ce9205c03bd20d26af23ca891e97a9f848a612d1"
     },
diff --git a/src/compiler/nir/nir_opt_load_store_vectorize.c b/src/compiler/nir/nir_opt_load_store_vectorize.c
index 68296940931..8449be505d5 100644
--- a/src/compiler/nir/nir_opt_load_store_vectorize.c
+++ b/src/compiler/nir/nir_opt_load_store_vectorize.c
@@ -1196,7 +1196,6 @@ handle_barrier(struct vectorize_ctx *ctx, bool *progress, nir_function_impl *imp
          release = nir_intrinsic_memory_semantics(intrin) & NIR_MEMORY_RELEASE;
          switch (nir_intrinsic_memory_scope(intrin)) {
          case NIR_SCOPE_INVOCATION:
-         case NIR_SCOPE_SUBGROUP:
             /* a barier should never be required for correctness with these scopes */
             modes = 0;
             break;