[ET-VK] Fix metadata UBO VVL warnings#7484

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
SS-JIA merged 4 commits into from
Jan 3, 2025
Merged

[ET-VK] Fix metadata UBO VVL warnings #7484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f658a42
[ET-VK][ez] Fix undefined behaviour in ambiguous `ParamsBuffer` const…
SS-JIA Jan 2, 2025
bd59382
[ET-VK] Create Pipeline layouts with push constant ranges when required
SS-JIA Jan 2, 2025
f1c5e51
[ET-VK] Fix metadata UBO VVL warnings
SS-JIA Jan 2, 2025
ccda565
Merge branch 'main' into gh/SS-JIA/161/orig
SS-JIA Jan 3, 2025
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
43 changes: 27 additions & 16 deletions backends/vulkan/runtime/api/containers/Tensor.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -658,66 +658,77 @@ utils::GPUMemoryLayout vTensor::estimate_memory_layout() const {
}

const vkapi::BufferBindInfo vTensor::sizes_ubo() {
const size_t size_per_ubo = context()->adapter_ptr()->min_ubo_alignment();
const size_t max_ubo_size = kMaxMetadataFieldCount * size_per_ubo;
if (!uniforms_.buffer()) {
uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize, true);
uniforms_ = ParamsBuffer(storage_.context_, max_ubo_size, true);
}
if (sizes_uniform_offset_ == kUniformOffsetUnset) {
VK_CHECK_COND(
(uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
(uniforms_size_ + size_per_ubo) <= max_ubo_size,
"Uniform data allocation has exceeded Tensor uniform buffer size");
sizes_uniform_offset_ = uniforms_size_;
uniforms_size_ += kSizePerUniform;
uniforms_size_ += size_per_ubo;
uniforms_.update(utils::make_whcn_ivec4(sizes_), sizes_uniform_offset_);
}
return vkapi::BufferBindInfo(uniforms_.buffer(), sizes_uniform_offset_);
return vkapi::BufferBindInfo(
uniforms_.buffer(), sizes_uniform_offset_, size_per_ubo);
}

const vkapi::BufferBindInfo vTensor::strides_ubo() {
const size_t size_per_ubo = context()->adapter_ptr()->min_ubo_alignment();
const size_t max_ubo_size = kMaxMetadataFieldCount * size_per_ubo;
if (!uniforms_.buffer()) {
uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize, true);
uniforms_ = ParamsBuffer(storage_.context_, max_ubo_size, true);
}
if (unsqueezed_strides_offset_ == kUniformOffsetUnset) {
VK_CHECK_COND(
(uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
(uniforms_size_ + size_per_ubo) <= max_ubo_size,
"Uniform data allocation has exceeded Tensor uniform buffer size");
unsqueezed_strides_offset_ = uniforms_size_;
uniforms_size_ += kSizePerUniform;
uniforms_size_ += size_per_ubo;
uniforms_.update(
utils::make_whcn_ivec4(unsqueezed_strides_),
unsqueezed_strides_offset_);
}
return vkapi::BufferBindInfo(uniforms_.buffer(), unsqueezed_strides_offset_);
return vkapi::BufferBindInfo(
uniforms_.buffer(), unsqueezed_strides_offset_, size_per_ubo);
}

const vkapi::BufferBindInfo vTensor::logical_limits_ubo() {
const size_t size_per_ubo = context()->adapter_ptr()->min_ubo_alignment();
const size_t max_ubo_size = kMaxMetadataFieldCount * size_per_ubo;
if (!uniforms_.buffer()) {
uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize, true);
uniforms_ = ParamsBuffer(storage_.context_, max_ubo_size, true);
}
if (logical_limits_uniform_offset_ == kUniformOffsetUnset) {
VK_CHECK_COND(
(uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
(uniforms_size_ + size_per_ubo) <= max_ubo_size,
"Uniform data allocation has exceeded Tensor uniform buffer size");
logical_limits_uniform_offset_ = uniforms_size_;
uniforms_size_ += kSizePerUniform;
uniforms_size_ += size_per_ubo;
uniforms_.update(logical_limits(), logical_limits_uniform_offset_);
}
return vkapi::BufferBindInfo(
uniforms_.buffer(), logical_limits_uniform_offset_);
uniforms_.buffer(), logical_limits_uniform_offset_, size_per_ubo);
}

const vkapi::BufferBindInfo vTensor::numel_ubo() {
const size_t size_per_ubo = context()->adapter_ptr()->min_ubo_alignment();
const size_t max_ubo_size = kMaxMetadataFieldCount * size_per_ubo;
if (!uniforms_.buffer()) {
uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize, true);
uniforms_ = ParamsBuffer(storage_.context_, max_ubo_size, true);
}
if (numel_uniform_offset_ == kUniformOffsetUnset) {
VK_CHECK_COND(
(uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
(uniforms_size_ + size_per_ubo) <= max_ubo_size,
"Uniform data allocation has exceeded Tensor uniform buffer size");
numel_uniform_offset_ = uniforms_size_;
uniforms_size_ += kSizePerUniform;
uniforms_size_ += size_per_ubo;
uniforms_.update(numel(), numel_uniform_offset_);
}
return vkapi::BufferBindInfo(uniforms_.buffer(), numel_uniform_offset_);
return vkapi::BufferBindInfo(
uniforms_.buffer(), numel_uniform_offset_, size_per_ubo);
}

size_t vTensor::staging_buffer_numel() const {
Expand Down
17 changes: 7 additions & 10 deletions backends/vulkan/runtime/api/containers/Tensor.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -348,16 +348,13 @@ class vTensor final {
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;
// Maximum number of metadata fields that can be stored in the metadata UBO.
// This is used to calculate the size of the UBO that should be allocated.
constexpr static size_t kMaxMetadataFieldCount = 4;

// Initial value of uniform buffer offsets. 1 is selected as it is essentially
// impossible for a ubo to have an offset of 1.
constexpr static uint32_t kUniformOffsetUnset = 1;

vTensorStorage storage_;

Expand Down
4 changes: 4 additions & 0 deletions backends/vulkan/runtime/vk_api/Adapter.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -207,6 +207,10 @@ class Adapter final {
return supports_8bit_storage_buffers() && supports_int8_shader_types();
}

inline size_t min_ubo_alignment() const {
return physical_device_.min_ubo_alignment;
}

// Command Buffer Submission

void
Expand Down
12 changes: 11 additions & 1 deletion backends/vulkan/runtime/vk_api/Descriptor.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,17 @@ BufferBindInfo::BufferBindInfo(
const uint32_t offset_p)
: handle(buffer_p.handle()),
offset(buffer_p.mem_offset() + offset_p),
range(buffer_p.mem_range()) {}
range(buffer_p.mem_range() - offset_p) {}

BufferBindInfo::BufferBindInfo(
const VulkanBuffer& buffer_p,
const uint32_t offset_p,
const uint32_t range_p)
: handle(buffer_p.handle()),
offset(buffer_p.mem_offset() + offset_p),
range(range_p) {
VK_CHECK_COND(range_p <= (buffer_p.mem_range() - offset_p));
}

//
// ParamsBindList
Expand Down
4 changes: 4 additions & 0 deletions backends/vulkan/runtime/vk_api/Descriptor.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,10 @@ struct BufferBindInfo final {

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

struct ParamsBindList final {
Expand Down
11 changes: 9 additions & 2 deletions backends/vulkan/runtime/vk_api/Device.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,10 +39,17 @@ PhysicalDevice::PhysicalDevice(VkPhysicalDevice physical_device_handle)
num_compute_queues(0),
supports_int16_shader_types(false),
has_unified_memory(false),
has_timestamps(properties.limits.timestampComputeAndGraphics),
timestamp_period(properties.limits.timestampPeriod) {
has_timestamps(false),
timestamp_period(0),
min_ubo_alignment(0) {
// Extract physical device properties
vkGetPhysicalDeviceProperties(handle, &properties);

// Extract fields of interest
has_timestamps = properties.limits.timestampComputeAndGraphics;
timestamp_period = properties.limits.timestampPeriod;
min_ubo_alignment = properties.limits.minUniformBufferOffsetAlignment;

vkGetPhysicalDeviceMemoryProperties(handle, &memory_properties);

VkPhysicalDeviceFeatures2 features2{
Expand Down
1 change: 1 addition & 0 deletions backends/vulkan/runtime/vk_api/Device.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,7 @@ struct PhysicalDevice final {
bool has_unified_memory;
bool has_timestamps;
float timestamp_period;
size_t min_ubo_alignment;

explicit PhysicalDevice(VkPhysicalDevice);
};
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] Fix metadata UBO VVL warnings#7484

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

SS-JIA
merged 4 commits into

from

Jan 3, 2025
 Merged


[ET-VK] Fix metadata UBO VVL warnings
#7484
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
f658a42

[ET-VK][ez] Fix undefined behaviour in ambiguous `ParamsBuffer` const…


SS-JIA Jan 2, 2025
bd59382

[ET-VK] Create Pipeline layouts with push constant ranges when required


SS-JIA Jan 2, 2025
f1c5e51

[ET-VK] Fix metadata UBO VVL warnings


SS-JIA Jan 2, 2025
ccda565

Merge branch 'main' into gh/SS-JIA/161/orig


SS-JIA Jan 3, 2025

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


43 changes: 27 additions & 16 deletions
backends/vulkan/runtime/api/containers/Tensor.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -658,66 +658,77 @@ utils::GPUMemoryLayout vTensor::estimate_memory_layout() const {
}

const vkapi::BufferBindInfo vTensor::sizes_ubo() {
 const size_t size_per_ubo = context()->adapter_ptr()->min_ubo_alignment();
 const size_t max_ubo_size = kMaxMetadataFieldCount * size_per_ubo;
 if (!uniforms_.buffer()) {
 uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize, true);
 uniforms_ = ParamsBuffer(storage_.context_, max_ubo_size, true);
 }
 if (sizes_uniform_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 (uniforms_size_ + size_per_ubo) <= max_ubo_size,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 sizes_uniform_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_size_ += size_per_ubo;
 uniforms_.update(utils::make_whcn_ivec4(sizes_), sizes_uniform_offset_);
 }
 return vkapi::BufferBindInfo(uniforms_.buffer(), sizes_uniform_offset_);
 return vkapi::BufferBindInfo(
 uniforms_.buffer(), sizes_uniform_offset_, size_per_ubo);
}

const vkapi::BufferBindInfo vTensor::strides_ubo() {
 const size_t size_per_ubo = context()->adapter_ptr()->min_ubo_alignment();
 const size_t max_ubo_size = kMaxMetadataFieldCount * size_per_ubo;
 if (!uniforms_.buffer()) {
 uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize, true);
 uniforms_ = ParamsBuffer(storage_.context_, max_ubo_size, true);
 }
 if (unsqueezed_strides_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 (uniforms_size_ + size_per_ubo) <= max_ubo_size,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 unsqueezed_strides_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_size_ += size_per_ubo;
 uniforms_.update(
 utils::make_whcn_ivec4(unsqueezed_strides_),
 unsqueezed_strides_offset_);
 }
 return vkapi::BufferBindInfo(uniforms_.buffer(), unsqueezed_strides_offset_);
 return vkapi::BufferBindInfo(
 uniforms_.buffer(), unsqueezed_strides_offset_, size_per_ubo);
}

const vkapi::BufferBindInfo vTensor::logical_limits_ubo() {
 const size_t size_per_ubo = context()->adapter_ptr()->min_ubo_alignment();
 const size_t max_ubo_size = kMaxMetadataFieldCount * size_per_ubo;
 if (!uniforms_.buffer()) {
 uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize, true);
 uniforms_ = ParamsBuffer(storage_.context_, max_ubo_size, true);
 }
 if (logical_limits_uniform_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 (uniforms_size_ + size_per_ubo) <= max_ubo_size,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 logical_limits_uniform_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_size_ += size_per_ubo;
 uniforms_.update(logical_limits(), logical_limits_uniform_offset_);
 }
 return vkapi::BufferBindInfo(
 uniforms_.buffer(), logical_limits_uniform_offset_);
 uniforms_.buffer(), logical_limits_uniform_offset_, size_per_ubo);
}

const vkapi::BufferBindInfo vTensor::numel_ubo() {
 const size_t size_per_ubo = context()->adapter_ptr()->min_ubo_alignment();
 const size_t max_ubo_size = kMaxMetadataFieldCount * size_per_ubo;
 if (!uniforms_.buffer()) {
 uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize, true);
 uniforms_ = ParamsBuffer(storage_.context_, max_ubo_size, true);
 }
 if (numel_uniform_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 (uniforms_size_ + size_per_ubo) <= max_ubo_size,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 numel_uniform_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_size_ += size_per_ubo;
 uniforms_.update(numel(), numel_uniform_offset_);
 }
 return vkapi::BufferBindInfo(uniforms_.buffer(), numel_uniform_offset_);
 return vkapi::BufferBindInfo(
 uniforms_.buffer(), numel_uniform_offset_, size_per_ubo);
}

size_t vTensor::staging_buffer_numel() const {
Expand Down

17 changes: 7 additions & 10 deletions
backends/vulkan/runtime/api/containers/Tensor.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -348,16 +348,13 @@ class vTensor final {
 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;
 // Maximum number of metadata fields that can be stored in the metadata UBO.
 // This is used to calculate the size of the UBO that should be allocated.
 constexpr static size_t kMaxMetadataFieldCount = 4;

 // Initial value of uniform buffer offsets. 1 is selected as it is essentially
 // impossible for a ubo to have an offset of 1.
 constexpr static uint32_t kUniformOffsetUnset = 1;

 vTensorStorage storage_;

Expand Down

4 changes: 4 additions & 0 deletions
backends/vulkan/runtime/vk_api/Adapter.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -207,6 +207,10 @@ class Adapter final {
 return supports_8bit_storage_buffers() && supports_int8_shader_types();
 }

 inline size_t min_ubo_alignment() const {
 return physical_device_.min_ubo_alignment;
 }

 // Command Buffer Submission

 void
Expand Down

12 changes: 11 additions & 1 deletion
backends/vulkan/runtime/vk_api/Descriptor.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,17 @@ BufferBindInfo::BufferBindInfo(
 const uint32_t offset_p)
 : handle(buffer_p.handle()),
 offset(buffer_p.mem_offset() + offset_p),
 range(buffer_p.mem_range()) {}
 range(buffer_p.mem_range() - offset_p) {}

BufferBindInfo::BufferBindInfo(
 const VulkanBuffer& buffer_p,
 const uint32_t offset_p,
 const uint32_t range_p)
 : handle(buffer_p.handle()),
 offset(buffer_p.mem_offset() + offset_p),
 range(range_p) {
 VK_CHECK_COND(range_p <= (buffer_p.mem_range() - offset_p));
}

//
// ParamsBindList
Expand Down

4 changes: 4 additions & 0 deletions
backends/vulkan/runtime/vk_api/Descriptor.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,10 @@ struct BufferBindInfo final {

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

struct ParamsBindList final {
Expand Down

11 changes: 9 additions & 2 deletions
backends/vulkan/runtime/vk_api/Device.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,10 +39,17 @@ PhysicalDevice::PhysicalDevice(VkPhysicalDevice physical_device_handle)
 num_compute_queues(0),
 supports_int16_shader_types(false),
 has_unified_memory(false),
 has_timestamps(properties.limits.timestampComputeAndGraphics),
 timestamp_period(properties.limits.timestampPeriod) {
 has_timestamps(false),
 timestamp_period(0),
 min_ubo_alignment(0) {
 // Extract physical device properties
 vkGetPhysicalDeviceProperties(handle, &properties);

 // Extract fields of interest
 has_timestamps = properties.limits.timestampComputeAndGraphics;
 timestamp_period = properties.limits.timestampPeriod;
 min_ubo_alignment = properties.limits.minUniformBufferOffsetAlignment;

 vkGetPhysicalDeviceMemoryProperties(handle, &memory_properties);

 VkPhysicalDeviceFeatures2 features2{
Expand Down

1 change: 1 addition & 0 deletions
backends/vulkan/runtime/vk_api/Device.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,7 @@ struct PhysicalDevice final {
 bool has_unified_memory;
 bool has_timestamps;
 float timestamp_period;
 size_t min_ubo_alignment;

 explicit PhysicalDevice(VkPhysicalDevice);
};
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] Fix metadata UBO VVL warnings#7484

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

SS-JIA
merged 4 commits into

from

Jan 3, 2025
 Merged


[ET-VK] Fix metadata UBO VVL warnings
#7484
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
f658a42

[ET-VK][ez] Fix undefined behaviour in ambiguous `ParamsBuffer` const…


SS-JIA Jan 2, 2025
bd59382

[ET-VK] Create Pipeline layouts with push constant ranges when required


SS-JIA Jan 2, 2025
f1c5e51

[ET-VK] Fix metadata UBO VVL warnings


SS-JIA Jan 2, 2025
ccda565

Merge branch 'main' into gh/SS-JIA/161/orig


SS-JIA Jan 3, 2025

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


43 changes: 27 additions & 16 deletions
backends/vulkan/runtime/api/containers/Tensor.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -658,66 +658,77 @@ utils::GPUMemoryLayout vTensor::estimate_memory_layout() const {
}

const vkapi::BufferBindInfo vTensor::sizes_ubo() {
 const size_t size_per_ubo = context()->adapter_ptr()->min_ubo_alignment();
 const size_t max_ubo_size = kMaxMetadataFieldCount * size_per_ubo;
 if (!uniforms_.buffer()) {
 uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize, true);
 uniforms_ = ParamsBuffer(storage_.context_, max_ubo_size, true);
 }
 if (sizes_uniform_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 (uniforms_size_ + size_per_ubo) <= max_ubo_size,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 sizes_uniform_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_size_ += size_per_ubo;
 uniforms_.update(utils::make_whcn_ivec4(sizes_), sizes_uniform_offset_);
 }
 return vkapi::BufferBindInfo(uniforms_.buffer(), sizes_uniform_offset_);
 return vkapi::BufferBindInfo(
 uniforms_.buffer(), sizes_uniform_offset_, size_per_ubo);
}

const vkapi::BufferBindInfo vTensor::strides_ubo() {
 const size_t size_per_ubo = context()->adapter_ptr()->min_ubo_alignment();
 const size_t max_ubo_size = kMaxMetadataFieldCount * size_per_ubo;
 if (!uniforms_.buffer()) {
 uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize, true);
 uniforms_ = ParamsBuffer(storage_.context_, max_ubo_size, true);
 }
 if (unsqueezed_strides_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 (uniforms_size_ + size_per_ubo) <= max_ubo_size,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 unsqueezed_strides_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_size_ += size_per_ubo;
 uniforms_.update(
 utils::make_whcn_ivec4(unsqueezed_strides_),
 unsqueezed_strides_offset_);
 }
 return vkapi::BufferBindInfo(uniforms_.buffer(), unsqueezed_strides_offset_);
 return vkapi::BufferBindInfo(
 uniforms_.buffer(), unsqueezed_strides_offset_, size_per_ubo);
}

const vkapi::BufferBindInfo vTensor::logical_limits_ubo() {
 const size_t size_per_ubo = context()->adapter_ptr()->min_ubo_alignment();
 const size_t max_ubo_size = kMaxMetadataFieldCount * size_per_ubo;
 if (!uniforms_.buffer()) {
 uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize, true);
 uniforms_ = ParamsBuffer(storage_.context_, max_ubo_size, true);
 }
 if (logical_limits_uniform_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 (uniforms_size_ + size_per_ubo) <= max_ubo_size,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 logical_limits_uniform_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_size_ += size_per_ubo;
 uniforms_.update(logical_limits(), logical_limits_uniform_offset_);
 }
 return vkapi::BufferBindInfo(
 uniforms_.buffer(), logical_limits_uniform_offset_);
 uniforms_.buffer(), logical_limits_uniform_offset_, size_per_ubo);
}

const vkapi::BufferBindInfo vTensor::numel_ubo() {
 const size_t size_per_ubo = context()->adapter_ptr()->min_ubo_alignment();
 const size_t max_ubo_size = kMaxMetadataFieldCount * size_per_ubo;
 if (!uniforms_.buffer()) {
 uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize, true);
 uniforms_ = ParamsBuffer(storage_.context_, max_ubo_size, true);
 }
 if (numel_uniform_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 (uniforms_size_ + size_per_ubo) <= max_ubo_size,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 numel_uniform_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_size_ += size_per_ubo;
 uniforms_.update(numel(), numel_uniform_offset_);
 }
 return vkapi::BufferBindInfo(uniforms_.buffer(), numel_uniform_offset_);
 return vkapi::BufferBindInfo(
 uniforms_.buffer(), numel_uniform_offset_, size_per_ubo);
}

size_t vTensor::staging_buffer_numel() const {
Expand Down

17 changes: 7 additions & 10 deletions
backends/vulkan/runtime/api/containers/Tensor.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -348,16 +348,13 @@ class vTensor final {
 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;
 // Maximum number of metadata fields that can be stored in the metadata UBO.
 // This is used to calculate the size of the UBO that should be allocated.
 constexpr static size_t kMaxMetadataFieldCount = 4;

 // Initial value of uniform buffer offsets. 1 is selected as it is essentially
 // impossible for a ubo to have an offset of 1.
 constexpr static uint32_t kUniformOffsetUnset = 1;

 vTensorStorage storage_;

Expand Down

4 changes: 4 additions & 0 deletions
backends/vulkan/runtime/vk_api/Adapter.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -207,6 +207,10 @@ class Adapter final {
 return supports_8bit_storage_buffers() && supports_int8_shader_types();
 }

 inline size_t min_ubo_alignment() const {
 return physical_device_.min_ubo_alignment;
 }

 // Command Buffer Submission

 void
Expand Down

12 changes: 11 additions & 1 deletion
backends/vulkan/runtime/vk_api/Descriptor.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,17 @@ BufferBindInfo::BufferBindInfo(
 const uint32_t offset_p)
 : handle(buffer_p.handle()),
 offset(buffer_p.mem_offset() + offset_p),
 range(buffer_p.mem_range()) {}
 range(buffer_p.mem_range() - offset_p) {}

BufferBindInfo::BufferBindInfo(
 const VulkanBuffer& buffer_p,
 const uint32_t offset_p,
 const uint32_t range_p)
 : handle(buffer_p.handle()),
 offset(buffer_p.mem_offset() + offset_p),
 range(range_p) {
 VK_CHECK_COND(range_p <= (buffer_p.mem_range() - offset_p));
}

//
// ParamsBindList
Expand Down

4 changes: 4 additions & 0 deletions
backends/vulkan/runtime/vk_api/Descriptor.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,10 @@ struct BufferBindInfo final {

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

struct ParamsBindList final {
Expand Down

11 changes: 9 additions & 2 deletions
backends/vulkan/runtime/vk_api/Device.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,10 +39,17 @@ PhysicalDevice::PhysicalDevice(VkPhysicalDevice physical_device_handle)
 num_compute_queues(0),
 supports_int16_shader_types(false),
 has_unified_memory(false),
 has_timestamps(properties.limits.timestampComputeAndGraphics),
 timestamp_period(properties.limits.timestampPeriod) {
 has_timestamps(false),
 timestamp_period(0),
 min_ubo_alignment(0) {
 // Extract physical device properties
 vkGetPhysicalDeviceProperties(handle, &properties);

 // Extract fields of interest
 has_timestamps = properties.limits.timestampComputeAndGraphics;
 timestamp_period = properties.limits.timestampPeriod;
 min_ubo_alignment = properties.limits.minUniformBufferOffsetAlignment;

 vkGetPhysicalDeviceMemoryProperties(handle, &memory_properties);

 VkPhysicalDeviceFeatures2 features2{
Expand Down

1 change: 1 addition & 0 deletions
backends/vulkan/runtime/vk_api/Device.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,7 @@ struct PhysicalDevice final {
 bool has_unified_memory;
 bool has_timestamps;
 float timestamp_period;
 size_t min_ubo_alignment;

 explicit PhysicalDevice(VkPhysicalDevice);
};
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] Fix metadata UBO VVL warnings#7484

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

SS-JIA
merged 4 commits into

from

Jan 3, 2025
 Merged


[ET-VK] Fix metadata UBO VVL warnings
#7484
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
f658a42

[ET-VK][ez] Fix undefined behaviour in ambiguous `ParamsBuffer` const…


SS-JIA Jan 2, 2025
bd59382

[ET-VK] Create Pipeline layouts with push constant ranges when required


SS-JIA Jan 2, 2025
f1c5e51

[ET-VK] Fix metadata UBO VVL warnings


SS-JIA Jan 2, 2025
ccda565

Merge branch 'main' into gh/SS-JIA/161/orig


SS-JIA Jan 3, 2025

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


43 changes: 27 additions & 16 deletions
backends/vulkan/runtime/api/containers/Tensor.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -658,66 +658,77 @@ utils::GPUMemoryLayout vTensor::estimate_memory_layout() const {
}

const vkapi::BufferBindInfo vTensor::sizes_ubo() {
 const size_t size_per_ubo = context()->adapter_ptr()->min_ubo_alignment();
 const size_t max_ubo_size = kMaxMetadataFieldCount * size_per_ubo;
 if (!uniforms_.buffer()) {
 uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize, true);
 uniforms_ = ParamsBuffer(storage_.context_, max_ubo_size, true);
 }
 if (sizes_uniform_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 (uniforms_size_ + size_per_ubo) <= max_ubo_size,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 sizes_uniform_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_size_ += size_per_ubo;
 uniforms_.update(utils::make_whcn_ivec4(sizes_), sizes_uniform_offset_);
 }
 return vkapi::BufferBindInfo(uniforms_.buffer(), sizes_uniform_offset_);
 return vkapi::BufferBindInfo(
 uniforms_.buffer(), sizes_uniform_offset_, size_per_ubo);
}

const vkapi::BufferBindInfo vTensor::strides_ubo() {
 const size_t size_per_ubo = context()->adapter_ptr()->min_ubo_alignment();
 const size_t max_ubo_size = kMaxMetadataFieldCount * size_per_ubo;
 if (!uniforms_.buffer()) {
 uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize, true);
 uniforms_ = ParamsBuffer(storage_.context_, max_ubo_size, true);
 }
 if (unsqueezed_strides_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 (uniforms_size_ + size_per_ubo) <= max_ubo_size,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 unsqueezed_strides_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_size_ += size_per_ubo;
 uniforms_.update(
 utils::make_whcn_ivec4(unsqueezed_strides_),
 unsqueezed_strides_offset_);
 }
 return vkapi::BufferBindInfo(uniforms_.buffer(), unsqueezed_strides_offset_);
 return vkapi::BufferBindInfo(
 uniforms_.buffer(), unsqueezed_strides_offset_, size_per_ubo);
}

const vkapi::BufferBindInfo vTensor::logical_limits_ubo() {
 const size_t size_per_ubo = context()->adapter_ptr()->min_ubo_alignment();
 const size_t max_ubo_size = kMaxMetadataFieldCount * size_per_ubo;
 if (!uniforms_.buffer()) {
 uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize, true);
 uniforms_ = ParamsBuffer(storage_.context_, max_ubo_size, true);
 }
 if (logical_limits_uniform_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 (uniforms_size_ + size_per_ubo) <= max_ubo_size,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 logical_limits_uniform_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_size_ += size_per_ubo;
 uniforms_.update(logical_limits(), logical_limits_uniform_offset_);
 }
 return vkapi::BufferBindInfo(
 uniforms_.buffer(), logical_limits_uniform_offset_);
 uniforms_.buffer(), logical_limits_uniform_offset_, size_per_ubo);
}

const vkapi::BufferBindInfo vTensor::numel_ubo() {
 const size_t size_per_ubo = context()->adapter_ptr()->min_ubo_alignment();
 const size_t max_ubo_size = kMaxMetadataFieldCount * size_per_ubo;
 if (!uniforms_.buffer()) {
 uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize, true);
 uniforms_ = ParamsBuffer(storage_.context_, max_ubo_size, true);
 }
 if (numel_uniform_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 (uniforms_size_ + size_per_ubo) <= max_ubo_size,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 numel_uniform_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_size_ += size_per_ubo;
 uniforms_.update(numel(), numel_uniform_offset_);
 }
 return vkapi::BufferBindInfo(uniforms_.buffer(), numel_uniform_offset_);
 return vkapi::BufferBindInfo(
 uniforms_.buffer(), numel_uniform_offset_, size_per_ubo);
}

size_t vTensor::staging_buffer_numel() const {
Expand Down

17 changes: 7 additions & 10 deletions
backends/vulkan/runtime/api/containers/Tensor.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -348,16 +348,13 @@ class vTensor final {
 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;
 // Maximum number of metadata fields that can be stored in the metadata UBO.
 // This is used to calculate the size of the UBO that should be allocated.
 constexpr static size_t kMaxMetadataFieldCount = 4;

 // Initial value of uniform buffer offsets. 1 is selected as it is essentially
 // impossible for a ubo to have an offset of 1.
 constexpr static uint32_t kUniformOffsetUnset = 1;

 vTensorStorage storage_;

Expand Down

4 changes: 4 additions & 0 deletions
backends/vulkan/runtime/vk_api/Adapter.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -207,6 +207,10 @@ class Adapter final {
 return supports_8bit_storage_buffers() && supports_int8_shader_types();
 }

 inline size_t min_ubo_alignment() const {
 return physical_device_.min_ubo_alignment;
 }

 // Command Buffer Submission

 void
Expand Down

12 changes: 11 additions & 1 deletion
backends/vulkan/runtime/vk_api/Descriptor.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,17 @@ BufferBindInfo::BufferBindInfo(
 const uint32_t offset_p)
 : handle(buffer_p.handle()),
 offset(buffer_p.mem_offset() + offset_p),
 range(buffer_p.mem_range()) {}
 range(buffer_p.mem_range() - offset_p) {}

BufferBindInfo::BufferBindInfo(
 const VulkanBuffer& buffer_p,
 const uint32_t offset_p,
 const uint32_t range_p)
 : handle(buffer_p.handle()),
 offset(buffer_p.mem_offset() + offset_p),
 range(range_p) {
 VK_CHECK_COND(range_p <= (buffer_p.mem_range() - offset_p));
}

//
// ParamsBindList
Expand Down

4 changes: 4 additions & 0 deletions
backends/vulkan/runtime/vk_api/Descriptor.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,10 @@ struct BufferBindInfo final {

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

struct ParamsBindList final {
Expand Down

11 changes: 9 additions & 2 deletions
backends/vulkan/runtime/vk_api/Device.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,10 +39,17 @@ PhysicalDevice::PhysicalDevice(VkPhysicalDevice physical_device_handle)
 num_compute_queues(0),
 supports_int16_shader_types(false),
 has_unified_memory(false),
 has_timestamps(properties.limits.timestampComputeAndGraphics),
 timestamp_period(properties.limits.timestampPeriod) {
 has_timestamps(false),
 timestamp_period(0),
 min_ubo_alignment(0) {
 // Extract physical device properties
 vkGetPhysicalDeviceProperties(handle, &properties);

 // Extract fields of interest
 has_timestamps = properties.limits.timestampComputeAndGraphics;
 timestamp_period = properties.limits.timestampPeriod;
 min_ubo_alignment = properties.limits.minUniformBufferOffsetAlignment;

 vkGetPhysicalDeviceMemoryProperties(handle, &memory_properties);

 VkPhysicalDeviceFeatures2 features2{
Expand Down

1 change: 1 addition & 0 deletions
backends/vulkan/runtime/vk_api/Device.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,7 @@ struct PhysicalDevice final {
 bool has_unified_memory;
 bool has_timestamps;
 float timestamp_period;
 size_t min_ubo_alignment;

 explicit PhysicalDevice(VkPhysicalDevice);
};
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] Fix metadata UBO VVL warnings#7484

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

SS-JIA
merged 4 commits into

from

Jan 3, 2025
 Merged


[ET-VK] Fix metadata UBO VVL warnings
#7484
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
f658a42

[ET-VK][ez] Fix undefined behaviour in ambiguous `ParamsBuffer` const…


SS-JIA Jan 2, 2025
bd59382

[ET-VK] Create Pipeline layouts with push constant ranges when required


SS-JIA Jan 2, 2025
f1c5e51

[ET-VK] Fix metadata UBO VVL warnings


SS-JIA Jan 2, 2025
ccda565

Merge branch 'main' into gh/SS-JIA/161/orig


SS-JIA Jan 3, 2025

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


43 changes: 27 additions & 16 deletions
backends/vulkan/runtime/api/containers/Tensor.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -658,66 +658,77 @@ utils::GPUMemoryLayout vTensor::estimate_memory_layout() const {
}

const vkapi::BufferBindInfo vTensor::sizes_ubo() {
 const size_t size_per_ubo = context()->adapter_ptr()->min_ubo_alignment();
 const size_t max_ubo_size = kMaxMetadataFieldCount * size_per_ubo;
 if (!uniforms_.buffer()) {
 uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize, true);
 uniforms_ = ParamsBuffer(storage_.context_, max_ubo_size, true);
 }
 if (sizes_uniform_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 (uniforms_size_ + size_per_ubo) <= max_ubo_size,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 sizes_uniform_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_size_ += size_per_ubo;
 uniforms_.update(utils::make_whcn_ivec4(sizes_), sizes_uniform_offset_);
 }
 return vkapi::BufferBindInfo(uniforms_.buffer(), sizes_uniform_offset_);
 return vkapi::BufferBindInfo(
 uniforms_.buffer(), sizes_uniform_offset_, size_per_ubo);
}

const vkapi::BufferBindInfo vTensor::strides_ubo() {
 const size_t size_per_ubo = context()->adapter_ptr()->min_ubo_alignment();
 const size_t max_ubo_size = kMaxMetadataFieldCount * size_per_ubo;
 if (!uniforms_.buffer()) {
 uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize, true);
 uniforms_ = ParamsBuffer(storage_.context_, max_ubo_size, true);
 }
 if (unsqueezed_strides_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 (uniforms_size_ + size_per_ubo) <= max_ubo_size,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 unsqueezed_strides_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_size_ += size_per_ubo;
 uniforms_.update(
 utils::make_whcn_ivec4(unsqueezed_strides_),
 unsqueezed_strides_offset_);
 }
 return vkapi::BufferBindInfo(uniforms_.buffer(), unsqueezed_strides_offset_);
 return vkapi::BufferBindInfo(
 uniforms_.buffer(), unsqueezed_strides_offset_, size_per_ubo);
}

const vkapi::BufferBindInfo vTensor::logical_limits_ubo() {
 const size_t size_per_ubo = context()->adapter_ptr()->min_ubo_alignment();
 const size_t max_ubo_size = kMaxMetadataFieldCount * size_per_ubo;
 if (!uniforms_.buffer()) {
 uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize, true);
 uniforms_ = ParamsBuffer(storage_.context_, max_ubo_size, true);
 }
 if (logical_limits_uniform_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 (uniforms_size_ + size_per_ubo) <= max_ubo_size,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 logical_limits_uniform_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_size_ += size_per_ubo;
 uniforms_.update(logical_limits(), logical_limits_uniform_offset_);
 }
 return vkapi::BufferBindInfo(
 uniforms_.buffer(), logical_limits_uniform_offset_);
 uniforms_.buffer(), logical_limits_uniform_offset_, size_per_ubo);
}

const vkapi::BufferBindInfo vTensor::numel_ubo() {
 const size_t size_per_ubo = context()->adapter_ptr()->min_ubo_alignment();
 const size_t max_ubo_size = kMaxMetadataFieldCount * size_per_ubo;
 if (!uniforms_.buffer()) {
 uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize, true);
 uniforms_ = ParamsBuffer(storage_.context_, max_ubo_size, true);
 }
 if (numel_uniform_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 (uniforms_size_ + size_per_ubo) <= max_ubo_size,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 numel_uniform_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_size_ += size_per_ubo;
 uniforms_.update(numel(), numel_uniform_offset_);
 }
 return vkapi::BufferBindInfo(uniforms_.buffer(), numel_uniform_offset_);
 return vkapi::BufferBindInfo(
 uniforms_.buffer(), numel_uniform_offset_, size_per_ubo);
}

size_t vTensor::staging_buffer_numel() const {
Expand Down

17 changes: 7 additions & 10 deletions
backends/vulkan/runtime/api/containers/Tensor.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -348,16 +348,13 @@ class vTensor final {
 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;
 // Maximum number of metadata fields that can be stored in the metadata UBO.
 // This is used to calculate the size of the UBO that should be allocated.
 constexpr static size_t kMaxMetadataFieldCount = 4;

 // Initial value of uniform buffer offsets. 1 is selected as it is essentially
 // impossible for a ubo to have an offset of 1.
 constexpr static uint32_t kUniformOffsetUnset = 1;

 vTensorStorage storage_;

Expand Down

4 changes: 4 additions & 0 deletions
backends/vulkan/runtime/vk_api/Adapter.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -207,6 +207,10 @@ class Adapter final {
 return supports_8bit_storage_buffers() && supports_int8_shader_types();
 }

 inline size_t min_ubo_alignment() const {
 return physical_device_.min_ubo_alignment;
 }

 // Command Buffer Submission

 void
Expand Down

12 changes: 11 additions & 1 deletion
backends/vulkan/runtime/vk_api/Descriptor.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,17 @@ BufferBindInfo::BufferBindInfo(
 const uint32_t offset_p)
 : handle(buffer_p.handle()),
 offset(buffer_p.mem_offset() + offset_p),
 range(buffer_p.mem_range()) {}
 range(buffer_p.mem_range() - offset_p) {}

BufferBindInfo::BufferBindInfo(
 const VulkanBuffer& buffer_p,
 const uint32_t offset_p,
 const uint32_t range_p)
 : handle(buffer_p.handle()),
 offset(buffer_p.mem_offset() + offset_p),
 range(range_p) {
 VK_CHECK_COND(range_p <= (buffer_p.mem_range() - offset_p));
}

//
// ParamsBindList
Expand Down

4 changes: 4 additions & 0 deletions
backends/vulkan/runtime/vk_api/Descriptor.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,10 @@ struct BufferBindInfo final {

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

struct ParamsBindList final {
Expand Down

11 changes: 9 additions & 2 deletions
backends/vulkan/runtime/vk_api/Device.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,10 +39,17 @@ PhysicalDevice::PhysicalDevice(VkPhysicalDevice physical_device_handle)
 num_compute_queues(0),
 supports_int16_shader_types(false),
 has_unified_memory(false),
 has_timestamps(properties.limits.timestampComputeAndGraphics),
 timestamp_period(properties.limits.timestampPeriod) {
 has_timestamps(false),
 timestamp_period(0),
 min_ubo_alignment(0) {
 // Extract physical device properties
 vkGetPhysicalDeviceProperties(handle, &properties);

 // Extract fields of interest
 has_timestamps = properties.limits.timestampComputeAndGraphics;
 timestamp_period = properties.limits.timestampPeriod;
 min_ubo_alignment = properties.limits.minUniformBufferOffsetAlignment;

 vkGetPhysicalDeviceMemoryProperties(handle, &memory_properties);

 VkPhysicalDeviceFeatures2 features2{
Expand Down

1 change: 1 addition & 0 deletions
backends/vulkan/runtime/vk_api/Device.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,7 @@ struct PhysicalDevice final {
 bool has_unified_memory;
 bool has_timestamps;
 float timestamp_period;
 size_t min_ubo_alignment;

 explicit PhysicalDevice(VkPhysicalDevice);
};
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] Fix metadata UBO VVL warnings#7484

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

SS-JIA
merged 4 commits into

from

Jan 3, 2025
 Merged


[ET-VK] Fix metadata UBO VVL warnings
#7484
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
f658a42

[ET-VK][ez] Fix undefined behaviour in ambiguous `ParamsBuffer` const…


SS-JIA Jan 2, 2025
bd59382

[ET-VK] Create Pipeline layouts with push constant ranges when required


SS-JIA Jan 2, 2025
f1c5e51

[ET-VK] Fix metadata UBO VVL warnings


SS-JIA Jan 2, 2025
ccda565

Merge branch 'main' into gh/SS-JIA/161/orig


SS-JIA Jan 3, 2025

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


43 changes: 27 additions & 16 deletions
backends/vulkan/runtime/api/containers/Tensor.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -658,66 +658,77 @@ utils::GPUMemoryLayout vTensor::estimate_memory_layout() const {
}

const vkapi::BufferBindInfo vTensor::sizes_ubo() {
 const size_t size_per_ubo = context()->adapter_ptr()->min_ubo_alignment();
 const size_t max_ubo_size = kMaxMetadataFieldCount * size_per_ubo;
 if (!uniforms_.buffer()) {
 uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize, true);
 uniforms_ = ParamsBuffer(storage_.context_, max_ubo_size, true);
 }
 if (sizes_uniform_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 (uniforms_size_ + size_per_ubo) <= max_ubo_size,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 sizes_uniform_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_size_ += size_per_ubo;
 uniforms_.update(utils::make_whcn_ivec4(sizes_), sizes_uniform_offset_);
 }
 return vkapi::BufferBindInfo(uniforms_.buffer(), sizes_uniform_offset_);
 return vkapi::BufferBindInfo(
 uniforms_.buffer(), sizes_uniform_offset_, size_per_ubo);
}

const vkapi::BufferBindInfo vTensor::strides_ubo() {
 const size_t size_per_ubo = context()->adapter_ptr()->min_ubo_alignment();
 const size_t max_ubo_size = kMaxMetadataFieldCount * size_per_ubo;
 if (!uniforms_.buffer()) {
 uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize, true);
 uniforms_ = ParamsBuffer(storage_.context_, max_ubo_size, true);
 }
 if (unsqueezed_strides_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 (uniforms_size_ + size_per_ubo) <= max_ubo_size,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 unsqueezed_strides_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_size_ += size_per_ubo;
 uniforms_.update(
 utils::make_whcn_ivec4(unsqueezed_strides_),
 unsqueezed_strides_offset_);
 }
 return vkapi::BufferBindInfo(uniforms_.buffer(), unsqueezed_strides_offset_);
 return vkapi::BufferBindInfo(
 uniforms_.buffer(), unsqueezed_strides_offset_, size_per_ubo);
}

const vkapi::BufferBindInfo vTensor::logical_limits_ubo() {
 const size_t size_per_ubo = context()->adapter_ptr()->min_ubo_alignment();
 const size_t max_ubo_size = kMaxMetadataFieldCount * size_per_ubo;
 if (!uniforms_.buffer()) {
 uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize, true);
 uniforms_ = ParamsBuffer(storage_.context_, max_ubo_size, true);
 }
 if (logical_limits_uniform_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 (uniforms_size_ + size_per_ubo) <= max_ubo_size,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 logical_limits_uniform_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_size_ += size_per_ubo;
 uniforms_.update(logical_limits(), logical_limits_uniform_offset_);
 }
 return vkapi::BufferBindInfo(
 uniforms_.buffer(), logical_limits_uniform_offset_);
 uniforms_.buffer(), logical_limits_uniform_offset_, size_per_ubo);
}

const vkapi::BufferBindInfo vTensor::numel_ubo() {
 const size_t size_per_ubo = context()->adapter_ptr()->min_ubo_alignment();
 const size_t max_ubo_size = kMaxMetadataFieldCount * size_per_ubo;
 if (!uniforms_.buffer()) {
 uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize, true);
 uniforms_ = ParamsBuffer(storage_.context_, max_ubo_size, true);
 }
 if (numel_uniform_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 (uniforms_size_ + size_per_ubo) <= max_ubo_size,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 numel_uniform_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_size_ += size_per_ubo;
 uniforms_.update(numel(), numel_uniform_offset_);
 }
 return vkapi::BufferBindInfo(uniforms_.buffer(), numel_uniform_offset_);
 return vkapi::BufferBindInfo(
 uniforms_.buffer(), numel_uniform_offset_, size_per_ubo);
}

size_t vTensor::staging_buffer_numel() const {
Expand Down

17 changes: 7 additions & 10 deletions
backends/vulkan/runtime/api/containers/Tensor.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -348,16 +348,13 @@ class vTensor final {
 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;
 // Maximum number of metadata fields that can be stored in the metadata UBO.
 // This is used to calculate the size of the UBO that should be allocated.
 constexpr static size_t kMaxMetadataFieldCount = 4;

 // Initial value of uniform buffer offsets. 1 is selected as it is essentially
 // impossible for a ubo to have an offset of 1.
 constexpr static uint32_t kUniformOffsetUnset = 1;

 vTensorStorage storage_;

Expand Down

4 changes: 4 additions & 0 deletions
backends/vulkan/runtime/vk_api/Adapter.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -207,6 +207,10 @@ class Adapter final {
 return supports_8bit_storage_buffers() && supports_int8_shader_types();
 }

 inline size_t min_ubo_alignment() const {
 return physical_device_.min_ubo_alignment;
 }

 // Command Buffer Submission

 void
Expand Down

12 changes: 11 additions & 1 deletion
backends/vulkan/runtime/vk_api/Descriptor.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,17 @@ BufferBindInfo::BufferBindInfo(
 const uint32_t offset_p)
 : handle(buffer_p.handle()),
 offset(buffer_p.mem_offset() + offset_p),
 range(buffer_p.mem_range()) {}
 range(buffer_p.mem_range() - offset_p) {}

BufferBindInfo::BufferBindInfo(
 const VulkanBuffer& buffer_p,
 const uint32_t offset_p,
 const uint32_t range_p)
 : handle(buffer_p.handle()),
 offset(buffer_p.mem_offset() + offset_p),
 range(range_p) {
 VK_CHECK_COND(range_p <= (buffer_p.mem_range() - offset_p));
}

//
// ParamsBindList
Expand Down

4 changes: 4 additions & 0 deletions
backends/vulkan/runtime/vk_api/Descriptor.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,10 @@ struct BufferBindInfo final {

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

struct ParamsBindList final {
Expand Down

11 changes: 9 additions & 2 deletions
backends/vulkan/runtime/vk_api/Device.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,10 +39,17 @@ PhysicalDevice::PhysicalDevice(VkPhysicalDevice physical_device_handle)
 num_compute_queues(0),
 supports_int16_shader_types(false),
 has_unified_memory(false),
 has_timestamps(properties.limits.timestampComputeAndGraphics),
 timestamp_period(properties.limits.timestampPeriod) {
 has_timestamps(false),
 timestamp_period(0),
 min_ubo_alignment(0) {
 // Extract physical device properties
 vkGetPhysicalDeviceProperties(handle, &properties);

 // Extract fields of interest
 has_timestamps = properties.limits.timestampComputeAndGraphics;
 timestamp_period = properties.limits.timestampPeriod;
 min_ubo_alignment = properties.limits.minUniformBufferOffsetAlignment;

 vkGetPhysicalDeviceMemoryProperties(handle, &memory_properties);

 VkPhysicalDeviceFeatures2 features2{
Expand Down

1 change: 1 addition & 0 deletions
backends/vulkan/runtime/vk_api/Device.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,7 @@ struct PhysicalDevice final {
 bool has_unified_memory;
 bool has_timestamps;
 float timestamp_period;
 size_t min_ubo_alignment;

 explicit PhysicalDevice(VkPhysicalDevice);
};
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] Fix metadata UBO VVL warnings#7484

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

SS-JIA
merged 4 commits into

from

Jan 3, 2025
 Merged


[ET-VK] Fix metadata UBO VVL warnings
#7484
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
f658a42

[ET-VK][ez] Fix undefined behaviour in ambiguous `ParamsBuffer` const…


SS-JIA Jan 2, 2025
bd59382

[ET-VK] Create Pipeline layouts with push constant ranges when required


SS-JIA Jan 2, 2025
f1c5e51

[ET-VK] Fix metadata UBO VVL warnings


SS-JIA Jan 2, 2025
ccda565

Merge branch 'main' into gh/SS-JIA/161/orig


SS-JIA Jan 3, 2025

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


43 changes: 27 additions & 16 deletions
backends/vulkan/runtime/api/containers/Tensor.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -658,66 +658,77 @@ utils::GPUMemoryLayout vTensor::estimate_memory_layout() const {
}

const vkapi::BufferBindInfo vTensor::sizes_ubo() {
 const size_t size_per_ubo = context()->adapter_ptr()->min_ubo_alignment();
 const size_t max_ubo_size = kMaxMetadataFieldCount * size_per_ubo;
 if (!uniforms_.buffer()) {
 uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize, true);
 uniforms_ = ParamsBuffer(storage_.context_, max_ubo_size, true);
 }
 if (sizes_uniform_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 (uniforms_size_ + size_per_ubo) <= max_ubo_size,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 sizes_uniform_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_size_ += size_per_ubo;
 uniforms_.update(utils::make_whcn_ivec4(sizes_), sizes_uniform_offset_);
 }
 return vkapi::BufferBindInfo(uniforms_.buffer(), sizes_uniform_offset_);
 return vkapi::BufferBindInfo(
 uniforms_.buffer(), sizes_uniform_offset_, size_per_ubo);
}

const vkapi::BufferBindInfo vTensor::strides_ubo() {
 const size_t size_per_ubo = context()->adapter_ptr()->min_ubo_alignment();
 const size_t max_ubo_size = kMaxMetadataFieldCount * size_per_ubo;
 if (!uniforms_.buffer()) {
 uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize, true);
 uniforms_ = ParamsBuffer(storage_.context_, max_ubo_size, true);
 }
 if (unsqueezed_strides_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 (uniforms_size_ + size_per_ubo) <= max_ubo_size,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 unsqueezed_strides_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_size_ += size_per_ubo;
 uniforms_.update(
 utils::make_whcn_ivec4(unsqueezed_strides_),
 unsqueezed_strides_offset_);
 }
 return vkapi::BufferBindInfo(uniforms_.buffer(), unsqueezed_strides_offset_);
 return vkapi::BufferBindInfo(
 uniforms_.buffer(), unsqueezed_strides_offset_, size_per_ubo);
}

const vkapi::BufferBindInfo vTensor::logical_limits_ubo() {
 const size_t size_per_ubo = context()->adapter_ptr()->min_ubo_alignment();
 const size_t max_ubo_size = kMaxMetadataFieldCount * size_per_ubo;
 if (!uniforms_.buffer()) {
 uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize, true);
 uniforms_ = ParamsBuffer(storage_.context_, max_ubo_size, true);
 }
 if (logical_limits_uniform_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 (uniforms_size_ + size_per_ubo) <= max_ubo_size,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 logical_limits_uniform_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_size_ += size_per_ubo;
 uniforms_.update(logical_limits(), logical_limits_uniform_offset_);
 }
 return vkapi::BufferBindInfo(
 uniforms_.buffer(), logical_limits_uniform_offset_);
 uniforms_.buffer(), logical_limits_uniform_offset_, size_per_ubo);
}

const vkapi::BufferBindInfo vTensor::numel_ubo() {
 const size_t size_per_ubo = context()->adapter_ptr()->min_ubo_alignment();
 const size_t max_ubo_size = kMaxMetadataFieldCount * size_per_ubo;
 if (!uniforms_.buffer()) {
 uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize, true);
 uniforms_ = ParamsBuffer(storage_.context_, max_ubo_size, true);
 }
 if (numel_uniform_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 (uniforms_size_ + size_per_ubo) <= max_ubo_size,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 numel_uniform_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_size_ += size_per_ubo;
 uniforms_.update(numel(), numel_uniform_offset_);
 }
 return vkapi::BufferBindInfo(uniforms_.buffer(), numel_uniform_offset_);
 return vkapi::BufferBindInfo(
 uniforms_.buffer(), numel_uniform_offset_, size_per_ubo);
}

size_t vTensor::staging_buffer_numel() const {
Expand Down

17 changes: 7 additions & 10 deletions
backends/vulkan/runtime/api/containers/Tensor.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -348,16 +348,13 @@ class vTensor final {
 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;
 // Maximum number of metadata fields that can be stored in the metadata UBO.
 // This is used to calculate the size of the UBO that should be allocated.
 constexpr static size_t kMaxMetadataFieldCount = 4;

 // Initial value of uniform buffer offsets. 1 is selected as it is essentially
 // impossible for a ubo to have an offset of 1.
 constexpr static uint32_t kUniformOffsetUnset = 1;

 vTensorStorage storage_;

Expand Down

4 changes: 4 additions & 0 deletions
backends/vulkan/runtime/vk_api/Adapter.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -207,6 +207,10 @@ class Adapter final {
 return supports_8bit_storage_buffers() && supports_int8_shader_types();
 }

 inline size_t min_ubo_alignment() const {
 return physical_device_.min_ubo_alignment;
 }

 // Command Buffer Submission

 void
Expand Down

12 changes: 11 additions & 1 deletion
backends/vulkan/runtime/vk_api/Descriptor.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,17 @@ BufferBindInfo::BufferBindInfo(
 const uint32_t offset_p)
 : handle(buffer_p.handle()),
 offset(buffer_p.mem_offset() + offset_p),
 range(buffer_p.mem_range()) {}
 range(buffer_p.mem_range() - offset_p) {}

BufferBindInfo::BufferBindInfo(
 const VulkanBuffer& buffer_p,
 const uint32_t offset_p,
 const uint32_t range_p)
 : handle(buffer_p.handle()),
 offset(buffer_p.mem_offset() + offset_p),
 range(range_p) {
 VK_CHECK_COND(range_p <= (buffer_p.mem_range() - offset_p));
}

//
// ParamsBindList
Expand Down

4 changes: 4 additions & 0 deletions
backends/vulkan/runtime/vk_api/Descriptor.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,10 @@ struct BufferBindInfo final {

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

struct ParamsBindList final {
Expand Down

11 changes: 9 additions & 2 deletions
backends/vulkan/runtime/vk_api/Device.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,10 +39,17 @@ PhysicalDevice::PhysicalDevice(VkPhysicalDevice physical_device_handle)
 num_compute_queues(0),
 supports_int16_shader_types(false),
 has_unified_memory(false),
 has_timestamps(properties.limits.timestampComputeAndGraphics),
 timestamp_period(properties.limits.timestampPeriod) {
 has_timestamps(false),
 timestamp_period(0),
 min_ubo_alignment(0) {
 // Extract physical device properties
 vkGetPhysicalDeviceProperties(handle, &properties);

 // Extract fields of interest
 has_timestamps = properties.limits.timestampComputeAndGraphics;
 timestamp_period = properties.limits.timestampPeriod;
 min_ubo_alignment = properties.limits.minUniformBufferOffsetAlignment;

 vkGetPhysicalDeviceMemoryProperties(handle, &memory_properties);

 VkPhysicalDeviceFeatures2 features2{
Expand Down

1 change: 1 addition & 0 deletions
backends/vulkan/runtime/vk_api/Device.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,7 @@ struct PhysicalDevice final {
 bool has_unified_memory;
 bool has_timestamps;
 float timestamp_period;
 size_t min_ubo_alignment;

 explicit PhysicalDevice(VkPhysicalDevice);
};
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] Fix metadata UBO VVL warnings#7484

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

SS-JIA
merged 4 commits into

from

Jan 3, 2025
 Merged


[ET-VK] Fix metadata UBO VVL warnings
#7484
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
f658a42

[ET-VK][ez] Fix undefined behaviour in ambiguous `ParamsBuffer` const…


SS-JIA Jan 2, 2025
bd59382

[ET-VK] Create Pipeline layouts with push constant ranges when required


SS-JIA Jan 2, 2025
f1c5e51

[ET-VK] Fix metadata UBO VVL warnings


SS-JIA Jan 2, 2025
ccda565

Merge branch 'main' into gh/SS-JIA/161/orig


SS-JIA Jan 3, 2025

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


43 changes: 27 additions & 16 deletions
backends/vulkan/runtime/api/containers/Tensor.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -658,66 +658,77 @@ utils::GPUMemoryLayout vTensor::estimate_memory_layout() const {
}

const vkapi::BufferBindInfo vTensor::sizes_ubo() {
 const size_t size_per_ubo = context()->adapter_ptr()->min_ubo_alignment();
 const size_t max_ubo_size = kMaxMetadataFieldCount * size_per_ubo;
 if (!uniforms_.buffer()) {
 uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize, true);
 uniforms_ = ParamsBuffer(storage_.context_, max_ubo_size, true);
 }
 if (sizes_uniform_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 (uniforms_size_ + size_per_ubo) <= max_ubo_size,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 sizes_uniform_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_size_ += size_per_ubo;
 uniforms_.update(utils::make_whcn_ivec4(sizes_), sizes_uniform_offset_);
 }
 return vkapi::BufferBindInfo(uniforms_.buffer(), sizes_uniform_offset_);
 return vkapi::BufferBindInfo(
 uniforms_.buffer(), sizes_uniform_offset_, size_per_ubo);
}

const vkapi::BufferBindInfo vTensor::strides_ubo() {
 const size_t size_per_ubo = context()->adapter_ptr()->min_ubo_alignment();
 const size_t max_ubo_size = kMaxMetadataFieldCount * size_per_ubo;
 if (!uniforms_.buffer()) {
 uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize, true);
 uniforms_ = ParamsBuffer(storage_.context_, max_ubo_size, true);
 }
 if (unsqueezed_strides_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 (uniforms_size_ + size_per_ubo) <= max_ubo_size,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 unsqueezed_strides_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_size_ += size_per_ubo;
 uniforms_.update(
 utils::make_whcn_ivec4(unsqueezed_strides_),
 unsqueezed_strides_offset_);
 }
 return vkapi::BufferBindInfo(uniforms_.buffer(), unsqueezed_strides_offset_);
 return vkapi::BufferBindInfo(
 uniforms_.buffer(), unsqueezed_strides_offset_, size_per_ubo);
}

const vkapi::BufferBindInfo vTensor::logical_limits_ubo() {
 const size_t size_per_ubo = context()->adapter_ptr()->min_ubo_alignment();
 const size_t max_ubo_size = kMaxMetadataFieldCount * size_per_ubo;
 if (!uniforms_.buffer()) {
 uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize, true);
 uniforms_ = ParamsBuffer(storage_.context_, max_ubo_size, true);
 }
 if (logical_limits_uniform_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 (uniforms_size_ + size_per_ubo) <= max_ubo_size,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 logical_limits_uniform_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_size_ += size_per_ubo;
 uniforms_.update(logical_limits(), logical_limits_uniform_offset_);
 }
 return vkapi::BufferBindInfo(
 uniforms_.buffer(), logical_limits_uniform_offset_);
 uniforms_.buffer(), logical_limits_uniform_offset_, size_per_ubo);
}

const vkapi::BufferBindInfo vTensor::numel_ubo() {
 const size_t size_per_ubo = context()->adapter_ptr()->min_ubo_alignment();
 const size_t max_ubo_size = kMaxMetadataFieldCount * size_per_ubo;
 if (!uniforms_.buffer()) {
 uniforms_ = ParamsBuffer(storage_.context_, kMaxUniformBufferSize, true);
 uniforms_ = ParamsBuffer(storage_.context_, max_ubo_size, true);
 }
 if (numel_uniform_offset_ == kUniformOffsetUnset) {
 VK_CHECK_COND(
 (uniforms_size_ + kSizePerUniform) <= kMaxUniformBufferSize,
 (uniforms_size_ + size_per_ubo) <= max_ubo_size,
 "Uniform data allocation has exceeded Tensor uniform buffer size");
 numel_uniform_offset_ = uniforms_size_;
 uniforms_size_ += kSizePerUniform;
 uniforms_size_ += size_per_ubo;
 uniforms_.update(numel(), numel_uniform_offset_);
 }
 return vkapi::BufferBindInfo(uniforms_.buffer(), numel_uniform_offset_);
 return vkapi::BufferBindInfo(
 uniforms_.buffer(), numel_uniform_offset_, size_per_ubo);
}

size_t vTensor::staging_buffer_numel() const {
Expand Down

17 changes: 7 additions & 10 deletions
backends/vulkan/runtime/api/containers/Tensor.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -348,16 +348,13 @@ class vTensor final {
 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;
 // Maximum number of metadata fields that can be stored in the metadata UBO.
 // This is used to calculate the size of the UBO that should be allocated.
 constexpr static size_t kMaxMetadataFieldCount = 4;

 // Initial value of uniform buffer offsets. 1 is selected as it is essentially
 // impossible for a ubo to have an offset of 1.
 constexpr static uint32_t kUniformOffsetUnset = 1;

 vTensorStorage storage_;

Expand Down

4 changes: 4 additions & 0 deletions
backends/vulkan/runtime/vk_api/Adapter.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -207,6 +207,10 @@ class Adapter final {
 return supports_8bit_storage_buffers() && supports_int8_shader_types();
 }

 inline size_t min_ubo_alignment() const {
 return physical_device_.min_ubo_alignment;
 }

 // Command Buffer Submission

 void
Expand Down

12 changes: 11 additions & 1 deletion
backends/vulkan/runtime/vk_api/Descriptor.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,17 @@ BufferBindInfo::BufferBindInfo(
 const uint32_t offset_p)
 : handle(buffer_p.handle()),
 offset(buffer_p.mem_offset() + offset_p),
 range(buffer_p.mem_range()) {}
 range(buffer_p.mem_range() - offset_p) {}

BufferBindInfo::BufferBindInfo(
 const VulkanBuffer& buffer_p,
 const uint32_t offset_p,
 const uint32_t range_p)
 : handle(buffer_p.handle()),
 offset(buffer_p.mem_offset() + offset_p),
 range(range_p) {
 VK_CHECK_COND(range_p <= (buffer_p.mem_range() - offset_p));
}

//
// ParamsBindList
Expand Down

4 changes: 4 additions & 0 deletions
backends/vulkan/runtime/vk_api/Descriptor.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,10 @@ struct BufferBindInfo final {

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

struct ParamsBindList final {
Expand Down

11 changes: 9 additions & 2 deletions
backends/vulkan/runtime/vk_api/Device.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,10 +39,17 @@ PhysicalDevice::PhysicalDevice(VkPhysicalDevice physical_device_handle)
 num_compute_queues(0),
 supports_int16_shader_types(false),
 has_unified_memory(false),
 has_timestamps(properties.limits.timestampComputeAndGraphics),
 timestamp_period(properties.limits.timestampPeriod) {
 has_timestamps(false),
 timestamp_period(0),
 min_ubo_alignment(0) {
 // Extract physical device properties
 vkGetPhysicalDeviceProperties(handle, &properties);

 // Extract fields of interest
 has_timestamps = properties.limits.timestampComputeAndGraphics;
 timestamp_period = properties.limits.timestampPeriod;
 min_ubo_alignment = properties.limits.minUniformBufferOffsetAlignment;

 vkGetPhysicalDeviceMemoryProperties(handle, &memory_properties);

 VkPhysicalDeviceFeatures2 features2{
Expand Down

1 change: 1 addition & 0 deletions
backends/vulkan/runtime/vk_api/Device.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,7 @@ struct PhysicalDevice final {
 bool has_unified_memory;
 bool has_timestamps;
 float timestamp_period;
 size_t min_ubo_alignment;

 explicit PhysicalDevice(VkPhysicalDevice);
};
Expand Down