Add more tests from tracetooltests

Also fix issues with descriptor buffers handling.

Author: per-mathisen-arm

CMakeLists.txt

@@ -585,7 +585,11 @@ layer_test(pnext_chain pnext_chain)
 #layer_test(as_3 as_3)
 #layer_test(as_4 as_4) # crashes
 #layer_test(as_5 as_5) # crashes
+#layer_test(as_6 as_6)
+#layer_test(as_7 as_7)
 #layer_test(aliasing_1 aliasing_1) # TBD need to implement aliasing support
+#layer_test(aliasing_2 aliasing_2)
+#layer_test(aliasing_3 aliasing_3)
 layer_test(privatedata privatedata)
 layer_test(privatedataext privatedataext)
 #layer_test(multidevice_1 multidevice_1) # assert failure on memory type
@@ -598,3 +602,16 @@ layer_test(pipeline_executable_properties pipeline_executable_properties)
 layer_test(extended_dynamic_state3 extended_dynamic_state3)
 #layer_test(push_descriptor)
 layer_test(host_image_copy host_image_copy)
+#layer_test(compute_aliasing compute_aliasing)
+layer_test(compute_bda_copying_address compute_bda_copying_address)
+layer_test(compute_descriptor_buffer compute_descriptor_buffer)
+layer_test(descriptor_buffer_mutable_type descriptor_buffer_mutable_type)
+layer_test(maintenance7 maintenance7)
+layer_test(memory_2 memory_2)
+layer_test(memory_2_1 memory_2_1)
+layer_test(pipeline_creation_cache_control pipeline_creation_cache_control)
+layer_test(stress_1 stress_1)
+layer_test(tensors_1 tensors_1)
+layer_test(timeline_semaphore_1 timeline_semaphore_1)
+layer_test(trace_helpers trace_helpers)
+layer_test(updatedescriptor_1 updatedescriptor_1)

external/tracetooltests

@@ -543,14 +543,14 @@ def print_load(self, name, owner): # called for each parameter
 			z.do('switch (sptr->type)')
 			z.brace_begin()
 			z.do('case VK_DESCRIPTOR_TYPE_SAMPLER: { VkSampler* tmp = reader.pool.allocate<VkSampler>(1); uint32_t index = reader.read_handle(DEBUGPARAM("%s")); *tmp = index_to_VkSampler.at(index); sptr->data.pSampler = tmp; } break;' % self.type)
-			z.do('case VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER: opt = reader.read_uint8_t(); if (opt) read_VkDescriptorImageInfo(reader, (VkDescriptorImageInfo*)sptr->data.pCombinedImageSampler); break;')
-			z.do('case VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT: opt = reader.read_uint8_t(); if (opt) read_VkDescriptorImageInfo(reader, (VkDescriptorImageInfo*)sptr->data.pInputAttachmentImage); break;')
-			z.do('case VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE: opt = reader.read_uint8_t(); if (opt) read_VkDescriptorImageInfo(reader, (VkDescriptorImageInfo*)sptr->data.pSampledImage); break;')
-			z.do('case VK_DESCRIPTOR_TYPE_STORAGE_IMAGE: opt = reader.read_uint8_t(); if (opt) read_VkDescriptorImageInfo(reader, (VkDescriptorImageInfo*)sptr->data.pStorageImage); break;')
-			z.do('case VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER: opt = reader.read_uint8_t(); if (opt) read_VkDescriptorAddressInfoEXT(reader, (VkDescriptorAddressInfoEXT*)sptr->data.pUniformTexelBuffer); break;')
-			z.do('case VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER: opt = reader.read_uint8_t(); if (opt) read_VkDescriptorAddressInfoEXT(reader, (VkDescriptorAddressInfoEXT*)sptr->data.pStorageTexelBuffer); break;')
-			z.do('case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER: opt = reader.read_uint8_t(); if (opt) read_VkDescriptorAddressInfoEXT(reader, (VkDescriptorAddressInfoEXT*)sptr->data.pUniformBuffer); break;')
-			z.do('case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER: opt = reader.read_uint8_t(); if (opt) read_VkDescriptorAddressInfoEXT(reader, (VkDescriptorAddressInfoEXT*)sptr->data.pStorageBuffer); break;')
+			z.do('case VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER: opt = reader.read_uint8_t(); if (opt) { auto* tmp = reader.pool.allocate<VkDescriptorImageInfo>(1); sptr->data.pCombinedImageSampler = tmp; read_VkDescriptorImageInfo(reader, tmp); } else { sptr->data.pCombinedImageSampler = nullptr; } break;')
+			z.do('case VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT: opt = reader.read_uint8_t(); if (opt) { auto* tmp = reader.pool.allocate<VkDescriptorImageInfo>(1); sptr->data.pInputAttachmentImage = tmp; read_VkDescriptorImageInfo(reader, tmp); } else { sptr->data.pInputAttachmentImage = nullptr; } break;')
+			z.do('case VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE: opt = reader.read_uint8_t(); if (opt) { auto* tmp = reader.pool.allocate<VkDescriptorImageInfo>(1); sptr->data.pSampledImage = tmp; read_VkDescriptorImageInfo(reader, tmp); } else { sptr->data.pSampledImage = nullptr; } break;')
+			z.do('case VK_DESCRIPTOR_TYPE_STORAGE_IMAGE: opt = reader.read_uint8_t(); if (opt) { auto* tmp = reader.pool.allocate<VkDescriptorImageInfo>(1); sptr->data.pStorageImage = tmp; read_VkDescriptorImageInfo(reader, tmp); } else { sptr->data.pStorageImage = nullptr; } break;')
+			z.do('case VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER: opt = reader.read_uint8_t(); if (opt) { auto* tmp = reader.pool.allocate<VkDescriptorAddressInfoEXT>(1); sptr->data.pUniformTexelBuffer = tmp; read_VkDescriptorAddressInfoEXT(reader, tmp); } else { sptr->data.pUniformTexelBuffer = nullptr; } break;')
+			z.do('case VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER: opt = reader.read_uint8_t(); if (opt) { auto* tmp = reader.pool.allocate<VkDescriptorAddressInfoEXT>(1); sptr->data.pStorageTexelBuffer = tmp; read_VkDescriptorAddressInfoEXT(reader, tmp); } else { sptr->data.pStorageTexelBuffer = nullptr; } break;')
+			z.do('case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER: opt = reader.read_uint8_t(); if (opt) { auto* tmp = reader.pool.allocate<VkDescriptorAddressInfoEXT>(1); sptr->data.pUniformBuffer = tmp; read_VkDescriptorAddressInfoEXT(reader, tmp); } else { sptr->data.pUniformBuffer = nullptr; } break;')
+			z.do('case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER: opt = reader.read_uint8_t(); if (opt) { auto* tmp = reader.pool.allocate<VkDescriptorAddressInfoEXT>(1); sptr->data.pStorageBuffer = tmp; read_VkDescriptorAddressInfoEXT(reader, tmp); } else { sptr->data.pStorageBuffer = nullptr; } break;')
 			z.do('case VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR:')
 			z.brace_begin()
 			z.do('uint64_t stored_address = reader.read_uint64_t();')
@@ -1003,7 +1003,7 @@ def print_save(self, name, owner, postprocess = False): # called for each parame
 					z.do('auto* image_data = writer.parent->records.VkImage_index.at(pImageMemoryBarriers->image);')
 					z.do('commandbuffer_data->touch(image_data, 0, image_data->size, __LINE__);')
 					z.loop_end()
-				elif self.funcname in [ 'vkCmdBeginRendering' ] and not postprocess:
+				elif self.funcname in [ 'vkCmdBeginRendering', 'vkCmdBeginRenderingKHR' ] and not postprocess:
 					z.do('for (unsigned ii = 0; ii < pRenderingInfo->colorAttachmentCount; ii++)')
 					z.loop_begin()
 					z.do('if (pRenderingInfo->pColorAttachments[ii].loadOp == VK_ATTACHMENT_LOAD_OP_LOAD)')

scripts/util.py

@@ -1313,6 +1313,21 @@ static void handle_VkWriteDescriptorSets(lava_file_reader& reader, uint32_t desc
 	}
 }
 
+static void handle_VkCopyDescriptorSets(lava_file_reader& reader, uint32_t descriptorCopyCount, const VkCopyDescriptorSet* pDescriptorCopies)
+{
+	if (descriptorCopyCount == 0 || !pDescriptorCopies) return;
+
+	for (unsigned i = 0; i < descriptorCopyCount; i++)
+	{
+		const uint32_t src_index = index_to_VkDescriptorSet.index(pDescriptorCopies[i].srcSet);
+		auto& src = VkDescriptorSet_index.at(src_index);
+		const uint32_t dst_index = index_to_VkDescriptorSet.index(pDescriptorCopies[i].dstSet);
+		auto& dst = VkDescriptorSet_index.at(dst_index);
+		for (const auto& pair : src.bound_buffers) dst.bound_buffers[pair.first] = pair.second;
+		for (const auto& pair : src.dynamic_buffers) dst.dynamic_buffers[pair.first] = pair.second;
+	}
+}
+
 void replay_postprocess_vkCmdPushDescriptorSetKHR(lava_file_reader& reader, VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, uint32_t set, uint32_t descriptorWriteCount, const VkWriteDescriptorSet* pDescriptorWrites)
 {
 	assert(false);
@@ -1332,9 +1347,7 @@ void replay_postprocess_vkCmdPushDescriptorSet2KHR(lava_file_reader& reader, VkC
 void replay_postprocess_vkUpdateDescriptorSets(lava_file_reader& reader, VkDevice device, uint32_t descriptorWriteCount, const VkWriteDescriptorSet* pDescriptorWrites, uint32_t descriptorCopyCount, const VkCopyDescriptorSet* pDescriptorCopies)
 {
 	handle_VkWriteDescriptorSets(reader, descriptorWriteCount, pDescriptorWrites, true);
-
-	// TBD handle copy
-	assert(descriptorCopyCount == 0);
+	handle_VkCopyDescriptorSets(reader, descriptorCopyCount, pDescriptorCopies);
 }
 
 void replay_postprocess_vkCmdBindDescriptorSets(lava_file_reader& reader, VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout,

src/hardcode_read.cpp

@@ -637,6 +637,31 @@ static void handle_VkWriteDescriptorSets(lava_file_writer& writer, uint32_t desc
 	}
 }
 
+static void merge_descriptor_touched(trackeddescriptorset_trace* dst, const trackeddescriptorset_trace* src)
+{
+	for (const auto& pair : src->touched)
+	{
+		if (dst->touched.count(pair.first) > 0)
+		{
+			for (const auto& r : pair.second.list()) dst->touched[pair.first].add(r.first, r.last);
+		}
+		else dst->touched[pair.first] = pair.second;
+	}
+}
+
+static void handle_VkCopyDescriptorSets(lava_file_writer& writer, uint32_t descriptorCopyCount, const VkCopyDescriptorSet* pDescriptorCopies)
+{
+	if (descriptorCopyCount == 0 || !pDescriptorCopies) return;
+
+	for (unsigned i = 0; i < descriptorCopyCount; i++)
+	{
+		auto* src = writer.parent->records.VkDescriptorSet_index.at(pDescriptorCopies[i].srcSet);
+		auto* dst = writer.parent->records.VkDescriptorSet_index.at(pDescriptorCopies[i].dstSet);
+		merge_descriptor_touched(dst, src);
+		if (dst->dynamic_buffers.empty() && !src->dynamic_buffers.empty()) dst->dynamic_buffers = src->dynamic_buffers;
+	}
+}
+
 static void trace_post_vkCmdPushDescriptorSetKHR(lava_file_writer& writer, VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, uint32_t set, uint32_t descriptorWriteCount, const VkWriteDescriptorSet* pDescriptorWrites)
 {
 	handle_VkWriteDescriptorSets(writer, descriptorWriteCount, pDescriptorWrites, false, true);
@@ -650,9 +675,7 @@ static void trace_post_vkCmdPushDescriptorSet2KHR(lava_file_writer& writer, VkCo
 static void trace_post_vkUpdateDescriptorSets(lava_file_writer& writer, VkDevice device, uint32_t descriptorWriteCount, const VkWriteDescriptorSet* pDescriptorWrites, uint32_t descriptorCopyCount, const VkCopyDescriptorSet* pDescriptorCopies)
 {
 	handle_VkWriteDescriptorSets(writer, descriptorWriteCount, pDescriptorWrites, true, false);
-
-	// TBD handle copy
-	assert(descriptorCopyCount == 0);
+	handle_VkCopyDescriptorSets(writer, descriptorCopyCount, pDescriptorCopies);
 }
 
 // combine all updates for each memory into one update list for each device memory object, so we keep the number of map operations to a minimum