d3d12: Add a couple compute transforms for "fake" SO buffers

This solves 2 problems with the CPU readback we're doing for this now:
1. It's not on the CPU
2. It handles gaps, leaving the destination buffer intact in those gaps

Reviewed-by: Sil Vilerino <sivileri@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14787>

diff --git a/src/gallium/drivers/d3d12/d3d12_compute_transforms.cpp b/src/gallium/drivers/d3d12/d3d12_compute_transforms.cpp
index d93e720..3b87d2f 100644 (file)
--- a/src/gallium/drivers/d3d12/d3d12_compute_transforms.cpp
+++ b/src/gallium/drivers/d3d12/d3d12_compute_transforms.cpp
@@ -102,11 +102,102 @@ get_indirect_draw_base_vertex_transform(const d3d12_compute_transform_key *args)
 }
 
 static struct nir_shader *
+get_fake_so_buffer_copy_back(const d3d12_compute_transform_key *key)
+{
+   nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_COMPUTE,
+      dxil_get_nir_compiler_options(), "FakeSOBufferCopyBack");
+
+   nir_variable *output_so_data_var = nir_variable_create(b.shader, nir_var_mem_ssbo,
+      glsl_array_type(glsl_uint_type(), 0, 0), "output_data");
+   nir_variable *input_so_data_var = nir_variable_create(b.shader, nir_var_mem_ssbo, output_so_data_var->type, "input_data");
+   output_so_data_var->data.driver_location = 0;
+   input_so_data_var->data.driver_location = 1;
+
+   /* UBO is [fake SO filled size, fake SO vertex count, 1, 1, original SO filled size] */
+   nir_variable *input_ubo = nir_variable_create(b.shader, nir_var_mem_ubo,
+      glsl_array_type(glsl_uint_type(), 5, 0), "input_ubo");
+   input_ubo->data.driver_location = 0;
+
+   nir_ssa_def *original_so_filled_size = nir_load_ubo(&b, 1, 32, nir_imm_int(&b, 0), nir_imm_int(&b, 4 * sizeof(uint32_t)),
+      (gl_access_qualifier)0, 4, 0, 4 * sizeof(uint32_t), 4);
+
+   nir_variable *state_var = nullptr;
+   nir_ssa_def *fake_so_multiplier = d3d12_get_state_var(&b, D3D12_STATE_VAR_TRANSFORM_GENERIC0, "fake_so_multiplier", glsl_uint_type(), &state_var);
+
+   nir_ssa_def *vertex_offset = nir_imul(&b, nir_imm_int(&b, key->fake_so_buffer_copy_back.stride),
+      nir_channel(&b, nir_load_global_invocation_id(&b, 32), 0));
+
+   nir_ssa_def *output_offset_base = nir_iadd(&b, original_so_filled_size, vertex_offset);
+   nir_ssa_def *input_offset_base = nir_imul(&b, vertex_offset, fake_so_multiplier);
+
+   for (unsigned i = 0; i < key->fake_so_buffer_copy_back.num_ranges; ++i) {
+      auto& output = key->fake_so_buffer_copy_back.ranges[i];
+      assert(output.size % 4 == 0 && output.offset % 4 == 0);
+      nir_ssa_def *field_offset = nir_imm_int(&b, output.offset);
+      nir_ssa_def *output_offset = nir_iadd(&b, output_offset_base, field_offset);
+      nir_ssa_def *input_offset = nir_iadd(&b, input_offset_base, field_offset);
+
+      for (unsigned loaded = 0; loaded < output.size; loaded += 16) {
+         unsigned to_load = MIN2(output.size, 16);
+         unsigned components = to_load / 4;
+         nir_ssa_def *loaded_data = nir_load_ssbo(&b, components, 32, nir_imm_int(&b, 1),
+            nir_iadd(&b, input_offset, nir_imm_int(&b, loaded)), (gl_access_qualifier)0, 4, 0);
+         nir_store_ssbo(&b, loaded_data, nir_imm_int(&b, 0),
+            nir_iadd(&b, output_offset, nir_imm_int(&b, loaded)), (1u << components) - 1, (gl_access_qualifier)0, 4, 0);
+      }
+   }
+
+   nir_validate_shader(b.shader, "creation");
+   b.shader->info.num_ssbos = 2;
+   b.shader->info.num_ubos = 1;
+
+   return b.shader;
+}
+
+static struct nir_shader *
+get_fake_so_buffer_vertex_count()
+{
+   nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_COMPUTE,
+      dxil_get_nir_compiler_options(), "FakeSOBufferVertexCount");
+
+   nir_variable_create(b.shader, nir_var_mem_ssbo, glsl_array_type(glsl_uint_type(), 0, 0), "fake_so");
+   nir_ssa_def *fake_buffer_filled_size = nir_load_ssbo(&b, 1, 32, nir_imm_int(&b, 0), nir_imm_int(&b, 0), (gl_access_qualifier)0, 4, 0);
+
+   nir_variable *real_so_var = nir_variable_create(b.shader, nir_var_mem_ssbo,
+      glsl_array_type(glsl_uint_type(), 0, 0), "real_so");
+   real_so_var->data.driver_location = 1;
+   nir_ssa_def *real_buffer_filled_size = nir_load_ssbo(&b, 1, 32, nir_imm_int(&b, 1), nir_imm_int(&b, 0), (gl_access_qualifier)0, 4, 0);
+
+   nir_variable *state_var = nullptr;
+   nir_ssa_def *state_var_data = d3d12_get_state_var(&b, D3D12_STATE_VAR_TRANSFORM_GENERIC0, "state_var", glsl_uvec4_type(), &state_var);
+   nir_ssa_def *stride = nir_channel(&b, state_var_data, 0);
+   nir_ssa_def *fake_so_multiplier = nir_channel(&b, state_var_data, 1);
+
+   nir_ssa_def *real_so_bytes_added = nir_idiv(&b, fake_buffer_filled_size, fake_so_multiplier);
+   nir_ssa_def *vertex_count = nir_idiv(&b, real_so_bytes_added, stride);
+   nir_ssa_def *to_write_to_fake_buffer = nir_vec4(&b, vertex_count, nir_imm_int(&b, 1), nir_imm_int(&b, 1), real_buffer_filled_size);
+   nir_store_ssbo(&b, to_write_to_fake_buffer, nir_imm_int(&b, 0), nir_imm_int(&b, 4), 0xf, (gl_access_qualifier)0, 4, 0);
+
+   nir_ssa_def *updated_filled_size = nir_iadd(&b, real_buffer_filled_size, real_so_bytes_added);
+   nir_store_ssbo(&b, updated_filled_size, nir_imm_int(&b, 1), nir_imm_int(&b, 0), 1, (gl_access_qualifier)0, 4, 0);
+
+   nir_validate_shader(b.shader, "creation");
+   b.shader->info.num_ssbos = 2;
+   b.shader->info.num_ubos = 0;
+
+   return b.shader;
+}
+
+static struct nir_shader *
 create_compute_transform(const d3d12_compute_transform_key *key)
 {
    switch (key->type) {
    case d3d12_compute_transform_type::base_vertex:
       return get_indirect_draw_base_vertex_transform(key);
+   case d3d12_compute_transform_type::fake_so_buffer_copy_back:
+      return get_fake_so_buffer_copy_back(key);
+   case d3d12_compute_transform_type::fake_so_buffer_vertex_count:
+      return get_fake_so_buffer_vertex_count();
    default:
       unreachable("Invalid transform");
    }

diff --git a/src/gallium/drivers/d3d12/d3d12_compute_transforms.h b/src/gallium/drivers/d3d12/d3d12_compute_transforms.h
index 12ae163..5884e25 100644 (file)
--- a/src/gallium/drivers/d3d12/d3d12_compute_transforms.h
+++ b/src/gallium/drivers/d3d12/d3d12_compute_transforms.h
@@ -33,6 +33,16 @@ enum class d3d12_compute_transform_type
     * a stream of indirect draw (indexed) params
     */
    base_vertex,
+   /* Given an SO buffer's declaration in the key, copy filled items from a fake (multiplied)
+    * buffer into the original SO buffer, after the original filled size (loaded from the indirect
+    * arg buffer double-bound as a UBO), making sure to skip gaps
+    */
+   fake_so_buffer_copy_back,
+   /* Append a fake SO buffer filed size with (vertex count, 1, 1, original filled size)
+    * for an indirect dispatch of the fake_so_buffer_copy_back transform, and also update
+    * the original filled size with the fake filled size
+    */
+   fake_so_buffer_vertex_count,
    max,
 };
 
@@ -40,10 +50,22 @@ struct d3d12_compute_transform_key
 {
    d3d12_compute_transform_type type;
 
-   struct {
-      unsigned indexed:1;
-      unsigned dynamic_count:1;
-   } base_vertex;
+   union
+   {
+      struct {
+         unsigned indexed : 1;
+         unsigned dynamic_count : 1;
+      } base_vertex;
+
+      struct {
+         uint16_t stride;
+         uint16_t num_ranges;
+         struct {
+            uint16_t offset;
+            uint16_t size;
+         } ranges[PIPE_MAX_SO_OUTPUTS];
+      } fake_so_buffer_copy_back;
+   };
 };
 
 d3d12_shader_selector *

diff --git a/src/gallium/drivers/d3d12/d3d12_draw.cpp b/src/gallium/drivers/d3d12/d3d12_draw.cpp
index be9c298..e85a832 100644 (file)
--- a/src/gallium/drivers/d3d12/d3d12_draw.cpp
+++ b/src/gallium/drivers/d3d12/d3d12_draw.cpp
@@ -773,9 +773,9 @@ update_draw_indirect_with_sysvals(struct d3d12_context *ctx,
       save_cs_ssbos[i] = ctx->ssbo_views[PIPE_SHADER_COMPUTE][i];
    }
 
-   d3d12_compute_transform_key key = {
-      d3d12_compute_transform_type::base_vertex,
-   };
+   d3d12_compute_transform_key key;
+   memset(&key, 0, sizeof(key));
+   key.type = d3d12_compute_transform_type::base_vertex;
    key.base_vertex.indexed = dinfo->index_size > 0;
    key.base_vertex.dynamic_count = indirect_in->indirect_draw_count != nullptr;
    ctx->base.bind_compute_state(&ctx->base, d3d12_get_compute_transform(ctx, &key));