From 540814136837ae4e0071fd9e3e023a40015e7eaf Mon Sep 17 00:00:00 2001 From: Emre Kultursay Date: Thu, 21 May 2026 14:04:53 -0700 Subject: [PATCH] Move CPUTiming layer to cpu_timing directory This does not move the generated files yet, to avoid complicating merges from upstream into our repo. --- layersvt/CMakeLists.txt | 20 ++++++++++++++----- .../VkLayer_CPUTiming.json.in | 0 layersvt/{ => cpu_timing}/cputiming.cpp | 0 layersvt/{ => cpu_timing}/cputiming.h | 0 .../cputiming_handwritten_dispatch.cpp | 0 .../cputiming_handwritten_functions.h | 0 6 files changed, 15 insertions(+), 5 deletions(-) rename layersvt/{json => cpu_timing}/VkLayer_CPUTiming.json.in (100%) rename layersvt/{ => cpu_timing}/cputiming.cpp (100%) rename layersvt/{ => cpu_timing}/cputiming.h (100%) rename layersvt/{ => cpu_timing}/cputiming_handwritten_dispatch.cpp (100%) rename layersvt/{ => cpu_timing}/cputiming_handwritten_functions.h (100%) diff --git a/layersvt/CMakeLists.txt b/layersvt/CMakeLists.txt index fe3114b764..1ed2af86d9 100644 --- a/layersvt/CMakeLists.txt +++ b/layersvt/CMakeLists.txt @@ -125,19 +125,25 @@ if(BUILD_CPUTIMING) add_library(VkLayer_CPUTiming MODULE) set_target_properties(VkLayer_CPUTiming PROPERTIES FOLDER "layers/cputiming") target_sources(VkLayer_CPUTiming PRIVATE - cputiming_handwritten_dispatch.cpp + cpu_timing/cputiming_handwritten_dispatch.cpp generated/cputiming_dispatch.h generated/cputiming_implementation.h - cputiming_handwritten_functions.h - cputiming.h - cputiming.cpp + cpu_timing/cputiming_handwritten_functions.h + cpu_timing/cputiming.h + cpu_timing/cputiming.cpp perfetto/perfetto.cc perfetto/perfetto_helpers.cpp ../scripts/generators/cputiming_generator.py vk_layer_table.cpp vk_layer_table.h layer_keep_alive.cpp - json/VkLayer_CPUTiming.json.in + cpu_timing/VkLayer_CPUTiming.json.in + ) + + target_include_directories(VkLayer_CPUTiming PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/cpu_timing + ${CMAKE_CURRENT_BINARY_DIR} ) if(CMAKE_SYSTEM_NAME MATCHES "Linux|BSD|DragonFly|GNU") @@ -207,6 +213,8 @@ foreach(layer ${TOOL_LAYERS}) if (layer STREQUAL "VkLayer_DebugMarker") set(layer_dir "debug_marker/") + elseif(layer STREQUAL "VkLayer_CPUTiming") + set(layer_dir "cpu_timing/") else() set(layer_dir "") endif() @@ -251,6 +259,8 @@ foreach(layer ${TOOL_LAYERS}) if (layer STREQUAL "VkLayer_DebugMarker") set(INPUT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/debug_marker/${layer}.json.in") + elseif(layer STREQUAL "VkLayer_CPUTiming") + set(INPUT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/cpu_timing/${layer}.json.in") else() set(INPUT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/json/${layer}.json.in") endif() diff --git a/layersvt/json/VkLayer_CPUTiming.json.in b/layersvt/cpu_timing/VkLayer_CPUTiming.json.in similarity index 100% rename from layersvt/json/VkLayer_CPUTiming.json.in rename to layersvt/cpu_timing/VkLayer_CPUTiming.json.in diff --git a/layersvt/cputiming.cpp b/layersvt/cpu_timing/cputiming.cpp similarity index 100% rename from layersvt/cputiming.cpp rename to layersvt/cpu_timing/cputiming.cpp diff --git a/layersvt/cputiming.h b/layersvt/cpu_timing/cputiming.h similarity index 100% rename from layersvt/cputiming.h rename to layersvt/cpu_timing/cputiming.h diff --git a/layersvt/cputiming_handwritten_dispatch.cpp b/layersvt/cpu_timing/cputiming_handwritten_dispatch.cpp similarity index 100% rename from layersvt/cputiming_handwritten_dispatch.cpp rename to layersvt/cpu_timing/cputiming_handwritten_dispatch.cpp diff --git a/layersvt/cputiming_handwritten_functions.h b/layersvt/cpu_timing/cputiming_handwritten_functions.h similarity index 100% rename from layersvt/cputiming_handwritten_functions.h rename to layersvt/cpu_timing/cputiming_handwritten_functions.h