[Mesa-dev] [PATCH 26/47] i965/fs: Use byte_scattered_write on 16-bit store_ssbo

[Alejandro Piñeiro]

We need to rely on byte scattered writes as untyped writes are 32-bit
size. We could try to keep using 32-bit messages when we have two or
four 16-bit elements, but for simplicity sake, we use the same message
for any component number. We should revisit this in the future.
---
 src/intel/compiler/brw_fs_nir.cpp | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/intel/compiler/brw_fs_nir.cpp b/src/intel/compiler/brw_fs_nir.cpp
index 6791b2c7a4f..b9876a25eed 100644
--- a/src/intel/compiler/brw_fs_nir.cpp
+++ b/src/intel/compiler/brw_fs_nir.cpp
@@ -28,6 +28,7 @@
 
 using namespace brw;
 using namespace brw::surface_access;
+using namespace brw::scattered_access;
 
 void
 fs_visitor::emit_nir_code()
@@ -4118,8 +4119,15 @@ fs_visitor::nir_emit_intrinsic(const fs_builder &bld, nir_intrinsic_instr *instr
           * length of the write to what we can do and let the next iteration
           * handle the rest
           */
-         if (type_size > 4)
+         if (type_size > 4) {
             length = MIN2(2, length);
+         } else if (type_size == 2) {
+            /* For 16-bit types we are using byte scattered writes, that can
+             * only write one component per call. So we limit the length, and
+             * let the write happening in several iterations.
+             */
+            length = 1;
+         }
 
          fs_reg offset_reg;
          nir_const_value *const_offset = nir_src_as_const_value(instr->src[2]);
@@ -4133,11 +4141,20 @@ fs_visitor::nir_emit_intrinsic(const fs_builder &bld, nir_intrinsic_instr *instr
                     brw_imm_ud(type_size * first_component));
          }
 
-
-         emit_untyped_write(bld, surf_index, offset_reg,
-                            offset(val_reg, bld, first_component * type_slots),
-                            1 /* dims */, length * type_slots,
-                            BRW_PREDICATE_NONE);
+         if (type_size == 2) {
+            /* Untyped Surface messages have a fixed 32-bit size, so we need
+             * to rely on byte scattered in order to write 16-bit elements.
+             */
+            emit_byte_scattered_write(bld, surf_index, offset_reg,
+                                      offset(val_reg, bld, first_component * type_slots),
+                                      1 /* dims */, length * type_slots,
+                                      BRW_PREDICATE_NONE);
+         } else {
+            emit_untyped_write(bld, surf_index, offset_reg,
+                               offset(val_reg, bld, first_component * type_slots),
+                               1 /* dims */, length * type_slots,
+                               BRW_PREDICATE_NONE);
+         }
 
          /* Clear the bits in the writemask that we just wrote, then try
           * again to see if more channels are left.
-- 
2.11.0