gpuav: Vertex attributes OOB

- Move vertex attributes OOB validation to instrumentation => faster, simpler - Handle VK_VERTEX_INPUT_RATE_INSTANCE
KhronosGroup · Jan 24, 2025 · 7b63987 · 7b63987
1 parent afad70f
commit 7b63987
Show file tree

Hide file tree

Showing 29 changed files with 1,106 additions and 827 deletions.
diff --git a/BUILD.gn b/BUILD.gn
@@ -206,6 +206,8 @@ vvl_sources = [
   "layers/gpuav/spirv/buffer_device_address_pass.h",
   "layers/gpuav/spirv/post_process_descriptor_indexing_pass.cpp",
   "layers/gpuav/spirv/post_process_descriptor_indexing_pass.h",
+  "layers/gpuav/spirv/vertex_attribute_fetch_oob.cpp",
+  "layers/gpuav/spirv/vertex_attribute_fetch_oob.h",
   "layers/gpuav/spirv/function_basic_block.cpp",
   "layers/gpuav/spirv/function_basic_block.h",
   "layers/gpuav/spirv/instruction.cpp",
@@ -402,6 +404,8 @@ vvl_sources = [
   "layers/vulkan/generated/instrumentation_ray_query_comp.h",
   "layers/vulkan/generated/instrumentation_post_process_descriptor_index_comp.cpp",
   "layers/vulkan/generated/instrumentation_post_process_descriptor_index_comp.h",
+  "layers/vulkan/generated/instrumentation_vertex_attribute_fetch_oob_vert.cpp",
+  "layers/vulkan/generated/instrumentation_vertex_attribute_fetch_oob_vert.h",
   "layers/vulkan/generated/object_tracker.cpp",
   "layers/vulkan/generated/object_tracker_device_methods.h",
   "layers/vulkan/generated/object_tracker_instance_methods.h",

diff --git a/layers/VkLayer_khronos_validation.json.in b/layers/VkLayer_khronos_validation.json.in
@@ -683,6 +683,22 @@
                                                 ]
                                             }
                                         },
+                                        {
+                                            "key": "gpuav_vertex_attribute_fetch_oob",
+                                            "label": "Out of bounds vertex attribute fetching",
+                                            "description": "Validate that no vertex attribute fetching is out of bonds",
+                                            "type": "BOOL",
+                                            "default": true,
+                                            "platforms": [ "WINDOWS", "LINUX" ],
+                                            "dependence": {
+                                                "mode": "ALL",
+                                                "settings": [
+                                                    { "key": "gpuav_enable", "value": true },
+                                                    { "key": "gpuav_shader_instrumentation", "value": true }
+                                                ]
+                                            }
+                                        },
+
                                         {
                                             "key": "gpuav_select_instrumented_shaders",
                                             "label": "Enable instrumenting shaders selectively",

diff --git a/layers/gpuav/core/gpuav_record.cpp b/layers/gpuav/core/gpuav_record.cpp
@@ -455,8 +455,7 @@ void Validator::PreCallRecordCmdDrawIndexed(VkCommandBuffer commandBuffer, uint3
         InternalError(commandBuffer, record_obj.location, "Unrecognized command buffer.");
         return;
     }
-    valcmd::DrawIndexed(*this, *cb_state, record_obj.location, indexCount, firstIndex, vertexOffset,
-                        "VUID-vkCmdDrawIndexed-None-02721");
+
     PreCallSetupShaderInstrumentationResources(*this, *cb_state, VK_PIPELINE_BIND_POINT_GRAPHICS, record_obj.location);
     descriptor::PreCallActionCommand(*this, *cb_state, VK_PIPELINE_BIND_POINT_GRAPHICS, record_obj.location);
 }
@@ -557,11 +556,7 @@ void Validator::PreCallRecordCmdDrawIndexedIndirect(VkCommandBuffer commandBuffe
 
     valcmd::DrawIndexedIndirectIndexBuffer(*this, *cb_state, record_obj.location, buffer, offset, stride, count, VK_NULL_HANDLE, 0,
                                            "VUID-VkDrawIndexedIndirectCommand-robustBufferAccess2-08798");
-// https://github.com/KhronosGroup/Vulkan-ValidationLayers/issues/9163
-#if 0
-    valcmd::DrawIndexedIndirectVertexBuffer(*this, *cb_state, record_obj.location, buffer, offset, stride, count, VK_NULL_HANDLE, 0,
-                                            "VUID-vkCmdDrawIndexedIndirect-None-02721");
-#endif
+
     valcmd::FirstInstance<VkDrawIndexedIndirectCommand>(*this, *cb_state, record_obj.location, buffer, offset, count,
                                                         VK_NULL_HANDLE, 0, "VUID-VkDrawIndexedIndirectCommand-firstInstance-00554");
     PreCallSetupShaderInstrumentationResources(*this, *cb_state, VK_PIPELINE_BIND_POINT_GRAPHICS, record_obj.location);
@@ -705,11 +700,7 @@ void Validator::PreCallRecordCmdDrawIndexedIndirectCount(VkCommandBuffer command
 
     valcmd::DrawIndexedIndirectIndexBuffer(*this, *cb_state, record_obj.location, buffer, offset, stride, maxDrawCount, countBuffer,
                                            countBufferOffset, "VUID-VkDrawIndexedIndirectCommand-robustBufferAccess2-08798");
-// https://github.com/KhronosGroup/Vulkan-ValidationLayers/issues/9163
-#if 0
-    valcmd::DrawIndexedIndirectVertexBuffer(*this, *cb_state, record_obj.location, buffer, offset, stride, maxDrawCount,
-                                            countBuffer, countBufferOffset, "VUID-vkCmdDrawIndexedIndirectCount-None-02721");
-#endif
+
     PreCallSetupShaderInstrumentationResources(*this, *cb_state, VK_PIPELINE_BIND_POINT_GRAPHICS, record_obj.location);
     descriptor::PreCallActionCommand(*this, *cb_state, VK_PIPELINE_BIND_POINT_GRAPHICS, record_obj.location);
 }

diff --git a/layers/gpuav/core/gpuav_settings.h b/layers/gpuav/core/gpuav_settings.h
@@ -48,11 +48,13 @@ struct GpuAVSettings {
         bool buffer_device_address = true;
         bool ray_query = true;
         bool post_process_descriptor_index = true;
+        bool vertex_attribute_fetch_oob = true;
     } shader_instrumentation;
 
     bool IsShaderInstrumentationEnabled() const {
         return shader_instrumentation.descriptor_checks || shader_instrumentation.buffer_device_address ||
-               shader_instrumentation.ray_query || shader_instrumentation.post_process_descriptor_index;
+               shader_instrumentation.ray_query || shader_instrumentation.post_process_descriptor_index ||
+               shader_instrumentation.vertex_attribute_fetch_oob;
     }
     bool IsSpirvModified() const { return IsShaderInstrumentationEnabled() || debug_printf_enabled; }
 
@@ -62,6 +64,7 @@ struct GpuAVSettings {
         shader_instrumentation.buffer_device_address = false;
         shader_instrumentation.ray_query = false;
         shader_instrumentation.post_process_descriptor_index = false;
+        shader_instrumentation.vertex_attribute_fetch_oob = false;
         // Because of this setting, cannot really have an "enabled" parameter to pass to this method
         select_instrumented_shaders = false;
     }

diff --git a/layers/gpuav/core/gpuav_setup.cpp b/layers/gpuav/core/gpuav_setup.cpp
@@ -458,6 +458,8 @@ void Validator::PostCreateDevice(const VkDeviceCreateInfo *pCreateInfo, const Lo
         {glsl::kBindingInstCmdResourceIndex, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC, 1, VK_SHADER_STAGE_ALL, nullptr},
         // Commands errors counts buffer
         {glsl::kBindingInstCmdErrorsCount, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 1, VK_SHADER_STAGE_ALL, nullptr},
+        // Smallest vertex buffer binding
+        {glsl::kBindingInstSmallestVertexBufferBinding, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 1, VK_SHADER_STAGE_VERTEX_BIT, nullptr},
     };
 
     // TODO - Now that GPU-AV and DebugPrintf are merged, we should just have a single PostCreateDevice if possible (or at least