Skip to content

[ET-VK] Removing unnecessary and redundant members from StagingBuffer. #7220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 9, 2024
Merged

[ET-VK] Removing unnecessary and redundant members from StagingBuffer. #7220

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d60958d
[ET-VK] Removing unnecessary and redundant members from StagingBuffer.
trivedivivek Dec 6, 2024
f965225
Update on "[ET-VK] Removing unnecessary and redundant members from St…
trivedivivek Dec 6, 2024
e0be0c7
Update on "[ET-VK] Removing unnecessary and redundant members from St…
trivedivivek Dec 6, 2024
2f406ca
Update on "[ET-VK] Removing unnecessary and redundant members from St…
trivedivivek Dec 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 7 additions & 11 deletions backends/vulkan/runtime/api/containers/StagingBuffer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ class StagingBuffer final {
private:
Context* context_p_;
vkapi::ScalarType dtype_;
size_t numel_;
size_t nbytes_;
vkapi::VulkanBuffer vulkan_buffer_;

void* mapped_data_;
Expand All @@ -36,10 +34,8 @@ class StagingBuffer final {
const size_t numel)
: context_p_(context_p),
dtype_(dtype),
numel_(numel),
nbytes_(element_size(dtype_) * numel_),
vulkan_buffer_(
context_p_->adapter_ptr()->vma().create_staging_buffer(nbytes_)),
vulkan_buffer_(context_p_->adapter_ptr()->vma().create_staging_buffer(
element_size(dtype_) * numel)),
mapped_data_(nullptr) {}

StagingBuffer(const StagingBuffer&) = delete;
Expand Down Expand Up @@ -68,15 +64,15 @@ class StagingBuffer final {
}

inline size_t numel() {
return numel_;
return nbytes() / element_size(dtype_);
}

inline size_t nbytes() {
return nbytes_;
return vulkan_buffer_.mem_size();
}

inline void copy_from(const void* src, const size_t nbytes) {
VK_CHECK_COND(nbytes <= nbytes_);
VK_CHECK_COND(nbytes <= this->nbytes());
memcpy(data(), src, nbytes);
vmaFlushAllocation(
vulkan_buffer_.vma_allocator(),
Expand All @@ -86,7 +82,7 @@ class StagingBuffer final {
}

inline void copy_to(void* dst, const size_t nbytes) {
VK_CHECK_COND(nbytes <= nbytes_);
VK_CHECK_COND(nbytes <= this->nbytes());
vmaInvalidateAllocation(
vulkan_buffer_.vma_allocator(),
vulkan_buffer_.allocation(),
Expand All @@ -96,7 +92,7 @@ class StagingBuffer final {
}

inline void set_staging_zeros() {
memset(data(), 0, nbytes_);
memset(data(), 0, nbytes());
}
};

Expand Down