Skip to content

Commit

Permalink
coalesce bindless modification
Browse files Browse the repository at this point in the history
  • Loading branch information
@shiinamiyuki
shiinamiyuki committed Oct 11, 2023
1 parent e3292b9 commit 7afa417
Show file tree
Hide file tree
Showing 3 changed files with 72 additions and 61 deletions.
129 changes: 70 additions & 59 deletions luisa_compute/src/resource.rs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use std::cell::{Cell, RefCell};
use std::collections::HashMap;
use std::fmt;
use std::ops::RangeBounds;
use std::process::abort;
Expand Down Expand Up @@ -601,7 +602,7 @@ impl<T: Value> BufferHeapVar<T> {
pub struct BindlessArray {
pub(crate) device: Device,
pub(crate) handle: Arc<BindlessArrayHandle>,
pub(crate) modifications: RefCell<Vec<api::BindlessArrayUpdateModification>>,
pub(crate) modifications: RefCell<HashMap<usize, api::BindlessArrayUpdateModification>>,
pub(crate) slots: RefCell<Vec<BindlessArraySlot>>,
pub(crate) lock: Arc<RawMutex>,
}
Expand Down Expand Up @@ -657,16 +658,18 @@ impl BindlessArray {
self.lock();
self.modifications
.borrow_mut()
.push(api::BindlessArrayUpdateModification {
.entry(index)
.or_insert(api::BindlessArrayUpdateModification {
slot: index,
buffer: api::BindlessArrayUpdateBuffer {
op: api::BindlessArrayUpdateOperation::Emplace,
handle: bufferview.handle(),
offset: bufferview.offset,
},
tex2d: api::BindlessArrayUpdateTexture::default(),
tex3d: api::BindlessArrayUpdateTexture::default(),
});
buffer: Default::default(),
tex2d: Default::default(),
tex3d: Default::default(),
})
.buffer = api::BindlessArrayUpdateBuffer {
op: api::BindlessArrayUpdateOperation::Emplace,
handle: bufferview.handle(),
offset: bufferview.offset,
};
let mut slots = self.slots.borrow_mut();
slots[index].buffer = Some(bufferview.buffer.handle.clone());
self.unlock();
Expand All @@ -680,16 +683,18 @@ impl BindlessArray {
self.lock();
self.modifications
.borrow_mut()
.push(api::BindlessArrayUpdateModification {
.entry(index)
.or_insert(api::BindlessArrayUpdateModification {
slot: index,
buffer: api::BindlessArrayUpdateBuffer::default(),
tex2d: api::BindlessArrayUpdateTexture {
op: api::BindlessArrayUpdateOperation::Emplace,
handle: texture.handle(),
sampler,
},
tex3d: api::BindlessArrayUpdateTexture::default(),
});
buffer: Default::default(),
tex2d: Default::default(),
tex3d: Default::default(),
})
.tex2d = api::BindlessArrayUpdateTexture {
op: api::BindlessArrayUpdateOperation::Emplace,
handle: texture.handle(),
sampler,
};
let mut slots = self.slots.borrow_mut();
slots[index].tex2d = Some(texture.handle.clone());
self.unlock();
Expand All @@ -703,16 +708,18 @@ impl BindlessArray {
self.lock();
self.modifications
.borrow_mut()
.push(api::BindlessArrayUpdateModification {
.entry(index)
.or_insert(api::BindlessArrayUpdateModification {
slot: index,
buffer: api::BindlessArrayUpdateBuffer::default(),
tex2d: api::BindlessArrayUpdateTexture::default(),
tex3d: api::BindlessArrayUpdateTexture {
op: api::BindlessArrayUpdateOperation::Emplace,
handle: texture.handle(),
sampler,
},
});
buffer: Default::default(),
tex2d: Default::default(),
tex3d: Default::default(),
})
.tex3d = api::BindlessArrayUpdateTexture {
op: api::BindlessArrayUpdateOperation::Emplace,
handle: texture.handle(),
sampler,
};
let mut slots = self.slots.borrow_mut();
slots[index].tex3d = Some(texture.handle.clone());
self.unlock();
Expand All @@ -721,16 +728,18 @@ impl BindlessArray {
self.lock();
self.modifications
.borrow_mut()
.push(api::BindlessArrayUpdateModification {
.entry(index)
.or_insert(api::BindlessArrayUpdateModification {
slot: index,
buffer: api::BindlessArrayUpdateBuffer {
op: api::BindlessArrayUpdateOperation::Remove,
handle: api::Buffer(INVALID_RESOURCE_HANDLE),
offset: 0,
},
tex2d: api::BindlessArrayUpdateTexture::default(),
tex3d: api::BindlessArrayUpdateTexture::default(),
});
buffer: Default::default(),
tex2d: Default::default(),
tex3d: Default::default(),
})
.buffer = api::BindlessArrayUpdateBuffer {
op: api::BindlessArrayUpdateOperation::Remove,
handle: api::Buffer(INVALID_RESOURCE_HANDLE),
offset: 0,
};
let mut slots = self.slots.borrow_mut();
slots[index].buffer = None;
self.unlock();
Expand All @@ -739,16 +748,18 @@ impl BindlessArray {
self.lock();
self.modifications
.borrow_mut()
.push(api::BindlessArrayUpdateModification {
.entry(index)
.or_insert(api::BindlessArrayUpdateModification {
slot: index,
buffer: api::BindlessArrayUpdateBuffer::default(),
tex2d: api::BindlessArrayUpdateTexture {
op: api::BindlessArrayUpdateOperation::Remove,
handle: api::Texture(INVALID_RESOURCE_HANDLE),
sampler: Sampler::default(),
},
tex3d: api::BindlessArrayUpdateTexture::default(),
});
buffer: Default::default(),
tex2d: Default::default(),
tex3d: Default::default(),
})
.tex2d = api::BindlessArrayUpdateTexture {
op: api::BindlessArrayUpdateOperation::Remove,
handle: api::Texture(INVALID_RESOURCE_HANDLE),
sampler: Sampler::default(),
};
let mut slots = self.slots.borrow_mut();
slots[index].tex2d = None;
self.unlock();
Expand All @@ -757,16 +768,18 @@ impl BindlessArray {
self.lock();
self.modifications
.borrow_mut()
.push(api::BindlessArrayUpdateModification {
.entry(index)
.or_insert(api::BindlessArrayUpdateModification {
slot: index,
buffer: api::BindlessArrayUpdateBuffer::default(),
tex2d: api::BindlessArrayUpdateTexture::default(),
tex3d: api::BindlessArrayUpdateTexture {
op: api::BindlessArrayUpdateOperation::Remove,
handle: api::Texture(INVALID_RESOURCE_HANDLE),
sampler: Sampler::default(),
},
});
buffer: Default::default(),
tex2d: Default::default(),
tex3d: Default::default(),
})
.tex3d = api::BindlessArrayUpdateTexture {
op: api::BindlessArrayUpdateOperation::Remove,
handle: api::Texture(INVALID_RESOURCE_HANDLE),
sampler: Sampler::default(),
};
let mut slots = self.slots.borrow_mut();
slots[index].tex3d = None;
self.unlock();
Expand Down Expand Up @@ -824,10 +837,8 @@ impl BindlessArray {
// What lifetime should this be?
self.lock();
let mut rt = ResourceTracker::new();
let modifications = Arc::new(std::mem::replace(
&mut *self.modifications.borrow_mut(),
Vec::new(),
));
let mut modifications = self.modifications.borrow_mut();
let modifications = Arc::new(modifications.drain().map(|(k, v)| v).collect::<Vec<_>>());
rt.add(modifications.clone());
let lock = self.lock.clone();
Command {
Expand Down
2 changes: 1 addition & 1 deletion luisa_compute/src/runtime.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ impl Device {
handle: api::BindlessArray(array.handle),
native_handle: array.native_handle,
}),
modifications: RefCell::new(Vec::new()),
modifications: RefCell::new(HashMap::new()),
slots: RefCell::new(vec![
BindlessArraySlot {
buffer: None,
Expand Down
2 changes: 1 addition & 1 deletion luisa_compute_sys/LuisaCompute
Submodule LuisaCompute updated 13 files
+40 −2 include/luisa/backends/ext/dx_cuda_interop.h
+8 −0 src/backends/dx/CMakeLists.txt
+9 −0 src/backends/dx/DXApi/LCDevice.cpp
+55 −8 src/backends/dx/DXApi/cuda_interop.cpp
+11 −3 src/backends/dx/DXApi/ext.h
+1 −1 src/backends/dx/Resource/DefaultBuffer.cpp
+2 −1 src/backends/dx/Resource/GpuAllocator.cpp
+1 −1 src/ext/magic_enum
+1 −1 src/ext/xxHash
+63 −72 src/py/luisa/atomic.py
+1 −1 src/rust/luisa_compute_api_types/src/lib.rs
+93 −0 src/tests/test_manual_ast.cpp
+1 −0 src/tests/xmake.lua

0 comments on commit 7afa417

Please sign in to comment.