[ET-VK] Replace Uniform buffers with push constants for copy op#7417

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 20, 2024
Merged

[ET-VK] Replace Uniform buffers with push constants for copy op #7417

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
23 changes: 11 additions & 12 deletions backends/vulkan/runtime/graph/ops/glsl/copy_channel_offset.glsl
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,17 +18,16 @@ ${layout_declare_tensor(B, "w", "t_out", DTYPE, STORAGE)}
${layout_declare_tensor(B, "r", "existing_out", DTYPE, STORAGE)}
${layout_declare_tensor(B, "r", "t_in", DTYPE, STORAGE)}

${layout_declare_ubo(B, "ivec4", "out_sizes")}
${layout_declare_ubo(B, "ivec4", "in_sizes")}

layout(set = 0, binding = 5) uniform PRECISION restrict CopyArgs {
layout(push_constant) uniform restrict Block {
ivec4 out_sizes;
ivec4 in_sizes;
// Operates on (x, y, z) logical extents.
ivec3 range;
// channel_range is stored in range.w
ivec4 range;
// Analogus to range variable in copy. It defines the # of channel being
// copied.
int channel_range;
ivec3 dst_offset;
int dst_channel_offset;
// dst channel offset is stored in dst_offset.w
ivec4 dst_offset;
int src_channel_offset;
};

Expand All@@ -47,11 +46,11 @@ void main() {
// Note: Unlike other shaders, the range is often not equal to the destination
// texture extent.
const ivec3 lpos = ivec3(gl_GlobalInvocationID);
if (any(greaterThanEqual(lpos, range))) {
if (any(greaterThanEqual(lpos, range.xyz))) {
return;
}

const ivec3 out_lpos = lpos + dst_offset;
const ivec3 out_lpos = lpos + dst_offset.xyz;

const ivec4 out_tidx = lpos_to_tidx(out_lpos, out_sizes, out_axis_map.w, packed_dim);

Expand All@@ -61,12 +60,12 @@ void main() {
ivec4 in_tidx = out_tidx;
for (int i=0; i<4; i++) {

in_tidx[packed_dim] = out_tidx[packed_dim] - dst_channel_offset + i;
in_tidx[packed_dim] = out_tidx[packed_dim] - dst_offset.w + i;

// Handle the partial update for begining of channel in an existing tensor.
// If the source channel index is below zero or exceeds the range, we skip
// updating the element to avoid overwriting existing data.
if ((in_tidx[packed_dim] < 0) || (in_tidx[packed_dim] >= channel_range)) {
if ((in_tidx[packed_dim] < 0) || (in_tidx[packed_dim] >= range.w)) {
continue;
}

Expand Down
6 changes: 5 additions & 1 deletion backends/vulkan/runtime/graph/ops/glsl/copy_offset.glsl
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,11 @@ layout(std430) buffer;
${layout_declare_tensor(B, "w", "t_out", DTYPE, STORAGE)}
${layout_declare_tensor(B, "r", "t_in", DTYPE, STORAGE)}

${layout_declare_ubo(B, "ivec3", "range", "ivec3", "src_offset", "ivec3", "dst_offset")}
layout(push_constant) uniform restrict Block {
ivec3 range;
ivec3 src_offset;
ivec3 dst_offset;
};

#include "indexing_utils.h"

Expand Down
70 changes: 33 additions & 37 deletions backends/vulkan/runtime/graph/ops/impl/Copy.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,16 +33,6 @@ void add_copy_offset_node(
add_dtype_suffix(kernel_name, *t_out);
add_storage_type_suffix(kernel_name, *t_out);

const struct Block final {
alignas(16) ivec3 range;
alignas(16) ivec3 src_offset;
alignas(16) ivec3 dst_offset;
} offset_params{
range,
src_offset,
dst_offset,
};

auto shader = VK_KERNEL_FROM_STR(kernel_name);

graph.execute_nodes().emplace_back(new DispatchNode(
Expand All@@ -56,11 +46,18 @@ void add_copy_offset_node(
{in, vkapi::kRead},
},
// Parameter buffers
{
graph.create_params_buffer(offset_params),
},
{},
// Specialization Constants
{graph.hashed_layout_of(out), graph.hashed_layout_of(in)}));
{graph.hashed_layout_of(out), graph.hashed_layout_of(in)},
nullptr,
{},
{
PushConstantDataInfo(&range, sizeof(range), sizeof(utils::ivec4)),
PushConstantDataInfo(
&src_offset, sizeof(src_offset), sizeof(utils::ivec4)),
PushConstantDataInfo(
&dst_offset, sizeof(dst_offset), sizeof(utils::ivec4)),
}));
}

void add_copy_channel_offset_node(
Expand DownExpand Up@@ -128,28 +125,23 @@ void add_copy_channel_offset_node(
// The shader combines the global invocation id and the dst_offset to get
// the actual coordinate.

ivec3 dst_offset{
const ivec3 dst_offset{
0, 0, dst_first_z + batch_idx * utils::div_up_4(out_channels)};

uvec3 global_size{
const uvec3 global_size{
utils::safe_downcast<uint32_t>(dim_at<kWidth4D>(in_sizes)),
utils::safe_downcast<uint32_t>(dim_at<kHeight4D>(in_sizes)),
utils::safe_downcast<uint32_t>(dst_last_z - dst_first_z + 1)};
uvec3 local_size = graph.create_local_wg_size(global_size);

const struct Block final {
ivec3 range;
int32_t channel_range;
ivec3 dst_offset;
int32_t dst_channel_offset;
int32_t src_channel_offset;
} channel_offset_params{
utils::make_ivec3(global_size),
channel_range,
dst_offset,
dst_channel_offset,
src_channel_offset,
};
const uvec3 local_size = graph.create_local_wg_size(global_size);

const utils::ivec4 range_params = {
static_cast<int>(global_size[0]),
static_cast<int>(global_size[1]),
static_cast<int>(global_size[2]),
channel_range};

const utils::ivec4 offset_params = {
dst_offset[0], dst_offset[1], dst_offset[2], dst_channel_offset};

auto shader = VK_KERNEL_FROM_STR(kernel_name);

Expand All@@ -165,13 +157,17 @@ void add_copy_channel_offset_node(
{in, vkapi::MemoryAccessType::READ},
},
// Parameter buffers
{
t_out->sizes_ubo(),
t_in->sizes_ubo(),
graph.create_params_buffer(channel_offset_params),
},
{},
// Specialization Constants
{graph.hashed_layout_of(out), graph.hashed_layout_of(in)}));
{graph.hashed_layout_of(out), graph.hashed_layout_of(in)},
nullptr,
{},
{graph.sizes_pc_of(out),
graph.sizes_pc_of(in),
PushConstantDataInfo(&range_params, sizeof(range_params)),
PushConstantDataInfo(&offset_params, sizeof(offset_params)),
PushConstantDataInfo(
&src_channel_offset, sizeof(src_channel_offset))}));
}
}

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] Replace Uniform buffers with push constants for copy op#7417

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 20, 2024
 Merged


[ET-VK] Replace Uniform buffers with push constants for copy op
#7417
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


23 changes: 11 additions & 12 deletions
backends/vulkan/runtime/graph/ops/glsl/copy_channel_offset.glsl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,17 +18,16 @@ ${layout_declare_tensor(B, "w", "t_out", DTYPE, STORAGE)}
${layout_declare_tensor(B, "r", "existing_out", DTYPE, STORAGE)}
${layout_declare_tensor(B, "r", "t_in", DTYPE, STORAGE)}

${layout_declare_ubo(B, "ivec4", "out_sizes")}
${layout_declare_ubo(B, "ivec4", "in_sizes")}

layout(set = 0, binding = 5) uniform PRECISION restrict CopyArgs {
layout(push_constant) uniform restrict Block {
 ivec4 out_sizes;
 ivec4 in_sizes;
 // Operates on (x, y, z) logical extents.
 ivec3 range;
 // channel_range is stored in range.w
 ivec4 range;
 // Analogus to range variable in copy. It defines the # of channel being
 // copied.
 int channel_range;
 ivec3 dst_offset;
 int dst_channel_offset;
 // dst channel offset is stored in dst_offset.w
 ivec4 dst_offset;
 int src_channel_offset;
};

Expand All@@ -47,11 +46,11 @@ void main() {
 // Note: Unlike other shaders, the range is often not equal to the destination
 // texture extent.
 const ivec3 lpos = ivec3(gl_GlobalInvocationID);
 if (any(greaterThanEqual(lpos, range))) {
 if (any(greaterThanEqual(lpos, range.xyz))) {
 return;
 }

 const ivec3 out_lpos = lpos + dst_offset;
 const ivec3 out_lpos = lpos + dst_offset.xyz;

 const ivec4 out_tidx = lpos_to_tidx(out_lpos, out_sizes, out_axis_map.w, packed_dim);

Expand All@@ -61,12 +60,12 @@ void main() {
 ivec4 in_tidx = out_tidx;
 for (int i=0; i<4; i++) {

 in_tidx[packed_dim] = out_tidx[packed_dim] - dst_channel_offset + i;
 in_tidx[packed_dim] = out_tidx[packed_dim] - dst_offset.w + i;

 // Handle the partial update for begining of channel in an existing tensor.
 // If the source channel index is below zero or exceeds the range, we skip
 // updating the element to avoid overwriting existing data.
 if ((in_tidx[packed_dim] < 0) || (in_tidx[packed_dim] >= channel_range)) {
 if ((in_tidx[packed_dim] < 0) || (in_tidx[packed_dim] >= range.w)) {
 continue;
 }

Expand Down

6 changes: 5 additions & 1 deletion
backends/vulkan/runtime/graph/ops/glsl/copy_offset.glsl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,11 @@ layout(std430) buffer;
${layout_declare_tensor(B, "w", "t_out", DTYPE, STORAGE)}
${layout_declare_tensor(B, "r", "t_in", DTYPE, STORAGE)}

${layout_declare_ubo(B, "ivec3", "range", "ivec3", "src_offset", "ivec3", "dst_offset")}
layout(push_constant) uniform restrict Block {
 ivec3 range;
 ivec3 src_offset;
 ivec3 dst_offset;
};

#include "indexing_utils.h"

Expand Down

70 changes: 33 additions & 37 deletions
backends/vulkan/runtime/graph/ops/impl/Copy.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,16 +33,6 @@ void add_copy_offset_node(
 add_dtype_suffix(kernel_name, *t_out);
 add_storage_type_suffix(kernel_name, *t_out);

 const struct Block final {
 alignas(16) ivec3 range;
 alignas(16) ivec3 src_offset;
 alignas(16) ivec3 dst_offset;
 } offset_params{
 range,
 src_offset,
 dst_offset,
 };

 auto shader = VK_KERNEL_FROM_STR(kernel_name);

 graph.execute_nodes().emplace_back(new DispatchNode(
Expand All@@ -56,11 +46,18 @@ void add_copy_offset_node(
 {in, vkapi::kRead},
 },
 // Parameter buffers
 {
 graph.create_params_buffer(offset_params),
 },
 {},
 // Specialization Constants
 {graph.hashed_layout_of(out), graph.hashed_layout_of(in)}));
 {graph.hashed_layout_of(out), graph.hashed_layout_of(in)},
 nullptr,
 {},
 {
 PushConstantDataInfo(&range, sizeof(range), sizeof(utils::ivec4)),
 PushConstantDataInfo(
 &src_offset, sizeof(src_offset), sizeof(utils::ivec4)),
 PushConstantDataInfo(
 &dst_offset, sizeof(dst_offset), sizeof(utils::ivec4)),
 }));
}

void add_copy_channel_offset_node(
Expand DownExpand Up@@ -128,28 +125,23 @@ void add_copy_channel_offset_node(
 // The shader combines the global invocation id and the dst_offset to get
 // the actual coordinate.

 ivec3 dst_offset{
const ivec3 dst_offset{
 0, 0, dst_first_z + batch_idx * utils::div_up_4(out_channels)};

 uvec3 global_size{
const uvec3 global_size{
 utils::safe_downcast<uint32_t>(dim_at<kWidth4D>(in_sizes)),
 utils::safe_downcast<uint32_t>(dim_at<kHeight4D>(in_sizes)),
 utils::safe_downcast<uint32_t>(dst_last_z - dst_first_z + 1)};
 uvec3 local_size = graph.create_local_wg_size(global_size);

 const struct Block final {
 ivec3 range;
 int32_t channel_range;
 ivec3 dst_offset;
 int32_t dst_channel_offset;
 int32_t src_channel_offset;
 } channel_offset_params{
 utils::make_ivec3(global_size),
 channel_range,
 dst_offset,
 dst_channel_offset,
 src_channel_offset,
 };
 const uvec3 local_size = graph.create_local_wg_size(global_size);

 const utils::ivec4 range_params = {
 static_cast<int>(global_size[0]),
 static_cast<int>(global_size[1]),
 static_cast<int>(global_size[2]),
 channel_range};

 const utils::ivec4 offset_params = {
 dst_offset[0], dst_offset[1], dst_offset[2], dst_channel_offset};

 auto shader = VK_KERNEL_FROM_STR(kernel_name);

Expand All@@ -165,13 +157,17 @@ void add_copy_channel_offset_node(
 {in, vkapi::MemoryAccessType::READ},
 },
 // Parameter buffers
 {
 t_out->sizes_ubo(),
 t_in->sizes_ubo(),
 graph.create_params_buffer(channel_offset_params),
 },
 {},
 // Specialization Constants
 {graph.hashed_layout_of(out), graph.hashed_layout_of(in)}));
 {graph.hashed_layout_of(out), graph.hashed_layout_of(in)},
 nullptr,
 {},
 {graph.sizes_pc_of(out),
 graph.sizes_pc_of(in),
 PushConstantDataInfo(&range_params, sizeof(range_params)),
 PushConstantDataInfo(&offset_params, sizeof(offset_params)),
 PushConstantDataInfo(
 &src_channel_offset, sizeof(src_channel_offset))}));
 }
}

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] Replace Uniform buffers with push constants for copy op#7417

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 20, 2024
 Merged


[ET-VK] Replace Uniform buffers with push constants for copy op
#7417
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


23 changes: 11 additions & 12 deletions
backends/vulkan/runtime/graph/ops/glsl/copy_channel_offset.glsl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,17 +18,16 @@ ${layout_declare_tensor(B, "w", "t_out", DTYPE, STORAGE)}
${layout_declare_tensor(B, "r", "existing_out", DTYPE, STORAGE)}
${layout_declare_tensor(B, "r", "t_in", DTYPE, STORAGE)}

${layout_declare_ubo(B, "ivec4", "out_sizes")}
${layout_declare_ubo(B, "ivec4", "in_sizes")}

layout(set = 0, binding = 5) uniform PRECISION restrict CopyArgs {
layout(push_constant) uniform restrict Block {
 ivec4 out_sizes;
 ivec4 in_sizes;
 // Operates on (x, y, z) logical extents.
 ivec3 range;
 // channel_range is stored in range.w
 ivec4 range;
 // Analogus to range variable in copy. It defines the # of channel being
 // copied.
 int channel_range;
 ivec3 dst_offset;
 int dst_channel_offset;
 // dst channel offset is stored in dst_offset.w
 ivec4 dst_offset;
 int src_channel_offset;
};

Expand All@@ -47,11 +46,11 @@ void main() {
 // Note: Unlike other shaders, the range is often not equal to the destination
 // texture extent.
 const ivec3 lpos = ivec3(gl_GlobalInvocationID);
 if (any(greaterThanEqual(lpos, range))) {
 if (any(greaterThanEqual(lpos, range.xyz))) {
 return;
 }

 const ivec3 out_lpos = lpos + dst_offset;
 const ivec3 out_lpos = lpos + dst_offset.xyz;

 const ivec4 out_tidx = lpos_to_tidx(out_lpos, out_sizes, out_axis_map.w, packed_dim);

Expand All@@ -61,12 +60,12 @@ void main() {
 ivec4 in_tidx = out_tidx;
 for (int i=0; i<4; i++) {

 in_tidx[packed_dim] = out_tidx[packed_dim] - dst_channel_offset + i;
 in_tidx[packed_dim] = out_tidx[packed_dim] - dst_offset.w + i;

 // Handle the partial update for begining of channel in an existing tensor.
 // If the source channel index is below zero or exceeds the range, we skip
 // updating the element to avoid overwriting existing data.
 if ((in_tidx[packed_dim] < 0) || (in_tidx[packed_dim] >= channel_range)) {
 if ((in_tidx[packed_dim] < 0) || (in_tidx[packed_dim] >= range.w)) {
 continue;
 }

Expand Down

6 changes: 5 additions & 1 deletion
backends/vulkan/runtime/graph/ops/glsl/copy_offset.glsl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,11 @@ layout(std430) buffer;
${layout_declare_tensor(B, "w", "t_out", DTYPE, STORAGE)}
${layout_declare_tensor(B, "r", "t_in", DTYPE, STORAGE)}

${layout_declare_ubo(B, "ivec3", "range", "ivec3", "src_offset", "ivec3", "dst_offset")}
layout(push_constant) uniform restrict Block {
 ivec3 range;
 ivec3 src_offset;
 ivec3 dst_offset;
};

#include "indexing_utils.h"

Expand Down

70 changes: 33 additions & 37 deletions
backends/vulkan/runtime/graph/ops/impl/Copy.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,16 +33,6 @@ void add_copy_offset_node(
 add_dtype_suffix(kernel_name, *t_out);
 add_storage_type_suffix(kernel_name, *t_out);

 const struct Block final {
 alignas(16) ivec3 range;
 alignas(16) ivec3 src_offset;
 alignas(16) ivec3 dst_offset;
 } offset_params{
 range,
 src_offset,
 dst_offset,
 };

 auto shader = VK_KERNEL_FROM_STR(kernel_name);

 graph.execute_nodes().emplace_back(new DispatchNode(
Expand All@@ -56,11 +46,18 @@ void add_copy_offset_node(
 {in, vkapi::kRead},
 },
 // Parameter buffers
 {
 graph.create_params_buffer(offset_params),
 },
 {},
 // Specialization Constants
 {graph.hashed_layout_of(out), graph.hashed_layout_of(in)}));
 {graph.hashed_layout_of(out), graph.hashed_layout_of(in)},
 nullptr,
 {},
 {
 PushConstantDataInfo(&range, sizeof(range), sizeof(utils::ivec4)),
 PushConstantDataInfo(
 &src_offset, sizeof(src_offset), sizeof(utils::ivec4)),
 PushConstantDataInfo(
 &dst_offset, sizeof(dst_offset), sizeof(utils::ivec4)),
 }));
}

void add_copy_channel_offset_node(
Expand DownExpand Up@@ -128,28 +125,23 @@ void add_copy_channel_offset_node(
 // The shader combines the global invocation id and the dst_offset to get
 // the actual coordinate.

 ivec3 dst_offset{
const ivec3 dst_offset{
 0, 0, dst_first_z + batch_idx * utils::div_up_4(out_channels)};

 uvec3 global_size{
const uvec3 global_size{
 utils::safe_downcast<uint32_t>(dim_at<kWidth4D>(in_sizes)),
 utils::safe_downcast<uint32_t>(dim_at<kHeight4D>(in_sizes)),
 utils::safe_downcast<uint32_t>(dst_last_z - dst_first_z + 1)};
 uvec3 local_size = graph.create_local_wg_size(global_size);

 const struct Block final {
 ivec3 range;
 int32_t channel_range;
 ivec3 dst_offset;
 int32_t dst_channel_offset;
 int32_t src_channel_offset;
 } channel_offset_params{
 utils::make_ivec3(global_size),
 channel_range,
 dst_offset,
 dst_channel_offset,
 src_channel_offset,
 };
 const uvec3 local_size = graph.create_local_wg_size(global_size);

 const utils::ivec4 range_params = {
 static_cast<int>(global_size[0]),
 static_cast<int>(global_size[1]),
 static_cast<int>(global_size[2]),
 channel_range};

 const utils::ivec4 offset_params = {
 dst_offset[0], dst_offset[1], dst_offset[2], dst_channel_offset};

 auto shader = VK_KERNEL_FROM_STR(kernel_name);

Expand All@@ -165,13 +157,17 @@ void add_copy_channel_offset_node(
 {in, vkapi::MemoryAccessType::READ},
 },
 // Parameter buffers
 {
 t_out->sizes_ubo(),
 t_in->sizes_ubo(),
 graph.create_params_buffer(channel_offset_params),
 },
 {},
 // Specialization Constants
 {graph.hashed_layout_of(out), graph.hashed_layout_of(in)}));
 {graph.hashed_layout_of(out), graph.hashed_layout_of(in)},
 nullptr,
 {},
 {graph.sizes_pc_of(out),
 graph.sizes_pc_of(in),
 PushConstantDataInfo(&range_params, sizeof(range_params)),
 PushConstantDataInfo(&offset_params, sizeof(offset_params)),
 PushConstantDataInfo(
 &src_channel_offset, sizeof(src_channel_offset))}));
 }
}

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] Replace Uniform buffers with push constants for copy op#7417

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 20, 2024
 Merged


[ET-VK] Replace Uniform buffers with push constants for copy op
#7417
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


23 changes: 11 additions & 12 deletions
backends/vulkan/runtime/graph/ops/glsl/copy_channel_offset.glsl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,17 +18,16 @@ ${layout_declare_tensor(B, "w", "t_out", DTYPE, STORAGE)}
${layout_declare_tensor(B, "r", "existing_out", DTYPE, STORAGE)}
${layout_declare_tensor(B, "r", "t_in", DTYPE, STORAGE)}

${layout_declare_ubo(B, "ivec4", "out_sizes")}
${layout_declare_ubo(B, "ivec4", "in_sizes")}

layout(set = 0, binding = 5) uniform PRECISION restrict CopyArgs {
layout(push_constant) uniform restrict Block {
 ivec4 out_sizes;
 ivec4 in_sizes;
 // Operates on (x, y, z) logical extents.
 ivec3 range;
 // channel_range is stored in range.w
 ivec4 range;
 // Analogus to range variable in copy. It defines the # of channel being
 // copied.
 int channel_range;
 ivec3 dst_offset;
 int dst_channel_offset;
 // dst channel offset is stored in dst_offset.w
 ivec4 dst_offset;
 int src_channel_offset;
};

Expand All@@ -47,11 +46,11 @@ void main() {
 // Note: Unlike other shaders, the range is often not equal to the destination
 // texture extent.
 const ivec3 lpos = ivec3(gl_GlobalInvocationID);
 if (any(greaterThanEqual(lpos, range))) {
 if (any(greaterThanEqual(lpos, range.xyz))) {
 return;
 }

 const ivec3 out_lpos = lpos + dst_offset;
 const ivec3 out_lpos = lpos + dst_offset.xyz;

 const ivec4 out_tidx = lpos_to_tidx(out_lpos, out_sizes, out_axis_map.w, packed_dim);

Expand All@@ -61,12 +60,12 @@ void main() {
 ivec4 in_tidx = out_tidx;
 for (int i=0; i<4; i++) {

 in_tidx[packed_dim] = out_tidx[packed_dim] - dst_channel_offset + i;
 in_tidx[packed_dim] = out_tidx[packed_dim] - dst_offset.w + i;

 // Handle the partial update for begining of channel in an existing tensor.
 // If the source channel index is below zero or exceeds the range, we skip
 // updating the element to avoid overwriting existing data.
 if ((in_tidx[packed_dim] < 0) || (in_tidx[packed_dim] >= channel_range)) {
 if ((in_tidx[packed_dim] < 0) || (in_tidx[packed_dim] >= range.w)) {
 continue;
 }

Expand Down

6 changes: 5 additions & 1 deletion
backends/vulkan/runtime/graph/ops/glsl/copy_offset.glsl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,11 @@ layout(std430) buffer;
${layout_declare_tensor(B, "w", "t_out", DTYPE, STORAGE)}
${layout_declare_tensor(B, "r", "t_in", DTYPE, STORAGE)}

${layout_declare_ubo(B, "ivec3", "range", "ivec3", "src_offset", "ivec3", "dst_offset")}
layout(push_constant) uniform restrict Block {
 ivec3 range;
 ivec3 src_offset;
 ivec3 dst_offset;
};

#include "indexing_utils.h"

Expand Down

70 changes: 33 additions & 37 deletions
backends/vulkan/runtime/graph/ops/impl/Copy.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,16 +33,6 @@ void add_copy_offset_node(
 add_dtype_suffix(kernel_name, *t_out);
 add_storage_type_suffix(kernel_name, *t_out);

 const struct Block final {
 alignas(16) ivec3 range;
 alignas(16) ivec3 src_offset;
 alignas(16) ivec3 dst_offset;
 } offset_params{
 range,
 src_offset,
 dst_offset,
 };

 auto shader = VK_KERNEL_FROM_STR(kernel_name);

 graph.execute_nodes().emplace_back(new DispatchNode(
Expand All@@ -56,11 +46,18 @@ void add_copy_offset_node(
 {in, vkapi::kRead},
 },
 // Parameter buffers
 {
 graph.create_params_buffer(offset_params),
 },
 {},
 // Specialization Constants
 {graph.hashed_layout_of(out), graph.hashed_layout_of(in)}));
 {graph.hashed_layout_of(out), graph.hashed_layout_of(in)},
 nullptr,
 {},
 {
 PushConstantDataInfo(&range, sizeof(range), sizeof(utils::ivec4)),
 PushConstantDataInfo(
 &src_offset, sizeof(src_offset), sizeof(utils::ivec4)),
 PushConstantDataInfo(
 &dst_offset, sizeof(dst_offset), sizeof(utils::ivec4)),
 }));
}

void add_copy_channel_offset_node(
Expand DownExpand Up@@ -128,28 +125,23 @@ void add_copy_channel_offset_node(
 // The shader combines the global invocation id and the dst_offset to get
 // the actual coordinate.

 ivec3 dst_offset{
const ivec3 dst_offset{
 0, 0, dst_first_z + batch_idx * utils::div_up_4(out_channels)};

 uvec3 global_size{
const uvec3 global_size{
 utils::safe_downcast<uint32_t>(dim_at<kWidth4D>(in_sizes)),
 utils::safe_downcast<uint32_t>(dim_at<kHeight4D>(in_sizes)),
 utils::safe_downcast<uint32_t>(dst_last_z - dst_first_z + 1)};
 uvec3 local_size = graph.create_local_wg_size(global_size);

 const struct Block final {
 ivec3 range;
 int32_t channel_range;
 ivec3 dst_offset;
 int32_t dst_channel_offset;
 int32_t src_channel_offset;
 } channel_offset_params{
 utils::make_ivec3(global_size),
 channel_range,
 dst_offset,
 dst_channel_offset,
 src_channel_offset,
 };
 const uvec3 local_size = graph.create_local_wg_size(global_size);

 const utils::ivec4 range_params = {
 static_cast<int>(global_size[0]),
 static_cast<int>(global_size[1]),
 static_cast<int>(global_size[2]),
 channel_range};

 const utils::ivec4 offset_params = {
 dst_offset[0], dst_offset[1], dst_offset[2], dst_channel_offset};

 auto shader = VK_KERNEL_FROM_STR(kernel_name);

Expand All@@ -165,13 +157,17 @@ void add_copy_channel_offset_node(
 {in, vkapi::MemoryAccessType::READ},
 },
 // Parameter buffers
 {
 t_out->sizes_ubo(),
 t_in->sizes_ubo(),
 graph.create_params_buffer(channel_offset_params),
 },
 {},
 // Specialization Constants
 {graph.hashed_layout_of(out), graph.hashed_layout_of(in)}));
 {graph.hashed_layout_of(out), graph.hashed_layout_of(in)},
 nullptr,
 {},
 {graph.sizes_pc_of(out),
 graph.sizes_pc_of(in),
 PushConstantDataInfo(&range_params, sizeof(range_params)),
 PushConstantDataInfo(&offset_params, sizeof(offset_params)),
 PushConstantDataInfo(
 &src_channel_offset, sizeof(src_channel_offset))}));
 }
}

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] Replace Uniform buffers with push constants for copy op#7417

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 20, 2024
 Merged


[ET-VK] Replace Uniform buffers with push constants for copy op
#7417
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


23 changes: 11 additions & 12 deletions
backends/vulkan/runtime/graph/ops/glsl/copy_channel_offset.glsl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,17 +18,16 @@ ${layout_declare_tensor(B, "w", "t_out", DTYPE, STORAGE)}
${layout_declare_tensor(B, "r", "existing_out", DTYPE, STORAGE)}
${layout_declare_tensor(B, "r", "t_in", DTYPE, STORAGE)}

${layout_declare_ubo(B, "ivec4", "out_sizes")}
${layout_declare_ubo(B, "ivec4", "in_sizes")}

layout(set = 0, binding = 5) uniform PRECISION restrict CopyArgs {
layout(push_constant) uniform restrict Block {
 ivec4 out_sizes;
 ivec4 in_sizes;
 // Operates on (x, y, z) logical extents.
 ivec3 range;
 // channel_range is stored in range.w
 ivec4 range;
 // Analogus to range variable in copy. It defines the # of channel being
 // copied.
 int channel_range;
 ivec3 dst_offset;
 int dst_channel_offset;
 // dst channel offset is stored in dst_offset.w
 ivec4 dst_offset;
 int src_channel_offset;
};

Expand All@@ -47,11 +46,11 @@ void main() {
 // Note: Unlike other shaders, the range is often not equal to the destination
 // texture extent.
 const ivec3 lpos = ivec3(gl_GlobalInvocationID);
 if (any(greaterThanEqual(lpos, range))) {
 if (any(greaterThanEqual(lpos, range.xyz))) {
 return;
 }

 const ivec3 out_lpos = lpos + dst_offset;
 const ivec3 out_lpos = lpos + dst_offset.xyz;

 const ivec4 out_tidx = lpos_to_tidx(out_lpos, out_sizes, out_axis_map.w, packed_dim);

Expand All@@ -61,12 +60,12 @@ void main() {
 ivec4 in_tidx = out_tidx;
 for (int i=0; i<4; i++) {

 in_tidx[packed_dim] = out_tidx[packed_dim] - dst_channel_offset + i;
 in_tidx[packed_dim] = out_tidx[packed_dim] - dst_offset.w + i;

 // Handle the partial update for begining of channel in an existing tensor.
 // If the source channel index is below zero or exceeds the range, we skip
 // updating the element to avoid overwriting existing data.
 if ((in_tidx[packed_dim] < 0) || (in_tidx[packed_dim] >= channel_range)) {
 if ((in_tidx[packed_dim] < 0) || (in_tidx[packed_dim] >= range.w)) {
 continue;
 }

Expand Down

6 changes: 5 additions & 1 deletion
backends/vulkan/runtime/graph/ops/glsl/copy_offset.glsl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,11 @@ layout(std430) buffer;
${layout_declare_tensor(B, "w", "t_out", DTYPE, STORAGE)}
${layout_declare_tensor(B, "r", "t_in", DTYPE, STORAGE)}

${layout_declare_ubo(B, "ivec3", "range", "ivec3", "src_offset", "ivec3", "dst_offset")}
layout(push_constant) uniform restrict Block {
 ivec3 range;
 ivec3 src_offset;
 ivec3 dst_offset;
};

#include "indexing_utils.h"

Expand Down

70 changes: 33 additions & 37 deletions
backends/vulkan/runtime/graph/ops/impl/Copy.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,16 +33,6 @@ void add_copy_offset_node(
 add_dtype_suffix(kernel_name, *t_out);
 add_storage_type_suffix(kernel_name, *t_out);

 const struct Block final {
 alignas(16) ivec3 range;
 alignas(16) ivec3 src_offset;
 alignas(16) ivec3 dst_offset;
 } offset_params{
 range,
 src_offset,
 dst_offset,
 };

 auto shader = VK_KERNEL_FROM_STR(kernel_name);

 graph.execute_nodes().emplace_back(new DispatchNode(
Expand All@@ -56,11 +46,18 @@ void add_copy_offset_node(
 {in, vkapi::kRead},
 },
 // Parameter buffers
 {
 graph.create_params_buffer(offset_params),
 },
 {},
 // Specialization Constants
 {graph.hashed_layout_of(out), graph.hashed_layout_of(in)}));
 {graph.hashed_layout_of(out), graph.hashed_layout_of(in)},
 nullptr,
 {},
 {
 PushConstantDataInfo(&range, sizeof(range), sizeof(utils::ivec4)),
 PushConstantDataInfo(
 &src_offset, sizeof(src_offset), sizeof(utils::ivec4)),
 PushConstantDataInfo(
 &dst_offset, sizeof(dst_offset), sizeof(utils::ivec4)),
 }));
}

void add_copy_channel_offset_node(
Expand DownExpand Up@@ -128,28 +125,23 @@ void add_copy_channel_offset_node(
 // The shader combines the global invocation id and the dst_offset to get
 // the actual coordinate.

 ivec3 dst_offset{
const ivec3 dst_offset{
 0, 0, dst_first_z + batch_idx * utils::div_up_4(out_channels)};

 uvec3 global_size{
const uvec3 global_size{
 utils::safe_downcast<uint32_t>(dim_at<kWidth4D>(in_sizes)),
 utils::safe_downcast<uint32_t>(dim_at<kHeight4D>(in_sizes)),
 utils::safe_downcast<uint32_t>(dst_last_z - dst_first_z + 1)};
 uvec3 local_size = graph.create_local_wg_size(global_size);

 const struct Block final {
 ivec3 range;
 int32_t channel_range;
 ivec3 dst_offset;
 int32_t dst_channel_offset;
 int32_t src_channel_offset;
 } channel_offset_params{
 utils::make_ivec3(global_size),
 channel_range,
 dst_offset,
 dst_channel_offset,
 src_channel_offset,
 };
 const uvec3 local_size = graph.create_local_wg_size(global_size);

 const utils::ivec4 range_params = {
 static_cast<int>(global_size[0]),
 static_cast<int>(global_size[1]),
 static_cast<int>(global_size[2]),
 channel_range};

 const utils::ivec4 offset_params = {
 dst_offset[0], dst_offset[1], dst_offset[2], dst_channel_offset};

 auto shader = VK_KERNEL_FROM_STR(kernel_name);

Expand All@@ -165,13 +157,17 @@ void add_copy_channel_offset_node(
 {in, vkapi::MemoryAccessType::READ},
 },
 // Parameter buffers
 {
 t_out->sizes_ubo(),
 t_in->sizes_ubo(),
 graph.create_params_buffer(channel_offset_params),
 },
 {},
 // Specialization Constants
 {graph.hashed_layout_of(out), graph.hashed_layout_of(in)}));
 {graph.hashed_layout_of(out), graph.hashed_layout_of(in)},
 nullptr,
 {},
 {graph.sizes_pc_of(out),
 graph.sizes_pc_of(in),
 PushConstantDataInfo(&range_params, sizeof(range_params)),
 PushConstantDataInfo(&offset_params, sizeof(offset_params)),
 PushConstantDataInfo(
 &src_channel_offset, sizeof(src_channel_offset))}));
 }
}

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] Replace Uniform buffers with push constants for copy op#7417

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 20, 2024
 Merged


[ET-VK] Replace Uniform buffers with push constants for copy op
#7417
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


23 changes: 11 additions & 12 deletions
backends/vulkan/runtime/graph/ops/glsl/copy_channel_offset.glsl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,17 +18,16 @@ ${layout_declare_tensor(B, "w", "t_out", DTYPE, STORAGE)}
${layout_declare_tensor(B, "r", "existing_out", DTYPE, STORAGE)}
${layout_declare_tensor(B, "r", "t_in", DTYPE, STORAGE)}

${layout_declare_ubo(B, "ivec4", "out_sizes")}
${layout_declare_ubo(B, "ivec4", "in_sizes")}

layout(set = 0, binding = 5) uniform PRECISION restrict CopyArgs {
layout(push_constant) uniform restrict Block {
 ivec4 out_sizes;
 ivec4 in_sizes;
 // Operates on (x, y, z) logical extents.
 ivec3 range;
 // channel_range is stored in range.w
 ivec4 range;
 // Analogus to range variable in copy. It defines the # of channel being
 // copied.
 int channel_range;
 ivec3 dst_offset;
 int dst_channel_offset;
 // dst channel offset is stored in dst_offset.w
 ivec4 dst_offset;
 int src_channel_offset;
};

Expand All@@ -47,11 +46,11 @@ void main() {
 // Note: Unlike other shaders, the range is often not equal to the destination
 // texture extent.
 const ivec3 lpos = ivec3(gl_GlobalInvocationID);
 if (any(greaterThanEqual(lpos, range))) {
 if (any(greaterThanEqual(lpos, range.xyz))) {
 return;
 }

 const ivec3 out_lpos = lpos + dst_offset;
 const ivec3 out_lpos = lpos + dst_offset.xyz;

 const ivec4 out_tidx = lpos_to_tidx(out_lpos, out_sizes, out_axis_map.w, packed_dim);

Expand All@@ -61,12 +60,12 @@ void main() {
 ivec4 in_tidx = out_tidx;
 for (int i=0; i<4; i++) {

 in_tidx[packed_dim] = out_tidx[packed_dim] - dst_channel_offset + i;
 in_tidx[packed_dim] = out_tidx[packed_dim] - dst_offset.w + i;

 // Handle the partial update for begining of channel in an existing tensor.
 // If the source channel index is below zero or exceeds the range, we skip
 // updating the element to avoid overwriting existing data.
 if ((in_tidx[packed_dim] < 0) || (in_tidx[packed_dim] >= channel_range)) {
 if ((in_tidx[packed_dim] < 0) || (in_tidx[packed_dim] >= range.w)) {
 continue;
 }

Expand Down

6 changes: 5 additions & 1 deletion
backends/vulkan/runtime/graph/ops/glsl/copy_offset.glsl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,11 @@ layout(std430) buffer;
${layout_declare_tensor(B, "w", "t_out", DTYPE, STORAGE)}
${layout_declare_tensor(B, "r", "t_in", DTYPE, STORAGE)}

${layout_declare_ubo(B, "ivec3", "range", "ivec3", "src_offset", "ivec3", "dst_offset")}
layout(push_constant) uniform restrict Block {
 ivec3 range;
 ivec3 src_offset;
 ivec3 dst_offset;
};

#include "indexing_utils.h"

Expand Down

70 changes: 33 additions & 37 deletions
backends/vulkan/runtime/graph/ops/impl/Copy.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,16 +33,6 @@ void add_copy_offset_node(
 add_dtype_suffix(kernel_name, *t_out);
 add_storage_type_suffix(kernel_name, *t_out);

 const struct Block final {
 alignas(16) ivec3 range;
 alignas(16) ivec3 src_offset;
 alignas(16) ivec3 dst_offset;
 } offset_params{
 range,
 src_offset,
 dst_offset,
 };

 auto shader = VK_KERNEL_FROM_STR(kernel_name);

 graph.execute_nodes().emplace_back(new DispatchNode(
Expand All@@ -56,11 +46,18 @@ void add_copy_offset_node(
 {in, vkapi::kRead},
 },
 // Parameter buffers
 {
 graph.create_params_buffer(offset_params),
 },
 {},
 // Specialization Constants
 {graph.hashed_layout_of(out), graph.hashed_layout_of(in)}));
 {graph.hashed_layout_of(out), graph.hashed_layout_of(in)},
 nullptr,
 {},
 {
 PushConstantDataInfo(&range, sizeof(range), sizeof(utils::ivec4)),
 PushConstantDataInfo(
 &src_offset, sizeof(src_offset), sizeof(utils::ivec4)),
 PushConstantDataInfo(
 &dst_offset, sizeof(dst_offset), sizeof(utils::ivec4)),
 }));
}

void add_copy_channel_offset_node(
Expand DownExpand Up@@ -128,28 +125,23 @@ void add_copy_channel_offset_node(
 // The shader combines the global invocation id and the dst_offset to get
 // the actual coordinate.

 ivec3 dst_offset{
const ivec3 dst_offset{
 0, 0, dst_first_z + batch_idx * utils::div_up_4(out_channels)};

 uvec3 global_size{
const uvec3 global_size{
 utils::safe_downcast<uint32_t>(dim_at<kWidth4D>(in_sizes)),
 utils::safe_downcast<uint32_t>(dim_at<kHeight4D>(in_sizes)),
 utils::safe_downcast<uint32_t>(dst_last_z - dst_first_z + 1)};
 uvec3 local_size = graph.create_local_wg_size(global_size);

 const struct Block final {
 ivec3 range;
 int32_t channel_range;
 ivec3 dst_offset;
 int32_t dst_channel_offset;
 int32_t src_channel_offset;
 } channel_offset_params{
 utils::make_ivec3(global_size),
 channel_range,
 dst_offset,
 dst_channel_offset,
 src_channel_offset,
 };
 const uvec3 local_size = graph.create_local_wg_size(global_size);

 const utils::ivec4 range_params = {
 static_cast<int>(global_size[0]),
 static_cast<int>(global_size[1]),
 static_cast<int>(global_size[2]),
 channel_range};

 const utils::ivec4 offset_params = {
 dst_offset[0], dst_offset[1], dst_offset[2], dst_channel_offset};

 auto shader = VK_KERNEL_FROM_STR(kernel_name);

Expand All@@ -165,13 +157,17 @@ void add_copy_channel_offset_node(
 {in, vkapi::MemoryAccessType::READ},
 },
 // Parameter buffers
 {
 t_out->sizes_ubo(),
 t_in->sizes_ubo(),
 graph.create_params_buffer(channel_offset_params),
 },
 {},
 // Specialization Constants
 {graph.hashed_layout_of(out), graph.hashed_layout_of(in)}));
 {graph.hashed_layout_of(out), graph.hashed_layout_of(in)},
 nullptr,
 {},
 {graph.sizes_pc_of(out),
 graph.sizes_pc_of(in),
 PushConstantDataInfo(&range_params, sizeof(range_params)),
 PushConstantDataInfo(&offset_params, sizeof(offset_params)),
 PushConstantDataInfo(
 &src_channel_offset, sizeof(src_channel_offset))}));
 }
}

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] Replace Uniform buffers with push constants for copy op#7417

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 20, 2024
 Merged


[ET-VK] Replace Uniform buffers with push constants for copy op
#7417
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


23 changes: 11 additions & 12 deletions
backends/vulkan/runtime/graph/ops/glsl/copy_channel_offset.glsl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,17 +18,16 @@ ${layout_declare_tensor(B, "w", "t_out", DTYPE, STORAGE)}
${layout_declare_tensor(B, "r", "existing_out", DTYPE, STORAGE)}
${layout_declare_tensor(B, "r", "t_in", DTYPE, STORAGE)}

${layout_declare_ubo(B, "ivec4", "out_sizes")}
${layout_declare_ubo(B, "ivec4", "in_sizes")}

layout(set = 0, binding = 5) uniform PRECISION restrict CopyArgs {
layout(push_constant) uniform restrict Block {
 ivec4 out_sizes;
 ivec4 in_sizes;
 // Operates on (x, y, z) logical extents.
 ivec3 range;
 // channel_range is stored in range.w
 ivec4 range;
 // Analogus to range variable in copy. It defines the # of channel being
 // copied.
 int channel_range;
 ivec3 dst_offset;
 int dst_channel_offset;
 // dst channel offset is stored in dst_offset.w
 ivec4 dst_offset;
 int src_channel_offset;
};

Expand All@@ -47,11 +46,11 @@ void main() {
 // Note: Unlike other shaders, the range is often not equal to the destination
 // texture extent.
 const ivec3 lpos = ivec3(gl_GlobalInvocationID);
 if (any(greaterThanEqual(lpos, range))) {
 if (any(greaterThanEqual(lpos, range.xyz))) {
 return;
 }

 const ivec3 out_lpos = lpos + dst_offset;
 const ivec3 out_lpos = lpos + dst_offset.xyz;

 const ivec4 out_tidx = lpos_to_tidx(out_lpos, out_sizes, out_axis_map.w, packed_dim);

Expand All@@ -61,12 +60,12 @@ void main() {
 ivec4 in_tidx = out_tidx;
 for (int i=0; i<4; i++) {

 in_tidx[packed_dim] = out_tidx[packed_dim] - dst_channel_offset + i;
 in_tidx[packed_dim] = out_tidx[packed_dim] - dst_offset.w + i;

 // Handle the partial update for begining of channel in an existing tensor.
 // If the source channel index is below zero or exceeds the range, we skip
 // updating the element to avoid overwriting existing data.
 if ((in_tidx[packed_dim] < 0) || (in_tidx[packed_dim] >= channel_range)) {
 if ((in_tidx[packed_dim] < 0) || (in_tidx[packed_dim] >= range.w)) {
 continue;
 }

Expand Down

6 changes: 5 additions & 1 deletion
backends/vulkan/runtime/graph/ops/glsl/copy_offset.glsl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,11 @@ layout(std430) buffer;
${layout_declare_tensor(B, "w", "t_out", DTYPE, STORAGE)}
${layout_declare_tensor(B, "r", "t_in", DTYPE, STORAGE)}

${layout_declare_ubo(B, "ivec3", "range", "ivec3", "src_offset", "ivec3", "dst_offset")}
layout(push_constant) uniform restrict Block {
 ivec3 range;
 ivec3 src_offset;
 ivec3 dst_offset;
};

#include "indexing_utils.h"

Expand Down

70 changes: 33 additions & 37 deletions
backends/vulkan/runtime/graph/ops/impl/Copy.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,16 +33,6 @@ void add_copy_offset_node(
 add_dtype_suffix(kernel_name, *t_out);
 add_storage_type_suffix(kernel_name, *t_out);

 const struct Block final {
 alignas(16) ivec3 range;
 alignas(16) ivec3 src_offset;
 alignas(16) ivec3 dst_offset;
 } offset_params{
 range,
 src_offset,
 dst_offset,
 };

 auto shader = VK_KERNEL_FROM_STR(kernel_name);

 graph.execute_nodes().emplace_back(new DispatchNode(
Expand All@@ -56,11 +46,18 @@ void add_copy_offset_node(
 {in, vkapi::kRead},
 },
 // Parameter buffers
 {
 graph.create_params_buffer(offset_params),
 },
 {},
 // Specialization Constants
 {graph.hashed_layout_of(out), graph.hashed_layout_of(in)}));
 {graph.hashed_layout_of(out), graph.hashed_layout_of(in)},
 nullptr,
 {},
 {
 PushConstantDataInfo(&range, sizeof(range), sizeof(utils::ivec4)),
 PushConstantDataInfo(
 &src_offset, sizeof(src_offset), sizeof(utils::ivec4)),
 PushConstantDataInfo(
 &dst_offset, sizeof(dst_offset), sizeof(utils::ivec4)),
 }));
}

void add_copy_channel_offset_node(
Expand DownExpand Up@@ -128,28 +125,23 @@ void add_copy_channel_offset_node(
 // The shader combines the global invocation id and the dst_offset to get
 // the actual coordinate.

 ivec3 dst_offset{
const ivec3 dst_offset{
 0, 0, dst_first_z + batch_idx * utils::div_up_4(out_channels)};

 uvec3 global_size{
const uvec3 global_size{
 utils::safe_downcast<uint32_t>(dim_at<kWidth4D>(in_sizes)),
 utils::safe_downcast<uint32_t>(dim_at<kHeight4D>(in_sizes)),
 utils::safe_downcast<uint32_t>(dst_last_z - dst_first_z + 1)};
 uvec3 local_size = graph.create_local_wg_size(global_size);

 const struct Block final {
 ivec3 range;
 int32_t channel_range;
 ivec3 dst_offset;
 int32_t dst_channel_offset;
 int32_t src_channel_offset;
 } channel_offset_params{
 utils::make_ivec3(global_size),
 channel_range,
 dst_offset,
 dst_channel_offset,
 src_channel_offset,
 };
 const uvec3 local_size = graph.create_local_wg_size(global_size);

 const utils::ivec4 range_params = {
 static_cast<int>(global_size[0]),
 static_cast<int>(global_size[1]),
 static_cast<int>(global_size[2]),
 channel_range};

 const utils::ivec4 offset_params = {
 dst_offset[0], dst_offset[1], dst_offset[2], dst_channel_offset};

 auto shader = VK_KERNEL_FROM_STR(kernel_name);

Expand All@@ -165,13 +157,17 @@ void add_copy_channel_offset_node(
 {in, vkapi::MemoryAccessType::READ},
 },
 // Parameter buffers
 {
 t_out->sizes_ubo(),
 t_in->sizes_ubo(),
 graph.create_params_buffer(channel_offset_params),
 },
 {},
 // Specialization Constants
 {graph.hashed_layout_of(out), graph.hashed_layout_of(in)}));
 {graph.hashed_layout_of(out), graph.hashed_layout_of(in)},
 nullptr,
 {},
 {graph.sizes_pc_of(out),
 graph.sizes_pc_of(in),
 PushConstantDataInfo(&range_params, sizeof(range_params)),
 PushConstantDataInfo(&offset_params, sizeof(offset_params)),
 PushConstantDataInfo(
 &src_channel_offset, sizeof(src_channel_offset))}));
 }
}

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] Replace Uniform buffers with push constants for copy op#7417

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 20, 2024
 Merged


[ET-VK] Replace Uniform buffers with push constants for copy op
#7417
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


23 changes: 11 additions & 12 deletions
backends/vulkan/runtime/graph/ops/glsl/copy_channel_offset.glsl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,17 +18,16 @@ ${layout_declare_tensor(B, "w", "t_out", DTYPE, STORAGE)}
${layout_declare_tensor(B, "r", "existing_out", DTYPE, STORAGE)}
${layout_declare_tensor(B, "r", "t_in", DTYPE, STORAGE)}

${layout_declare_ubo(B, "ivec4", "out_sizes")}
${layout_declare_ubo(B, "ivec4", "in_sizes")}

layout(set = 0, binding = 5) uniform PRECISION restrict CopyArgs {
layout(push_constant) uniform restrict Block {
 ivec4 out_sizes;
 ivec4 in_sizes;
 // Operates on (x, y, z) logical extents.
 ivec3 range;
 // channel_range is stored in range.w
 ivec4 range;
 // Analogus to range variable in copy. It defines the # of channel being
 // copied.
 int channel_range;
 ivec3 dst_offset;
 int dst_channel_offset;
 // dst channel offset is stored in dst_offset.w
 ivec4 dst_offset;
 int src_channel_offset;
};

Expand All@@ -47,11 +46,11 @@ void main() {
 // Note: Unlike other shaders, the range is often not equal to the destination
 // texture extent.
 const ivec3 lpos = ivec3(gl_GlobalInvocationID);
 if (any(greaterThanEqual(lpos, range))) {
 if (any(greaterThanEqual(lpos, range.xyz))) {
 return;
 }

 const ivec3 out_lpos = lpos + dst_offset;
 const ivec3 out_lpos = lpos + dst_offset.xyz;

 const ivec4 out_tidx = lpos_to_tidx(out_lpos, out_sizes, out_axis_map.w, packed_dim);

Expand All@@ -61,12 +60,12 @@ void main() {
 ivec4 in_tidx = out_tidx;
 for (int i=0; i<4; i++) {

 in_tidx[packed_dim] = out_tidx[packed_dim] - dst_channel_offset + i;
 in_tidx[packed_dim] = out_tidx[packed_dim] - dst_offset.w + i;

 // Handle the partial update for begining of channel in an existing tensor.
 // If the source channel index is below zero or exceeds the range, we skip
 // updating the element to avoid overwriting existing data.
 if ((in_tidx[packed_dim] < 0) || (in_tidx[packed_dim] >= channel_range)) {
 if ((in_tidx[packed_dim] < 0) || (in_tidx[packed_dim] >= range.w)) {
 continue;
 }

Expand Down

6 changes: 5 additions & 1 deletion
backends/vulkan/runtime/graph/ops/glsl/copy_offset.glsl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,11 @@ layout(std430) buffer;
${layout_declare_tensor(B, "w", "t_out", DTYPE, STORAGE)}
${layout_declare_tensor(B, "r", "t_in", DTYPE, STORAGE)}

${layout_declare_ubo(B, "ivec3", "range", "ivec3", "src_offset", "ivec3", "dst_offset")}
layout(push_constant) uniform restrict Block {
 ivec3 range;
 ivec3 src_offset;
 ivec3 dst_offset;
};

#include "indexing_utils.h"

Expand Down

70 changes: 33 additions & 37 deletions
backends/vulkan/runtime/graph/ops/impl/Copy.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,16 +33,6 @@ void add_copy_offset_node(
 add_dtype_suffix(kernel_name, *t_out);
 add_storage_type_suffix(kernel_name, *t_out);

 const struct Block final {
 alignas(16) ivec3 range;
 alignas(16) ivec3 src_offset;
 alignas(16) ivec3 dst_offset;
 } offset_params{
 range,
 src_offset,
 dst_offset,
 };

 auto shader = VK_KERNEL_FROM_STR(kernel_name);

 graph.execute_nodes().emplace_back(new DispatchNode(
Expand All@@ -56,11 +46,18 @@ void add_copy_offset_node(
 {in, vkapi::kRead},
 },
 // Parameter buffers
 {
 graph.create_params_buffer(offset_params),
 },
 {},
 // Specialization Constants
 {graph.hashed_layout_of(out), graph.hashed_layout_of(in)}));
 {graph.hashed_layout_of(out), graph.hashed_layout_of(in)},
 nullptr,
 {},
 {
 PushConstantDataInfo(&range, sizeof(range), sizeof(utils::ivec4)),
 PushConstantDataInfo(
 &src_offset, sizeof(src_offset), sizeof(utils::ivec4)),
 PushConstantDataInfo(
 &dst_offset, sizeof(dst_offset), sizeof(utils::ivec4)),
 }));
}

void add_copy_channel_offset_node(
Expand DownExpand Up@@ -128,28 +125,23 @@ void add_copy_channel_offset_node(
 // The shader combines the global invocation id and the dst_offset to get
 // the actual coordinate.

 ivec3 dst_offset{
const ivec3 dst_offset{
 0, 0, dst_first_z + batch_idx * utils::div_up_4(out_channels)};

 uvec3 global_size{
const uvec3 global_size{
 utils::safe_downcast<uint32_t>(dim_at<kWidth4D>(in_sizes)),
 utils::safe_downcast<uint32_t>(dim_at<kHeight4D>(in_sizes)),
 utils::safe_downcast<uint32_t>(dst_last_z - dst_first_z + 1)};
 uvec3 local_size = graph.create_local_wg_size(global_size);

 const struct Block final {
 ivec3 range;
 int32_t channel_range;
 ivec3 dst_offset;
 int32_t dst_channel_offset;
 int32_t src_channel_offset;
 } channel_offset_params{
 utils::make_ivec3(global_size),
 channel_range,
 dst_offset,
 dst_channel_offset,
 src_channel_offset,
 };
 const uvec3 local_size = graph.create_local_wg_size(global_size);

 const utils::ivec4 range_params = {
 static_cast<int>(global_size[0]),
 static_cast<int>(global_size[1]),
 static_cast<int>(global_size[2]),
 channel_range};

 const utils::ivec4 offset_params = {
 dst_offset[0], dst_offset[1], dst_offset[2], dst_channel_offset};

 auto shader = VK_KERNEL_FROM_STR(kernel_name);

Expand All@@ -165,13 +157,17 @@ void add_copy_channel_offset_node(
 {in, vkapi::MemoryAccessType::READ},
 },
 // Parameter buffers
 {
 t_out->sizes_ubo(),
 t_in->sizes_ubo(),
 graph.create_params_buffer(channel_offset_params),
 },
 {},
 // Specialization Constants
 {graph.hashed_layout_of(out), graph.hashed_layout_of(in)}));
 {graph.hashed_layout_of(out), graph.hashed_layout_of(in)},
 nullptr,
 {},
 {graph.sizes_pc_of(out),
 graph.sizes_pc_of(in),
 PushConstantDataInfo(&range_params, sizeof(range_params)),
 PushConstantDataInfo(&offset_params, sizeof(offset_params)),
 PushConstantDataInfo(
 &src_channel_offset, sizeof(src_channel_offset))}));
 }
}

Expand Down