From 7a53ef73f4f705e25a73a0230792ff9a5d7fc48a Mon Sep 17 00:00:00 2001 From: Emre Kultursay Date: Thu, 5 Mar 2026 12:14:46 -0800 Subject: [PATCH] Update perfetto categories to use VulkanCPUTiming ...instead of CPUTiming --- layersvt/perfetto/perfetto_helpers.h | 12 +++++----- layersvt/test/test_cputiming.cpp | 2 +- layersvt/timer.h | 36 ++++++++++++++-------------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/layersvt/perfetto/perfetto_helpers.h b/layersvt/perfetto/perfetto_helpers.h index ae86b12424..f2d17dbf0c 100644 --- a/layersvt/perfetto/perfetto_helpers.h +++ b/layersvt/perfetto/perfetto_helpers.h @@ -6,12 +6,12 @@ // Define categories used for Perfetto tracing. // These static strings are registered with Perfetto at initialization time. PERFETTO_DEFINE_CATEGORIES( - perfetto::Category("CPUTiming/VkInstance").SetDescription("Instance Level Commands"), - perfetto::Category("CPUTiming/VkPhysicalDevice").SetDescription("Physical Device Level Commands"), - perfetto::Category("CPUTiming/VkDevice").SetDescription("Device Level Commands"), - perfetto::Category("CPUTiming/VkQueue").SetDescription("Queue Level Commands"), - perfetto::Category("CPUTiming/VkCommandBuffer").SetDescription("Command Buffer Level Commands"), - perfetto::Category("CPUTiming/Other").SetDescription("Other Commands") + perfetto::Category("VulkanCPUTiming/VkInstance").SetDescription("Instance Level Commands"), + perfetto::Category("VulkanCPUTiming/VkPhysicalDevice").SetDescription("Physical Device Level Commands"), + perfetto::Category("VulkanCPUTiming/VkDevice").SetDescription("Device Level Commands"), + perfetto::Category("VulkanCPUTiming/VkQueue").SetDescription("Queue Level Commands"), + perfetto::Category("VulkanCPUTiming/VkCommandBuffer").SetDescription("Command Buffer Level Commands"), + perfetto::Category("VulkanCPUTiming/Other").SetDescription("Other Commands") ); // Enum matching the Perfetto categories above. diff --git a/layersvt/test/test_cputiming.cpp b/layersvt/test/test_cputiming.cpp index d16c241fc4..b4e55d0d16 100644 --- a/layersvt/test/test_cputiming.cpp +++ b/layersvt/test/test_cputiming.cpp @@ -58,7 +58,7 @@ TEST_F(CpuTimingTests, InitLayer) { // Verify that we saw creating instance timing // Expected output format: "vkCreateInstance: ns" - EXPECT_NE(output.find("CPUTiming/Other vkCreateInstance:"), std::string::npos); + EXPECT_NE(output.find("VulkanCPUTiming/Other vkCreateInstance:"), std::string::npos); EXPECT_NE(output.find("ns"), std::string::npos); // If we found a physical device, we should see enumeration timing too diff --git a/layersvt/timer.h b/layersvt/timer.h index 7979505dd8..953a2e3e9f 100644 --- a/layersvt/timer.h +++ b/layersvt/timer.h @@ -39,27 +39,27 @@ class Timer { // helper function here since it would not be a compile-time constexpr. switch (cat_) { case CPUTimingCategory::VkInstance: { - TRACE_EVENT_BEGIN("CPUTiming/VkInstance", perfetto::StaticString(name)); + TRACE_EVENT_BEGIN("VulkanCPUTiming/VkInstance", perfetto::StaticString(name)); break; } case CPUTimingCategory::VkPhysicalDevice: { - TRACE_EVENT_BEGIN("CPUTiming/VkPhysicalDevice", perfetto::StaticString(name)); + TRACE_EVENT_BEGIN("VulkanCPUTiming/VkPhysicalDevice", perfetto::StaticString(name)); break; } case CPUTimingCategory::VkDevice: { - TRACE_EVENT_BEGIN("CPUTiming/VkDevice", perfetto::StaticString(name)); + TRACE_EVENT_BEGIN("VulkanCPUTiming/VkDevice", perfetto::StaticString(name)); break; } case CPUTimingCategory::VkQueue: { - TRACE_EVENT_BEGIN("CPUTiming/VkQueue", perfetto::StaticString(name)); + TRACE_EVENT_BEGIN("VulkanCPUTiming/VkQueue", perfetto::StaticString(name)); break; } case CPUTimingCategory::VkCommandBuffer: { - TRACE_EVENT_BEGIN("CPUTiming/VkCommandBuffer", perfetto::StaticString(name)); + TRACE_EVENT_BEGIN("VulkanCPUTiming/VkCommandBuffer", perfetto::StaticString(name)); break; } default: { - TRACE_EVENT_BEGIN("CPUTiming/Other", perfetto::StaticString(name)); + TRACE_EVENT_BEGIN("VulkanCPUTiming/Other", perfetto::StaticString(name)); break; } } @@ -68,40 +68,40 @@ class Timer { ~Timer() { switch (cat_) { case CPUTimingCategory::VkInstance: { - TRACE_EVENT_END("CPUTiming/VkInstance"); + TRACE_EVENT_END("VulkanCPUTiming/VkInstance"); break; } case CPUTimingCategory::VkPhysicalDevice: { - TRACE_EVENT_END("CPUTiming/VkPhysicalDevice"); + TRACE_EVENT_END("VulkanCPUTiming/VkPhysicalDevice"); break; } case CPUTimingCategory::VkDevice: { - TRACE_EVENT_END("CPUTiming/VkDevice"); + TRACE_EVENT_END("VulkanCPUTiming/VkDevice"); break; } case CPUTimingCategory::VkQueue: { - TRACE_EVENT_END("CPUTiming/VkQueue"); + TRACE_EVENT_END("VulkanCPUTiming/VkQueue"); break; } case CPUTimingCategory::VkCommandBuffer: { - TRACE_EVENT_END("CPUTiming/VkCommandBuffer"); + TRACE_EVENT_END("VulkanCPUTiming/VkCommandBuffer"); break; } default: { - TRACE_EVENT_END("CPUTiming/Other"); + TRACE_EVENT_END("VulkanCPUTiming/Other"); break; } } #ifndef __ANDROID__ auto end = std::chrono::high_resolution_clock::now(); auto duration = std::chrono::duration_cast(end - start_).count(); - const char* cat_str = "CPUTiming/Other"; + const char* cat_str = "VulkanCPUTiming/Other"; switch (cat_) { - case CPUTimingCategory::VkInstance: cat_str = "CPUTiming/VkInstance"; break; - case CPUTimingCategory::VkPhysicalDevice: cat_str = "CPUTiming/VkPhysicalDevice"; break; - case CPUTimingCategory::VkDevice: cat_str = "CPUTiming/VkDevice"; break; - case CPUTimingCategory::VkQueue: cat_str = "CPUTiming/VkQueue"; break; - case CPUTimingCategory::VkCommandBuffer: cat_str = "CPUTiming/VkCommandBuffer"; break; + case CPUTimingCategory::VkInstance: cat_str = "VulkanCPUTiming/VkInstance"; break; + case CPUTimingCategory::VkPhysicalDevice: cat_str = "VulkanCPUTiming/VkPhysicalDevice"; break; + case CPUTimingCategory::VkDevice: cat_str = "VulkanCPUTiming/VkDevice"; break; + case CPUTimingCategory::VkQueue: cat_str = "VulkanCPUTiming/VkQueue"; break; + case CPUTimingCategory::VkCommandBuffer: cat_str = "VulkanCPUTiming/VkCommandBuffer"; break; default: break; } std::cout << cat_str << " " << name_ << ": " << duration << " ns" << std::endl;