[ET-VK] Replace Uniform buffers with push constants for permute op#7347

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 2 commits into from
Dec 18, 2024
Merged

[ET-VK] Replace Uniform buffers with push constants for permute op #7347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f5ae56
[ET-VK] Replace Uniform buffers with push constants for binary op
trviv Dec 17, 2024
13587c2
[ET-VK] Replace Uniform buffers with push constants for permute op
trviv Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions backends/vulkan/runtime/graph/ops/DispatchNode.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,12 +46,15 @@ class PushConstantDataInfo {
payload_.attr = attr;
}

explicit PushConstantDataInfo(const void* data, uint32_t dataLen)
explicit PushConstantDataInfo(
const void* data,
uint32_t dataLen,
uint32_t pushConstantLen = 0)
: tensorUniformData(nullptr) {
VK_CHECK_COND(
dataLen <= 16, "Single push constant data size must be <= 16 bytes");
payload_.dataSize = dataLen;
memcpy(payload_.data, data, payload_.dataSize);
payload_.dataSize = pushConstantLen ? pushConstantLen : dataLen;
memcpy(payload_.data, data, dataLen);
}

/*
Expand Down
13 changes: 8 additions & 5 deletions backends/vulkan/runtime/graph/ops/glsl/binary_op.glsl
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,11 +19,6 @@ layout(std430) buffer;
${layout_declare_tensor(B, "w", "t_out", DTYPE, STORAGE)}
${layout_declare_tensor(B, "r", "t_in", DTYPE, STORAGE)}
${layout_declare_tensor(B, "r", "t_other", DTYPE, STORAGE)}
${layout_declare_ubo(B, "ivec4", "out_sizes")}
${layout_declare_ubo(B, "ivec4", "in_sizes")}
${layout_declare_ubo(B, "ivec4", "other_sizes")}
${layout_declare_ubo(B, "ivec2", "broadcast_params")}
${layout_declare_ubo(B, "float", "alpha")}

#include "broadcasting_utils.h"
#include "indexing_utils.h"
Expand All@@ -40,6 +35,14 @@ const lowp ivec4 in_axis_map = unhash_axis_map(in_layout);
${layout_declare_spec_const(C, "int", "other_layout", "DEFAULT_LAYOUT")}
const lowp ivec4 other_axis_map = unhash_axis_map(other_layout);

layout(push_constant) uniform restrict Block {
ivec4 out_sizes;
ivec4 in_sizes;
ivec4 other_sizes;
ivec2 broadcast_params;
float alpha;
};

void main() {
const ivec3 lpos = ivec3(gl_GlobalInvocationID);
const ivec4 tidx = lpos_to_tidx(lpos, out_sizes, out_axis_map.w, packed_dim);
Expand Down
12 changes: 3 additions & 9 deletions backends/vulkan/runtime/graph/ops/glsl/permute.glsl
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,15 +19,9 @@ layout(std430) buffer;
layout(set = 0, binding = 0, ${IMAGE_FORMAT[DTYPE]}) uniform PRECISION restrict writeonly ${IMAGE_T[NDIM][DTYPE]} image_out;
layout(set = 0, binding = 1) uniform PRECISION ${SAMPLER_T[NDIM][DTYPE]} image_in;

layout(set = 0, binding = 2) uniform PRECISION restrict OutLimits {
ivec3 out_limits;
};

layout(set = 0, binding = 3) uniform PRECISION restrict Sizes {
layout(push_constant) uniform PRECISION restrict Block {
ivec4 out_limits;
ivec4 sizes;
};

layout(set = 0, binding = 4) uniform PRECISION restrict Block {
// output dims
ivec4 out_ndims;
// x = output channels aligned to 4, y = input channels aligned to 4
Expand All@@ -41,7 +35,7 @@ layout(local_size_x_id = 0, local_size_y_id = 1, local_size_z_id = 2) in;
void main() {
const u16vec3 pos = u16vec3(gl_GlobalInvocationID);

if (any(greaterThanEqual(pos, out_limits))) {
if (any(greaterThanEqual(pos, out_limits.xyz))) {
return;
}

Expand Down
17 changes: 10 additions & 7 deletions backends/vulkan/runtime/graph/ops/impl/BinaryOp.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,10 @@ void add_binary_op_node(
alpha_val = graph.extract_scalar<float>(alpha);
}

const utils::ivec2 broadcast_params = create_broadcast_params(*t_in1, *t_in2);
const struct BinaryOpsParams {
const utils::ivec2 broadcast_params;
const float alpha_val;
} binary_ops_params{create_broadcast_params(*t_in1, *t_in2), alpha_val};

std::string kernel_name("binary_");
kernel_name.reserve(kShaderNameReserve);
Expand All@@ -83,16 +86,16 @@ void add_binary_op_node(
{{out, vkapi::MemoryAccessType::WRITE},
{{arg1, arg2}, vkapi::MemoryAccessType::READ}},
// Shader params buffers
{t_out->sizes_ubo(),
t_in1->sizes_ubo(),
t_in2->sizes_ubo(),
graph.create_params_buffer(broadcast_params),
graph.create_params_buffer(alpha_val)},
{},
// Specialization Constants
{t_out->hashed_layout(), t_in1->hashed_layout(), t_in2->hashed_layout()},
// Resizing Logic
resize_binary_op_node,
{}));
{},
{{graph.sizes_pc_of(out),
graph.sizes_pc_of(arg1),
graph.sizes_pc_of(arg2),
PushConstantDataInfo(&binary_ops_params, sizeof(binary_ops_params))}}));
}

#define DEFINE_BINARY_OP_WITH_ALPHA_FN(op_name) \
Expand Down
18 changes: 7 additions & 11 deletions backends/vulkan/runtime/graph/ops/impl/Permute.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -75,13 +75,7 @@ void add_permute_node(
int32_t out_c_aligned = utils::align_up_4(out_channels);
int32_t in_c_aligned = utils::align_up_4(in_channels);

const struct Block final {
ivec4 out_ndims;
ivec2 ch_info;
} params{
out_dims,
{out_c_aligned, in_c_aligned},
};
const ivec2 ch_info = {out_c_aligned, in_c_aligned};

graph.execute_nodes().emplace_back(new DispatchNode(
graph,
Expand All@@ -90,14 +84,16 @@ void add_permute_node(
graph.create_local_wg_size(out),
{{out, vkapi::MemoryAccessType::WRITE},
{in, vkapi::MemoryAccessType::READ}},
{t_out->logical_limits_ubo(),
t_out->sizes_ubo(),
graph.create_params_buffer(params)},
{},
// Specialization Constants
{},
// Resizing Logic
nullptr,
{}));
{},
{{graph.logical_limits_pc_of(out),
graph.sizes_pc_of(out),
PushConstantDataInfo(&out_dims, sizeof(out_dims)),
PushConstantDataInfo(&ch_info, sizeof(ch_info))}}));
}

void add_permute_node(
Expand Down
11 changes: 4 additions & 7 deletions backends/vulkan/test/vulkan_compute_api_test.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1601,9 +1601,7 @@ TEST(VulkanComputeGraphTest, test_simple_shared_objects_with_resize) {
auto addFn = VK_GET_OP_FN("aten.add.Tensor");
addFn(graph, {a.value, b.value, kDummyValueRef, c});

// +2: alpha UBO, broadcast UBO for arithmetic shader
// +1: t.sizes_ubo() for arithmetic shader output c
expected_vma_allocation_count += 3;
// no new allocations if binary op uses push constants
EXPECT_EQ(get_vma_allocation_count(), expected_vma_allocation_count);

IOValueRef d = graph.add_input_tensor(
Expand All@@ -1624,17 +1622,16 @@ TEST(VulkanComputeGraphTest, test_simple_shared_objects_with_resize) {
auto mulFn = VK_GET_OP_FN("aten.mul.Tensor");
mulFn(graph, {c, d.value, e});

// +2: alpha UBO, broadcast UBO for arithmetic shader
// +1: t.sizes_ubo() for arithmetic shader output e
expected_vma_allocation_count += 3;
// no new allocations if binary op uses push constants
EXPECT_EQ(get_vma_allocation_count(), expected_vma_allocation_count);

IOValueRef out = {};
out.value = e;
out.staging = graph.set_output_tensor(out.value);

// +1: staging buffer input tensor
// +1: staging buffer for the output tensor
expected_vma_allocation_count += 1;
expected_vma_allocation_count += 2;
EXPECT_EQ(get_vma_allocation_count(), expected_vma_allocation_count);

graph.prepare();
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 permute op#7347

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 2 commits into

from

Dec 18, 2024
 Merged


[ET-VK] Replace Uniform buffers with push constants for permute op
#7347
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
6f5ae56

[ET-VK] Replace Uniform buffers with push constants for binary op


trviv Dec 17, 2024
13587c2

[ET-VK] Replace Uniform buffers with push constants for permute op


trviv Dec 17, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


9 changes: 6 additions & 3 deletions
backends/vulkan/runtime/graph/ops/DispatchNode.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,12 +46,15 @@ class PushConstantDataInfo {
 payload_.attr = attr;
 }

 explicit PushConstantDataInfo(const void* data, uint32_t dataLen)
 explicit PushConstantDataInfo(
 const void* data,
 uint32_t dataLen,
 uint32_t pushConstantLen = 0)
 : tensorUniformData(nullptr) {
 VK_CHECK_COND(
 dataLen <= 16, "Single push constant data size must be <= 16 bytes");
 payload_.dataSize = dataLen;
 memcpy(payload_.data, data, payload_.dataSize);
 payload_.dataSize = pushConstantLen ? pushConstantLen : dataLen;
 memcpy(payload_.data, data, dataLen);
 }

 /*
Expand Down

13 changes: 8 additions & 5 deletions
backends/vulkan/runtime/graph/ops/glsl/binary_op.glsl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,11 +19,6 @@ layout(std430) buffer;
${layout_declare_tensor(B, "w", "t_out", DTYPE, STORAGE)}
${layout_declare_tensor(B, "r", "t_in", DTYPE, STORAGE)}
${layout_declare_tensor(B, "r", "t_other", DTYPE, STORAGE)}
${layout_declare_ubo(B, "ivec4", "out_sizes")}
${layout_declare_ubo(B, "ivec4", "in_sizes")}
${layout_declare_ubo(B, "ivec4", "other_sizes")}
${layout_declare_ubo(B, "ivec2", "broadcast_params")}
${layout_declare_ubo(B, "float", "alpha")}

#include "broadcasting_utils.h"
#include "indexing_utils.h"
Expand All@@ -40,6 +35,14 @@ const lowp ivec4 in_axis_map = unhash_axis_map(in_layout);
${layout_declare_spec_const(C, "int", "other_layout", "DEFAULT_LAYOUT")}
const lowp ivec4 other_axis_map = unhash_axis_map(other_layout);

layout(push_constant) uniform restrict Block {
 ivec4 out_sizes;
 ivec4 in_sizes;
 ivec4 other_sizes;
 ivec2 broadcast_params;
 float alpha;
};

void main() {
 const ivec3 lpos = ivec3(gl_GlobalInvocationID);
 const ivec4 tidx = lpos_to_tidx(lpos, out_sizes, out_axis_map.w, packed_dim);
Expand Down

12 changes: 3 additions & 9 deletions
backends/vulkan/runtime/graph/ops/glsl/permute.glsl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,15 +19,9 @@ layout(std430) buffer;
layout(set = 0, binding = 0, ${IMAGE_FORMAT[DTYPE]}) uniform PRECISION restrict writeonly ${IMAGE_T[NDIM][DTYPE]} image_out;
layout(set = 0, binding = 1) uniform PRECISION ${SAMPLER_T[NDIM][DTYPE]} image_in;

layout(set = 0, binding = 2) uniform PRECISION restrict OutLimits {
 ivec3 out_limits;
};

layout(set = 0, binding = 3) uniform PRECISION restrict Sizes {
layout(push_constant) uniform PRECISION restrict Block {
 ivec4 out_limits;
 ivec4 sizes;
};

layout(set = 0, binding = 4) uniform PRECISION restrict Block {
 // output dims
 ivec4 out_ndims;
 // x = output channels aligned to 4, y = input channels aligned to 4
Expand All@@ -41,7 +35,7 @@ layout(local_size_x_id = 0, local_size_y_id = 1, local_size_z_id = 2) in;
void main() {
 const u16vec3 pos = u16vec3(gl_GlobalInvocationID);

 if (any(greaterThanEqual(pos, out_limits))) {
 if (any(greaterThanEqual(pos, out_limits.xyz))) {
 return;
 }

Expand Down

17 changes: 10 additions & 7 deletions
backends/vulkan/runtime/graph/ops/impl/BinaryOp.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,10 @@ void add_binary_op_node(
 alpha_val = graph.extract_scalar<float>(alpha);
 }

 const utils::ivec2 broadcast_params = create_broadcast_params(*t_in1, *t_in2);
 const struct BinaryOpsParams {
 const utils::ivec2 broadcast_params;
 const float alpha_val;
 } binary_ops_params{create_broadcast_params(*t_in1, *t_in2), alpha_val};

 std::string kernel_name("binary_");
 kernel_name.reserve(kShaderNameReserve);
Expand All@@ -83,16 +86,16 @@ void add_binary_op_node(
 {{out, vkapi::MemoryAccessType::WRITE},
 {{arg1, arg2}, vkapi::MemoryAccessType::READ}},
 // Shader params buffers
 {t_out->sizes_ubo(),
 t_in1->sizes_ubo(),
 t_in2->sizes_ubo(),
 graph.create_params_buffer(broadcast_params),
 graph.create_params_buffer(alpha_val)},
 {},
 // Specialization Constants
 {t_out->hashed_layout(), t_in1->hashed_layout(), t_in2->hashed_layout()},
 // Resizing Logic
 resize_binary_op_node,
 {}));
 {},
 {{graph.sizes_pc_of(out),
 graph.sizes_pc_of(arg1),
 graph.sizes_pc_of(arg2),
 PushConstantDataInfo(&binary_ops_params, sizeof(binary_ops_params))}}));
}

#define DEFINE_BINARY_OP_WITH_ALPHA_FN(op_name) \
Expand Down

18 changes: 7 additions & 11 deletions
backends/vulkan/runtime/graph/ops/impl/Permute.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,13 +75,7 @@ void add_permute_node(
 int32_t out_c_aligned = utils::align_up_4(out_channels);
 int32_t in_c_aligned = utils::align_up_4(in_channels);

 const struct Block final {
 ivec4 out_ndims;
 ivec2 ch_info;
 } params{
 out_dims,
 {out_c_aligned, in_c_aligned},
 };
 const ivec2 ch_info = {out_c_aligned, in_c_aligned};

 graph.execute_nodes().emplace_back(new DispatchNode(
 graph,
Expand All@@ -90,14 +84,16 @@ void add_permute_node(
 graph.create_local_wg_size(out),
 {{out, vkapi::MemoryAccessType::WRITE},
 {in, vkapi::MemoryAccessType::READ}},
 {t_out->logical_limits_ubo(),
 t_out->sizes_ubo(),
 graph.create_params_buffer(params)},
 {},
 // Specialization Constants
 {},
 // Resizing Logic
 nullptr,
 {}));
 {},
 {{graph.logical_limits_pc_of(out),
 graph.sizes_pc_of(out),
 PushConstantDataInfo(&out_dims, sizeof(out_dims)),
 PushConstantDataInfo(&ch_info, sizeof(ch_info))}}));
}

void add_permute_node(
Expand Down

11 changes: 4 additions & 7 deletions
backends/vulkan/test/vulkan_compute_api_test.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1601,9 +1601,7 @@ TEST(VulkanComputeGraphTest, test_simple_shared_objects_with_resize) {
 auto addFn = VK_GET_OP_FN("aten.add.Tensor");
 addFn(graph, {a.value, b.value, kDummyValueRef, c});

 // +2: alpha UBO, broadcast UBO for arithmetic shader
 // +1: t.sizes_ubo() for arithmetic shader output c
 expected_vma_allocation_count += 3;
 // no new allocations if binary op uses push constants
 EXPECT_EQ(get_vma_allocation_count(), expected_vma_allocation_count);

 IOValueRef d = graph.add_input_tensor(
Expand All@@ -1624,17 +1622,16 @@ TEST(VulkanComputeGraphTest, test_simple_shared_objects_with_resize) {
 auto mulFn = VK_GET_OP_FN("aten.mul.Tensor");
 mulFn(graph, {c, d.value, e});

 // +2: alpha UBO, broadcast UBO for arithmetic shader
 // +1: t.sizes_ubo() for arithmetic shader output e
 expected_vma_allocation_count += 3;
 // no new allocations if binary op uses push constants
 EXPECT_EQ(get_vma_allocation_count(), expected_vma_allocation_count);

 IOValueRef out = {};
 out.value = e;
 out.staging = graph.set_output_tensor(out.value);

 // +1: staging buffer input tensor
 // +1: staging buffer for the output tensor
 expected_vma_allocation_count += 1;
 expected_vma_allocation_count += 2;
 EXPECT_EQ(get_vma_allocation_count(), expected_vma_allocation_count);

 graph.prepare();
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 permute op#7347

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 2 commits into

from

Dec 18, 2024
 Merged


[ET-VK] Replace Uniform buffers with push constants for permute op
#7347
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
6f5ae56

[ET-VK] Replace Uniform buffers with push constants for binary op


trviv Dec 17, 2024
13587c2

[ET-VK] Replace Uniform buffers with push constants for permute op


trviv Dec 17, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


9 changes: 6 additions & 3 deletions
backends/vulkan/runtime/graph/ops/DispatchNode.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,12 +46,15 @@ class PushConstantDataInfo {
 payload_.attr = attr;
 }

 explicit PushConstantDataInfo(const void* data, uint32_t dataLen)
 explicit PushConstantDataInfo(
 const void* data,
 uint32_t dataLen,
 uint32_t pushConstantLen = 0)
 : tensorUniformData(nullptr) {
 VK_CHECK_COND(
 dataLen <= 16, "Single push constant data size must be <= 16 bytes");
 payload_.dataSize = dataLen;
 memcpy(payload_.data, data, payload_.dataSize);
 payload_.dataSize = pushConstantLen ? pushConstantLen : dataLen;
 memcpy(payload_.data, data, dataLen);
 }

 /*
Expand Down

13 changes: 8 additions & 5 deletions
backends/vulkan/runtime/graph/ops/glsl/binary_op.glsl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,11 +19,6 @@ layout(std430) buffer;
${layout_declare_tensor(B, "w", "t_out", DTYPE, STORAGE)}
${layout_declare_tensor(B, "r", "t_in", DTYPE, STORAGE)}
${layout_declare_tensor(B, "r", "t_other", DTYPE, STORAGE)}
${layout_declare_ubo(B, "ivec4", "out_sizes")}
${layout_declare_ubo(B, "ivec4", "in_sizes")}
${layout_declare_ubo(B, "ivec4", "other_sizes")}
${layout_declare_ubo(B, "ivec2", "broadcast_params")}
${layout_declare_ubo(B, "float", "alpha")}

#include "broadcasting_utils.h"
#include "indexing_utils.h"
Expand All@@ -40,6 +35,14 @@ const lowp ivec4 in_axis_map = unhash_axis_map(in_layout);
${layout_declare_spec_const(C, "int", "other_layout", "DEFAULT_LAYOUT")}
const lowp ivec4 other_axis_map = unhash_axis_map(other_layout);

layout(push_constant) uniform restrict Block {
 ivec4 out_sizes;
 ivec4 in_sizes;
 ivec4 other_sizes;
 ivec2 broadcast_params;
 float alpha;
};

void main() {
 const ivec3 lpos = ivec3(gl_GlobalInvocationID);
 const ivec4 tidx = lpos_to_tidx(lpos, out_sizes, out_axis_map.w, packed_dim);
Expand Down

12 changes: 3 additions & 9 deletions
backends/vulkan/runtime/graph/ops/glsl/permute.glsl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,15 +19,9 @@ layout(std430) buffer;
layout(set = 0, binding = 0, ${IMAGE_FORMAT[DTYPE]}) uniform PRECISION restrict writeonly ${IMAGE_T[NDIM][DTYPE]} image_out;
layout(set = 0, binding = 1) uniform PRECISION ${SAMPLER_T[NDIM][DTYPE]} image_in;

layout(set = 0, binding = 2) uniform PRECISION restrict OutLimits {
 ivec3 out_limits;
};

layout(set = 0, binding = 3) uniform PRECISION restrict Sizes {
layout(push_constant) uniform PRECISION restrict Block {
 ivec4 out_limits;
 ivec4 sizes;
};

layout(set = 0, binding = 4) uniform PRECISION restrict Block {
 // output dims
 ivec4 out_ndims;
 // x = output channels aligned to 4, y = input channels aligned to 4
Expand All@@ -41,7 +35,7 @@ layout(local_size_x_id = 0, local_size_y_id = 1, local_size_z_id = 2) in;
void main() {
 const u16vec3 pos = u16vec3(gl_GlobalInvocationID);

 if (any(greaterThanEqual(pos, out_limits))) {
 if (any(greaterThanEqual(pos, out_limits.xyz))) {
 return;
 }

Expand Down

17 changes: 10 additions & 7 deletions
backends/vulkan/runtime/graph/ops/impl/BinaryOp.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,10 @@ void add_binary_op_node(
 alpha_val = graph.extract_scalar<float>(alpha);
 }

 const utils::ivec2 broadcast_params = create_broadcast_params(*t_in1, *t_in2);
 const struct BinaryOpsParams {
 const utils::ivec2 broadcast_params;
 const float alpha_val;
 } binary_ops_params{create_broadcast_params(*t_in1, *t_in2), alpha_val};

 std::string kernel_name("binary_");
 kernel_name.reserve(kShaderNameReserve);
Expand All@@ -83,16 +86,16 @@ void add_binary_op_node(
 {{out, vkapi::MemoryAccessType::WRITE},
 {{arg1, arg2}, vkapi::MemoryAccessType::READ}},
 // Shader params buffers
 {t_out->sizes_ubo(),
 t_in1->sizes_ubo(),
 t_in2->sizes_ubo(),
 graph.create_params_buffer(broadcast_params),
 graph.create_params_buffer(alpha_val)},
 {},
 // Specialization Constants
 {t_out->hashed_layout(), t_in1->hashed_layout(), t_in2->hashed_layout()},
 // Resizing Logic
 resize_binary_op_node,
 {}));
 {},
 {{graph.sizes_pc_of(out),
 graph.sizes_pc_of(arg1),
 graph.sizes_pc_of(arg2),
 PushConstantDataInfo(&binary_ops_params, sizeof(binary_ops_params))}}));
}

#define DEFINE_BINARY_OP_WITH_ALPHA_FN(op_name) \
Expand Down

18 changes: 7 additions & 11 deletions
backends/vulkan/runtime/graph/ops/impl/Permute.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,13 +75,7 @@ void add_permute_node(
 int32_t out_c_aligned = utils::align_up_4(out_channels);
 int32_t in_c_aligned = utils::align_up_4(in_channels);

 const struct Block final {
 ivec4 out_ndims;
 ivec2 ch_info;
 } params{
 out_dims,
 {out_c_aligned, in_c_aligned},
 };
 const ivec2 ch_info = {out_c_aligned, in_c_aligned};

 graph.execute_nodes().emplace_back(new DispatchNode(
 graph,
Expand All@@ -90,14 +84,16 @@ void add_permute_node(
 graph.create_local_wg_size(out),
 {{out, vkapi::MemoryAccessType::WRITE},
 {in, vkapi::MemoryAccessType::READ}},
 {t_out->logical_limits_ubo(),
 t_out->sizes_ubo(),
 graph.create_params_buffer(params)},
 {},
 // Specialization Constants
 {},
 // Resizing Logic
 nullptr,
 {}));
 {},
 {{graph.logical_limits_pc_of(out),
 graph.sizes_pc_of(out),
 PushConstantDataInfo(&out_dims, sizeof(out_dims)),
 PushConstantDataInfo(&ch_info, sizeof(ch_info))}}));
}

void add_permute_node(
Expand Down

11 changes: 4 additions & 7 deletions
backends/vulkan/test/vulkan_compute_api_test.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1601,9 +1601,7 @@ TEST(VulkanComputeGraphTest, test_simple_shared_objects_with_resize) {
 auto addFn = VK_GET_OP_FN("aten.add.Tensor");
 addFn(graph, {a.value, b.value, kDummyValueRef, c});

 // +2: alpha UBO, broadcast UBO for arithmetic shader
 // +1: t.sizes_ubo() for arithmetic shader output c
 expected_vma_allocation_count += 3;
 // no new allocations if binary op uses push constants
 EXPECT_EQ(get_vma_allocation_count(), expected_vma_allocation_count);

 IOValueRef d = graph.add_input_tensor(
Expand All@@ -1624,17 +1622,16 @@ TEST(VulkanComputeGraphTest, test_simple_shared_objects_with_resize) {
 auto mulFn = VK_GET_OP_FN("aten.mul.Tensor");
 mulFn(graph, {c, d.value, e});

 // +2: alpha UBO, broadcast UBO for arithmetic shader
 // +1: t.sizes_ubo() for arithmetic shader output e
 expected_vma_allocation_count += 3;
 // no new allocations if binary op uses push constants
 EXPECT_EQ(get_vma_allocation_count(), expected_vma_allocation_count);

 IOValueRef out = {};
 out.value = e;
 out.staging = graph.set_output_tensor(out.value);

 // +1: staging buffer input tensor
 // +1: staging buffer for the output tensor
 expected_vma_allocation_count += 1;
 expected_vma_allocation_count += 2;
 EXPECT_EQ(get_vma_allocation_count(), expected_vma_allocation_count);

 graph.prepare();
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 permute op#7347

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 2 commits into

from

Dec 18, 2024
 Merged


[ET-VK] Replace Uniform buffers with push constants for permute op
#7347
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
6f5ae56

[ET-VK] Replace Uniform buffers with push constants for binary op


trviv Dec 17, 2024
13587c2

[ET-VK] Replace Uniform buffers with push constants for permute op


trviv Dec 17, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


9 changes: 6 additions & 3 deletions
backends/vulkan/runtime/graph/ops/DispatchNode.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,12 +46,15 @@ class PushConstantDataInfo {
 payload_.attr = attr;
 }

 explicit PushConstantDataInfo(const void* data, uint32_t dataLen)
 explicit PushConstantDataInfo(
 const void* data,
 uint32_t dataLen,
 uint32_t pushConstantLen = 0)
 : tensorUniformData(nullptr) {
 VK_CHECK_COND(
 dataLen <= 16, "Single push constant data size must be <= 16 bytes");
 payload_.dataSize = dataLen;
 memcpy(payload_.data, data, payload_.dataSize);
 payload_.dataSize = pushConstantLen ? pushConstantLen : dataLen;
 memcpy(payload_.data, data, dataLen);
 }

 /*
Expand Down

13 changes: 8 additions & 5 deletions
backends/vulkan/runtime/graph/ops/glsl/binary_op.glsl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,11 +19,6 @@ layout(std430) buffer;
${layout_declare_tensor(B, "w", "t_out", DTYPE, STORAGE)}
${layout_declare_tensor(B, "r", "t_in", DTYPE, STORAGE)}
${layout_declare_tensor(B, "r", "t_other", DTYPE, STORAGE)}
${layout_declare_ubo(B, "ivec4", "out_sizes")}
${layout_declare_ubo(B, "ivec4", "in_sizes")}
${layout_declare_ubo(B, "ivec4", "other_sizes")}
${layout_declare_ubo(B, "ivec2", "broadcast_params")}
${layout_declare_ubo(B, "float", "alpha")}

#include "broadcasting_utils.h"
#include "indexing_utils.h"
Expand All@@ -40,6 +35,14 @@ const lowp ivec4 in_axis_map = unhash_axis_map(in_layout);
${layout_declare_spec_const(C, "int", "other_layout", "DEFAULT_LAYOUT")}
const lowp ivec4 other_axis_map = unhash_axis_map(other_layout);

layout(push_constant) uniform restrict Block {
 ivec4 out_sizes;
 ivec4 in_sizes;
 ivec4 other_sizes;
 ivec2 broadcast_params;
 float alpha;
};

void main() {
 const ivec3 lpos = ivec3(gl_GlobalInvocationID);
 const ivec4 tidx = lpos_to_tidx(lpos, out_sizes, out_axis_map.w, packed_dim);
Expand Down

12 changes: 3 additions & 9 deletions
backends/vulkan/runtime/graph/ops/glsl/permute.glsl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,15 +19,9 @@ layout(std430) buffer;
layout(set = 0, binding = 0, ${IMAGE_FORMAT[DTYPE]}) uniform PRECISION restrict writeonly ${IMAGE_T[NDIM][DTYPE]} image_out;
layout(set = 0, binding = 1) uniform PRECISION ${SAMPLER_T[NDIM][DTYPE]} image_in;

layout(set = 0, binding = 2) uniform PRECISION restrict OutLimits {
 ivec3 out_limits;
};

layout(set = 0, binding = 3) uniform PRECISION restrict Sizes {
layout(push_constant) uniform PRECISION restrict Block {
 ivec4 out_limits;
 ivec4 sizes;
};

layout(set = 0, binding = 4) uniform PRECISION restrict Block {
 // output dims
 ivec4 out_ndims;
 // x = output channels aligned to 4, y = input channels aligned to 4
Expand All@@ -41,7 +35,7 @@ layout(local_size_x_id = 0, local_size_y_id = 1, local_size_z_id = 2) in;
void main() {
 const u16vec3 pos = u16vec3(gl_GlobalInvocationID);

 if (any(greaterThanEqual(pos, out_limits))) {
 if (any(greaterThanEqual(pos, out_limits.xyz))) {
 return;
 }

Expand Down

17 changes: 10 additions & 7 deletions
backends/vulkan/runtime/graph/ops/impl/BinaryOp.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,10 @@ void add_binary_op_node(
 alpha_val = graph.extract_scalar<float>(alpha);
 }

 const utils::ivec2 broadcast_params = create_broadcast_params(*t_in1, *t_in2);
 const struct BinaryOpsParams {
 const utils::ivec2 broadcast_params;
 const float alpha_val;
 } binary_ops_params{create_broadcast_params(*t_in1, *t_in2), alpha_val};

 std::string kernel_name("binary_");
 kernel_name.reserve(kShaderNameReserve);
Expand All@@ -83,16 +86,16 @@ void add_binary_op_node(
 {{out, vkapi::MemoryAccessType::WRITE},
 {{arg1, arg2}, vkapi::MemoryAccessType::READ}},
 // Shader params buffers
 {t_out->sizes_ubo(),
 t_in1->sizes_ubo(),
 t_in2->sizes_ubo(),
 graph.create_params_buffer(broadcast_params),
 graph.create_params_buffer(alpha_val)},
 {},
 // Specialization Constants
 {t_out->hashed_layout(), t_in1->hashed_layout(), t_in2->hashed_layout()},
 // Resizing Logic
 resize_binary_op_node,
 {}));
 {},
 {{graph.sizes_pc_of(out),
 graph.sizes_pc_of(arg1),
 graph.sizes_pc_of(arg2),
 PushConstantDataInfo(&binary_ops_params, sizeof(binary_ops_params))}}));
}

#define DEFINE_BINARY_OP_WITH_ALPHA_FN(op_name) \
Expand Down

18 changes: 7 additions & 11 deletions
backends/vulkan/runtime/graph/ops/impl/Permute.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,13 +75,7 @@ void add_permute_node(
 int32_t out_c_aligned = utils::align_up_4(out_channels);
 int32_t in_c_aligned = utils::align_up_4(in_channels);

 const struct Block final {
 ivec4 out_ndims;
 ivec2 ch_info;
 } params{
 out_dims,
 {out_c_aligned, in_c_aligned},
 };
 const ivec2 ch_info = {out_c_aligned, in_c_aligned};

 graph.execute_nodes().emplace_back(new DispatchNode(
 graph,
Expand All@@ -90,14 +84,16 @@ void add_permute_node(
 graph.create_local_wg_size(out),
 {{out, vkapi::MemoryAccessType::WRITE},
 {in, vkapi::MemoryAccessType::READ}},
 {t_out->logical_limits_ubo(),
 t_out->sizes_ubo(),
 graph.create_params_buffer(params)},
 {},
 // Specialization Constants
 {},
 // Resizing Logic
 nullptr,
 {}));
 {},
 {{graph.logical_limits_pc_of(out),
 graph.sizes_pc_of(out),
 PushConstantDataInfo(&out_dims, sizeof(out_dims)),
 PushConstantDataInfo(&ch_info, sizeof(ch_info))}}));
}

void add_permute_node(
Expand Down

11 changes: 4 additions & 7 deletions
backends/vulkan/test/vulkan_compute_api_test.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1601,9 +1601,7 @@ TEST(VulkanComputeGraphTest, test_simple_shared_objects_with_resize) {
 auto addFn = VK_GET_OP_FN("aten.add.Tensor");
 addFn(graph, {a.value, b.value, kDummyValueRef, c});

 // +2: alpha UBO, broadcast UBO for arithmetic shader
 // +1: t.sizes_ubo() for arithmetic shader output c
 expected_vma_allocation_count += 3;
 // no new allocations if binary op uses push constants
 EXPECT_EQ(get_vma_allocation_count(), expected_vma_allocation_count);

 IOValueRef d = graph.add_input_tensor(
Expand All@@ -1624,17 +1622,16 @@ TEST(VulkanComputeGraphTest, test_simple_shared_objects_with_resize) {
 auto mulFn = VK_GET_OP_FN("aten.mul.Tensor");
 mulFn(graph, {c, d.value, e});

 // +2: alpha UBO, broadcast UBO for arithmetic shader
 // +1: t.sizes_ubo() for arithmetic shader output e
 expected_vma_allocation_count += 3;
 // no new allocations if binary op uses push constants
 EXPECT_EQ(get_vma_allocation_count(), expected_vma_allocation_count);

 IOValueRef out = {};
 out.value = e;
 out.staging = graph.set_output_tensor(out.value);

 // +1: staging buffer input tensor
 // +1: staging buffer for the output tensor
 expected_vma_allocation_count += 1;
 expected_vma_allocation_count += 2;
 EXPECT_EQ(get_vma_allocation_count(), expected_vma_allocation_count);

 graph.prepare();
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 permute op#7347

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 2 commits into

from

Dec 18, 2024
 Merged


[ET-VK] Replace Uniform buffers with push constants for permute op
#7347
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
6f5ae56

[ET-VK] Replace Uniform buffers with push constants for binary op


trviv Dec 17, 2024
13587c2

[ET-VK] Replace Uniform buffers with push constants for permute op


trviv Dec 17, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


9 changes: 6 additions & 3 deletions
backends/vulkan/runtime/graph/ops/DispatchNode.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,12 +46,15 @@ class PushConstantDataInfo {
 payload_.attr = attr;
 }

 explicit PushConstantDataInfo(const void* data, uint32_t dataLen)
 explicit PushConstantDataInfo(
 const void* data,
 uint32_t dataLen,
 uint32_t pushConstantLen = 0)
 : tensorUniformData(nullptr) {
 VK_CHECK_COND(
 dataLen <= 16, "Single push constant data size must be <= 16 bytes");
 payload_.dataSize = dataLen;
 memcpy(payload_.data, data, payload_.dataSize);
 payload_.dataSize = pushConstantLen ? pushConstantLen : dataLen;
 memcpy(payload_.data, data, dataLen);
 }

 /*
Expand Down

13 changes: 8 additions & 5 deletions
backends/vulkan/runtime/graph/ops/glsl/binary_op.glsl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,11 +19,6 @@ layout(std430) buffer;
${layout_declare_tensor(B, "w", "t_out", DTYPE, STORAGE)}
${layout_declare_tensor(B, "r", "t_in", DTYPE, STORAGE)}
${layout_declare_tensor(B, "r", "t_other", DTYPE, STORAGE)}
${layout_declare_ubo(B, "ivec4", "out_sizes")}
${layout_declare_ubo(B, "ivec4", "in_sizes")}
${layout_declare_ubo(B, "ivec4", "other_sizes")}
${layout_declare_ubo(B, "ivec2", "broadcast_params")}
${layout_declare_ubo(B, "float", "alpha")}

#include "broadcasting_utils.h"
#include "indexing_utils.h"
Expand All@@ -40,6 +35,14 @@ const lowp ivec4 in_axis_map = unhash_axis_map(in_layout);
${layout_declare_spec_const(C, "int", "other_layout", "DEFAULT_LAYOUT")}
const lowp ivec4 other_axis_map = unhash_axis_map(other_layout);

layout(push_constant) uniform restrict Block {
 ivec4 out_sizes;
 ivec4 in_sizes;
 ivec4 other_sizes;
 ivec2 broadcast_params;
 float alpha;
};

void main() {
 const ivec3 lpos = ivec3(gl_GlobalInvocationID);
 const ivec4 tidx = lpos_to_tidx(lpos, out_sizes, out_axis_map.w, packed_dim);
Expand Down

12 changes: 3 additions & 9 deletions
backends/vulkan/runtime/graph/ops/glsl/permute.glsl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,15 +19,9 @@ layout(std430) buffer;
layout(set = 0, binding = 0, ${IMAGE_FORMAT[DTYPE]}) uniform PRECISION restrict writeonly ${IMAGE_T[NDIM][DTYPE]} image_out;
layout(set = 0, binding = 1) uniform PRECISION ${SAMPLER_T[NDIM][DTYPE]} image_in;

layout(set = 0, binding = 2) uniform PRECISION restrict OutLimits {
 ivec3 out_limits;
};

layout(set = 0, binding = 3) uniform PRECISION restrict Sizes {
layout(push_constant) uniform PRECISION restrict Block {
 ivec4 out_limits;
 ivec4 sizes;
};

layout(set = 0, binding = 4) uniform PRECISION restrict Block {
 // output dims
 ivec4 out_ndims;
 // x = output channels aligned to 4, y = input channels aligned to 4
Expand All@@ -41,7 +35,7 @@ layout(local_size_x_id = 0, local_size_y_id = 1, local_size_z_id = 2) in;
void main() {
 const u16vec3 pos = u16vec3(gl_GlobalInvocationID);

 if (any(greaterThanEqual(pos, out_limits))) {
 if (any(greaterThanEqual(pos, out_limits.xyz))) {
 return;
 }

Expand Down

17 changes: 10 additions & 7 deletions
backends/vulkan/runtime/graph/ops/impl/BinaryOp.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,10 @@ void add_binary_op_node(
 alpha_val = graph.extract_scalar<float>(alpha);
 }

 const utils::ivec2 broadcast_params = create_broadcast_params(*t_in1, *t_in2);
 const struct BinaryOpsParams {
 const utils::ivec2 broadcast_params;
 const float alpha_val;
 } binary_ops_params{create_broadcast_params(*t_in1, *t_in2), alpha_val};

 std::string kernel_name("binary_");
 kernel_name.reserve(kShaderNameReserve);
Expand All@@ -83,16 +86,16 @@ void add_binary_op_node(
 {{out, vkapi::MemoryAccessType::WRITE},
 {{arg1, arg2}, vkapi::MemoryAccessType::READ}},
 // Shader params buffers
 {t_out->sizes_ubo(),
 t_in1->sizes_ubo(),
 t_in2->sizes_ubo(),
 graph.create_params_buffer(broadcast_params),
 graph.create_params_buffer(alpha_val)},
 {},
 // Specialization Constants
 {t_out->hashed_layout(), t_in1->hashed_layout(), t_in2->hashed_layout()},
 // Resizing Logic
 resize_binary_op_node,
 {}));
 {},
 {{graph.sizes_pc_of(out),
 graph.sizes_pc_of(arg1),
 graph.sizes_pc_of(arg2),
 PushConstantDataInfo(&binary_ops_params, sizeof(binary_ops_params))}}));
}

#define DEFINE_BINARY_OP_WITH_ALPHA_FN(op_name) \
Expand Down

18 changes: 7 additions & 11 deletions
backends/vulkan/runtime/graph/ops/impl/Permute.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,13 +75,7 @@ void add_permute_node(
 int32_t out_c_aligned = utils::align_up_4(out_channels);
 int32_t in_c_aligned = utils::align_up_4(in_channels);

 const struct Block final {
 ivec4 out_ndims;
 ivec2 ch_info;
 } params{
 out_dims,
 {out_c_aligned, in_c_aligned},
 };
 const ivec2 ch_info = {out_c_aligned, in_c_aligned};

 graph.execute_nodes().emplace_back(new DispatchNode(
 graph,
Expand All@@ -90,14 +84,16 @@ void add_permute_node(
 graph.create_local_wg_size(out),
 {{out, vkapi::MemoryAccessType::WRITE},
 {in, vkapi::MemoryAccessType::READ}},
 {t_out->logical_limits_ubo(),
 t_out->sizes_ubo(),
 graph.create_params_buffer(params)},
 {},
 // Specialization Constants
 {},
 // Resizing Logic
 nullptr,
 {}));
 {},
 {{graph.logical_limits_pc_of(out),
 graph.sizes_pc_of(out),
 PushConstantDataInfo(&out_dims, sizeof(out_dims)),
 PushConstantDataInfo(&ch_info, sizeof(ch_info))}}));
}

void add_permute_node(
Expand Down

11 changes: 4 additions & 7 deletions
backends/vulkan/test/vulkan_compute_api_test.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1601,9 +1601,7 @@ TEST(VulkanComputeGraphTest, test_simple_shared_objects_with_resize) {
 auto addFn = VK_GET_OP_FN("aten.add.Tensor");
 addFn(graph, {a.value, b.value, kDummyValueRef, c});

 // +2: alpha UBO, broadcast UBO for arithmetic shader
 // +1: t.sizes_ubo() for arithmetic shader output c
 expected_vma_allocation_count += 3;
 // no new allocations if binary op uses push constants
 EXPECT_EQ(get_vma_allocation_count(), expected_vma_allocation_count);

 IOValueRef d = graph.add_input_tensor(
Expand All@@ -1624,17 +1622,16 @@ TEST(VulkanComputeGraphTest, test_simple_shared_objects_with_resize) {
 auto mulFn = VK_GET_OP_FN("aten.mul.Tensor");
 mulFn(graph, {c, d.value, e});

 // +2: alpha UBO, broadcast UBO for arithmetic shader
 // +1: t.sizes_ubo() for arithmetic shader output e
 expected_vma_allocation_count += 3;
 // no new allocations if binary op uses push constants
 EXPECT_EQ(get_vma_allocation_count(), expected_vma_allocation_count);

 IOValueRef out = {};
 out.value = e;
 out.staging = graph.set_output_tensor(out.value);

 // +1: staging buffer input tensor
 // +1: staging buffer for the output tensor
 expected_vma_allocation_count += 1;
 expected_vma_allocation_count += 2;
 EXPECT_EQ(get_vma_allocation_count(), expected_vma_allocation_count);

 graph.prepare();
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 permute op#7347

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 2 commits into

from

Dec 18, 2024
 Merged


[ET-VK] Replace Uniform buffers with push constants for permute op
#7347
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
6f5ae56

[ET-VK] Replace Uniform buffers with push constants for binary op


trviv Dec 17, 2024
13587c2

[ET-VK] Replace Uniform buffers with push constants for permute op


trviv Dec 17, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


9 changes: 6 additions & 3 deletions
backends/vulkan/runtime/graph/ops/DispatchNode.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,12 +46,15 @@ class PushConstantDataInfo {
 payload_.attr = attr;
 }

 explicit PushConstantDataInfo(const void* data, uint32_t dataLen)
 explicit PushConstantDataInfo(
 const void* data,
 uint32_t dataLen,
 uint32_t pushConstantLen = 0)
 : tensorUniformData(nullptr) {
 VK_CHECK_COND(
 dataLen <= 16, "Single push constant data size must be <= 16 bytes");
 payload_.dataSize = dataLen;
 memcpy(payload_.data, data, payload_.dataSize);
 payload_.dataSize = pushConstantLen ? pushConstantLen : dataLen;
 memcpy(payload_.data, data, dataLen);
 }

 /*
Expand Down

13 changes: 8 additions & 5 deletions
backends/vulkan/runtime/graph/ops/glsl/binary_op.glsl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,11 +19,6 @@ layout(std430) buffer;
${layout_declare_tensor(B, "w", "t_out", DTYPE, STORAGE)}
${layout_declare_tensor(B, "r", "t_in", DTYPE, STORAGE)}
${layout_declare_tensor(B, "r", "t_other", DTYPE, STORAGE)}
${layout_declare_ubo(B, "ivec4", "out_sizes")}
${layout_declare_ubo(B, "ivec4", "in_sizes")}
${layout_declare_ubo(B, "ivec4", "other_sizes")}
${layout_declare_ubo(B, "ivec2", "broadcast_params")}
${layout_declare_ubo(B, "float", "alpha")}

#include "broadcasting_utils.h"
#include "indexing_utils.h"
Expand All@@ -40,6 +35,14 @@ const lowp ivec4 in_axis_map = unhash_axis_map(in_layout);
${layout_declare_spec_const(C, "int", "other_layout", "DEFAULT_LAYOUT")}
const lowp ivec4 other_axis_map = unhash_axis_map(other_layout);

layout(push_constant) uniform restrict Block {
 ivec4 out_sizes;
 ivec4 in_sizes;
 ivec4 other_sizes;
 ivec2 broadcast_params;
 float alpha;
};

void main() {
 const ivec3 lpos = ivec3(gl_GlobalInvocationID);
 const ivec4 tidx = lpos_to_tidx(lpos, out_sizes, out_axis_map.w, packed_dim);
Expand Down

12 changes: 3 additions & 9 deletions
backends/vulkan/runtime/graph/ops/glsl/permute.glsl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,15 +19,9 @@ layout(std430) buffer;
layout(set = 0, binding = 0, ${IMAGE_FORMAT[DTYPE]}) uniform PRECISION restrict writeonly ${IMAGE_T[NDIM][DTYPE]} image_out;
layout(set = 0, binding = 1) uniform PRECISION ${SAMPLER_T[NDIM][DTYPE]} image_in;

layout(set = 0, binding = 2) uniform PRECISION restrict OutLimits {
 ivec3 out_limits;
};

layout(set = 0, binding = 3) uniform PRECISION restrict Sizes {
layout(push_constant) uniform PRECISION restrict Block {
 ivec4 out_limits;
 ivec4 sizes;
};

layout(set = 0, binding = 4) uniform PRECISION restrict Block {
 // output dims
 ivec4 out_ndims;
 // x = output channels aligned to 4, y = input channels aligned to 4
Expand All@@ -41,7 +35,7 @@ layout(local_size_x_id = 0, local_size_y_id = 1, local_size_z_id = 2) in;
void main() {
 const u16vec3 pos = u16vec3(gl_GlobalInvocationID);

 if (any(greaterThanEqual(pos, out_limits))) {
 if (any(greaterThanEqual(pos, out_limits.xyz))) {
 return;
 }

Expand Down

17 changes: 10 additions & 7 deletions
backends/vulkan/runtime/graph/ops/impl/BinaryOp.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,10 @@ void add_binary_op_node(
 alpha_val = graph.extract_scalar<float>(alpha);
 }

 const utils::ivec2 broadcast_params = create_broadcast_params(*t_in1, *t_in2);
 const struct BinaryOpsParams {
 const utils::ivec2 broadcast_params;
 const float alpha_val;
 } binary_ops_params{create_broadcast_params(*t_in1, *t_in2), alpha_val};

 std::string kernel_name("binary_");
 kernel_name.reserve(kShaderNameReserve);
Expand All@@ -83,16 +86,16 @@ void add_binary_op_node(
 {{out, vkapi::MemoryAccessType::WRITE},
 {{arg1, arg2}, vkapi::MemoryAccessType::READ}},
 // Shader params buffers
 {t_out->sizes_ubo(),
 t_in1->sizes_ubo(),
 t_in2->sizes_ubo(),
 graph.create_params_buffer(broadcast_params),
 graph.create_params_buffer(alpha_val)},
 {},
 // Specialization Constants
 {t_out->hashed_layout(), t_in1->hashed_layout(), t_in2->hashed_layout()},
 // Resizing Logic
 resize_binary_op_node,
 {}));
 {},
 {{graph.sizes_pc_of(out),
 graph.sizes_pc_of(arg1),
 graph.sizes_pc_of(arg2),
 PushConstantDataInfo(&binary_ops_params, sizeof(binary_ops_params))}}));
}

#define DEFINE_BINARY_OP_WITH_ALPHA_FN(op_name) \
Expand Down

18 changes: 7 additions & 11 deletions
backends/vulkan/runtime/graph/ops/impl/Permute.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,13 +75,7 @@ void add_permute_node(
 int32_t out_c_aligned = utils::align_up_4(out_channels);
 int32_t in_c_aligned = utils::align_up_4(in_channels);

 const struct Block final {
 ivec4 out_ndims;
 ivec2 ch_info;
 } params{
 out_dims,
 {out_c_aligned, in_c_aligned},
 };
 const ivec2 ch_info = {out_c_aligned, in_c_aligned};

 graph.execute_nodes().emplace_back(new DispatchNode(
 graph,
Expand All@@ -90,14 +84,16 @@ void add_permute_node(
 graph.create_local_wg_size(out),
 {{out, vkapi::MemoryAccessType::WRITE},
 {in, vkapi::MemoryAccessType::READ}},
 {t_out->logical_limits_ubo(),
 t_out->sizes_ubo(),
 graph.create_params_buffer(params)},
 {},
 // Specialization Constants
 {},
 // Resizing Logic
 nullptr,
 {}));
 {},
 {{graph.logical_limits_pc_of(out),
 graph.sizes_pc_of(out),
 PushConstantDataInfo(&out_dims, sizeof(out_dims)),
 PushConstantDataInfo(&ch_info, sizeof(ch_info))}}));
}

void add_permute_node(
Expand Down

11 changes: 4 additions & 7 deletions
backends/vulkan/test/vulkan_compute_api_test.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1601,9 +1601,7 @@ TEST(VulkanComputeGraphTest, test_simple_shared_objects_with_resize) {
 auto addFn = VK_GET_OP_FN("aten.add.Tensor");
 addFn(graph, {a.value, b.value, kDummyValueRef, c});

 // +2: alpha UBO, broadcast UBO for arithmetic shader
 // +1: t.sizes_ubo() for arithmetic shader output c
 expected_vma_allocation_count += 3;
 // no new allocations if binary op uses push constants
 EXPECT_EQ(get_vma_allocation_count(), expected_vma_allocation_count);

 IOValueRef d = graph.add_input_tensor(
Expand All@@ -1624,17 +1622,16 @@ TEST(VulkanComputeGraphTest, test_simple_shared_objects_with_resize) {
 auto mulFn = VK_GET_OP_FN("aten.mul.Tensor");
 mulFn(graph, {c, d.value, e});

 // +2: alpha UBO, broadcast UBO for arithmetic shader
 // +1: t.sizes_ubo() for arithmetic shader output e
 expected_vma_allocation_count += 3;
 // no new allocations if binary op uses push constants
 EXPECT_EQ(get_vma_allocation_count(), expected_vma_allocation_count);

 IOValueRef out = {};
 out.value = e;
 out.staging = graph.set_output_tensor(out.value);

 // +1: staging buffer input tensor
 // +1: staging buffer for the output tensor
 expected_vma_allocation_count += 1;
 expected_vma_allocation_count += 2;
 EXPECT_EQ(get_vma_allocation_count(), expected_vma_allocation_count);

 graph.prepare();
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 permute op#7347

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 2 commits into

from

Dec 18, 2024
 Merged


[ET-VK] Replace Uniform buffers with push constants for permute op
#7347
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
6f5ae56

[ET-VK] Replace Uniform buffers with push constants for binary op


trviv Dec 17, 2024
13587c2

[ET-VK] Replace Uniform buffers with push constants for permute op


trviv Dec 17, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


9 changes: 6 additions & 3 deletions
backends/vulkan/runtime/graph/ops/DispatchNode.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,12 +46,15 @@ class PushConstantDataInfo {
 payload_.attr = attr;
 }

 explicit PushConstantDataInfo(const void* data, uint32_t dataLen)
 explicit PushConstantDataInfo(
 const void* data,
 uint32_t dataLen,
 uint32_t pushConstantLen = 0)
 : tensorUniformData(nullptr) {
 VK_CHECK_COND(
 dataLen <= 16, "Single push constant data size must be <= 16 bytes");
 payload_.dataSize = dataLen;
 memcpy(payload_.data, data, payload_.dataSize);
 payload_.dataSize = pushConstantLen ? pushConstantLen : dataLen;
 memcpy(payload_.data, data, dataLen);
 }

 /*
Expand Down

13 changes: 8 additions & 5 deletions
backends/vulkan/runtime/graph/ops/glsl/binary_op.glsl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,11 +19,6 @@ layout(std430) buffer;
${layout_declare_tensor(B, "w", "t_out", DTYPE, STORAGE)}
${layout_declare_tensor(B, "r", "t_in", DTYPE, STORAGE)}
${layout_declare_tensor(B, "r", "t_other", DTYPE, STORAGE)}
${layout_declare_ubo(B, "ivec4", "out_sizes")}
${layout_declare_ubo(B, "ivec4", "in_sizes")}
${layout_declare_ubo(B, "ivec4", "other_sizes")}
${layout_declare_ubo(B, "ivec2", "broadcast_params")}
${layout_declare_ubo(B, "float", "alpha")}

#include "broadcasting_utils.h"
#include "indexing_utils.h"
Expand All@@ -40,6 +35,14 @@ const lowp ivec4 in_axis_map = unhash_axis_map(in_layout);
${layout_declare_spec_const(C, "int", "other_layout", "DEFAULT_LAYOUT")}
const lowp ivec4 other_axis_map = unhash_axis_map(other_layout);

layout(push_constant) uniform restrict Block {
 ivec4 out_sizes;
 ivec4 in_sizes;
 ivec4 other_sizes;
 ivec2 broadcast_params;
 float alpha;
};

void main() {
 const ivec3 lpos = ivec3(gl_GlobalInvocationID);
 const ivec4 tidx = lpos_to_tidx(lpos, out_sizes, out_axis_map.w, packed_dim);
Expand Down

12 changes: 3 additions & 9 deletions
backends/vulkan/runtime/graph/ops/glsl/permute.glsl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,15 +19,9 @@ layout(std430) buffer;
layout(set = 0, binding = 0, ${IMAGE_FORMAT[DTYPE]}) uniform PRECISION restrict writeonly ${IMAGE_T[NDIM][DTYPE]} image_out;
layout(set = 0, binding = 1) uniform PRECISION ${SAMPLER_T[NDIM][DTYPE]} image_in;

layout(set = 0, binding = 2) uniform PRECISION restrict OutLimits {
 ivec3 out_limits;
};

layout(set = 0, binding = 3) uniform PRECISION restrict Sizes {
layout(push_constant) uniform PRECISION restrict Block {
 ivec4 out_limits;
 ivec4 sizes;
};

layout(set = 0, binding = 4) uniform PRECISION restrict Block {
 // output dims
 ivec4 out_ndims;
 // x = output channels aligned to 4, y = input channels aligned to 4
Expand All@@ -41,7 +35,7 @@ layout(local_size_x_id = 0, local_size_y_id = 1, local_size_z_id = 2) in;
void main() {
 const u16vec3 pos = u16vec3(gl_GlobalInvocationID);

 if (any(greaterThanEqual(pos, out_limits))) {
 if (any(greaterThanEqual(pos, out_limits.xyz))) {
 return;
 }

Expand Down

17 changes: 10 additions & 7 deletions
backends/vulkan/runtime/graph/ops/impl/BinaryOp.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,10 @@ void add_binary_op_node(
 alpha_val = graph.extract_scalar<float>(alpha);
 }

 const utils::ivec2 broadcast_params = create_broadcast_params(*t_in1, *t_in2);
 const struct BinaryOpsParams {
 const utils::ivec2 broadcast_params;
 const float alpha_val;
 } binary_ops_params{create_broadcast_params(*t_in1, *t_in2), alpha_val};

 std::string kernel_name("binary_");
 kernel_name.reserve(kShaderNameReserve);
Expand All@@ -83,16 +86,16 @@ void add_binary_op_node(
 {{out, vkapi::MemoryAccessType::WRITE},
 {{arg1, arg2}, vkapi::MemoryAccessType::READ}},
 // Shader params buffers
 {t_out->sizes_ubo(),
 t_in1->sizes_ubo(),
 t_in2->sizes_ubo(),
 graph.create_params_buffer(broadcast_params),
 graph.create_params_buffer(alpha_val)},
 {},
 // Specialization Constants
 {t_out->hashed_layout(), t_in1->hashed_layout(), t_in2->hashed_layout()},
 // Resizing Logic
 resize_binary_op_node,
 {}));
 {},
 {{graph.sizes_pc_of(out),
 graph.sizes_pc_of(arg1),
 graph.sizes_pc_of(arg2),
 PushConstantDataInfo(&binary_ops_params, sizeof(binary_ops_params))}}));
}

#define DEFINE_BINARY_OP_WITH_ALPHA_FN(op_name) \
Expand Down

18 changes: 7 additions & 11 deletions
backends/vulkan/runtime/graph/ops/impl/Permute.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,13 +75,7 @@ void add_permute_node(
 int32_t out_c_aligned = utils::align_up_4(out_channels);
 int32_t in_c_aligned = utils::align_up_4(in_channels);

 const struct Block final {
 ivec4 out_ndims;
 ivec2 ch_info;
 } params{
 out_dims,
 {out_c_aligned, in_c_aligned},
 };
 const ivec2 ch_info = {out_c_aligned, in_c_aligned};

 graph.execute_nodes().emplace_back(new DispatchNode(
 graph,
Expand All@@ -90,14 +84,16 @@ void add_permute_node(
 graph.create_local_wg_size(out),
 {{out, vkapi::MemoryAccessType::WRITE},
 {in, vkapi::MemoryAccessType::READ}},
 {t_out->logical_limits_ubo(),
 t_out->sizes_ubo(),
 graph.create_params_buffer(params)},
 {},
 // Specialization Constants
 {},
 // Resizing Logic
 nullptr,
 {}));
 {},
 {{graph.logical_limits_pc_of(out),
 graph.sizes_pc_of(out),
 PushConstantDataInfo(&out_dims, sizeof(out_dims)),
 PushConstantDataInfo(&ch_info, sizeof(ch_info))}}));
}

void add_permute_node(
Expand Down

11 changes: 4 additions & 7 deletions
backends/vulkan/test/vulkan_compute_api_test.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1601,9 +1601,7 @@ TEST(VulkanComputeGraphTest, test_simple_shared_objects_with_resize) {
 auto addFn = VK_GET_OP_FN("aten.add.Tensor");
 addFn(graph, {a.value, b.value, kDummyValueRef, c});

 // +2: alpha UBO, broadcast UBO for arithmetic shader
 // +1: t.sizes_ubo() for arithmetic shader output c
 expected_vma_allocation_count += 3;
 // no new allocations if binary op uses push constants
 EXPECT_EQ(get_vma_allocation_count(), expected_vma_allocation_count);

 IOValueRef d = graph.add_input_tensor(
Expand All@@ -1624,17 +1622,16 @@ TEST(VulkanComputeGraphTest, test_simple_shared_objects_with_resize) {
 auto mulFn = VK_GET_OP_FN("aten.mul.Tensor");
 mulFn(graph, {c, d.value, e});

 // +2: alpha UBO, broadcast UBO for arithmetic shader
 // +1: t.sizes_ubo() for arithmetic shader output e
 expected_vma_allocation_count += 3;
 // no new allocations if binary op uses push constants
 EXPECT_EQ(get_vma_allocation_count(), expected_vma_allocation_count);

 IOValueRef out = {};
 out.value = e;
 out.staging = graph.set_output_tensor(out.value);

 // +1: staging buffer input tensor
 // +1: staging buffer for the output tensor
 expected_vma_allocation_count += 1;
 expected_vma_allocation_count += 2;
 EXPECT_EQ(get_vma_allocation_count(), expected_vma_allocation_count);

 graph.prepare();
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 permute op#7347

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 2 commits into

from

Dec 18, 2024
 Merged


[ET-VK] Replace Uniform buffers with push constants for permute op
#7347
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
6f5ae56

[ET-VK] Replace Uniform buffers with push constants for binary op


trviv Dec 17, 2024
13587c2

[ET-VK] Replace Uniform buffers with push constants for permute op


trviv Dec 17, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


9 changes: 6 additions & 3 deletions
backends/vulkan/runtime/graph/ops/DispatchNode.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,12 +46,15 @@ class PushConstantDataInfo {
 payload_.attr = attr;
 }

 explicit PushConstantDataInfo(const void* data, uint32_t dataLen)
 explicit PushConstantDataInfo(
 const void* data,
 uint32_t dataLen,
 uint32_t pushConstantLen = 0)
 : tensorUniformData(nullptr) {
 VK_CHECK_COND(
 dataLen <= 16, "Single push constant data size must be <= 16 bytes");
 payload_.dataSize = dataLen;
 memcpy(payload_.data, data, payload_.dataSize);
 payload_.dataSize = pushConstantLen ? pushConstantLen : dataLen;
 memcpy(payload_.data, data, dataLen);
 }

 /*
Expand Down

13 changes: 8 additions & 5 deletions
backends/vulkan/runtime/graph/ops/glsl/binary_op.glsl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,11 +19,6 @@ layout(std430) buffer;
${layout_declare_tensor(B, "w", "t_out", DTYPE, STORAGE)}
${layout_declare_tensor(B, "r", "t_in", DTYPE, STORAGE)}
${layout_declare_tensor(B, "r", "t_other", DTYPE, STORAGE)}
${layout_declare_ubo(B, "ivec4", "out_sizes")}
${layout_declare_ubo(B, "ivec4", "in_sizes")}
${layout_declare_ubo(B, "ivec4", "other_sizes")}
${layout_declare_ubo(B, "ivec2", "broadcast_params")}
${layout_declare_ubo(B, "float", "alpha")}

#include "broadcasting_utils.h"
#include "indexing_utils.h"
Expand All@@ -40,6 +35,14 @@ const lowp ivec4 in_axis_map = unhash_axis_map(in_layout);
${layout_declare_spec_const(C, "int", "other_layout", "DEFAULT_LAYOUT")}
const lowp ivec4 other_axis_map = unhash_axis_map(other_layout);

layout(push_constant) uniform restrict Block {
 ivec4 out_sizes;
 ivec4 in_sizes;
 ivec4 other_sizes;
 ivec2 broadcast_params;
 float alpha;
};

void main() {
 const ivec3 lpos = ivec3(gl_GlobalInvocationID);
 const ivec4 tidx = lpos_to_tidx(lpos, out_sizes, out_axis_map.w, packed_dim);
Expand Down

12 changes: 3 additions & 9 deletions
backends/vulkan/runtime/graph/ops/glsl/permute.glsl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,15 +19,9 @@ layout(std430) buffer;
layout(set = 0, binding = 0, ${IMAGE_FORMAT[DTYPE]}) uniform PRECISION restrict writeonly ${IMAGE_T[NDIM][DTYPE]} image_out;
layout(set = 0, binding = 1) uniform PRECISION ${SAMPLER_T[NDIM][DTYPE]} image_in;

layout(set = 0, binding = 2) uniform PRECISION restrict OutLimits {
 ivec3 out_limits;
};

layout(set = 0, binding = 3) uniform PRECISION restrict Sizes {
layout(push_constant) uniform PRECISION restrict Block {
 ivec4 out_limits;
 ivec4 sizes;
};

layout(set = 0, binding = 4) uniform PRECISION restrict Block {
 // output dims
 ivec4 out_ndims;
 // x = output channels aligned to 4, y = input channels aligned to 4
Expand All@@ -41,7 +35,7 @@ layout(local_size_x_id = 0, local_size_y_id = 1, local_size_z_id = 2) in;
void main() {
 const u16vec3 pos = u16vec3(gl_GlobalInvocationID);

 if (any(greaterThanEqual(pos, out_limits))) {
 if (any(greaterThanEqual(pos, out_limits.xyz))) {
 return;
 }

Expand Down

17 changes: 10 additions & 7 deletions
backends/vulkan/runtime/graph/ops/impl/BinaryOp.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,10 @@ void add_binary_op_node(
 alpha_val = graph.extract_scalar<float>(alpha);
 }

 const utils::ivec2 broadcast_params = create_broadcast_params(*t_in1, *t_in2);
 const struct BinaryOpsParams {
 const utils::ivec2 broadcast_params;
 const float alpha_val;
 } binary_ops_params{create_broadcast_params(*t_in1, *t_in2), alpha_val};

 std::string kernel_name("binary_");
 kernel_name.reserve(kShaderNameReserve);
Expand All@@ -83,16 +86,16 @@ void add_binary_op_node(
 {{out, vkapi::MemoryAccessType::WRITE},
 {{arg1, arg2}, vkapi::MemoryAccessType::READ}},
 // Shader params buffers
 {t_out->sizes_ubo(),
 t_in1->sizes_ubo(),
 t_in2->sizes_ubo(),
 graph.create_params_buffer(broadcast_params),
 graph.create_params_buffer(alpha_val)},
 {},
 // Specialization Constants
 {t_out->hashed_layout(), t_in1->hashed_layout(), t_in2->hashed_layout()},
 // Resizing Logic
 resize_binary_op_node,
 {}));
 {},
 {{graph.sizes_pc_of(out),
 graph.sizes_pc_of(arg1),
 graph.sizes_pc_of(arg2),
 PushConstantDataInfo(&binary_ops_params, sizeof(binary_ops_params))}}));
}

#define DEFINE_BINARY_OP_WITH_ALPHA_FN(op_name) \
Expand Down

18 changes: 7 additions & 11 deletions
backends/vulkan/runtime/graph/ops/impl/Permute.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,13 +75,7 @@ void add_permute_node(
 int32_t out_c_aligned = utils::align_up_4(out_channels);
 int32_t in_c_aligned = utils::align_up_4(in_channels);

 const struct Block final {
 ivec4 out_ndims;
 ivec2 ch_info;
 } params{
 out_dims,
 {out_c_aligned, in_c_aligned},
 };
 const ivec2 ch_info = {out_c_aligned, in_c_aligned};

 graph.execute_nodes().emplace_back(new DispatchNode(
 graph,
Expand All@@ -90,14 +84,16 @@ void add_permute_node(
 graph.create_local_wg_size(out),
 {{out, vkapi::MemoryAccessType::WRITE},
 {in, vkapi::MemoryAccessType::READ}},
 {t_out->logical_limits_ubo(),
 t_out->sizes_ubo(),
 graph.create_params_buffer(params)},
 {},
 // Specialization Constants
 {},
 // Resizing Logic
 nullptr,
 {}));
 {},
 {{graph.logical_limits_pc_of(out),
 graph.sizes_pc_of(out),
 PushConstantDataInfo(&out_dims, sizeof(out_dims)),
 PushConstantDataInfo(&ch_info, sizeof(ch_info))}}));
}

void add_permute_node(
Expand Down

11 changes: 4 additions & 7 deletions
backends/vulkan/test/vulkan_compute_api_test.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1601,9 +1601,7 @@ TEST(VulkanComputeGraphTest, test_simple_shared_objects_with_resize) {
 auto addFn = VK_GET_OP_FN("aten.add.Tensor");
 addFn(graph, {a.value, b.value, kDummyValueRef, c});

 // +2: alpha UBO, broadcast UBO for arithmetic shader
 // +1: t.sizes_ubo() for arithmetic shader output c
 expected_vma_allocation_count += 3;
 // no new allocations if binary op uses push constants
 EXPECT_EQ(get_vma_allocation_count(), expected_vma_allocation_count);

 IOValueRef d = graph.add_input_tensor(
Expand All@@ -1624,17 +1622,16 @@ TEST(VulkanComputeGraphTest, test_simple_shared_objects_with_resize) {
 auto mulFn = VK_GET_OP_FN("aten.mul.Tensor");
 mulFn(graph, {c, d.value, e});

 // +2: alpha UBO, broadcast UBO for arithmetic shader
 // +1: t.sizes_ubo() for arithmetic shader output e
 expected_vma_allocation_count += 3;
 // no new allocations if binary op uses push constants
 EXPECT_EQ(get_vma_allocation_count(), expected_vma_allocation_count);

 IOValueRef out = {};
 out.value = e;
 out.staging = graph.set_output_tensor(out.value);

 // +1: staging buffer input tensor
 // +1: staging buffer for the output tensor
 expected_vma_allocation_count += 1;
 expected_vma_allocation_count += 2;
 EXPECT_EQ(get_vma_allocation_count(), expected_vma_allocation_count);

 graph.prepare();
Expand Down