Remove faked frame boundary extension feature struct from replay.

Also add back feature/ext print calls on replay failure to create
vulkan device that had gone missing, and print a warning on capture
failure using the python wrapper script.

scripts/lava-capture.py

@@ -105,4 +105,6 @@ def PrintEnvVar(envVar):
 		result = subprocess.run(['gdb', '-q', '-ex', 'run', '--args'] + args.programAndArgs)
 	else:
 		result = subprocess.run(args.programAndArgs)
+	if result.returncode != 0:
+		print('Captured program returned an error value!')
 	sys.exit(result.returncode)

scripts/util.py

@@ -554,7 +554,7 @@ def print_load(self, name, owner): # called for each parameter
 			elif self.funcname == 'VkInstanceCreateInfo' and self.name == 'ppEnabledLayerNames':
 				z.do('%s = instance_layers(reader, sptr->%s);' % (varname, len))
 			elif self.funcname == 'VkDeviceCreateInfo' and self.name == 'ppEnabledExtensionNames':
-				z.do('%s = device_extensions(reader, physicalDevice, sptr->%s);' % (varname, len))
+				z.do('%s = device_extensions(sptr, reader, physicalDevice, sptr->%s);' % (varname, len))
 			elif self.funcname == 'VkDeviceCreateInfo' and self.name == 'ppEnabledLayerNames':
 				z.do('%s = device_layers(reader, sptr->%s);' % (varname, len))
 			else:

scripts/vk_wrapper.py

@@ -247,6 +247,10 @@ def print_wrapper_cpp(name):
 	print('\t// Setup next layer', file=w)
 	print('\tPFN_vkCreateDevice createDeviceNext = reinterpret_cast<PFN_vkCreateDevice>(gipa(VK_NULL_HANDLE, "vkCreateDevice"));', file=w)
 	print('\tVkResult retval = createDeviceNext(physicalDevice, pCreateInfo, pAllocator, pDevice);', file=w)
+	print('\tif (retval == VK_ERROR_FEATURE_NOT_PRESENT) print_feature_mismatch(physicalDevice, pCreateInfo);', file=w)
+	print('\telse if (retval == VK_ERROR_EXTENSION_NOT_PRESENT) print_extension_mismatch(physicalDevice, pCreateInfo);', file=w)
+	print('\tif (retval != VK_SUCCESS) ABORT("Failed to create device: %s", errorString(retval));', file=w)
+	print('\tassert(*pDevice);', file=w)
 	print(file=w)
 	build_device_table(w)
 	print(file=w)

src/hardcode_read.cpp

@@ -630,7 +630,7 @@ void replay_post_vkCreateInstance(lava_file_reader& reader, VkResult result, con
 	}
 }
 
-const char* const* device_extensions(lava_file_reader& reader, VkPhysicalDevice physicalDevice, uint32_t& len)
+const char* const* device_extensions(VkDeviceCreateInfo* sptr, lava_file_reader& reader, VkPhysicalDevice physicalDevice, uint32_t& len)
 {
 	bool host_has_frame_boundary = false;
 	bool trace_has_frame_boundary = false;
@@ -700,6 +700,7 @@ const char* const* device_extensions(lava_file_reader& reader, VkPhysicalDevice
 	if (!host_has_frame_boundary && trace_has_frame_boundary)
 	{
 		ILOG("Replay host does not have frame boundary but trace does -- removing it from the replay!");
+		purge_extension_parent(sptr, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAME_BOUNDARY_FEATURES_EXT);
 	}
 	else if (trace_has_frame_boundary)
 	{

src/hardcode_write.cpp

@@ -920,8 +920,9 @@ static void trace_pre_vkCreateDevice(VkPhysicalDevice physicalDevice, VkDeviceCr
 	// -- Modify app request --
 
 	bool has_VK_EXT_tooling_info = false;
-	bool has_VK_KHR_external_memory = false;
-	bool has_VK_EXT_external_memory_host = false;
+	bool add_VK_KHR_external_memory = false;
+	bool add_VK_EXT_external_memory_host = false;
+	bool has_VK_EXT_frame_boundary = false;
 	uint32_t propertyCount = 0;
 	[[maybe_unused]] VkResult result = wrap_vkEnumerateDeviceExtensionProperties(physicalDevice, nullptr, &propertyCount, nullptr); // call first to get correct count on host
 	assert(result == VK_SUCCESS);
@@ -932,14 +933,15 @@ static void trace_pre_vkCreateDevice(VkPhysicalDevice physicalDevice, VkDeviceCr
 	{
 		std::string name = ext.extensionName;
 		if (name == VK_EXT_TOOLING_INFO_EXTENSION_NAME) has_VK_EXT_tooling_info = true;
-		if (name == VK_KHR_EXTERNAL_MEMORY_EXTENSION_NAME) has_VK_KHR_external_memory = true;
-		if (name == VK_EXT_EXTERNAL_MEMORY_HOST_EXTENSION_NAME) has_VK_EXT_external_memory_host = true;
+		if (name == VK_KHR_EXTERNAL_MEMORY_EXTENSION_NAME) add_VK_KHR_external_memory = true;
+		if (name == VK_EXT_EXTERNAL_MEMORY_HOST_EXTENSION_NAME) add_VK_EXT_external_memory_host = true;
+		if (name == VK_EXT_FRAME_BOUNDARY_EXTENSION_NAME) has_VK_EXT_frame_boundary = true;
 	}
 
 	// Extra extensions to add
 	std::vector<std::string> extra_exts;
-	if (has_VK_KHR_external_memory) { extra_exts.push_back(VK_KHR_EXTERNAL_MEMORY_EXTENSION_NAME); }
-	if (has_VK_EXT_external_memory_host) { extra_exts.push_back(VK_EXT_EXTERNAL_MEMORY_HOST_EXTENSION_NAME); }
+	if (add_VK_KHR_external_memory) { extra_exts.push_back(VK_KHR_EXTERNAL_MEMORY_EXTENSION_NAME); }
+	if (add_VK_EXT_external_memory_host) { extra_exts.push_back(VK_EXT_EXTERNAL_MEMORY_HOST_EXTENSION_NAME); }
 
 	// Remove built-in extensions before sending the requested extension list to the driver
 	char** nameptrs = writer.pool.allocate<char*>(pCreateInfo->enabledExtensionCount + extra_exts.size()); // reserve space for all
@@ -959,8 +961,9 @@ static void trace_pre_vkCreateDevice(VkPhysicalDevice physicalDevice, VkDeviceCr
 		}
 		if (strcmp(name, VK_TRACETOOLTEST_CHECKSUM_VALIDATION_EXTENSION_NAME) == 0) continue; // do not pass to host
 		if (strcmp(name, VK_TRACETOOLTEST_OBJECT_PROPERTY_EXTENSION_NAME) == 0) continue; // do not pass to host
-		if (strcmp(name, VK_KHR_EXTERNAL_MEMORY_EXTENSION_NAME) == 0) has_VK_KHR_external_memory = false; // do not need to add, already there
-		if (strcmp(name, VK_EXT_EXTERNAL_MEMORY_HOST_EXTENSION_NAME) == 0) has_VK_EXT_external_memory_host = false; // ditto
+		if (!has_VK_EXT_frame_boundary && strcmp(name, VK_EXT_FRAME_BOUNDARY_EXTENSION_NAME) == 0) continue; // do not pass to host
+		if (strcmp(name, VK_KHR_EXTERNAL_MEMORY_EXTENSION_NAME) == 0 && add_VK_KHR_external_memory) continue; // do not need to add twice
+		if (strcmp(name, VK_EXT_EXTERNAL_MEMORY_HOST_EXTENSION_NAME) == 0 && add_VK_EXT_external_memory_host) continue;; // ditto
 		nameptrs[newcount++] = name;
 		DLOG("    %s", name);
 	}

src/util.cpp

@@ -326,6 +326,20 @@ void* find_extension(void* sptr, VkStructureType sType)
 	return ptr;
 }
 
+void purge_extension_parent(void* sptr, VkStructureType sType)
+{
+	VkBaseOutStructure* ptr = (VkBaseOutStructure*)sptr;
+	while (ptr != nullptr && ptr->pNext != nullptr)
+	{
+		if (ptr->pNext->sType == sType)
+		{
+			ptr->pNext = ptr->pNext->pNext;
+			return;
+		}
+		ptr = ptr->pNext;
+	}
+}
+
 const void* find_extension(const void* sptr, VkStructureType sType)
 {
 	const VkBaseOutStructure* ptr = (VkBaseOutStructure*)sptr;

src/util.h

@@ -197,8 +197,11 @@ struct buffer
 static __attribute__((const)) inline uint64_t aligned_size(uint64_t size, uint64_t alignment) { return size + alignment - 1ull - (size + alignment - 1ull) % alignment; }
 static __attribute__((const)) inline uint64_t aligned_start(uint64_t size, uint64_t alignment) { return (size & ~(alignment - 1)); }
 
-void* find_extension_parent(void* sptr, VkStructureType sType);
 void* find_extension(void* sptr, VkStructureType sType);
 const void* find_extension(const void* sptr, VkStructureType sType);
 
+// "parent" methods require you to pass the owner of the pNext chain
+void* find_extension_parent(void* sptr, VkStructureType sType); // returns the parent object to the searched for type
+void purge_extension_parent(void* sptr, VkStructureType sType); // removes this extension from a pNext chain
+
 const char* pretty_print_VkObjectType(VkObjectType val);