Some cleanup in preparetion for more aliasing work

Author: per-mathisen-arm

scripts/struct.py

@@ -79,12 +79,10 @@ def struct_impl_read(r, selected = None):
 		accessor = '%s* sptr' % name
 		special = ''
 		if name == 'VkDeviceCreateInfo': special = ', VkPhysicalDevice physicalDevice'
-		elif 'VkBindBufferMemoryInfo' in name or 'VkBindImageMemoryInfo' in name: special = ', VkDevice device'
 		print('static void read_%s(lava_file_reader& reader, %s%s)' % (name, accessor, special), file=r)
 		print('{', file=r)
 		if v.attrib.get('alias'):
 			if 'VkDeviceCreateInfo' in name: special = ', physicalDevice'
-			elif 'VkBindBufferMemoryInfo' in name or 'VkBindImageMemoryInfo' in name: special = ', device'
 			print('\tread_%s(reader, sptr%s);' % (v.attrib.get('alias'), special), file=r)
 		else:
 			z.target(r)

scripts/util.py

@@ -449,7 +449,6 @@ def print_struct(self, mytype, varname, owner, size = None):
 		elif 'vkCmdPushDescriptorSet' in self.funcname and mytype == 'VkWriteDescriptorSet' and not self.read: accessor += ', true'
 		elif mytype == 'VkWriteDescriptorSet' and not self.read: accessor += ', false'
 		elif mytype == 'VkDeviceCreateInfo' and self.read: accessor += ', physicalDevice'
-		elif ('VkBindImageMemoryInfo' in mytype or 'VkBindBufferMemoryInfo' in mytype) and self.read: accessor += ', device'
 
 		if self.funcname[0] == 'V' and mytype in deconst_struct and not self.read: # we cannot modify passed in memory when writing
 			if size:
@@ -721,11 +720,11 @@ def print_load(self, name, owner): # called for each parameter
 			z.do('const VkImageTiling tiling = static_cast<VkImageTiling>(reader.read_uint32_t()); // fetch tiling property especially added')
 			z.do('const VkDeviceSize min_size = static_cast<VkDeviceSize>(reader.read_uint64_t()); // fetch padded memory size')
 			z.do('trackedimage& image_data = VkImage_index.at(image_index);')
-			z.do('suballoc_location loc = reader.parent->allocator.add_image(reader.thread_index(), device, %s, image_index, special_flags, tiling, min_size);' % varname)
+			z.do('suballoc_location loc = reader.parent->allocator.add_image(reader.thread_index(), reader.device, %s, image_index, special_flags, tiling, min_size);' % varname)
 		elif self.funcname in ['vkBindBufferMemory', 'VkBindBufferMemoryInfo', 'VkBindBufferMemoryInfoKHR'] and self.name == 'buffer':
 			z.do('const VkMemoryPropertyFlags special_flags = static_cast<VkMemoryPropertyFlags>(reader.read_uint32_t()); // fetch memory flags especially added')
 			z.do('trackedbuffer& buffer_data = VkBuffer_index.at(buffer_index);')
-			z.do('suballoc_location loc = reader.parent->allocator.add_buffer(reader.thread_index(), device, %s, buffer_index, special_flags, buffer_data);' % varname)
+			z.do('suballoc_location loc = reader.parent->allocator.add_buffer(reader.thread_index(), reader.device, %s, special_flags, buffer_data);' % varname)
 
 		if self.funcname in ['vkBindImageMemory', 'vkBindBufferMemory', 'VkBindBufferMemoryInfo', 'VkBindBufferMemoryInfoKHR', 'VkBindImageMemoryInfoKHR', 'VkBindImageMemoryInfo']:
 			if self.name == 'memory':

src/lavatube.h

@@ -172,7 +172,7 @@ struct trackedobject : trackable
 	int source = 0; // code line that is the last source for us to be scanned, only for debugging
 	/// Do we alias another object in memory? if we alias 1-to-1, both point to each other, otherwise only the child points to
 	/// the parent object.
-	uint32_t alias_type = VK_OBJECT_TYPE_UNKNOWN;
+	VkObjectType alias_type = VK_OBJECT_TYPE_UNKNOWN;
 	uint32_t alias_index = UINT32_MAX;
 	VkDeviceAddress device_address = 0;
 

src/suballocator.cpp

@@ -24,6 +24,7 @@ struct suballocation
 	{
 		VkImage image;
 		VkBuffer buffer;
+		VkTensorARM tensor;
 	} handle;
 	VkDeviceSize size = 0;
 	VkDeviceSize offset = 0;
@@ -406,21 +407,18 @@ void suballocator::virtualswap_images(VkDevice device, const std::vector<VkImage
 	}
 }
 
-suballoc_location suballocator::add_buffer(uint16_t tid, VkDevice device, VkBuffer buffer, uint32_t buffer_index, VkMemoryPropertyFlags mempropflags, const trackedbuffer& buffer_data)
+suballoc_location suballocator::add_buffer(uint16_t tid, VkDevice device, VkBuffer buffer, VkMemoryPropertyFlags mempropflags, const trackedbuffer& buffer_data)
 {
 	const VkBufferUsageFlags buffer_flags = buffer_data.usage;
 	if ((mempropflags & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT) || (mempropflags & VK_MEMORY_PROPERTY_HOST_CACHED_BIT))
 	{
 		mempropflags &= ~VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; // do not require this bit in these cases
 	}
-	VkMemoryRequirements2 req = {};
-	req.sType = VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2;
-	VkMemoryDedicatedRequirements dedicated = {};
-	dedicated.sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS;
+	VkMemoryRequirements2 req = { VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2, nullptr };
+	VkMemoryDedicatedRequirements dedicated = { VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS, nullptr };
 	if (use_dedicated_allocation() && priv->run)
 	{
-		VkBufferMemoryRequirementsInfo2 info = {};
-		info.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_REQUIREMENTS_INFO_2;
+		VkBufferMemoryRequirementsInfo2 info = { VK_STRUCTURE_TYPE_BUFFER_MEMORY_REQUIREMENTS_INFO_2, nullptr };
 		info.buffer = buffer;
 		req.pNext = &dedicated;
 		wrap_vkGetBufferMemoryRequirements2(device, &info, &req);
@@ -441,7 +439,7 @@ suballoc_location suballocator::add_buffer(uint16_t tid, VkDevice device, VkBuff
 	s.handle.buffer = buffer;
 	s.size = req.memoryRequirements.size;
 	s.offset = 0;
-	s.index = buffer_index;
+	s.index = buffer_data.index;
 	s.alignment = req.memoryRequirements.alignment;
 	VkMemoryAllocateFlags allocflags = 0;
 	if (buffer_flags & VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT) { dedicated.prefersDedicatedAllocation = VK_TRUE; allocflags |= VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR; }

src/suballocator.h

@@ -32,7 +32,7 @@ struct suballocator
 	suballoc_location add_image(uint16_t tid, VkDevice device, VkImage image, uint32_t image_index, VkMemoryPropertyFlags flags, VkImageTiling tiling, VkDeviceSize min_size);
 
 	/// Add a buffer to our memory pools. See above.
-	suballoc_location add_buffer(uint16_t tid, VkDevice device, VkBuffer buffer, uint32_t buffer_index, VkMemoryPropertyFlags memory_flags, const trackedbuffer& buffer_data);
+	suballoc_location add_buffer(uint16_t tid, VkDevice device, VkBuffer buffer, VkMemoryPropertyFlags memory_flags, const trackedbuffer& buffer_data);
 
 	/// Delete an image from our memory pools. Thread safe because the internal data structure is preallocated and never resized,
 	/// and deleted entries are never reused.