nir: Add mode filtering to lower_mem_access_bit_sizes

Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Reviewed-by: M Henning <drawoc@darkrefraction.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21524>

diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h
index db0a536..f9f7568 100644 (file)
--- a/src/compiler/nir/nir.h
+++ b/src/compiler/nir/nir.h
@@ -4947,6 +4947,7 @@ typedef nir_mem_access_size_align
                                         const void *cb_data);
 
 bool nir_lower_mem_access_bit_sizes(nir_shader *shader,
+                                    nir_variable_mode modes,
                                     nir_lower_mem_access_bit_sizes_cb cb,
                                     const void *cb_data);
 

diff --git a/src/compiler/nir/nir_lower_mem_access_bit_sizes.c b/src/compiler/nir/nir_lower_mem_access_bit_sizes.c
index d22967e..2e1111d 100644 (file)
--- a/src/compiler/nir/nir_lower_mem_access_bit_sizes.c
+++ b/src/compiler/nir/nir_lower_mem_access_bit_sizes.c
@@ -285,10 +285,43 @@ lower_mem_store(nir_builder *b, nir_intrinsic_instr *intrin,
 }
 
 struct lower_mem_access_state {
+   nir_variable_mode modes;
    nir_lower_mem_access_bit_sizes_cb cb;
    const void *cb_data;
 };
 
+static nir_variable_mode
+intrin_to_variable_mode(nir_intrinsic_op intrin)
+{
+   switch (intrin) {
+   case nir_intrinsic_load_global:
+   case nir_intrinsic_store_global:
+      return nir_var_mem_global;
+
+   case nir_intrinsic_load_global_constant:
+      return nir_var_mem_constant;
+
+   case nir_intrinsic_load_ssbo:
+   case nir_intrinsic_store_ssbo:
+      return nir_var_mem_ssbo;
+
+   case nir_intrinsic_load_shared:
+   case nir_intrinsic_store_shared:
+      return nir_var_mem_shared;
+
+   case nir_intrinsic_load_scratch:
+   case nir_intrinsic_store_scratch:
+      return nir_var_shader_temp | nir_var_function_temp;
+
+   case nir_intrinsic_load_task_payload:
+   case nir_intrinsic_store_task_payload:
+      return nir_var_mem_task_payload;
+
+   default:
+      return 0;
+   }
+}
+
 static bool
 lower_mem_access_instr(nir_builder *b, nir_instr *instr, void *_data)
 {
@@ -297,9 +330,12 @@ lower_mem_access_instr(nir_builder *b, nir_instr *instr, void *_data)
    if (instr->type != nir_instr_type_intrinsic)
       return false;
 
+   nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
+   if (!(state->modes & intrin_to_variable_mode(intrin->intrinsic)))
+      return false;
+
    b->cursor = nir_after_instr(instr);
 
-   nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
    switch (intrin->intrinsic) {
    case nir_intrinsic_load_global:
    case nir_intrinsic_load_global_constant:
@@ -323,10 +359,12 @@ lower_mem_access_instr(nir_builder *b, nir_instr *instr, void *_data)
 
 bool
 nir_lower_mem_access_bit_sizes(nir_shader *shader,
+                               nir_variable_mode modes,
                                nir_lower_mem_access_bit_sizes_cb cb,
                                const void *cb_data)
 {
    struct lower_mem_access_state state = {
+      .modes = modes,
       .cb = cb,
       .cb_data = cb_data
    };

diff --git a/src/intel/compiler/brw_nir.c b/src/intel/compiler/brw_nir.c
index c2ac6be..f6c03f4 100644 (file)
--- a/src/intel/compiler/brw_nir.c
+++ b/src/intel/compiler/brw_nir.c
@@ -1368,7 +1368,15 @@ brw_vectorize_lower_mem_access(nir_shader *nir,
       OPT(nir_opt_load_store_vectorize, &options);
    }
 
-   OPT(nir_lower_mem_access_bit_sizes, get_mem_access_size_align, NULL);
+   OPT(nir_lower_mem_access_bit_sizes,
+       nir_var_mem_ssbo |
+       nir_var_mem_constant |
+       nir_var_mem_task_payload |
+       nir_var_shader_temp |
+       nir_var_function_temp |
+       nir_var_mem_global |
+       nir_var_mem_shared,
+       get_mem_access_size_align, NULL);
 
    while (progress) {
       progress = false;