Add profiling layer support

Author: solidpixel

layer_gpu_profile/source/CMakeLists.txt

@@ -49,6 +49,7 @@ add_library(
         layer_device_functions_command_buffer.cpp
         layer_device_functions_command_pool.cpp
         layer_device_functions_debug.cpp
+        layer_device_functions_dispatch_data_graph.cpp
         layer_device_functions_dispatch.cpp
         layer_device_functions_queue.cpp
         layer_device_functions_render_pass.cpp

layer_gpu_profile/source/layer_device_functions.hpp

@@ -194,6 +194,14 @@ VKAPI_ATTR void VKAPI_CALL layer_vkCmdDispatchIndirect<user_tag>(VkCommandBuffer
                                                                  VkBuffer buffer,
                                                                  VkDeviceSize offset);
 
+// Commands for data graph
+
+/* See Vulkan API for documentation. */
+template<>
+VKAPI_ATTR void VKAPI_CALL layer_vkCmdDispatchDataGraphARM<user_tag>(VkCommandBuffer commandBuffer,
+                                                                     VkDataGraphPipelineSessionARM session,
+                                                                     const VkDataGraphPipelineDispatchInfoARM* pInfo);
+
 // Commands for trace rays
 
 /* See Vulkan API for documentation. */

layer_gpu_profile/source/layer_device_functions_dispatch_data_graph.cpp

@@ -0,0 +1,71 @@
+/*
+ * SPDX-License-Identifier: MIT
+ * ----------------------------------------------------------------------------
+ * Copyright (c) 2024-2025 Arm Limited
+ *
+ * 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 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.
+ * ----------------------------------------------------------------------------
+ */
+
+#include "device.hpp"
+#include "device_utils.hpp"
+#include "framework/device_dispatch_table.hpp"
+
+#include <mutex>
+
+extern std::mutex g_vulkanLock;
+
+/**
+ * @brief Register a compute dispatch with the tracker.
+ *
+ * @param layer           The layer context for the device.
+ * @param commandBuffer   The command buffer we are recording.
+ */
+static void registerDispatchDataGraph(Device* layer,
+                                      VkCommandBuffer commandBuffer)
+{
+    if (!layer->isFrameOfInterest)
+    {
+        return;
+    }
+
+    auto& tracker = layer->getStateTracker();
+    auto& cb = tracker.getCommandBuffer(commandBuffer);
+    cb.dispatchDataGraph();
+}
+
+/* See Vulkan API for documentation. */
+template<>
+VKAPI_ATTR void VKAPI_CALL layer_vkCmdDispatchDataGraphARM<user_tag>(VkCommandBuffer commandBuffer,
+                                                                     VkDataGraphPipelineSessionARM session,
+                                                                     const VkDataGraphPipelineDispatchInfoARM* pInfo)
+{
+    LAYER_TRACE(__func__);
+
+    // Hold the lock to access layer-wide global store
+    std::unique_lock<std::mutex> lock {g_vulkanLock};
+    auto* layer = Device::retrieve(commandBuffer);
+
+    registerDispatchDataGraph(layer, commandBuffer);
+
+    // Release the lock to call into the driver
+    lock.unlock();
+    layer->driver.vkCmdDispatchDataGraphARM(commandBuffer, session, pInfo);
+    emitCPUTrap(*layer, commandBuffer);
+}

layer_gpu_profile/source/submit_visitor.cpp

@@ -97,7 +97,7 @@ void ProfileSubmitVisitor::operator()(
 ) {
     UNUSED(renderPass);
 
-    handleCPUTrap("renderpass", debugStack);
+    handleCPUTrap("render_pass", debugStack);
 }
 
 /* See header for documentation */
@@ -123,14 +123,24 @@ void ProfileSubmitVisitor::operator()(
     handleCPUTrap("compute", debugStack);
 }
 
+/* See header for documentation */
+void ProfileSubmitVisitor::operator()(
+    const Tracker::LCSDispatchDataGraph& dispatch,
+    const std::vector<std::string>& debugStack
+) {
+    UNUSED(dispatch);
+
+    handleCPUTrap("data_graph", debugStack);
+}
+
 /* See header for documentation */
 void ProfileSubmitVisitor::operator()(
     const Tracker::LCSTraceRays& traceRays,
     const std::vector<std::string>& debugStack
 ) {
     UNUSED(traceRays);
 
-    handleCPUTrap("tracerays", debugStack);
+    handleCPUTrap("trace_rays", debugStack);
 }
 
 /* See header for documentation */

layer_gpu_profile/source/submit_visitor.hpp

@@ -68,6 +68,10 @@ class ProfileSubmitVisitor : public Tracker::SubmitCommandWorkloadVisitor
         const Tracker::LCSDispatch& dispatch,
         const std::vector<std::string>& debugStack) override;
 
+    void operator()(
+        const Tracker::LCSDispatchDataGraph& dispatch,
+        const std::vector<std::string>& debugStack) override;
+
     void operator()(
         const Tracker::LCSTraceRays& traceRays,
         const std::vector<std::string>& debugStack) override;