anv: add shaders for copying query results

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Ivan Briano <ivan.briano@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23074>

src/intel/vulkan/shaders/common_query_copy.glsl

@@ -0,0 +1,116 @@
+/*
+ * Copyright © 2023 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#define BITFIELD_BIT(i) (1u << i)
+
+#define ANV_COPY_QUERY_FLAG_RESULT64  BITFIELD_BIT(0)
+#define ANV_COPY_QUERY_FLAG_AVAILABLE BITFIELD_BIT(1)
+#define ANV_COPY_QUERY_FLAG_DELTA     BITFIELD_BIT(2)
+#define ANV_COPY_QUERY_FLAG_PARTIAL   BITFIELD_BIT(3)
+
+/* These 3 bindings will be accessed through A64 messages */
+layout(set = 0, binding = 0, std430) buffer Storage0 {
+   uint query_data[];
+};
+
+layout(set = 0, binding = 1, std430) buffer Storage1 {
+   uint destination[];
+};
+
+/* This data will be provided through push constants. */
+layout(set = 0, binding = 2) uniform block {
+   uint flags;
+   uint num_queries;
+   uint num_items;
+   uint query_base;
+   uint query_stride;
+   uint query_data_offset;
+   uint destination_stride;
+};
+
+void query_copy(uint item_idx)
+{
+   if (item_idx >= num_queries)
+      return;
+
+   bool is_result64 = (flags & ANV_COPY_QUERY_FLAG_RESULT64) != 0;
+   bool write_available = (flags & ANV_COPY_QUERY_FLAG_AVAILABLE) != 0;
+   bool compute_delta = (flags & ANV_COPY_QUERY_FLAG_DELTA) != 0;
+   bool partial_result = (flags & ANV_COPY_QUERY_FLAG_PARTIAL) != 0;
+
+   uint query_byte = (query_base + item_idx) * query_stride;
+   uint query_data_byte = query_byte + query_data_offset;
+   uint destination_byte = item_idx * destination_stride;
+
+   uint64_t availability = query_data[query_byte / 4];
+
+   uint query_data_dword = query_data_byte / 4;
+   uint dest_dword = destination_byte / 4;
+   for (uint i = 0; i < num_items; i++) {
+      uint item_data_dword = query_data_dword + i * 2 * (compute_delta ? 2 : 1);
+
+      uint64_t v;
+      if (compute_delta) {
+         uint64_t v0 = uint64_t(query_data[item_data_dword + 0]) |
+                       (uint64_t(query_data[item_data_dword + 1]) << 32);
+         uint64_t v1 = uint64_t(query_data[item_data_dword + 2]) |
+                       (uint64_t(query_data[item_data_dword + 3]) << 32);
+
+         v = v1 - v0;
+      } else {
+
+         v = uint64_t(query_data[item_data_dword + 0]) |
+             (uint64_t(query_data[item_data_dword + 1]) << 32);
+      }
+
+      /* vkCmdCopyQueryPoolResults:
+       *
+       *    "If VK_QUERY_RESULT_PARTIAL_BIT is set, then for any query that is
+       *     unavailable, an intermediate result between zero and the final
+       *     result value is written for that query."
+       *
+       * We write 0 as the values not being written yet, we can't really make
+       * provide any sensible value.
+       */
+      if (partial_result && availability == 0)
+         v = 0;
+
+      if (is_result64) {
+         destination[dest_dword + 0] = uint(v & 0xffffffff);
+         destination[dest_dword + 1] = uint(v >> 32);
+         dest_dword += 2;
+      } else {
+         destination[dest_dword + 0] = uint(v & 0xffffffff);
+         dest_dword += 1;
+      }
+   }
+
+   if (write_available) {
+      if (is_result64) {
+         destination[dest_dword + 0] = uint(availability & 0xffffffff);
+         destination[dest_dword + 1] = uint(availability >> 32);
+      } else {
+         destination[dest_dword + 0] = uint(availability & 0xffffffff);
+      }
+   }
+}

src/intel/vulkan/shaders/meson.build

@@ -32,25 +32,30 @@ float64_spv_h = custom_target(
   ]
 )
 
-generated_draws_shaders = [
-  'gfx9_generated_draws.glsl',
-  'gfx11_generated_draws.glsl',
+anv_internal_shaders = [
+  [ 'gfx9_generated_draws.glsl',  'frag' ],
+  [ 'gfx11_generated_draws.glsl', 'frag' ],
+  [ 'query_copy_compute.glsl',    'comp' ],
+  [ 'query_copy_fragment.glsl',   'frag' ],
 ]
 
-generated_draws_spvs = []
-foreach f : generated_draws_shaders
+anv_internal_spvs = []
+foreach item : anv_internal_shaders
+  f = item[0]
+  stage = item[1]
   spv_filename = f.replace('.glsl', '_spv.h')
   src_name = f.replace('.glsl', '_spv_source')
-  generated_draws_spvs += custom_target(
+  anv_internal_spvs += custom_target(
     spv_filename,
-    input : [glsl2spirv, f, files('common_generated_draws.glsl')],
+    input : [glsl2spirv, f, files('common_generated_draws.glsl',
+                                  'common_query_copy.glsl')],
     output : spv_filename,
     command : [
       prog_python, '@INPUT0@', '@INPUT1@', '@OUTPUT@',
       prog_glslang,
       '--vn', src_name,
       '--glsl-version', '450',
-      '--stage', 'frag',
+      '--stage', stage,
       '-I' + meson.current_source_dir(),
     ])
 endforeach

src/intel/vulkan/shaders/query_copy_compute.glsl

@@ -0,0 +1,35 @@
+/*
+ * Copyright © 2023 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#version 450
+#extension GL_ARB_gpu_shader_int64 : enable
+#extension GL_GOOGLE_include_directive : enable
+
+#include "common_query_copy.glsl"
+
+layout(local_size_x = 16, local_size_y = 1, local_size_z = 1) in;
+
+void main()
+{
+   query_copy(gl_GlobalInvocationID.x);
+}

src/intel/vulkan/shaders/query_copy_fragment.glsl

@@ -0,0 +1,33 @@
+/*
+ * Copyright © 2023 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#version 450
+#extension GL_ARB_gpu_shader_int64 : enable
+#extension GL_GOOGLE_include_directive : enable
+
+#include "common_query_copy.glsl"
+
+void main()
+{
+   query_copy(uint(gl_FragCoord.y) * 8192 + uint(gl_FragCoord.x));
+}