Add the new marking log to tools as well

Author: per-mathisen-arm

scripts/lava.py

@@ -379,6 +379,7 @@ def out(lst, str=''):
 out(targets_read_headers, 'void tensor_update(lava_file_reader& reader, uint32_t device_index, uint32_t tensor_index, uint64_t size, const VkBaseOutStructure* sptr);')
 out(targets_read_headers, 'void terminate_all(lava_file_reader& reader, VkDevice device);')
 out(targets_read_headers, 'void reset_for_tools();')
+out(targets_read_headers, 'trackable& object_trackable(VkObjectType type, uint64_t handle);')
 out(targets_read_headers)
 
 out(targets_read, 'void retrace_init(lava_reader& replayer, const Json::Value& v, int heap_size, bool run)')

src/hardcode_read.cpp

@@ -201,7 +201,7 @@ static uint64_t object_lookup(VkObjectType type, uint32_t index)
 	return 0;
 }
 
-static trackable& object_trackable(VkObjectType type, uint64_t handle)
+trackable& object_trackable(VkObjectType type, uint64_t handle)
 {
 	static trackable dummy;
 	switch (type)

src/tool.cpp

@@ -95,6 +95,21 @@ static void replay_thread(lava_reader* replayer, int thread_id)
 	}
 }
 
+static void callback_vkSubmitDebugUtilsMessageEXT(VkInstance instance, VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity, VkDebugUtilsMessageTypeFlagsEXT messageTypes,
+                                                  const VkDebugUtilsMessengerCallbackDataEXT* pCallbackData)
+{
+	if (!pCallbackData) return;
+	if (pCallbackData->pObjects && pCallbackData->objectCount > 0 && pCallbackData->pMessage)
+	{
+		trackable& t = object_trackable(pCallbackData->pObjects[0].objectType, pCallbackData->pObjects[0].objectHandle);
+		DLOG("Marker for %s[%d]: " MAKEBLUE("%s"), pretty_print_VkObjectType(pCallbackData->pObjects[0].objectType), (int)t.index, pCallbackData->pMessage);
+	}
+	else if (pCallbackData->pMessage)
+	{
+		DLOG("Marker: " MAKEBLUE("%s"), pCallbackData->pMessage);
+	}
+}
+
 static void callback_vkCreateShaderModule(VkDevice device, const VkShaderModuleCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkShaderModule* pShaderModule)
 {
 	static int count = 0;
@@ -248,6 +263,7 @@ int main(int argc, char **argv)
 		// Add callbacks
 		vkCreateShaderModule_callbacks.push_back(callback_vkCreateShaderModule);
 		vkDestroyDevice_callbacks.push_back(callback_vkDestroyDevice);
+		vkSubmitDebugUtilsMessageEXT_callbacks.push_back(callback_vkSubmitDebugUtilsMessageEXT);
 
 		for (unsigned i = 0; i < replayer.threads.size(); i++)
 		{