Lock graph updates

This commit is contained in:
Andy Leiserson authored and mergify[bot] committed 2026-09-18 19:56:30 +00:00
1 parent 8392a3bc53
commit 468e87264a
1 file changed
+57 -24
+57 -24
View File
@@ -106,43 +106,65 @@ macro_rules! define_lock_ranks {
define_lock_ranks! {
// Non-leaf ranks, in topological order.
rank COMMAND_BUFFER_DATA "CommandBuffer::data" followed by {
rank INSTANCE_DEVICES "InstanceDevices" followed by {
DEVICE_SNATCHABLE_LOCK,
BUFFER_MAP_STATE,
COMMAND_ALLOCATOR_FREE_ENCODERS,
BUFFER_POOL,
QUEUE_PENDING_WRITES,
DEVICE_TRACKERS,
QUEUE_LIFE_TRACKER,
BUFFER_BIND_GROUPS,
DEVICE_TRACE,
DEVICE_USAGE_SCOPES,
INSTANCE_DEVICES,
SHARED_TRACKER_INDEX_ALLOCATOR_INNER,
TEXTURE_BIND_GROUPS,
TEXTURE_CLEAR_MODE,
TEXTURE_VIEWS,
DEVICE_DEFERRED_DESTROY,
DEVICE_LOST_CLOSURE,
}
rank DEVICE_SNATCHABLE_LOCK "Device::snatchable_lock" followed by {
BUFFER_MAP_STATE,
DEVICE_COMMAND_INDICES,
QUEUE_PENDING_WRITES,
TEXTURE_INITIALIZATION_STATUS,
DEVICE_TRACKERS,
QUEUE_LIFE_TRACKER,
BLAS_COMPACTION_STATE,
BUFFER_BIND_GROUPS,
BUFFER_INITIALIZATION_STATUS,
BUFFER_POOL,
DEVICE_LOST_CLOSURE,
DEVICE_TRACE,
DEVICE_USAGE_SCOPES,
INSTANCE_DEVICES,
QUERY_SET_INITIALIZED_SLOTS,
SHARED_TRACKER_INDEX_ALLOCATOR_INNER,
TEXTURE_BIND_GROUPS,
TEXTURE_CLEAR_MODE,
TEXTURE_INITIALIZATION_STATUS,
TEXTURE_VIEWS,
QUERY_SET_INITIALIZED_SLOTS,
// Uncomment this to see an interesting cycle.
// COMMAND_BUFFER_DATA,
}
rank DEVICE_COMMAND_INDICES "Device::command_indices" followed by {
COMMAND_BUFFER_DATA,
BUFFER_MAP_STATE,
BUFFER_POOL,
DEVICE_TRACKERS,
QUEUE_PENDING_WRITES,
QUEUE_LIFE_TRACKER,
BLAS_COMPACTION_STATE,
BLAS_BUILT_INDEX,
COMMAND_ALLOCATOR_FREE_ENCODERS,
DEVICE_DEFERRED_DESTROY,
DEVICE_TRACE,
QUERY_SET_INITIALIZED_SLOTS,
RESOURCE_POOL_INNER,
SHARED_TRACKER_INDEX_ALLOCATOR_INNER,
TEXTURE_CLEAR_MODE,
TLAS_BUILT_INDEX,
TLAS_DEPENDENCIES,
}
rank COMMAND_BUFFER_DATA "CommandBuffer::data" followed by {
BUFFER_MAP_STATE,
COMMAND_ALLOCATOR_FREE_ENCODERS,
BLAS_COMPACTION_STATE,
BUFFER_POOL,
DEVICE_TRACE,
DEVICE_USAGE_SCOPES,
SHARED_TRACKER_INDEX_ALLOCATOR_INNER,
}
rank QUEUE_PENDING_WRITES "Queue::pending_writes" followed by {
@@ -153,20 +175,29 @@ define_lock_ranks! {
TEXTURE_INITIALIZATION_STATUS,
SHARED_TRACKER_INDEX_ALLOCATOR_INNER,
}
rank TEXTURE_INITIALIZATION_STATUS "Texture::initialization_status" followed by {
DEVICE_TRACKERS,
}
rank DEVICE_TRACKERS "Device::trackers" followed by {
BUFFER_BIND_GROUPS,
BUFFER_INITIALIZATION_STATUS,
DEVICE_DEFERRED_DESTROY,
TEXTURE_BIND_GROUPS,
TEXTURE_CLEAR_MODE,
TEXTURE_INITIALIZATION_STATUS,
TEXTURE_VIEWS,
}
rank QUEUE_LIFE_TRACKER "Queue::life_tracker" followed by {
BLAS_COMPACTION_STATE,
BUFFER_MAP_STATE,
COMMAND_ALLOCATOR_FREE_ENCODERS,
BUFFER_INITIALIZATION_STATUS,
BUFFER_POOL,
COMMAND_ALLOCATOR_FREE_ENCODERS,
DEVICE_DEFERRED_DESTROY,
DEVICE_TRACE,
RESOURCE_POOL_INNER,
SHARED_TRACKER_INDEX_ALLOCATOR_INNER,
TEXTURE_CLEAR_MODE,
}
rank BLAS_COMPACTION_STATE "Blas::compaction_state" followed by {
BLAS_BUILT_INDEX,
}
rank BUFFER_MAP_STATE "Buffer::map_state" followed by {
BUFFER_INITIALIZATION_STATUS,
@@ -176,30 +207,32 @@ define_lock_ranks! {
rank COMMAND_ALLOCATOR_FREE_ENCODERS "CommandAllocator::free_encoders" followed by {
SHARED_TRACKER_INDEX_ALLOCATOR_INNER,
}
rank INSTANCE_DEVICES "InstanceDevices" followed by {
rank TLAS_BUILT_INDEX "Tlas::built_index" followed by {
TLAS_DEPENDENCIES,
}
rank TLAS_DEPENDENCIES "Tlas::dependencies" followed by {
BLAS_BUILT_INDEX,
}
// Leaf ranks reachable from the graph above, alphabetical.
rank BLAS_COMPACTION_STATE "Blas::compaction_state" followed by { }
rank BLAS_BUILT_INDEX "Blas::built_index" followed by { }
rank BUFFER_BIND_GROUPS "Buffer::bind_groups" followed by { }
rank BUFFER_INITIALIZATION_STATUS "Buffer::initialization_status" followed by { }
rank BUFFER_POOL "BufferPool::buffers" followed by { }
rank DEVICE_DEFERRED_DESTROY "Device::deferred_destroy" followed by { }
rank DEVICE_LOST_CLOSURE "Device::device_lost_closure" followed by { }
rank DEVICE_TRACE "Device::trace" followed by { }
rank DEVICE_USAGE_SCOPES "Device::usage_scopes" followed by { }
rank SHARED_TRACKER_INDEX_ALLOCATOR_INNER "SharedTrackerIndexAllocator::inner" followed by { }
rank QUERY_SET_INITIALIZED_SLOTS "QuerySet::initialized_slots" followed by { }
rank RESOURCE_POOL_INNER "ResourcePool::inner" followed by { }
rank SHARED_TRACKER_INDEX_ALLOCATOR_INNER "SharedTrackerIndexAllocator::inner" followed by { }
rank TEXTURE_BIND_GROUPS "Texture::bind_groups" followed by { }
rank TEXTURE_CLEAR_MODE "Texture::clear_mode" followed by { }
rank TEXTURE_INITIALIZATION_STATUS "Texture::initialization_status" followed by { }
rank TEXTURE_VIEWS "Texture::views" followed by { }
// Ranks not connected to the graph, alphabetical.
rank BLAS_BUILT_INDEX "Blas::built_index" followed by { }
rank DEVICE_LOST_CLOSURE "Device::device_lost_closure" followed by { }
rank RESOURCE_POOL_INNER "ResourcePool::inner" followed by { }
rank SURFACE_PRESENTATION "Surface::presentation" followed by { }
rank TLAS_BUILT_INDEX "Tlas::built_index" followed by { }
rank TLAS_DEPENDENCIES "Tlas::dependencies" followed by { }
#[cfg(test)]
rank PAWN "pawn" followed by { ROOK, BISHOP }