commit 1bdf8506384fce4c9dc13504e1b3272d1ddc1097
author Jason Ekstrand <jason@jlekstrand.net> Tue Aug 18 15:30:26 2020 -0500
committer Marge Bot <eric+marge@anholt.net> Tue Sep 01 20:50:04 2020 +0000
tree ef828f8ab84b9530c6f9254a80e7bf725386f505
parent bb8d8ba9c7f73e14f4053756bc1feab8cbf3b0d6

spirv: Use nir_var_mem_constant for UniformConstant data in CL

For now, we leave the constant_as_global option intact and get rid of
the UBO path which no one upstream is using today.

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6379>

src/compiler/spirv/nir_spirv.h

diff --git a/src/compiler/spirv/nir_spirv.h b/src/compiler/spirv/nir_spirv.h
index 3cbd026..dd7b5b3 100644
--- a/src/compiler/spirv/nir_spirv.h
+++ b/src/compiler/spirv/nir_spirv.h
@@ -78,6 +78,7 @@
    nir_address_format shared_addr_format;
    nir_address_format global_addr_format;
    nir_address_format temp_addr_format;
+   nir_address_format constant_addr_format;
 
    /* Whether UniformConstant memory should be treated as normal global memory.
     * This is usefull for CL 2.0 implementations with fine grain system SVM

src/compiler/spirv/spirv_to_nir.c

diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c
index 3a886ce..b9f1fae 100644
--- a/src/compiler/spirv/spirv_to_nir.c
+++ b/src/compiler/spirv/spirv_to_nir.c
@@ -4482,8 +4482,8 @@
          assert(nir_address_format_bit_size(b->options->shared_addr_format) == 32);
          assert(nir_address_format_num_components(b->options->shared_addr_format) == 1);
          if (!b->options->constant_as_global) {
-            assert(nir_address_format_bit_size(b->options->ubo_addr_format) == 32);
-            assert(nir_address_format_num_components(b->options->ubo_addr_format) == 1);
+            assert(nir_address_format_bit_size(b->options->constant_addr_format) == 32);
+            assert(nir_address_format_num_components(b->options->constant_addr_format) == 1);
          }
          break;
       case SpvAddressingModelPhysical64:
@@ -4496,8 +4496,8 @@
          assert(nir_address_format_bit_size(b->options->shared_addr_format) == 64);
          assert(nir_address_format_num_components(b->options->shared_addr_format) == 1);
          if (!b->options->constant_as_global) {
-            assert(nir_address_format_bit_size(b->options->ubo_addr_format) == 64);
-            assert(nir_address_format_num_components(b->options->ubo_addr_format) == 1);
+            assert(nir_address_format_bit_size(b->options->constant_addr_format) == 64);
+            assert(nir_address_format_num_components(b->options->constant_addr_format) == 1);
          }
          break;
       case SpvAddressingModelLogical:

src/compiler/spirv/vtn_private.h

diff --git a/src/compiler/spirv/vtn_private.h b/src/compiler/spirv/vtn_private.h
index c67d75a..300fb01 100644
--- a/src/compiler/spirv/vtn_private.h
+++ b/src/compiler/spirv/vtn_private.h
@@ -484,6 +484,7 @@
    vtn_variable_mode_push_constant,
    vtn_variable_mode_workgroup,
    vtn_variable_mode_cross_workgroup,
+   vtn_variable_mode_constant,
    vtn_variable_mode_input,
    vtn_variable_mode_output,
    vtn_variable_mode_image,

src/compiler/spirv/vtn_variables.c

diff --git a/src/compiler/spirv/vtn_variables.c b/src/compiler/spirv/vtn_variables.c
index df80fca..52c2837 100644
--- a/src/compiler/spirv/vtn_variables.c
+++ b/src/compiler/spirv/vtn_variables.c
@@ -1807,8 +1807,8 @@
             mode = vtn_variable_mode_cross_workgroup;
             nir_mode = nir_var_mem_global;
          } else {
-            mode = vtn_variable_mode_ubo;
-            nir_mode = nir_var_mem_ubo;
+            mode = vtn_variable_mode_constant;
+            nir_mode = nir_var_mem_constant;
          }
       } else {
          mode = vtn_variable_mode_uniform;
@@ -1885,6 +1885,9 @@
    case vtn_variable_mode_cross_workgroup:
       return b->options->global_addr_format;
 
+   case vtn_variable_mode_constant:
+      return b->options->constant_addr_format;
+
    case vtn_variable_mode_function:
       if (b->physical_ptrs)
          return b->options->temp_addr_format;
@@ -2175,6 +2178,7 @@
    case vtn_variable_mode_private:
    case vtn_variable_mode_uniform:
    case vtn_variable_mode_atomic_counter:
+   case vtn_variable_mode_constant:
       /* For these, we create the variable normally */
       var->var = rzalloc(b->shader, nir_variable);
       var->var->name = ralloc_strdup(var->var, val->name);