[ET-VK] Using a single GPU buffer for all tensor uniforms.#7207

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
kirklandsign merged 1 commit into from
Dec 5, 2024
Merged

[ET-VK] Using a single GPU buffer for all tensor uniforms. #7207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 9 additions & 5 deletions backends/vulkan/runtime/api/containers/ParamsBuffer.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,13 @@ class ParamsBuffer final {
vulkan_buffer_(
context_p_->adapter_ptr()->vma().create_params_buffer(block)) {}

template <typename Block>
ParamsBuffer(Context* context_p, const VkDeviceSize nbytes)
: context_p_(context_p),
nbytes_(nbytes),
vulkan_buffer_(
context_p_->adapter_ptr()->vma().create_uniform_buffer(nbytes)) {}

ParamsBuffer(const ParamsBuffer&);
ParamsBuffer& operator=(const ParamsBuffer&);

Expand All@@ -50,14 +57,11 @@ class ParamsBuffer final {
}

template <typename Block>
void update(const Block& block) {
if (sizeof(block) != nbytes_) {
VK_THROW("Attempted to update ParamsBuffer with data of different size");
}
void update(const Block& block, const uint32_t offset = 0) {
// Fill the uniform buffer with data in block
{
vkapi::MemoryMap mapping(vulkan_buffer_, vkapi::kWrite);
Block* data_ptr = mapping.template data<Block>();
Block* data_ptr = mapping.template data<Block>(offset);

*data_ptr = block;
}
Expand Down
119 changes: 81 additions & 38 deletions backends/vulkan/runtime/api/containers/Tensor.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -451,11 +451,13 @@ vTensor::vTensor(
unsqueezed_strides_{unsqueeze_strides(strides_, numel_)},
padded_numel_(utils::multiply_integers(padded_sizes_)),
logical_limits_{{0, 0, 0}},
uniforms_(),
// Utility Uniform Buffers that can be passed to shaders as arguments
sizes_uniform_(),
strides_uniform_(),
numel_uniform_(),
logical_limits_uniform_(),
uniforms_size_(0),
sizes_uniform_offset_(kUniformOffsetUnset),
unsqueezed_strides_offset_(kUniformOffsetUnset),
numel_uniform_offset_(kUniformOffsetUnset),
logical_limits_uniform_offset_(kUniformOffsetUnset),
// Construct Tensor storage
storage_(
context,
Expand DownExpand Up@@ -497,11 +499,13 @@ vTensor::vTensor(
unsqueezed_strides_(),
padded_numel_(utils::multiply_integers(padded_sizes_)),
logical_limits_(),
uniforms_(),
// Utility Uniform Buffers that can be passed to shaders as arguments
sizes_uniform_(),
strides_uniform_(),
numel_uniform_(),
logical_limits_uniform_(),
uniforms_size_(0),
sizes_uniform_offset_(kUniformOffsetUnset),
unsqueezed_strides_offset_(kUniformOffsetUnset),
numel_uniform_offset_(kUniformOffsetUnset),
logical_limits_uniform_offset_(kUniformOffsetUnset),
// Construct Tensor storage
storage_(context, image) {
set_logical_limits(storage_.image_extents_);
Expand All@@ -522,11 +526,13 @@ vTensor::vTensor(vTensor& other)
other.unsqueezed_strides_.end()},
padded_numel_(other.padded_numel_),
logical_limits_{other.logical_limits_},
uniforms_(),
// Empty initialize Utility Uniform Buffers
sizes_uniform_(),
strides_uniform_(),
numel_uniform_(),
logical_limits_uniform_(),
uniforms_size_(0),
sizes_uniform_offset_(kUniformOffsetUnset),
unsqueezed_strides_offset_(kUniformOffsetUnset),
numel_uniform_offset_(kUniformOffsetUnset),
logical_limits_uniform_offset_(kUniformOffsetUnset),
// Copy Tensor storage
storage_(other.storage_) {}

Expand All@@ -547,11 +553,13 @@ vTensor::vTensor(
unsqueezed_strides_{unsqueeze_strides(strides_, numel_)},
padded_numel_(utils::multiply_integers(padded_sizes_)),
logical_limits_(other.logical_limits_),
uniforms_(),
// Empty initialize Utility Uniform Buffers
sizes_uniform_(),
strides_uniform_(),
numel_uniform_(),
logical_limits_uniform_(),
uniforms_size_(0),
sizes_uniform_offset_(kUniformOffsetUnset),
unsqueezed_strides_offset_(kUniformOffsetUnset),
numel_uniform_offset_(kUniformOffsetUnset),
logical_limits_uniform_offset_(kUniformOffsetUnset),
// Copy Tensor storage
storage_(other.storage_, vkapi::element_size(dtype_) * offset_numel) {
VK_CHECK_COND(
Expand DownExpand Up@@ -612,33 +620,66 @@ utils::GPUMemoryLayout vTensor::estimate_memory_layout() const {
}

const vkapi::BufferBindInfo vTensor::sizes_ubo() {
if (!sizes_uniform_.buffer()) {
sizes_uniform_ =
ParamsBuffer(storage_.context_, utils::make_whcn_ivec4(sizes_));
if (!uniforms_.buffer()) {
uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize);
}
return vkapi::BufferBindInfo(sizes_uniform_.buffer());
if (sizes_uniform_offset_ == kUniformOffsetUnset) {
VK_CHECK_COND(
(uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
"Uniform data allocation has exceeded Tensor uniform buffer size");
sizes_uniform_offset_ = uniforms_size_;
uniforms_size_ += kSizePerUniform;
uniforms_.update(utils::make_whcn_ivec4(sizes_), sizes_uniform_offset_);
}
return vkapi::BufferBindInfo(uniforms_.buffer(), sizes_uniform_offset_);
}

const vkapi::BufferBindInfo vTensor::strides_ubo() {
if (!strides_uniform_.buffer()) {
strides_uniform_ = ParamsBuffer(
storage_.context_, utils::make_whcn_ivec4(unsqueezed_strides_));
if (!uniforms_.buffer()) {
uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize);
}
if (unsqueezed_strides_offset_ == kUniformOffsetUnset) {
VK_CHECK_COND(
(uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
"Uniform data allocation has exceeded Tensor uniform buffer size");
unsqueezed_strides_offset_ = uniforms_size_;
uniforms_size_ += kSizePerUniform;
uniforms_.update(
utils::make_whcn_ivec4(unsqueezed_strides_),
unsqueezed_strides_offset_);
}
return vkapi::BufferBindInfo(strides_uniform_.buffer());
return vkapi::BufferBindInfo(uniforms_.buffer(), unsqueezed_strides_offset_);
}

const vkapi::BufferBindInfo vTensor::logical_limits_ubo() {
if (!logical_limits_uniform_.buffer()) {
logical_limits_uniform_ = ParamsBuffer(storage_.context_, logical_limits_);
if (!uniforms_.buffer()) {
uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize);
}
return vkapi::BufferBindInfo(logical_limits_uniform_.buffer());
if (logical_limits_uniform_offset_ == kUniformOffsetUnset) {
VK_CHECK_COND(
(uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
"Uniform data allocation has exceeded Tensor uniform buffer size");
logical_limits_uniform_offset_ = uniforms_size_;
uniforms_size_ += kSizePerUniform;
uniforms_.update(logical_limits_, logical_limits_uniform_offset_);
}
return vkapi::BufferBindInfo(
uniforms_.buffer(), logical_limits_uniform_offset_);
}

const vkapi::BufferBindInfo vTensor::numel_ubo() {
if (!numel_uniform_.buffer()) {
numel_uniform_ = ParamsBuffer(storage_.context_, numel_);
if (!uniforms_.buffer()) {
uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize);
}
if (numel_uniform_offset_ == kUniformOffsetUnset) {
VK_CHECK_COND(
(uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
"Uniform data allocation has exceeded Tensor uniform buffer size");
numel_uniform_offset_ = uniforms_size_;
uniforms_size_ += kSizePerUniform;
uniforms_.update(numel_, numel_uniform_offset_);
}
return vkapi::BufferBindInfo(numel_uniform_.buffer());
return vkapi::BufferBindInfo(uniforms_.buffer(), numel_uniform_offset_);
}

size_t vTensor::staging_buffer_numel() const {
Expand DownExpand Up@@ -690,17 +731,19 @@ void vTensor::update_metadata() {
set_logical_limits(
calculate_image_extents(padded_sizes_, axis_map_, packed_dim_));

if (sizes_uniform_.buffer()) {
sizes_uniform_.update(utils::make_whcn_ivec4(sizes_));
if (sizes_uniform_offset_ != kUniformOffsetUnset) {
uniforms_.update(utils::make_whcn_ivec4(sizes_), sizes_uniform_offset_);
}
if (strides_uniform_.buffer()) {
strides_uniform_.update(utils::make_whcn_ivec4(unsqueezed_strides_));
if (unsqueezed_strides_offset_ != kUniformOffsetUnset) {
uniforms_.update(
utils::make_whcn_ivec4(unsqueezed_strides_),
unsqueezed_strides_offset_);
}
if (numel_uniform_.buffer()) {
numel_uniform_.update(numel_);
if (numel_uniform_offset_ != kUniformOffsetUnset) {
uniforms_.update(numel_, numel_uniform_offset_);
}
if (logical_limits_uniform_.buffer()) {
logical_limits_uniform_.update(logical_limits_);
if (logical_limits_uniform_offset_ != kUniformOffsetUnset) {
uniforms_.update(logical_limits_, logical_limits_uniform_offset_);
}
}

Expand Down
30 changes: 22 additions & 8 deletions backends/vulkan/runtime/api/containers/Tensor.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -297,18 +297,32 @@ class vTensor final {
TextureLimits logical_limits_;

/*
* Utility GPU buffers that can be passed to shaders in order to convey tensor
* metadata. These buffers will be initialized the first time they are
* accessed via the corresponding *_ubo() function, and their contents will be
* updated whenever virtual_resize() is called.
* Utility GPU buffer that can be passed to shaders in order to convey tensor
* metadata. Uniform buffer will be initialized only the first time a ubo is
* requested. Buffer offsets will be initialized the first time they are
* accessed via the corresponding *_ubo() function. Uniform buffer's contents
* will be updated whenever virtual_resize() is called.
*
* Refer to the comments for the corresponding *_ubo() functions for more
* context about the data contained in each buffer.
*/
ParamsBuffer sizes_uniform_;
ParamsBuffer strides_uniform_;
ParamsBuffer numel_uniform_;
ParamsBuffer logical_limits_uniform_;
ParamsBuffer uniforms_;
uint32_t uniforms_size_;
uint32_t sizes_uniform_offset_;
uint32_t unsqueezed_strides_offset_;
uint32_t numel_uniform_offset_;
uint32_t logical_limits_uniform_offset_;

// Size allocated for each uniform
// each uniform is assumed to be a vec of 4 ints to maintain 16 byte alignemnt
constexpr static size_t kSizePerUniform = sizeof(utils::ivec4);
// Total size of tensor's uniform buffer
constexpr static size_t kMaxUniformBufferSize =
4 * // we have 4 uniforms that are passed on to shaders
kSizePerUniform;

// Initial value of uniform buffer offsets
constexpr static uint32_t kUniformOffsetUnset = kMaxUniformBufferSize;

vTensorStorage storage_;

Expand Down
6 changes: 4 additions & 2 deletions backends/vulkan/runtime/vk_api/Descriptor.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,9 +23,11 @@ namespace vkapi {
BufferBindInfo::BufferBindInfo()
: handle(VK_NULL_HANDLE), offset(0u), range(0u) {}

BufferBindInfo::BufferBindInfo(const VulkanBuffer& buffer_p)
BufferBindInfo::BufferBindInfo(
const VulkanBuffer& buffer_p,
const uint32_t offset_p)
: handle(buffer_p.handle()),
offset(buffer_p.mem_offset()),
offset(buffer_p.mem_offset() + offset_p),
range(buffer_p.mem_range()) {}

//
Expand Down
2 changes: 1 addition & 1 deletion backends/vulkan/runtime/vk_api/Descriptor.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ struct BufferBindInfo final {
VkDeviceSize range;

BufferBindInfo();
BufferBindInfo(const VulkanBuffer& buffer_p);
BufferBindInfo(const VulkanBuffer& buffer_p, const uint32_t offset_p = 0u);
};

struct ParamsBindList final {
Expand Down
4 changes: 2 additions & 2 deletions backends/vulkan/runtime/vk_api/memory/Buffer.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -195,8 +195,8 @@ class MemoryMap final {

public:
template <typename T>
T* data() {
return reinterpret_cast<T*>(data_);
T* data(const uint32_t offset = 0) {
return reinterpret_cast<T*>(static_cast<uint8_t*>(data_) + offset);
}

inline size_t nbytes() {
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[ET-VK] Using a single GPU buffer for all tensor uniforms.#7207

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

kirklandsign
merged 1 commit into

from

Dec 5, 2024
 Merged


[ET-VK] Using a single GPU buffer for all tensor uniforms.
#7207
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


14 changes: 9 additions & 5 deletions
backends/vulkan/runtime/api/containers/ParamsBuffer.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,13 @@ class ParamsBuffer final {
 vulkan_buffer_(
 context_p_->adapter_ptr()->vma().create_params_buffer(block)) {}

 template <typename Block>
 ParamsBuffer(Context* context_p, const VkDeviceSize nbytes)
 : context_p_(context_p),
 nbytes_(nbytes),
 vulkan_buffer_(
 context_p_->adapter_ptr()->vma().create_uniform_buffer(nbytes)) {}

 ParamsBuffer(const ParamsBuffer&);
 ParamsBuffer& operator=(const ParamsBuffer&);

Expand All@@ -50,14 +57,11 @@ class ParamsBuffer final {
 }

 template <typename Block>
 void update(const Block& block) {
 if (sizeof(block) != nbytes_) {
 VK_THROW("Attempted to update ParamsBuffer with data of different size");
 }
 void update(const Block& block, const uint32_t offset = 0) {
 // Fill the uniform buffer with data in block
 {
 vkapi::MemoryMap mapping(vulkan_buffer_, vkapi::kWrite);
 Block* data_ptr = mapping.template data<Block>();
 Block* data_ptr = mapping.template data<Block>(offset);

 *data_ptr = block;
 }
Expand Down

119 changes: 81 additions & 38 deletions
backends/vulkan/runtime/api/containers/Tensor.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -451,11 +451,13 @@ vTensor::vTensor(
 unsqueezed_strides_{unsqueeze_strides(strides_, numel_)},
 padded_numel_(utils::multiply_integers(padded_sizes_)),
 logical_limits_{{0, 0, 0}},
 uniforms_(),
 // Utility Uniform Buffers that can be passed to shaders as arguments
 sizes_uniform_(),
 strides_uniform_(),
 numel_uniform_(),
 logical_limits_uniform_(),
 uniforms_size_(0),
 sizes_uniform_offset_(kUniformOffsetUnset),
 unsqueezed_strides_offset_(kUniformOffsetUnset),
 numel_uniform_offset_(kUniformOffsetUnset),
 logical_limits_uniform_offset_(kUniformOffsetUnset),
 // Construct Tensor storage
 storage_(
 context,
Expand DownExpand Up@@ -497,11 +499,13 @@ vTensor::vTensor(
 unsqueezed_strides_(),
 padded_numel_(utils::multiply_integers(padded_sizes_)),
 logical_limits_(),
 uniforms_(),
 // Utility Uniform Buffers that can be passed to shaders as arguments
 sizes_uniform_(),
 strides_uniform_(),
 numel_uniform_(),
 logical_limits_uniform_(),
 uniforms_size_(0),
 sizes_uniform_offset_(kUniformOffsetUnset),
 unsqueezed_strides_offset_(kUniformOffsetUnset),
 numel_uniform_offset_(kUniformOffsetUnset),
 logical_limits_uniform_offset_(kUniformOffsetUnset),
 // Construct Tensor storage
 storage_(context, image) {
 set_logical_limits(storage_.image_extents_);
Expand All@@ -522,11 +526,13 @@ vTensor::vTensor(vTensor& other)
 other.unsqueezed_strides_.end()},
 padded_numel_(other.padded_numel_),
 logical_limits_{other.logical_limits_},
 uniforms_(),
 // Empty initialize Utility Uniform Buffers
 sizes_uniform_(),
 strides_uniform_(),
 numel_uniform_(),
 logical_limits_uniform_(),
 uniforms_size_(0),
 sizes_uniform_offset_(kUniformOffsetUnset),
 unsqueezed_strides_offset_(kUniformOffsetUnset),
 numel_uniform_offset_(kUniformOffsetUnset),
 logical_limits_uniform_offset_(kUniformOffsetUnset),
 // Copy Tensor storage
 storage_(other.storage_) {}

Expand All@@ -547,11 +553,13 @@ vTensor::vTensor(
 unsqueezed_strides_{unsqueeze_strides(strides_, numel_)},
 padded_numel_(utils::multiply_integers(padded_sizes_)),
 logical_limits_(other.logical_limits_),
 uniforms_(),
 // Empty initialize Utility Uniform Buffers
 sizes_uniform_(),
 strides_uniform_(),
 numel_uniform_(),
 logical_limits_uniform_(),
 uniforms_size_(0),
 sizes_uniform_offset_(kUniformOffsetUnset),
 unsqueezed_strides_offset_(kUniformOffsetUnset),
 numel_uniform_offset_(kUniformOffsetUnset),
 logical_limits_uniform_offset_(kUniformOffsetUnset),
 // Copy Tensor storage
 storage_(other.storage_, vkapi::element_size(dtype_) * offset_numel) {
 VK_CHECK_COND(
Expand DownExpand Up@@ -612,33 +620,66 @@ utils::GPUMemoryLayout vTensor::estimate_memory_layout() const {
}

const vkapi::BufferBindInfo vTensor::sizes_ubo() {
 if (!sizes_uniform_.buffer()) {
 sizes_uniform_ =
 ParamsBuffer(storage_.context_, utils::make_whcn_ivec4(sizes_));
 if (!uniforms_.buffer()) {
 uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize);
 }
 return vkapi::BufferBindInfo(sizes_uniform_.buffer());
 if (sizes_uniform_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 sizes_uniform_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_.update(utils::make_whcn_ivec4(sizes_), sizes_uniform_offset_);
 }
 return vkapi::BufferBindInfo(uniforms_.buffer(), sizes_uniform_offset_);
}

const vkapi::BufferBindInfo vTensor::strides_ubo() {
 if (!strides_uniform_.buffer()) {
 strides_uniform_ = ParamsBuffer(
 storage_.context_, utils::make_whcn_ivec4(unsqueezed_strides_));
 if (!uniforms_.buffer()) {
 uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize);
 }
 if (unsqueezed_strides_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 unsqueezed_strides_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_.update(
 utils::make_whcn_ivec4(unsqueezed_strides_),
 unsqueezed_strides_offset_);
 }
 return vkapi::BufferBindInfo(strides_uniform_.buffer());
 return vkapi::BufferBindInfo(uniforms_.buffer(), unsqueezed_strides_offset_);
}

const vkapi::BufferBindInfo vTensor::logical_limits_ubo() {
 if (!logical_limits_uniform_.buffer()) {
logical_limits_uniform_ = ParamsBuffer(storage_.context_, logical_limits_);
 if (!uniforms_.buffer()) {
uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize);
 }
 return vkapi::BufferBindInfo(logical_limits_uniform_.buffer());
 if (logical_limits_uniform_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 logical_limits_uniform_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_.update(logical_limits_, logical_limits_uniform_offset_);
 }
 return vkapi::BufferBindInfo(
 uniforms_.buffer(), logical_limits_uniform_offset_);
}

const vkapi::BufferBindInfo vTensor::numel_ubo() {
 if (!numel_uniform_.buffer()) {
 numel_uniform_ = ParamsBuffer(storage_.context_, numel_);
 if (!uniforms_.buffer()) {
 uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize);
 }
 if (numel_uniform_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 numel_uniform_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_.update(numel_, numel_uniform_offset_);
 }
 return vkapi::BufferBindInfo(numel_uniform_.buffer());
 return vkapi::BufferBindInfo(uniforms_.buffer(), numel_uniform_offset_);
}

size_t vTensor::staging_buffer_numel() const {
Expand DownExpand Up@@ -690,17 +731,19 @@ void vTensor::update_metadata() {
 set_logical_limits(
 calculate_image_extents(padded_sizes_, axis_map_, packed_dim_));

 if (sizes_uniform_.buffer()) {
sizes_uniform_.update(utils::make_whcn_ivec4(sizes_));
 if (sizes_uniform_offset_ != kUniformOffsetUnset) {
uniforms_.update(utils::make_whcn_ivec4(sizes_), sizes_uniform_offset_);
 }
 if (strides_uniform_.buffer()) {
 strides_uniform_.update(utils::make_whcn_ivec4(unsqueezed_strides_));
 if (unsqueezed_strides_offset_ != kUniformOffsetUnset) {
 uniforms_.update(
 utils::make_whcn_ivec4(unsqueezed_strides_),
 unsqueezed_strides_offset_);
 }
 if (numel_uniform_.buffer()) {
numel_uniform_.update(numel_);
 if (numel_uniform_offset_ != kUniformOffsetUnset) {
uniforms_.update(numel_, numel_uniform_offset_);
 }
 if (logical_limits_uniform_.buffer()) {
logical_limits_uniform_.update(logical_limits_);
 if (logical_limits_uniform_offset_ != kUniformOffsetUnset) {
uniforms_.update(logical_limits_, logical_limits_uniform_offset_);
 }
}

Expand Down

30 changes: 22 additions & 8 deletions
backends/vulkan/runtime/api/containers/Tensor.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -297,18 +297,32 @@ class vTensor final {
 TextureLimits logical_limits_;

 /*
 * Utility GPU buffers that can be passed to shaders in order to convey tensor
 * metadata. These buffers will be initialized the first time they are
 * accessed via the corresponding *_ubo() function, and their contents will be
 * updated whenever virtual_resize() is called.
 * Utility GPU buffer that can be passed to shaders in order to convey tensor
 * metadata. Uniform buffer will be initialized only the first time a ubo is
 * requested. Buffer offsets will be initialized the first time they are
 * accessed via the corresponding *_ubo() function. Uniform buffer's contents
 * will be updated whenever virtual_resize() is called.
 *
 * Refer to the comments for the corresponding *_ubo() functions for more
 * context about the data contained in each buffer.
 */
 ParamsBuffer sizes_uniform_;
 ParamsBuffer strides_uniform_;
 ParamsBuffer numel_uniform_;
 ParamsBuffer logical_limits_uniform_;
 ParamsBuffer uniforms_;
 uint32_t uniforms_size_;
 uint32_t sizes_uniform_offset_;
 uint32_t unsqueezed_strides_offset_;
 uint32_t numel_uniform_offset_;
 uint32_t logical_limits_uniform_offset_;

 // Size allocated for each uniform
 // each uniform is assumed to be a vec of 4 ints to maintain 16 byte alignemnt
 constexpr static size_t kSizePerUniform = sizeof(utils::ivec4);
 // Total size of tensor's uniform buffer
 constexpr static size_t kMaxUniformBufferSize =
 4 * // we have 4 uniforms that are passed on to shaders
 kSizePerUniform;

 // Initial value of uniform buffer offsets
 constexpr static uint32_t kUniformOffsetUnset = kMaxUniformBufferSize;

 vTensorStorage storage_;

Expand Down

6 changes: 4 additions & 2 deletions
backends/vulkan/runtime/vk_api/Descriptor.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,9 +23,11 @@ namespace vkapi {
BufferBindInfo::BufferBindInfo()
 : handle(VK_NULL_HANDLE), offset(0u), range(0u) {}

BufferBindInfo::BufferBindInfo(const VulkanBuffer& buffer_p)
BufferBindInfo::BufferBindInfo(
 const VulkanBuffer& buffer_p,
 const uint32_t offset_p)
 : handle(buffer_p.handle()),
 offset(buffer_p.mem_offset()),
 offset(buffer_p.mem_offset() + offset_p),
 range(buffer_p.mem_range()) {}

//
Expand Down

2 changes: 1 addition & 1 deletion
backends/vulkan/runtime/vk_api/Descriptor.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ struct BufferBindInfo final {
 VkDeviceSize range;

 BufferBindInfo();
 BufferBindInfo(const VulkanBuffer& buffer_p);
 BufferBindInfo(const VulkanBuffer& buffer_p, const uint32_t offset_p = 0u);
};

struct ParamsBindList final {
Expand Down

4 changes: 2 additions & 2 deletions
backends/vulkan/runtime/vk_api/memory/Buffer.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -195,8 +195,8 @@ class MemoryMap final {

 public:
 template <typename T>
 T* data() {
 return reinterpret_cast<T*>(data_);
 T* data(const uint32_t offset = 0) {
 return reinterpret_cast<T*>(static_cast<uint8_t*>(data_) + offset);
 }

 inline size_t nbytes() {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[ET-VK] Using a single GPU buffer for all tensor uniforms.#7207

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

kirklandsign
merged 1 commit into

from

Dec 5, 2024
 Merged


[ET-VK] Using a single GPU buffer for all tensor uniforms.
#7207
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


14 changes: 9 additions & 5 deletions
backends/vulkan/runtime/api/containers/ParamsBuffer.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,13 @@ class ParamsBuffer final {
 vulkan_buffer_(
 context_p_->adapter_ptr()->vma().create_params_buffer(block)) {}

 template <typename Block>
 ParamsBuffer(Context* context_p, const VkDeviceSize nbytes)
 : context_p_(context_p),
 nbytes_(nbytes),
 vulkan_buffer_(
 context_p_->adapter_ptr()->vma().create_uniform_buffer(nbytes)) {}

 ParamsBuffer(const ParamsBuffer&);
 ParamsBuffer& operator=(const ParamsBuffer&);

Expand All@@ -50,14 +57,11 @@ class ParamsBuffer final {
 }

 template <typename Block>
 void update(const Block& block) {
 if (sizeof(block) != nbytes_) {
 VK_THROW("Attempted to update ParamsBuffer with data of different size");
 }
 void update(const Block& block, const uint32_t offset = 0) {
 // Fill the uniform buffer with data in block
 {
 vkapi::MemoryMap mapping(vulkan_buffer_, vkapi::kWrite);
 Block* data_ptr = mapping.template data<Block>();
 Block* data_ptr = mapping.template data<Block>(offset);

 *data_ptr = block;
 }
Expand Down

119 changes: 81 additions & 38 deletions
backends/vulkan/runtime/api/containers/Tensor.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -451,11 +451,13 @@ vTensor::vTensor(
 unsqueezed_strides_{unsqueeze_strides(strides_, numel_)},
 padded_numel_(utils::multiply_integers(padded_sizes_)),
 logical_limits_{{0, 0, 0}},
 uniforms_(),
 // Utility Uniform Buffers that can be passed to shaders as arguments
 sizes_uniform_(),
 strides_uniform_(),
 numel_uniform_(),
 logical_limits_uniform_(),
 uniforms_size_(0),
 sizes_uniform_offset_(kUniformOffsetUnset),
 unsqueezed_strides_offset_(kUniformOffsetUnset),
 numel_uniform_offset_(kUniformOffsetUnset),
 logical_limits_uniform_offset_(kUniformOffsetUnset),
 // Construct Tensor storage
 storage_(
 context,
Expand DownExpand Up@@ -497,11 +499,13 @@ vTensor::vTensor(
 unsqueezed_strides_(),
 padded_numel_(utils::multiply_integers(padded_sizes_)),
 logical_limits_(),
 uniforms_(),
 // Utility Uniform Buffers that can be passed to shaders as arguments
 sizes_uniform_(),
 strides_uniform_(),
 numel_uniform_(),
 logical_limits_uniform_(),
 uniforms_size_(0),
 sizes_uniform_offset_(kUniformOffsetUnset),
 unsqueezed_strides_offset_(kUniformOffsetUnset),
 numel_uniform_offset_(kUniformOffsetUnset),
 logical_limits_uniform_offset_(kUniformOffsetUnset),
 // Construct Tensor storage
 storage_(context, image) {
 set_logical_limits(storage_.image_extents_);
Expand All@@ -522,11 +526,13 @@ vTensor::vTensor(vTensor& other)
 other.unsqueezed_strides_.end()},
 padded_numel_(other.padded_numel_),
 logical_limits_{other.logical_limits_},
 uniforms_(),
 // Empty initialize Utility Uniform Buffers
 sizes_uniform_(),
 strides_uniform_(),
 numel_uniform_(),
 logical_limits_uniform_(),
 uniforms_size_(0),
 sizes_uniform_offset_(kUniformOffsetUnset),
 unsqueezed_strides_offset_(kUniformOffsetUnset),
 numel_uniform_offset_(kUniformOffsetUnset),
 logical_limits_uniform_offset_(kUniformOffsetUnset),
 // Copy Tensor storage
 storage_(other.storage_) {}

Expand All@@ -547,11 +553,13 @@ vTensor::vTensor(
 unsqueezed_strides_{unsqueeze_strides(strides_, numel_)},
 padded_numel_(utils::multiply_integers(padded_sizes_)),
 logical_limits_(other.logical_limits_),
 uniforms_(),
 // Empty initialize Utility Uniform Buffers
 sizes_uniform_(),
 strides_uniform_(),
 numel_uniform_(),
 logical_limits_uniform_(),
 uniforms_size_(0),
 sizes_uniform_offset_(kUniformOffsetUnset),
 unsqueezed_strides_offset_(kUniformOffsetUnset),
 numel_uniform_offset_(kUniformOffsetUnset),
 logical_limits_uniform_offset_(kUniformOffsetUnset),
 // Copy Tensor storage
 storage_(other.storage_, vkapi::element_size(dtype_) * offset_numel) {
 VK_CHECK_COND(
Expand DownExpand Up@@ -612,33 +620,66 @@ utils::GPUMemoryLayout vTensor::estimate_memory_layout() const {
}

const vkapi::BufferBindInfo vTensor::sizes_ubo() {
 if (!sizes_uniform_.buffer()) {
 sizes_uniform_ =
 ParamsBuffer(storage_.context_, utils::make_whcn_ivec4(sizes_));
 if (!uniforms_.buffer()) {
 uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize);
 }
 return vkapi::BufferBindInfo(sizes_uniform_.buffer());
 if (sizes_uniform_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 sizes_uniform_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_.update(utils::make_whcn_ivec4(sizes_), sizes_uniform_offset_);
 }
 return vkapi::BufferBindInfo(uniforms_.buffer(), sizes_uniform_offset_);
}

const vkapi::BufferBindInfo vTensor::strides_ubo() {
 if (!strides_uniform_.buffer()) {
 strides_uniform_ = ParamsBuffer(
 storage_.context_, utils::make_whcn_ivec4(unsqueezed_strides_));
 if (!uniforms_.buffer()) {
 uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize);
 }
 if (unsqueezed_strides_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 unsqueezed_strides_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_.update(
 utils::make_whcn_ivec4(unsqueezed_strides_),
 unsqueezed_strides_offset_);
 }
 return vkapi::BufferBindInfo(strides_uniform_.buffer());
 return vkapi::BufferBindInfo(uniforms_.buffer(), unsqueezed_strides_offset_);
}

const vkapi::BufferBindInfo vTensor::logical_limits_ubo() {
 if (!logical_limits_uniform_.buffer()) {
logical_limits_uniform_ = ParamsBuffer(storage_.context_, logical_limits_);
 if (!uniforms_.buffer()) {
uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize);
 }
 return vkapi::BufferBindInfo(logical_limits_uniform_.buffer());
 if (logical_limits_uniform_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 logical_limits_uniform_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_.update(logical_limits_, logical_limits_uniform_offset_);
 }
 return vkapi::BufferBindInfo(
 uniforms_.buffer(), logical_limits_uniform_offset_);
}

const vkapi::BufferBindInfo vTensor::numel_ubo() {
 if (!numel_uniform_.buffer()) {
 numel_uniform_ = ParamsBuffer(storage_.context_, numel_);
 if (!uniforms_.buffer()) {
 uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize);
 }
 if (numel_uniform_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 numel_uniform_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_.update(numel_, numel_uniform_offset_);
 }
 return vkapi::BufferBindInfo(numel_uniform_.buffer());
 return vkapi::BufferBindInfo(uniforms_.buffer(), numel_uniform_offset_);
}

size_t vTensor::staging_buffer_numel() const {
Expand DownExpand Up@@ -690,17 +731,19 @@ void vTensor::update_metadata() {
 set_logical_limits(
 calculate_image_extents(padded_sizes_, axis_map_, packed_dim_));

 if (sizes_uniform_.buffer()) {
sizes_uniform_.update(utils::make_whcn_ivec4(sizes_));
 if (sizes_uniform_offset_ != kUniformOffsetUnset) {
uniforms_.update(utils::make_whcn_ivec4(sizes_), sizes_uniform_offset_);
 }
 if (strides_uniform_.buffer()) {
 strides_uniform_.update(utils::make_whcn_ivec4(unsqueezed_strides_));
 if (unsqueezed_strides_offset_ != kUniformOffsetUnset) {
 uniforms_.update(
 utils::make_whcn_ivec4(unsqueezed_strides_),
 unsqueezed_strides_offset_);
 }
 if (numel_uniform_.buffer()) {
numel_uniform_.update(numel_);
 if (numel_uniform_offset_ != kUniformOffsetUnset) {
uniforms_.update(numel_, numel_uniform_offset_);
 }
 if (logical_limits_uniform_.buffer()) {
logical_limits_uniform_.update(logical_limits_);
 if (logical_limits_uniform_offset_ != kUniformOffsetUnset) {
uniforms_.update(logical_limits_, logical_limits_uniform_offset_);
 }
}

Expand Down

30 changes: 22 additions & 8 deletions
backends/vulkan/runtime/api/containers/Tensor.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -297,18 +297,32 @@ class vTensor final {
 TextureLimits logical_limits_;

 /*
 * Utility GPU buffers that can be passed to shaders in order to convey tensor
 * metadata. These buffers will be initialized the first time they are
 * accessed via the corresponding *_ubo() function, and their contents will be
 * updated whenever virtual_resize() is called.
 * Utility GPU buffer that can be passed to shaders in order to convey tensor
 * metadata. Uniform buffer will be initialized only the first time a ubo is
 * requested. Buffer offsets will be initialized the first time they are
 * accessed via the corresponding *_ubo() function. Uniform buffer's contents
 * will be updated whenever virtual_resize() is called.
 *
 * Refer to the comments for the corresponding *_ubo() functions for more
 * context about the data contained in each buffer.
 */
 ParamsBuffer sizes_uniform_;
 ParamsBuffer strides_uniform_;
 ParamsBuffer numel_uniform_;
 ParamsBuffer logical_limits_uniform_;
 ParamsBuffer uniforms_;
 uint32_t uniforms_size_;
 uint32_t sizes_uniform_offset_;
 uint32_t unsqueezed_strides_offset_;
 uint32_t numel_uniform_offset_;
 uint32_t logical_limits_uniform_offset_;

 // Size allocated for each uniform
 // each uniform is assumed to be a vec of 4 ints to maintain 16 byte alignemnt
 constexpr static size_t kSizePerUniform = sizeof(utils::ivec4);
 // Total size of tensor's uniform buffer
 constexpr static size_t kMaxUniformBufferSize =
 4 * // we have 4 uniforms that are passed on to shaders
 kSizePerUniform;

 // Initial value of uniform buffer offsets
 constexpr static uint32_t kUniformOffsetUnset = kMaxUniformBufferSize;

 vTensorStorage storage_;

Expand Down

6 changes: 4 additions & 2 deletions
backends/vulkan/runtime/vk_api/Descriptor.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,9 +23,11 @@ namespace vkapi {
BufferBindInfo::BufferBindInfo()
 : handle(VK_NULL_HANDLE), offset(0u), range(0u) {}

BufferBindInfo::BufferBindInfo(const VulkanBuffer& buffer_p)
BufferBindInfo::BufferBindInfo(
 const VulkanBuffer& buffer_p,
 const uint32_t offset_p)
 : handle(buffer_p.handle()),
 offset(buffer_p.mem_offset()),
 offset(buffer_p.mem_offset() + offset_p),
 range(buffer_p.mem_range()) {}

//
Expand Down

2 changes: 1 addition & 1 deletion
backends/vulkan/runtime/vk_api/Descriptor.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ struct BufferBindInfo final {
 VkDeviceSize range;

 BufferBindInfo();
 BufferBindInfo(const VulkanBuffer& buffer_p);
 BufferBindInfo(const VulkanBuffer& buffer_p, const uint32_t offset_p = 0u);
};

struct ParamsBindList final {
Expand Down

4 changes: 2 additions & 2 deletions
backends/vulkan/runtime/vk_api/memory/Buffer.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -195,8 +195,8 @@ class MemoryMap final {

 public:
 template <typename T>
 T* data() {
 return reinterpret_cast<T*>(data_);
 T* data(const uint32_t offset = 0) {
 return reinterpret_cast<T*>(static_cast<uint8_t*>(data_) + offset);
 }

 inline size_t nbytes() {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[ET-VK] Using a single GPU buffer for all tensor uniforms.#7207

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

kirklandsign
merged 1 commit into

from

Dec 5, 2024
 Merged


[ET-VK] Using a single GPU buffer for all tensor uniforms.
#7207
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


14 changes: 9 additions & 5 deletions
backends/vulkan/runtime/api/containers/ParamsBuffer.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,13 @@ class ParamsBuffer final {
 vulkan_buffer_(
 context_p_->adapter_ptr()->vma().create_params_buffer(block)) {}

 template <typename Block>
 ParamsBuffer(Context* context_p, const VkDeviceSize nbytes)
 : context_p_(context_p),
 nbytes_(nbytes),
 vulkan_buffer_(
 context_p_->adapter_ptr()->vma().create_uniform_buffer(nbytes)) {}

 ParamsBuffer(const ParamsBuffer&);
 ParamsBuffer& operator=(const ParamsBuffer&);

Expand All@@ -50,14 +57,11 @@ class ParamsBuffer final {
 }

 template <typename Block>
 void update(const Block& block) {
 if (sizeof(block) != nbytes_) {
 VK_THROW("Attempted to update ParamsBuffer with data of different size");
 }
 void update(const Block& block, const uint32_t offset = 0) {
 // Fill the uniform buffer with data in block
 {
 vkapi::MemoryMap mapping(vulkan_buffer_, vkapi::kWrite);
 Block* data_ptr = mapping.template data<Block>();
 Block* data_ptr = mapping.template data<Block>(offset);

 *data_ptr = block;
 }
Expand Down

119 changes: 81 additions & 38 deletions
backends/vulkan/runtime/api/containers/Tensor.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -451,11 +451,13 @@ vTensor::vTensor(
 unsqueezed_strides_{unsqueeze_strides(strides_, numel_)},
 padded_numel_(utils::multiply_integers(padded_sizes_)),
 logical_limits_{{0, 0, 0}},
 uniforms_(),
 // Utility Uniform Buffers that can be passed to shaders as arguments
 sizes_uniform_(),
 strides_uniform_(),
 numel_uniform_(),
 logical_limits_uniform_(),
 uniforms_size_(0),
 sizes_uniform_offset_(kUniformOffsetUnset),
 unsqueezed_strides_offset_(kUniformOffsetUnset),
 numel_uniform_offset_(kUniformOffsetUnset),
 logical_limits_uniform_offset_(kUniformOffsetUnset),
 // Construct Tensor storage
 storage_(
 context,
Expand DownExpand Up@@ -497,11 +499,13 @@ vTensor::vTensor(
 unsqueezed_strides_(),
 padded_numel_(utils::multiply_integers(padded_sizes_)),
 logical_limits_(),
 uniforms_(),
 // Utility Uniform Buffers that can be passed to shaders as arguments
 sizes_uniform_(),
 strides_uniform_(),
 numel_uniform_(),
 logical_limits_uniform_(),
 uniforms_size_(0),
 sizes_uniform_offset_(kUniformOffsetUnset),
 unsqueezed_strides_offset_(kUniformOffsetUnset),
 numel_uniform_offset_(kUniformOffsetUnset),
 logical_limits_uniform_offset_(kUniformOffsetUnset),
 // Construct Tensor storage
 storage_(context, image) {
 set_logical_limits(storage_.image_extents_);
Expand All@@ -522,11 +526,13 @@ vTensor::vTensor(vTensor& other)
 other.unsqueezed_strides_.end()},
 padded_numel_(other.padded_numel_),
 logical_limits_{other.logical_limits_},
 uniforms_(),
 // Empty initialize Utility Uniform Buffers
 sizes_uniform_(),
 strides_uniform_(),
 numel_uniform_(),
 logical_limits_uniform_(),
 uniforms_size_(0),
 sizes_uniform_offset_(kUniformOffsetUnset),
 unsqueezed_strides_offset_(kUniformOffsetUnset),
 numel_uniform_offset_(kUniformOffsetUnset),
 logical_limits_uniform_offset_(kUniformOffsetUnset),
 // Copy Tensor storage
 storage_(other.storage_) {}

Expand All@@ -547,11 +553,13 @@ vTensor::vTensor(
 unsqueezed_strides_{unsqueeze_strides(strides_, numel_)},
 padded_numel_(utils::multiply_integers(padded_sizes_)),
 logical_limits_(other.logical_limits_),
 uniforms_(),
 // Empty initialize Utility Uniform Buffers
 sizes_uniform_(),
 strides_uniform_(),
 numel_uniform_(),
 logical_limits_uniform_(),
 uniforms_size_(0),
 sizes_uniform_offset_(kUniformOffsetUnset),
 unsqueezed_strides_offset_(kUniformOffsetUnset),
 numel_uniform_offset_(kUniformOffsetUnset),
 logical_limits_uniform_offset_(kUniformOffsetUnset),
 // Copy Tensor storage
 storage_(other.storage_, vkapi::element_size(dtype_) * offset_numel) {
 VK_CHECK_COND(
Expand DownExpand Up@@ -612,33 +620,66 @@ utils::GPUMemoryLayout vTensor::estimate_memory_layout() const {
}

const vkapi::BufferBindInfo vTensor::sizes_ubo() {
 if (!sizes_uniform_.buffer()) {
 sizes_uniform_ =
 ParamsBuffer(storage_.context_, utils::make_whcn_ivec4(sizes_));
 if (!uniforms_.buffer()) {
 uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize);
 }
 return vkapi::BufferBindInfo(sizes_uniform_.buffer());
 if (sizes_uniform_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 sizes_uniform_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_.update(utils::make_whcn_ivec4(sizes_), sizes_uniform_offset_);
 }
 return vkapi::BufferBindInfo(uniforms_.buffer(), sizes_uniform_offset_);
}

const vkapi::BufferBindInfo vTensor::strides_ubo() {
 if (!strides_uniform_.buffer()) {
 strides_uniform_ = ParamsBuffer(
 storage_.context_, utils::make_whcn_ivec4(unsqueezed_strides_));
 if (!uniforms_.buffer()) {
 uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize);
 }
 if (unsqueezed_strides_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 unsqueezed_strides_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_.update(
 utils::make_whcn_ivec4(unsqueezed_strides_),
 unsqueezed_strides_offset_);
 }
 return vkapi::BufferBindInfo(strides_uniform_.buffer());
 return vkapi::BufferBindInfo(uniforms_.buffer(), unsqueezed_strides_offset_);
}

const vkapi::BufferBindInfo vTensor::logical_limits_ubo() {
 if (!logical_limits_uniform_.buffer()) {
logical_limits_uniform_ = ParamsBuffer(storage_.context_, logical_limits_);
 if (!uniforms_.buffer()) {
uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize);
 }
 return vkapi::BufferBindInfo(logical_limits_uniform_.buffer());
 if (logical_limits_uniform_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 logical_limits_uniform_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_.update(logical_limits_, logical_limits_uniform_offset_);
 }
 return vkapi::BufferBindInfo(
 uniforms_.buffer(), logical_limits_uniform_offset_);
}

const vkapi::BufferBindInfo vTensor::numel_ubo() {
 if (!numel_uniform_.buffer()) {
 numel_uniform_ = ParamsBuffer(storage_.context_, numel_);
 if (!uniforms_.buffer()) {
 uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize);
 }
 if (numel_uniform_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 numel_uniform_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_.update(numel_, numel_uniform_offset_);
 }
 return vkapi::BufferBindInfo(numel_uniform_.buffer());
 return vkapi::BufferBindInfo(uniforms_.buffer(), numel_uniform_offset_);
}

size_t vTensor::staging_buffer_numel() const {
Expand DownExpand Up@@ -690,17 +731,19 @@ void vTensor::update_metadata() {
 set_logical_limits(
 calculate_image_extents(padded_sizes_, axis_map_, packed_dim_));

 if (sizes_uniform_.buffer()) {
sizes_uniform_.update(utils::make_whcn_ivec4(sizes_));
 if (sizes_uniform_offset_ != kUniformOffsetUnset) {
uniforms_.update(utils::make_whcn_ivec4(sizes_), sizes_uniform_offset_);
 }
 if (strides_uniform_.buffer()) {
 strides_uniform_.update(utils::make_whcn_ivec4(unsqueezed_strides_));
 if (unsqueezed_strides_offset_ != kUniformOffsetUnset) {
 uniforms_.update(
 utils::make_whcn_ivec4(unsqueezed_strides_),
 unsqueezed_strides_offset_);
 }
 if (numel_uniform_.buffer()) {
numel_uniform_.update(numel_);
 if (numel_uniform_offset_ != kUniformOffsetUnset) {
uniforms_.update(numel_, numel_uniform_offset_);
 }
 if (logical_limits_uniform_.buffer()) {
logical_limits_uniform_.update(logical_limits_);
 if (logical_limits_uniform_offset_ != kUniformOffsetUnset) {
uniforms_.update(logical_limits_, logical_limits_uniform_offset_);
 }
}

Expand Down

30 changes: 22 additions & 8 deletions
backends/vulkan/runtime/api/containers/Tensor.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -297,18 +297,32 @@ class vTensor final {
 TextureLimits logical_limits_;

 /*
 * Utility GPU buffers that can be passed to shaders in order to convey tensor
 * metadata. These buffers will be initialized the first time they are
 * accessed via the corresponding *_ubo() function, and their contents will be
 * updated whenever virtual_resize() is called.
 * Utility GPU buffer that can be passed to shaders in order to convey tensor
 * metadata. Uniform buffer will be initialized only the first time a ubo is
 * requested. Buffer offsets will be initialized the first time they are
 * accessed via the corresponding *_ubo() function. Uniform buffer's contents
 * will be updated whenever virtual_resize() is called.
 *
 * Refer to the comments for the corresponding *_ubo() functions for more
 * context about the data contained in each buffer.
 */
 ParamsBuffer sizes_uniform_;
 ParamsBuffer strides_uniform_;
 ParamsBuffer numel_uniform_;
 ParamsBuffer logical_limits_uniform_;
 ParamsBuffer uniforms_;
 uint32_t uniforms_size_;
 uint32_t sizes_uniform_offset_;
 uint32_t unsqueezed_strides_offset_;
 uint32_t numel_uniform_offset_;
 uint32_t logical_limits_uniform_offset_;

 // Size allocated for each uniform
 // each uniform is assumed to be a vec of 4 ints to maintain 16 byte alignemnt
 constexpr static size_t kSizePerUniform = sizeof(utils::ivec4);
 // Total size of tensor's uniform buffer
 constexpr static size_t kMaxUniformBufferSize =
 4 * // we have 4 uniforms that are passed on to shaders
 kSizePerUniform;

 // Initial value of uniform buffer offsets
 constexpr static uint32_t kUniformOffsetUnset = kMaxUniformBufferSize;

 vTensorStorage storage_;

Expand Down

6 changes: 4 additions & 2 deletions
backends/vulkan/runtime/vk_api/Descriptor.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,9 +23,11 @@ namespace vkapi {
BufferBindInfo::BufferBindInfo()
 : handle(VK_NULL_HANDLE), offset(0u), range(0u) {}

BufferBindInfo::BufferBindInfo(const VulkanBuffer& buffer_p)
BufferBindInfo::BufferBindInfo(
 const VulkanBuffer& buffer_p,
 const uint32_t offset_p)
 : handle(buffer_p.handle()),
 offset(buffer_p.mem_offset()),
 offset(buffer_p.mem_offset() + offset_p),
 range(buffer_p.mem_range()) {}

//
Expand Down

2 changes: 1 addition & 1 deletion
backends/vulkan/runtime/vk_api/Descriptor.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ struct BufferBindInfo final {
 VkDeviceSize range;

 BufferBindInfo();
 BufferBindInfo(const VulkanBuffer& buffer_p);
 BufferBindInfo(const VulkanBuffer& buffer_p, const uint32_t offset_p = 0u);
};

struct ParamsBindList final {
Expand Down

4 changes: 2 additions & 2 deletions
backends/vulkan/runtime/vk_api/memory/Buffer.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -195,8 +195,8 @@ class MemoryMap final {

 public:
 template <typename T>
 T* data() {
 return reinterpret_cast<T*>(data_);
 T* data(const uint32_t offset = 0) {
 return reinterpret_cast<T*>(static_cast<uint8_t*>(data_) + offset);
 }

 inline size_t nbytes() {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[ET-VK] Using a single GPU buffer for all tensor uniforms.#7207

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

kirklandsign
merged 1 commit into

from

Dec 5, 2024
 Merged


[ET-VK] Using a single GPU buffer for all tensor uniforms.
#7207
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


14 changes: 9 additions & 5 deletions
backends/vulkan/runtime/api/containers/ParamsBuffer.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,13 @@ class ParamsBuffer final {
 vulkan_buffer_(
 context_p_->adapter_ptr()->vma().create_params_buffer(block)) {}

 template <typename Block>
 ParamsBuffer(Context* context_p, const VkDeviceSize nbytes)
 : context_p_(context_p),
 nbytes_(nbytes),
 vulkan_buffer_(
 context_p_->adapter_ptr()->vma().create_uniform_buffer(nbytes)) {}

 ParamsBuffer(const ParamsBuffer&);
 ParamsBuffer& operator=(const ParamsBuffer&);

Expand All@@ -50,14 +57,11 @@ class ParamsBuffer final {
 }

 template <typename Block>
 void update(const Block& block) {
 if (sizeof(block) != nbytes_) {
 VK_THROW("Attempted to update ParamsBuffer with data of different size");
 }
 void update(const Block& block, const uint32_t offset = 0) {
 // Fill the uniform buffer with data in block
 {
 vkapi::MemoryMap mapping(vulkan_buffer_, vkapi::kWrite);
 Block* data_ptr = mapping.template data<Block>();
 Block* data_ptr = mapping.template data<Block>(offset);

 *data_ptr = block;
 }
Expand Down

119 changes: 81 additions & 38 deletions
backends/vulkan/runtime/api/containers/Tensor.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -451,11 +451,13 @@ vTensor::vTensor(
 unsqueezed_strides_{unsqueeze_strides(strides_, numel_)},
 padded_numel_(utils::multiply_integers(padded_sizes_)),
 logical_limits_{{0, 0, 0}},
 uniforms_(),
 // Utility Uniform Buffers that can be passed to shaders as arguments
 sizes_uniform_(),
 strides_uniform_(),
 numel_uniform_(),
 logical_limits_uniform_(),
 uniforms_size_(0),
 sizes_uniform_offset_(kUniformOffsetUnset),
 unsqueezed_strides_offset_(kUniformOffsetUnset),
 numel_uniform_offset_(kUniformOffsetUnset),
 logical_limits_uniform_offset_(kUniformOffsetUnset),
 // Construct Tensor storage
 storage_(
 context,
Expand DownExpand Up@@ -497,11 +499,13 @@ vTensor::vTensor(
 unsqueezed_strides_(),
 padded_numel_(utils::multiply_integers(padded_sizes_)),
 logical_limits_(),
 uniforms_(),
 // Utility Uniform Buffers that can be passed to shaders as arguments
 sizes_uniform_(),
 strides_uniform_(),
 numel_uniform_(),
 logical_limits_uniform_(),
 uniforms_size_(0),
 sizes_uniform_offset_(kUniformOffsetUnset),
 unsqueezed_strides_offset_(kUniformOffsetUnset),
 numel_uniform_offset_(kUniformOffsetUnset),
 logical_limits_uniform_offset_(kUniformOffsetUnset),
 // Construct Tensor storage
 storage_(context, image) {
 set_logical_limits(storage_.image_extents_);
Expand All@@ -522,11 +526,13 @@ vTensor::vTensor(vTensor& other)
 other.unsqueezed_strides_.end()},
 padded_numel_(other.padded_numel_),
 logical_limits_{other.logical_limits_},
 uniforms_(),
 // Empty initialize Utility Uniform Buffers
 sizes_uniform_(),
 strides_uniform_(),
 numel_uniform_(),
 logical_limits_uniform_(),
 uniforms_size_(0),
 sizes_uniform_offset_(kUniformOffsetUnset),
 unsqueezed_strides_offset_(kUniformOffsetUnset),
 numel_uniform_offset_(kUniformOffsetUnset),
 logical_limits_uniform_offset_(kUniformOffsetUnset),
 // Copy Tensor storage
 storage_(other.storage_) {}

Expand All@@ -547,11 +553,13 @@ vTensor::vTensor(
 unsqueezed_strides_{unsqueeze_strides(strides_, numel_)},
 padded_numel_(utils::multiply_integers(padded_sizes_)),
 logical_limits_(other.logical_limits_),
 uniforms_(),
 // Empty initialize Utility Uniform Buffers
 sizes_uniform_(),
 strides_uniform_(),
 numel_uniform_(),
 logical_limits_uniform_(),
 uniforms_size_(0),
 sizes_uniform_offset_(kUniformOffsetUnset),
 unsqueezed_strides_offset_(kUniformOffsetUnset),
 numel_uniform_offset_(kUniformOffsetUnset),
 logical_limits_uniform_offset_(kUniformOffsetUnset),
 // Copy Tensor storage
 storage_(other.storage_, vkapi::element_size(dtype_) * offset_numel) {
 VK_CHECK_COND(
Expand DownExpand Up@@ -612,33 +620,66 @@ utils::GPUMemoryLayout vTensor::estimate_memory_layout() const {
}

const vkapi::BufferBindInfo vTensor::sizes_ubo() {
 if (!sizes_uniform_.buffer()) {
 sizes_uniform_ =
 ParamsBuffer(storage_.context_, utils::make_whcn_ivec4(sizes_));
 if (!uniforms_.buffer()) {
 uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize);
 }
 return vkapi::BufferBindInfo(sizes_uniform_.buffer());
 if (sizes_uniform_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 sizes_uniform_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_.update(utils::make_whcn_ivec4(sizes_), sizes_uniform_offset_);
 }
 return vkapi::BufferBindInfo(uniforms_.buffer(), sizes_uniform_offset_);
}

const vkapi::BufferBindInfo vTensor::strides_ubo() {
 if (!strides_uniform_.buffer()) {
 strides_uniform_ = ParamsBuffer(
 storage_.context_, utils::make_whcn_ivec4(unsqueezed_strides_));
 if (!uniforms_.buffer()) {
 uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize);
 }
 if (unsqueezed_strides_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 unsqueezed_strides_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_.update(
 utils::make_whcn_ivec4(unsqueezed_strides_),
 unsqueezed_strides_offset_);
 }
 return vkapi::BufferBindInfo(strides_uniform_.buffer());
 return vkapi::BufferBindInfo(uniforms_.buffer(), unsqueezed_strides_offset_);
}

const vkapi::BufferBindInfo vTensor::logical_limits_ubo() {
 if (!logical_limits_uniform_.buffer()) {
logical_limits_uniform_ = ParamsBuffer(storage_.context_, logical_limits_);
 if (!uniforms_.buffer()) {
uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize);
 }
 return vkapi::BufferBindInfo(logical_limits_uniform_.buffer());
 if (logical_limits_uniform_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 logical_limits_uniform_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_.update(logical_limits_, logical_limits_uniform_offset_);
 }
 return vkapi::BufferBindInfo(
 uniforms_.buffer(), logical_limits_uniform_offset_);
}

const vkapi::BufferBindInfo vTensor::numel_ubo() {
 if (!numel_uniform_.buffer()) {
 numel_uniform_ = ParamsBuffer(storage_.context_, numel_);
 if (!uniforms_.buffer()) {
 uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize);
 }
 if (numel_uniform_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 numel_uniform_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_.update(numel_, numel_uniform_offset_);
 }
 return vkapi::BufferBindInfo(numel_uniform_.buffer());
 return vkapi::BufferBindInfo(uniforms_.buffer(), numel_uniform_offset_);
}

size_t vTensor::staging_buffer_numel() const {
Expand DownExpand Up@@ -690,17 +731,19 @@ void vTensor::update_metadata() {
 set_logical_limits(
 calculate_image_extents(padded_sizes_, axis_map_, packed_dim_));

 if (sizes_uniform_.buffer()) {
sizes_uniform_.update(utils::make_whcn_ivec4(sizes_));
 if (sizes_uniform_offset_ != kUniformOffsetUnset) {
uniforms_.update(utils::make_whcn_ivec4(sizes_), sizes_uniform_offset_);
 }
 if (strides_uniform_.buffer()) {
 strides_uniform_.update(utils::make_whcn_ivec4(unsqueezed_strides_));
 if (unsqueezed_strides_offset_ != kUniformOffsetUnset) {
 uniforms_.update(
 utils::make_whcn_ivec4(unsqueezed_strides_),
 unsqueezed_strides_offset_);
 }
 if (numel_uniform_.buffer()) {
numel_uniform_.update(numel_);
 if (numel_uniform_offset_ != kUniformOffsetUnset) {
uniforms_.update(numel_, numel_uniform_offset_);
 }
 if (logical_limits_uniform_.buffer()) {
logical_limits_uniform_.update(logical_limits_);
 if (logical_limits_uniform_offset_ != kUniformOffsetUnset) {
uniforms_.update(logical_limits_, logical_limits_uniform_offset_);
 }
}

Expand Down

30 changes: 22 additions & 8 deletions
backends/vulkan/runtime/api/containers/Tensor.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -297,18 +297,32 @@ class vTensor final {
 TextureLimits logical_limits_;

 /*
 * Utility GPU buffers that can be passed to shaders in order to convey tensor
 * metadata. These buffers will be initialized the first time they are
 * accessed via the corresponding *_ubo() function, and their contents will be
 * updated whenever virtual_resize() is called.
 * Utility GPU buffer that can be passed to shaders in order to convey tensor
 * metadata. Uniform buffer will be initialized only the first time a ubo is
 * requested. Buffer offsets will be initialized the first time they are
 * accessed via the corresponding *_ubo() function. Uniform buffer's contents
 * will be updated whenever virtual_resize() is called.
 *
 * Refer to the comments for the corresponding *_ubo() functions for more
 * context about the data contained in each buffer.
 */
 ParamsBuffer sizes_uniform_;
 ParamsBuffer strides_uniform_;
 ParamsBuffer numel_uniform_;
 ParamsBuffer logical_limits_uniform_;
 ParamsBuffer uniforms_;
 uint32_t uniforms_size_;
 uint32_t sizes_uniform_offset_;
 uint32_t unsqueezed_strides_offset_;
 uint32_t numel_uniform_offset_;
 uint32_t logical_limits_uniform_offset_;

 // Size allocated for each uniform
 // each uniform is assumed to be a vec of 4 ints to maintain 16 byte alignemnt
 constexpr static size_t kSizePerUniform = sizeof(utils::ivec4);
 // Total size of tensor's uniform buffer
 constexpr static size_t kMaxUniformBufferSize =
 4 * // we have 4 uniforms that are passed on to shaders
 kSizePerUniform;

 // Initial value of uniform buffer offsets
 constexpr static uint32_t kUniformOffsetUnset = kMaxUniformBufferSize;

 vTensorStorage storage_;

Expand Down

6 changes: 4 additions & 2 deletions
backends/vulkan/runtime/vk_api/Descriptor.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,9 +23,11 @@ namespace vkapi {
BufferBindInfo::BufferBindInfo()
 : handle(VK_NULL_HANDLE), offset(0u), range(0u) {}

BufferBindInfo::BufferBindInfo(const VulkanBuffer& buffer_p)
BufferBindInfo::BufferBindInfo(
 const VulkanBuffer& buffer_p,
 const uint32_t offset_p)
 : handle(buffer_p.handle()),
 offset(buffer_p.mem_offset()),
 offset(buffer_p.mem_offset() + offset_p),
 range(buffer_p.mem_range()) {}

//
Expand Down

2 changes: 1 addition & 1 deletion
backends/vulkan/runtime/vk_api/Descriptor.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ struct BufferBindInfo final {
 VkDeviceSize range;

 BufferBindInfo();
 BufferBindInfo(const VulkanBuffer& buffer_p);
 BufferBindInfo(const VulkanBuffer& buffer_p, const uint32_t offset_p = 0u);
};

struct ParamsBindList final {
Expand Down

4 changes: 2 additions & 2 deletions
backends/vulkan/runtime/vk_api/memory/Buffer.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -195,8 +195,8 @@ class MemoryMap final {

 public:
 template <typename T>
 T* data() {
 return reinterpret_cast<T*>(data_);
 T* data(const uint32_t offset = 0) {
 return reinterpret_cast<T*>(static_cast<uint8_t*>(data_) + offset);
 }

 inline size_t nbytes() {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[ET-VK] Using a single GPU buffer for all tensor uniforms.#7207

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

kirklandsign
merged 1 commit into

from

Dec 5, 2024
 Merged


[ET-VK] Using a single GPU buffer for all tensor uniforms.
#7207
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


14 changes: 9 additions & 5 deletions
backends/vulkan/runtime/api/containers/ParamsBuffer.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,13 @@ class ParamsBuffer final {
 vulkan_buffer_(
 context_p_->adapter_ptr()->vma().create_params_buffer(block)) {}

 template <typename Block>
 ParamsBuffer(Context* context_p, const VkDeviceSize nbytes)
 : context_p_(context_p),
 nbytes_(nbytes),
 vulkan_buffer_(
 context_p_->adapter_ptr()->vma().create_uniform_buffer(nbytes)) {}

 ParamsBuffer(const ParamsBuffer&);
 ParamsBuffer& operator=(const ParamsBuffer&);

Expand All@@ -50,14 +57,11 @@ class ParamsBuffer final {
 }

 template <typename Block>
 void update(const Block& block) {
 if (sizeof(block) != nbytes_) {
 VK_THROW("Attempted to update ParamsBuffer with data of different size");
 }
 void update(const Block& block, const uint32_t offset = 0) {
 // Fill the uniform buffer with data in block
 {
 vkapi::MemoryMap mapping(vulkan_buffer_, vkapi::kWrite);
 Block* data_ptr = mapping.template data<Block>();
 Block* data_ptr = mapping.template data<Block>(offset);

 *data_ptr = block;
 }
Expand Down

119 changes: 81 additions & 38 deletions
backends/vulkan/runtime/api/containers/Tensor.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -451,11 +451,13 @@ vTensor::vTensor(
 unsqueezed_strides_{unsqueeze_strides(strides_, numel_)},
 padded_numel_(utils::multiply_integers(padded_sizes_)),
 logical_limits_{{0, 0, 0}},
 uniforms_(),
 // Utility Uniform Buffers that can be passed to shaders as arguments
 sizes_uniform_(),
 strides_uniform_(),
 numel_uniform_(),
 logical_limits_uniform_(),
 uniforms_size_(0),
 sizes_uniform_offset_(kUniformOffsetUnset),
 unsqueezed_strides_offset_(kUniformOffsetUnset),
 numel_uniform_offset_(kUniformOffsetUnset),
 logical_limits_uniform_offset_(kUniformOffsetUnset),
 // Construct Tensor storage
 storage_(
 context,
Expand DownExpand Up@@ -497,11 +499,13 @@ vTensor::vTensor(
 unsqueezed_strides_(),
 padded_numel_(utils::multiply_integers(padded_sizes_)),
 logical_limits_(),
 uniforms_(),
 // Utility Uniform Buffers that can be passed to shaders as arguments
 sizes_uniform_(),
 strides_uniform_(),
 numel_uniform_(),
 logical_limits_uniform_(),
 uniforms_size_(0),
 sizes_uniform_offset_(kUniformOffsetUnset),
 unsqueezed_strides_offset_(kUniformOffsetUnset),
 numel_uniform_offset_(kUniformOffsetUnset),
 logical_limits_uniform_offset_(kUniformOffsetUnset),
 // Construct Tensor storage
 storage_(context, image) {
 set_logical_limits(storage_.image_extents_);
Expand All@@ -522,11 +526,13 @@ vTensor::vTensor(vTensor& other)
 other.unsqueezed_strides_.end()},
 padded_numel_(other.padded_numel_),
 logical_limits_{other.logical_limits_},
 uniforms_(),
 // Empty initialize Utility Uniform Buffers
 sizes_uniform_(),
 strides_uniform_(),
 numel_uniform_(),
 logical_limits_uniform_(),
 uniforms_size_(0),
 sizes_uniform_offset_(kUniformOffsetUnset),
 unsqueezed_strides_offset_(kUniformOffsetUnset),
 numel_uniform_offset_(kUniformOffsetUnset),
 logical_limits_uniform_offset_(kUniformOffsetUnset),
 // Copy Tensor storage
 storage_(other.storage_) {}

Expand All@@ -547,11 +553,13 @@ vTensor::vTensor(
 unsqueezed_strides_{unsqueeze_strides(strides_, numel_)},
 padded_numel_(utils::multiply_integers(padded_sizes_)),
 logical_limits_(other.logical_limits_),
 uniforms_(),
 // Empty initialize Utility Uniform Buffers
 sizes_uniform_(),
 strides_uniform_(),
 numel_uniform_(),
 logical_limits_uniform_(),
 uniforms_size_(0),
 sizes_uniform_offset_(kUniformOffsetUnset),
 unsqueezed_strides_offset_(kUniformOffsetUnset),
 numel_uniform_offset_(kUniformOffsetUnset),
 logical_limits_uniform_offset_(kUniformOffsetUnset),
 // Copy Tensor storage
 storage_(other.storage_, vkapi::element_size(dtype_) * offset_numel) {
 VK_CHECK_COND(
Expand DownExpand Up@@ -612,33 +620,66 @@ utils::GPUMemoryLayout vTensor::estimate_memory_layout() const {
}

const vkapi::BufferBindInfo vTensor::sizes_ubo() {
 if (!sizes_uniform_.buffer()) {
 sizes_uniform_ =
 ParamsBuffer(storage_.context_, utils::make_whcn_ivec4(sizes_));
 if (!uniforms_.buffer()) {
 uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize);
 }
 return vkapi::BufferBindInfo(sizes_uniform_.buffer());
 if (sizes_uniform_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 sizes_uniform_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_.update(utils::make_whcn_ivec4(sizes_), sizes_uniform_offset_);
 }
 return vkapi::BufferBindInfo(uniforms_.buffer(), sizes_uniform_offset_);
}

const vkapi::BufferBindInfo vTensor::strides_ubo() {
 if (!strides_uniform_.buffer()) {
 strides_uniform_ = ParamsBuffer(
 storage_.context_, utils::make_whcn_ivec4(unsqueezed_strides_));
 if (!uniforms_.buffer()) {
 uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize);
 }
 if (unsqueezed_strides_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 unsqueezed_strides_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_.update(
 utils::make_whcn_ivec4(unsqueezed_strides_),
 unsqueezed_strides_offset_);
 }
 return vkapi::BufferBindInfo(strides_uniform_.buffer());
 return vkapi::BufferBindInfo(uniforms_.buffer(), unsqueezed_strides_offset_);
}

const vkapi::BufferBindInfo vTensor::logical_limits_ubo() {
 if (!logical_limits_uniform_.buffer()) {
logical_limits_uniform_ = ParamsBuffer(storage_.context_, logical_limits_);
 if (!uniforms_.buffer()) {
uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize);
 }
 return vkapi::BufferBindInfo(logical_limits_uniform_.buffer());
 if (logical_limits_uniform_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 logical_limits_uniform_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_.update(logical_limits_, logical_limits_uniform_offset_);
 }
 return vkapi::BufferBindInfo(
 uniforms_.buffer(), logical_limits_uniform_offset_);
}

const vkapi::BufferBindInfo vTensor::numel_ubo() {
 if (!numel_uniform_.buffer()) {
 numel_uniform_ = ParamsBuffer(storage_.context_, numel_);
 if (!uniforms_.buffer()) {
 uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize);
 }
 if (numel_uniform_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 numel_uniform_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_.update(numel_, numel_uniform_offset_);
 }
 return vkapi::BufferBindInfo(numel_uniform_.buffer());
 return vkapi::BufferBindInfo(uniforms_.buffer(), numel_uniform_offset_);
}

size_t vTensor::staging_buffer_numel() const {
Expand DownExpand Up@@ -690,17 +731,19 @@ void vTensor::update_metadata() {
 set_logical_limits(
 calculate_image_extents(padded_sizes_, axis_map_, packed_dim_));

 if (sizes_uniform_.buffer()) {
sizes_uniform_.update(utils::make_whcn_ivec4(sizes_));
 if (sizes_uniform_offset_ != kUniformOffsetUnset) {
uniforms_.update(utils::make_whcn_ivec4(sizes_), sizes_uniform_offset_);
 }
 if (strides_uniform_.buffer()) {
 strides_uniform_.update(utils::make_whcn_ivec4(unsqueezed_strides_));
 if (unsqueezed_strides_offset_ != kUniformOffsetUnset) {
 uniforms_.update(
 utils::make_whcn_ivec4(unsqueezed_strides_),
 unsqueezed_strides_offset_);
 }
 if (numel_uniform_.buffer()) {
numel_uniform_.update(numel_);
 if (numel_uniform_offset_ != kUniformOffsetUnset) {
uniforms_.update(numel_, numel_uniform_offset_);
 }
 if (logical_limits_uniform_.buffer()) {
logical_limits_uniform_.update(logical_limits_);
 if (logical_limits_uniform_offset_ != kUniformOffsetUnset) {
uniforms_.update(logical_limits_, logical_limits_uniform_offset_);
 }
}

Expand Down

30 changes: 22 additions & 8 deletions
backends/vulkan/runtime/api/containers/Tensor.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -297,18 +297,32 @@ class vTensor final {
 TextureLimits logical_limits_;

 /*
 * Utility GPU buffers that can be passed to shaders in order to convey tensor
 * metadata. These buffers will be initialized the first time they are
 * accessed via the corresponding *_ubo() function, and their contents will be
 * updated whenever virtual_resize() is called.
 * Utility GPU buffer that can be passed to shaders in order to convey tensor
 * metadata. Uniform buffer will be initialized only the first time a ubo is
 * requested. Buffer offsets will be initialized the first time they are
 * accessed via the corresponding *_ubo() function. Uniform buffer's contents
 * will be updated whenever virtual_resize() is called.
 *
 * Refer to the comments for the corresponding *_ubo() functions for more
 * context about the data contained in each buffer.
 */
 ParamsBuffer sizes_uniform_;
 ParamsBuffer strides_uniform_;
 ParamsBuffer numel_uniform_;
 ParamsBuffer logical_limits_uniform_;
 ParamsBuffer uniforms_;
 uint32_t uniforms_size_;
 uint32_t sizes_uniform_offset_;
 uint32_t unsqueezed_strides_offset_;
 uint32_t numel_uniform_offset_;
 uint32_t logical_limits_uniform_offset_;

 // Size allocated for each uniform
 // each uniform is assumed to be a vec of 4 ints to maintain 16 byte alignemnt
 constexpr static size_t kSizePerUniform = sizeof(utils::ivec4);
 // Total size of tensor's uniform buffer
 constexpr static size_t kMaxUniformBufferSize =
 4 * // we have 4 uniforms that are passed on to shaders
 kSizePerUniform;

 // Initial value of uniform buffer offsets
 constexpr static uint32_t kUniformOffsetUnset = kMaxUniformBufferSize;

 vTensorStorage storage_;

Expand Down

6 changes: 4 additions & 2 deletions
backends/vulkan/runtime/vk_api/Descriptor.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,9 +23,11 @@ namespace vkapi {
BufferBindInfo::BufferBindInfo()
 : handle(VK_NULL_HANDLE), offset(0u), range(0u) {}

BufferBindInfo::BufferBindInfo(const VulkanBuffer& buffer_p)
BufferBindInfo::BufferBindInfo(
 const VulkanBuffer& buffer_p,
 const uint32_t offset_p)
 : handle(buffer_p.handle()),
 offset(buffer_p.mem_offset()),
 offset(buffer_p.mem_offset() + offset_p),
 range(buffer_p.mem_range()) {}

//
Expand Down

2 changes: 1 addition & 1 deletion
backends/vulkan/runtime/vk_api/Descriptor.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ struct BufferBindInfo final {
 VkDeviceSize range;

 BufferBindInfo();
 BufferBindInfo(const VulkanBuffer& buffer_p);
 BufferBindInfo(const VulkanBuffer& buffer_p, const uint32_t offset_p = 0u);
};

struct ParamsBindList final {
Expand Down

4 changes: 2 additions & 2 deletions
backends/vulkan/runtime/vk_api/memory/Buffer.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -195,8 +195,8 @@ class MemoryMap final {

 public:
 template <typename T>
 T* data() {
 return reinterpret_cast<T*>(data_);
 T* data(const uint32_t offset = 0) {
 return reinterpret_cast<T*>(static_cast<uint8_t*>(data_) + offset);
 }

 inline size_t nbytes() {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[ET-VK] Using a single GPU buffer for all tensor uniforms.#7207

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

kirklandsign
merged 1 commit into

from

Dec 5, 2024
 Merged


[ET-VK] Using a single GPU buffer for all tensor uniforms.
#7207
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


14 changes: 9 additions & 5 deletions
backends/vulkan/runtime/api/containers/ParamsBuffer.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,13 @@ class ParamsBuffer final {
 vulkan_buffer_(
 context_p_->adapter_ptr()->vma().create_params_buffer(block)) {}

 template <typename Block>
 ParamsBuffer(Context* context_p, const VkDeviceSize nbytes)
 : context_p_(context_p),
 nbytes_(nbytes),
 vulkan_buffer_(
 context_p_->adapter_ptr()->vma().create_uniform_buffer(nbytes)) {}

 ParamsBuffer(const ParamsBuffer&);
 ParamsBuffer& operator=(const ParamsBuffer&);

Expand All@@ -50,14 +57,11 @@ class ParamsBuffer final {
 }

 template <typename Block>
 void update(const Block& block) {
 if (sizeof(block) != nbytes_) {
 VK_THROW("Attempted to update ParamsBuffer with data of different size");
 }
 void update(const Block& block, const uint32_t offset = 0) {
 // Fill the uniform buffer with data in block
 {
 vkapi::MemoryMap mapping(vulkan_buffer_, vkapi::kWrite);
 Block* data_ptr = mapping.template data<Block>();
 Block* data_ptr = mapping.template data<Block>(offset);

 *data_ptr = block;
 }
Expand Down

119 changes: 81 additions & 38 deletions
backends/vulkan/runtime/api/containers/Tensor.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -451,11 +451,13 @@ vTensor::vTensor(
 unsqueezed_strides_{unsqueeze_strides(strides_, numel_)},
 padded_numel_(utils::multiply_integers(padded_sizes_)),
 logical_limits_{{0, 0, 0}},
 uniforms_(),
 // Utility Uniform Buffers that can be passed to shaders as arguments
 sizes_uniform_(),
 strides_uniform_(),
 numel_uniform_(),
 logical_limits_uniform_(),
 uniforms_size_(0),
 sizes_uniform_offset_(kUniformOffsetUnset),
 unsqueezed_strides_offset_(kUniformOffsetUnset),
 numel_uniform_offset_(kUniformOffsetUnset),
 logical_limits_uniform_offset_(kUniformOffsetUnset),
 // Construct Tensor storage
 storage_(
 context,
Expand DownExpand Up@@ -497,11 +499,13 @@ vTensor::vTensor(
 unsqueezed_strides_(),
 padded_numel_(utils::multiply_integers(padded_sizes_)),
 logical_limits_(),
 uniforms_(),
 // Utility Uniform Buffers that can be passed to shaders as arguments
 sizes_uniform_(),
 strides_uniform_(),
 numel_uniform_(),
 logical_limits_uniform_(),
 uniforms_size_(0),
 sizes_uniform_offset_(kUniformOffsetUnset),
 unsqueezed_strides_offset_(kUniformOffsetUnset),
 numel_uniform_offset_(kUniformOffsetUnset),
 logical_limits_uniform_offset_(kUniformOffsetUnset),
 // Construct Tensor storage
 storage_(context, image) {
 set_logical_limits(storage_.image_extents_);
Expand All@@ -522,11 +526,13 @@ vTensor::vTensor(vTensor& other)
 other.unsqueezed_strides_.end()},
 padded_numel_(other.padded_numel_),
 logical_limits_{other.logical_limits_},
 uniforms_(),
 // Empty initialize Utility Uniform Buffers
 sizes_uniform_(),
 strides_uniform_(),
 numel_uniform_(),
 logical_limits_uniform_(),
 uniforms_size_(0),
 sizes_uniform_offset_(kUniformOffsetUnset),
 unsqueezed_strides_offset_(kUniformOffsetUnset),
 numel_uniform_offset_(kUniformOffsetUnset),
 logical_limits_uniform_offset_(kUniformOffsetUnset),
 // Copy Tensor storage
 storage_(other.storage_) {}

Expand All@@ -547,11 +553,13 @@ vTensor::vTensor(
 unsqueezed_strides_{unsqueeze_strides(strides_, numel_)},
 padded_numel_(utils::multiply_integers(padded_sizes_)),
 logical_limits_(other.logical_limits_),
 uniforms_(),
 // Empty initialize Utility Uniform Buffers
 sizes_uniform_(),
 strides_uniform_(),
 numel_uniform_(),
 logical_limits_uniform_(),
 uniforms_size_(0),
 sizes_uniform_offset_(kUniformOffsetUnset),
 unsqueezed_strides_offset_(kUniformOffsetUnset),
 numel_uniform_offset_(kUniformOffsetUnset),
 logical_limits_uniform_offset_(kUniformOffsetUnset),
 // Copy Tensor storage
 storage_(other.storage_, vkapi::element_size(dtype_) * offset_numel) {
 VK_CHECK_COND(
Expand DownExpand Up@@ -612,33 +620,66 @@ utils::GPUMemoryLayout vTensor::estimate_memory_layout() const {
}

const vkapi::BufferBindInfo vTensor::sizes_ubo() {
 if (!sizes_uniform_.buffer()) {
 sizes_uniform_ =
 ParamsBuffer(storage_.context_, utils::make_whcn_ivec4(sizes_));
 if (!uniforms_.buffer()) {
 uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize);
 }
 return vkapi::BufferBindInfo(sizes_uniform_.buffer());
 if (sizes_uniform_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 sizes_uniform_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_.update(utils::make_whcn_ivec4(sizes_), sizes_uniform_offset_);
 }
 return vkapi::BufferBindInfo(uniforms_.buffer(), sizes_uniform_offset_);
}

const vkapi::BufferBindInfo vTensor::strides_ubo() {
 if (!strides_uniform_.buffer()) {
 strides_uniform_ = ParamsBuffer(
 storage_.context_, utils::make_whcn_ivec4(unsqueezed_strides_));
 if (!uniforms_.buffer()) {
 uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize);
 }
 if (unsqueezed_strides_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 unsqueezed_strides_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_.update(
 utils::make_whcn_ivec4(unsqueezed_strides_),
 unsqueezed_strides_offset_);
 }
 return vkapi::BufferBindInfo(strides_uniform_.buffer());
 return vkapi::BufferBindInfo(uniforms_.buffer(), unsqueezed_strides_offset_);
}

const vkapi::BufferBindInfo vTensor::logical_limits_ubo() {
 if (!logical_limits_uniform_.buffer()) {
logical_limits_uniform_ = ParamsBuffer(storage_.context_, logical_limits_);
 if (!uniforms_.buffer()) {
uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize);
 }
 return vkapi::BufferBindInfo(logical_limits_uniform_.buffer());
 if (logical_limits_uniform_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 logical_limits_uniform_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_.update(logical_limits_, logical_limits_uniform_offset_);
 }
 return vkapi::BufferBindInfo(
 uniforms_.buffer(), logical_limits_uniform_offset_);
}

const vkapi::BufferBindInfo vTensor::numel_ubo() {
 if (!numel_uniform_.buffer()) {
 numel_uniform_ = ParamsBuffer(storage_.context_, numel_);
 if (!uniforms_.buffer()) {
 uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize);
 }
 if (numel_uniform_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 numel_uniform_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_.update(numel_, numel_uniform_offset_);
 }
 return vkapi::BufferBindInfo(numel_uniform_.buffer());
 return vkapi::BufferBindInfo(uniforms_.buffer(), numel_uniform_offset_);
}

size_t vTensor::staging_buffer_numel() const {
Expand DownExpand Up@@ -690,17 +731,19 @@ void vTensor::update_metadata() {
 set_logical_limits(
 calculate_image_extents(padded_sizes_, axis_map_, packed_dim_));

 if (sizes_uniform_.buffer()) {
sizes_uniform_.update(utils::make_whcn_ivec4(sizes_));
 if (sizes_uniform_offset_ != kUniformOffsetUnset) {
uniforms_.update(utils::make_whcn_ivec4(sizes_), sizes_uniform_offset_);
 }
 if (strides_uniform_.buffer()) {
 strides_uniform_.update(utils::make_whcn_ivec4(unsqueezed_strides_));
 if (unsqueezed_strides_offset_ != kUniformOffsetUnset) {
 uniforms_.update(
 utils::make_whcn_ivec4(unsqueezed_strides_),
 unsqueezed_strides_offset_);
 }
 if (numel_uniform_.buffer()) {
numel_uniform_.update(numel_);
 if (numel_uniform_offset_ != kUniformOffsetUnset) {
uniforms_.update(numel_, numel_uniform_offset_);
 }
 if (logical_limits_uniform_.buffer()) {
logical_limits_uniform_.update(logical_limits_);
 if (logical_limits_uniform_offset_ != kUniformOffsetUnset) {
uniforms_.update(logical_limits_, logical_limits_uniform_offset_);
 }
}

Expand Down

30 changes: 22 additions & 8 deletions
backends/vulkan/runtime/api/containers/Tensor.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -297,18 +297,32 @@ class vTensor final {
 TextureLimits logical_limits_;

 /*
 * Utility GPU buffers that can be passed to shaders in order to convey tensor
 * metadata. These buffers will be initialized the first time they are
 * accessed via the corresponding *_ubo() function, and their contents will be
 * updated whenever virtual_resize() is called.
 * Utility GPU buffer that can be passed to shaders in order to convey tensor
 * metadata. Uniform buffer will be initialized only the first time a ubo is
 * requested. Buffer offsets will be initialized the first time they are
 * accessed via the corresponding *_ubo() function. Uniform buffer's contents
 * will be updated whenever virtual_resize() is called.
 *
 * Refer to the comments for the corresponding *_ubo() functions for more
 * context about the data contained in each buffer.
 */
 ParamsBuffer sizes_uniform_;
 ParamsBuffer strides_uniform_;
 ParamsBuffer numel_uniform_;
 ParamsBuffer logical_limits_uniform_;
 ParamsBuffer uniforms_;
 uint32_t uniforms_size_;
 uint32_t sizes_uniform_offset_;
 uint32_t unsqueezed_strides_offset_;
 uint32_t numel_uniform_offset_;
 uint32_t logical_limits_uniform_offset_;

 // Size allocated for each uniform
 // each uniform is assumed to be a vec of 4 ints to maintain 16 byte alignemnt
 constexpr static size_t kSizePerUniform = sizeof(utils::ivec4);
 // Total size of tensor's uniform buffer
 constexpr static size_t kMaxUniformBufferSize =
 4 * // we have 4 uniforms that are passed on to shaders
 kSizePerUniform;

 // Initial value of uniform buffer offsets
 constexpr static uint32_t kUniformOffsetUnset = kMaxUniformBufferSize;

 vTensorStorage storage_;

Expand Down

6 changes: 4 additions & 2 deletions
backends/vulkan/runtime/vk_api/Descriptor.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,9 +23,11 @@ namespace vkapi {
BufferBindInfo::BufferBindInfo()
 : handle(VK_NULL_HANDLE), offset(0u), range(0u) {}

BufferBindInfo::BufferBindInfo(const VulkanBuffer& buffer_p)
BufferBindInfo::BufferBindInfo(
 const VulkanBuffer& buffer_p,
 const uint32_t offset_p)
 : handle(buffer_p.handle()),
 offset(buffer_p.mem_offset()),
 offset(buffer_p.mem_offset() + offset_p),
 range(buffer_p.mem_range()) {}

//
Expand Down

2 changes: 1 addition & 1 deletion
backends/vulkan/runtime/vk_api/Descriptor.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ struct BufferBindInfo final {
 VkDeviceSize range;

 BufferBindInfo();
 BufferBindInfo(const VulkanBuffer& buffer_p);
 BufferBindInfo(const VulkanBuffer& buffer_p, const uint32_t offset_p = 0u);
};

struct ParamsBindList final {
Expand Down

4 changes: 2 additions & 2 deletions
backends/vulkan/runtime/vk_api/memory/Buffer.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -195,8 +195,8 @@ class MemoryMap final {

 public:
 template <typename T>
 T* data() {
 return reinterpret_cast<T*>(data_);
 T* data(const uint32_t offset = 0) {
 return reinterpret_cast<T*>(static_cast<uint8_t*>(data_) + offset);
 }

 inline size_t nbytes() {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[ET-VK] Using a single GPU buffer for all tensor uniforms.#7207

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

kirklandsign
merged 1 commit into

from

Dec 5, 2024
 Merged


[ET-VK] Using a single GPU buffer for all tensor uniforms.
#7207
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


14 changes: 9 additions & 5 deletions
backends/vulkan/runtime/api/containers/ParamsBuffer.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,13 @@ class ParamsBuffer final {
 vulkan_buffer_(
 context_p_->adapter_ptr()->vma().create_params_buffer(block)) {}

 template <typename Block>
 ParamsBuffer(Context* context_p, const VkDeviceSize nbytes)
 : context_p_(context_p),
 nbytes_(nbytes),
 vulkan_buffer_(
 context_p_->adapter_ptr()->vma().create_uniform_buffer(nbytes)) {}

 ParamsBuffer(const ParamsBuffer&);
 ParamsBuffer& operator=(const ParamsBuffer&);

Expand All@@ -50,14 +57,11 @@ class ParamsBuffer final {
 }

 template <typename Block>
 void update(const Block& block) {
 if (sizeof(block) != nbytes_) {
 VK_THROW("Attempted to update ParamsBuffer with data of different size");
 }
 void update(const Block& block, const uint32_t offset = 0) {
 // Fill the uniform buffer with data in block
 {
 vkapi::MemoryMap mapping(vulkan_buffer_, vkapi::kWrite);
 Block* data_ptr = mapping.template data<Block>();
 Block* data_ptr = mapping.template data<Block>(offset);

 *data_ptr = block;
 }
Expand Down

119 changes: 81 additions & 38 deletions
backends/vulkan/runtime/api/containers/Tensor.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -451,11 +451,13 @@ vTensor::vTensor(
 unsqueezed_strides_{unsqueeze_strides(strides_, numel_)},
 padded_numel_(utils::multiply_integers(padded_sizes_)),
 logical_limits_{{0, 0, 0}},
 uniforms_(),
 // Utility Uniform Buffers that can be passed to shaders as arguments
 sizes_uniform_(),
 strides_uniform_(),
 numel_uniform_(),
 logical_limits_uniform_(),
 uniforms_size_(0),
 sizes_uniform_offset_(kUniformOffsetUnset),
 unsqueezed_strides_offset_(kUniformOffsetUnset),
 numel_uniform_offset_(kUniformOffsetUnset),
 logical_limits_uniform_offset_(kUniformOffsetUnset),
 // Construct Tensor storage
 storage_(
 context,
Expand DownExpand Up@@ -497,11 +499,13 @@ vTensor::vTensor(
 unsqueezed_strides_(),
 padded_numel_(utils::multiply_integers(padded_sizes_)),
 logical_limits_(),
 uniforms_(),
 // Utility Uniform Buffers that can be passed to shaders as arguments
 sizes_uniform_(),
 strides_uniform_(),
 numel_uniform_(),
 logical_limits_uniform_(),
 uniforms_size_(0),
 sizes_uniform_offset_(kUniformOffsetUnset),
 unsqueezed_strides_offset_(kUniformOffsetUnset),
 numel_uniform_offset_(kUniformOffsetUnset),
 logical_limits_uniform_offset_(kUniformOffsetUnset),
 // Construct Tensor storage
 storage_(context, image) {
 set_logical_limits(storage_.image_extents_);
Expand All@@ -522,11 +526,13 @@ vTensor::vTensor(vTensor& other)
 other.unsqueezed_strides_.end()},
 padded_numel_(other.padded_numel_),
 logical_limits_{other.logical_limits_},
 uniforms_(),
 // Empty initialize Utility Uniform Buffers
 sizes_uniform_(),
 strides_uniform_(),
 numel_uniform_(),
 logical_limits_uniform_(),
 uniforms_size_(0),
 sizes_uniform_offset_(kUniformOffsetUnset),
 unsqueezed_strides_offset_(kUniformOffsetUnset),
 numel_uniform_offset_(kUniformOffsetUnset),
 logical_limits_uniform_offset_(kUniformOffsetUnset),
 // Copy Tensor storage
 storage_(other.storage_) {}

Expand All@@ -547,11 +553,13 @@ vTensor::vTensor(
 unsqueezed_strides_{unsqueeze_strides(strides_, numel_)},
 padded_numel_(utils::multiply_integers(padded_sizes_)),
 logical_limits_(other.logical_limits_),
 uniforms_(),
 // Empty initialize Utility Uniform Buffers
 sizes_uniform_(),
 strides_uniform_(),
 numel_uniform_(),
 logical_limits_uniform_(),
 uniforms_size_(0),
 sizes_uniform_offset_(kUniformOffsetUnset),
 unsqueezed_strides_offset_(kUniformOffsetUnset),
 numel_uniform_offset_(kUniformOffsetUnset),
 logical_limits_uniform_offset_(kUniformOffsetUnset),
 // Copy Tensor storage
 storage_(other.storage_, vkapi::element_size(dtype_) * offset_numel) {
 VK_CHECK_COND(
Expand DownExpand Up@@ -612,33 +620,66 @@ utils::GPUMemoryLayout vTensor::estimate_memory_layout() const {
}

const vkapi::BufferBindInfo vTensor::sizes_ubo() {
 if (!sizes_uniform_.buffer()) {
 sizes_uniform_ =
 ParamsBuffer(storage_.context_, utils::make_whcn_ivec4(sizes_));
 if (!uniforms_.buffer()) {
 uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize);
 }
 return vkapi::BufferBindInfo(sizes_uniform_.buffer());
 if (sizes_uniform_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 sizes_uniform_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_.update(utils::make_whcn_ivec4(sizes_), sizes_uniform_offset_);
 }
 return vkapi::BufferBindInfo(uniforms_.buffer(), sizes_uniform_offset_);
}

const vkapi::BufferBindInfo vTensor::strides_ubo() {
 if (!strides_uniform_.buffer()) {
 strides_uniform_ = ParamsBuffer(
 storage_.context_, utils::make_whcn_ivec4(unsqueezed_strides_));
 if (!uniforms_.buffer()) {
 uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize);
 }
 if (unsqueezed_strides_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 unsqueezed_strides_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_.update(
 utils::make_whcn_ivec4(unsqueezed_strides_),
 unsqueezed_strides_offset_);
 }
 return vkapi::BufferBindInfo(strides_uniform_.buffer());
 return vkapi::BufferBindInfo(uniforms_.buffer(), unsqueezed_strides_offset_);
}

const vkapi::BufferBindInfo vTensor::logical_limits_ubo() {
 if (!logical_limits_uniform_.buffer()) {
logical_limits_uniform_ = ParamsBuffer(storage_.context_, logical_limits_);
 if (!uniforms_.buffer()) {
uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize);
 }
 return vkapi::BufferBindInfo(logical_limits_uniform_.buffer());
 if (logical_limits_uniform_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 logical_limits_uniform_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_.update(logical_limits_, logical_limits_uniform_offset_);
 }
 return vkapi::BufferBindInfo(
 uniforms_.buffer(), logical_limits_uniform_offset_);
}

const vkapi::BufferBindInfo vTensor::numel_ubo() {
 if (!numel_uniform_.buffer()) {
 numel_uniform_ = ParamsBuffer(storage_.context_, numel_);
 if (!uniforms_.buffer()) {
 uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize);
 }
 if (numel_uniform_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 numel_uniform_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_.update(numel_, numel_uniform_offset_);
 }
 return vkapi::BufferBindInfo(numel_uniform_.buffer());
 return vkapi::BufferBindInfo(uniforms_.buffer(), numel_uniform_offset_);
}

size_t vTensor::staging_buffer_numel() const {
Expand DownExpand Up@@ -690,17 +731,19 @@ void vTensor::update_metadata() {
 set_logical_limits(
 calculate_image_extents(padded_sizes_, axis_map_, packed_dim_));

 if (sizes_uniform_.buffer()) {
sizes_uniform_.update(utils::make_whcn_ivec4(sizes_));
 if (sizes_uniform_offset_ != kUniformOffsetUnset) {
uniforms_.update(utils::make_whcn_ivec4(sizes_), sizes_uniform_offset_);
 }
 if (strides_uniform_.buffer()) {
 strides_uniform_.update(utils::make_whcn_ivec4(unsqueezed_strides_));
 if (unsqueezed_strides_offset_ != kUniformOffsetUnset) {
 uniforms_.update(
 utils::make_whcn_ivec4(unsqueezed_strides_),
 unsqueezed_strides_offset_);
 }
 if (numel_uniform_.buffer()) {
numel_uniform_.update(numel_);
 if (numel_uniform_offset_ != kUniformOffsetUnset) {
uniforms_.update(numel_, numel_uniform_offset_);
 }
 if (logical_limits_uniform_.buffer()) {
logical_limits_uniform_.update(logical_limits_);
 if (logical_limits_uniform_offset_ != kUniformOffsetUnset) {
uniforms_.update(logical_limits_, logical_limits_uniform_offset_);
 }
}

Expand Down

30 changes: 22 additions & 8 deletions
backends/vulkan/runtime/api/containers/Tensor.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -297,18 +297,32 @@ class vTensor final {
 TextureLimits logical_limits_;

 /*
 * Utility GPU buffers that can be passed to shaders in order to convey tensor
 * metadata. These buffers will be initialized the first time they are
 * accessed via the corresponding *_ubo() function, and their contents will be
 * updated whenever virtual_resize() is called.
 * Utility GPU buffer that can be passed to shaders in order to convey tensor
 * metadata. Uniform buffer will be initialized only the first time a ubo is
 * requested. Buffer offsets will be initialized the first time they are
 * accessed via the corresponding *_ubo() function. Uniform buffer's contents
 * will be updated whenever virtual_resize() is called.
 *
 * Refer to the comments for the corresponding *_ubo() functions for more
 * context about the data contained in each buffer.
 */
 ParamsBuffer sizes_uniform_;
 ParamsBuffer strides_uniform_;
 ParamsBuffer numel_uniform_;
 ParamsBuffer logical_limits_uniform_;
 ParamsBuffer uniforms_;
 uint32_t uniforms_size_;
 uint32_t sizes_uniform_offset_;
 uint32_t unsqueezed_strides_offset_;
 uint32_t numel_uniform_offset_;
 uint32_t logical_limits_uniform_offset_;

 // Size allocated for each uniform
 // each uniform is assumed to be a vec of 4 ints to maintain 16 byte alignemnt
 constexpr static size_t kSizePerUniform = sizeof(utils::ivec4);
 // Total size of tensor's uniform buffer
 constexpr static size_t kMaxUniformBufferSize =
 4 * // we have 4 uniforms that are passed on to shaders
 kSizePerUniform;

 // Initial value of uniform buffer offsets
 constexpr static uint32_t kUniformOffsetUnset = kMaxUniformBufferSize;

 vTensorStorage storage_;

Expand Down

6 changes: 4 additions & 2 deletions
backends/vulkan/runtime/vk_api/Descriptor.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,9 +23,11 @@ namespace vkapi {
BufferBindInfo::BufferBindInfo()
 : handle(VK_NULL_HANDLE), offset(0u), range(0u) {}

BufferBindInfo::BufferBindInfo(const VulkanBuffer& buffer_p)
BufferBindInfo::BufferBindInfo(
 const VulkanBuffer& buffer_p,
 const uint32_t offset_p)
 : handle(buffer_p.handle()),
 offset(buffer_p.mem_offset()),
 offset(buffer_p.mem_offset() + offset_p),
 range(buffer_p.mem_range()) {}

//
Expand Down

2 changes: 1 addition & 1 deletion
backends/vulkan/runtime/vk_api/Descriptor.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ struct BufferBindInfo final {
 VkDeviceSize range;

 BufferBindInfo();
 BufferBindInfo(const VulkanBuffer& buffer_p);
 BufferBindInfo(const VulkanBuffer& buffer_p, const uint32_t offset_p = 0u);
};

struct ParamsBindList final {
Expand Down

4 changes: 2 additions & 2 deletions
backends/vulkan/runtime/vk_api/memory/Buffer.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -195,8 +195,8 @@ class MemoryMap final {

 public:
 template <typename T>
 T* data() {
 return reinterpret_cast<T*>(data_);
 T* data(const uint32_t offset = 0) {
 return reinterpret_cast<T*>(static_cast<uint8_t*>(data_) + offset);
 }

 inline size_t nbytes() {
Expand Down