nordic-dev.net/vulkano
nordic-dev.net/vulkano
2
0
Fork 0
mirror of https://github.com/vulkano-rs/vulkano.git synced 2024-11-21 22:34:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix suballocator cleanup (#2323)

Browse Source 
* Fix suballocator cleanup

* impl `Debug` for `dyn Suballocator`
This commit is contained in:
marc0246 2023-09-13 15:10:36 +02:00 committed by GitHub
parent 771aa30bbe
commit 28224138f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
vulkano/src/memory/allocator/mod.rs
View File

@ -1177,7 +1177,7 @@ unsafe impl<S: Suballocator + Send + 'static> MemoryAllocator for GenericMemoryA
blocks.sort_by_key(|block| block.free_size());
let (Ok(idx) | Err(idx)) = blocks.binary_search_by_key(&size, |block| block.free_size());
for block in &blocks[idx..] {
for block in &mut blocks[idx..] {
if let Ok(allocation) =
block.allocate(layout, allocation_type, self.buffer_image_granularity)
{
@ -1185,20 +1185,6 @@ unsafe impl<S: Suballocator + Send + 'static> MemoryAllocator for GenericMemoryA
}
}
// For bump allocators, first do a garbage sweep and try to allocate again.
if S::NEEDS_CLEANUP {
blocks.iter_mut().for_each(|block| block.cleanup());
blocks.sort_unstable_by_key(|block| block.free_size());
if let Some(block) = blocks.last() {
if let Ok(allocation) =
block.allocate(layout, allocation_type, self.buffer_image_granularity)
{
return Ok(allocation);
}
}
}
if never_allocate {
return Err(MemoryAllocatorError::OutOfPoolMemory);
}
@ -1237,7 +1223,7 @@ unsafe impl<S: Suballocator + Send + 'static> MemoryAllocator for GenericMemoryA
};
blocks.push(block);
let block = blocks.last().unwrap();
let block = blocks.last_mut().unwrap();
match block.allocate(layout, allocation_type, self.buffer_image_granularity) {
Ok(allocation) => Ok(allocation),
@ -1462,7 +1448,7 @@ unsafe impl<S: Suballocator + Send + 'static> MemoryAllocator for GenericMemoryA
if let Some(suballocation) = allocation.suballocation {
let memory_type_index = allocation.device_memory.memory_type_index();
let pool = self.pools[memory_type_index as usize].blocks.lock();
let block_ptr = allocation.allocation_handle.0 as *const Block<S>;
let block_ptr = allocation.allocation_handle.0 as *mut Block<S>;
// TODO: Maybe do a similar check for dedicated blocks.
debug_assert!(
@ -1477,7 +1463,7 @@ unsafe impl<S: Suballocator + Send + 'static> MemoryAllocator for GenericMemoryA
// memory and because a block isn't dropped until the allocator itself is dropped, at
// which point it would be impossible to call this method. We also know that it must be
// valid to create a reference to the block, because we locked the pool it belongs to.
let block = &*block_ptr;
let block = &mut *block_ptr;
// SAFETY: The caller must guarantee that `allocation` refers to a currently allocated
// allocation of `self`.
@ -1552,6 +1538,7 @@ unsafe impl<S> DeviceOwned for GenericMemoryAllocator<S> {
struct Block<S> {
device_memory: Arc<DeviceMemory>,
suballocator: S,
allocation_count: usize,
}
impl<S: Suballocator> Block<S> {
@ -1561,11 +1548,12 @@ impl<S: Suballocator> Block<S> {
Box::new(Block {
device_memory,
suballocator,
allocation_count: 0,
})
}
fn allocate(
&self,
&mut self,
layout: DeviceLayout,
allocation_type: AllocationType,
buffer_image_granularity: DeviceAlignment,
@ -1574,24 +1562,29 @@ impl<S: Suballocator> Block<S> {
self.suballocator
.allocate(layout, allocation_type, buffer_image_granularity)?;
self.allocation_count += 1;
Ok(MemoryAlloc {
device_memory: self.device_memory.clone(),
suballocation: Some(suballocation),
allocation_handle: AllocationHandle(self as *const Block<S> as _),
allocation_handle: AllocationHandle(self as *mut Block<S> as _),
})
}
unsafe fn deallocate(&self, suballocation: Suballocation) {
self.suballocator.deallocate(suballocation)
unsafe fn deallocate(&mut self, suballocation: Suballocation) {
self.suballocator.deallocate(suballocation);
self.allocation_count -= 1;
// For bump allocators, reset the free-start once there are no remaining allocations.
if self.allocation_count == 0 {
self.suballocator.cleanup();
}
}
fn free_size(&self) -> DeviceSize {
self.suballocator.free_size()
}
fn cleanup(&mut self) {
self.suballocator.cleanup();
}
}
/// Parameters to create a new [`GenericMemoryAllocator`].

25
vulkano/src/memory/allocator/suballocator.rs
View File

@ -22,7 +22,7 @@ use std::{
cell::{Cell, UnsafeCell},
cmp,
error::Error,
fmt::{self, Display},
fmt::{self, Debug, Display},
ptr,
};
@ -86,15 +86,6 @@ use std::{
/// [page]: super#pages
/// [buffer-image granularity]: super#buffer-image-granularity
pub unsafe trait Suballocator {
/// Whether the allocator needs [`cleanup`] to be called before memory can be released.
///
/// This is used by the [`GenericMemoryAllocator`] to specialize the allocation strategy to the
/// suballocator at compile time.
///
/// [`cleanup`]: Self::cleanup
/// [`GenericMemoryAllocator`]: super::GenericMemoryAllocator
const NEEDS_CLEANUP: bool;
/// Creates a new suballocator for the given [region].
///
/// # Arguments
@ -157,9 +148,17 @@ pub unsafe trait Suballocator {
fn free_size(&self) -> DeviceSize;
/// Tries to free some space, if applicable.
///
/// There must be no current allocations as they might get freed.
fn cleanup(&mut self);
}
impl Debug for dyn Suballocator {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.debug_struct("Suballocator").finish_non_exhaustive()
}
}
/// Tells the [suballocator] what type of resource will be bound to the allocation, so that it can
/// optimize memory usage while still respecting the [buffer-image granularity].
///
@ -298,8 +297,6 @@ pub struct FreeListAllocator {
}
unsafe impl Suballocator for FreeListAllocator {
const NEEDS_CLEANUP: bool = false;
/// Creates a new `FreeListAllocator` for the given [region].
///
/// [region]: Suballocator#regions
@ -773,8 +770,6 @@ impl BuddyAllocator {
}
unsafe impl Suballocator for BuddyAllocator {
const NEEDS_CLEANUP: bool = false;
/// Creates a new `BuddyAllocator` for the given [region].
///
/// # Panics
@ -1041,8 +1036,6 @@ impl BumpAllocator {
}
unsafe impl Suballocator for BumpAllocator {
const NEEDS_CLEANUP: bool = true;
/// Creates a new `BumpAllocator` for the given [region].
///
/// [region]: Suballocator#regions