Skip to content

[ET-VK] Adding PushConstantDataInfo input to PrepackNode class. #8649

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 7, 2025
Merged

[ET-VK] Adding PushConstantDataInfo input to PrepackNode class. #8649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c68c657
[ET-VK] Adding PushConstantDataInfo input to PrepackNode class.
trivedivivek Feb 24, 2025
9244fe7
Update on "[ET-VK] Adding PushConstantDataInfo input to PrepackNode c…
trivedivivek Feb 24, 2025
d3c2251
Update on "[ET-VK] Adding PushConstantDataInfo input to PrepackNode c…
trivedivivek Mar 3, 2025
82291ac
Update on "[ET-VK] Adding PushConstantDataInfo input to PrepackNode c…
trivedivivek Mar 7, 2025
4bc228e
Update on "[ET-VK] Adding PushConstantDataInfo input to PrepackNode c…
trivedivivek Mar 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 21 additions & 4 deletions backends/vulkan/runtime/graph/ops/PrepackNode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,17 @@ PrepackNode::PrepackNode(
const ValueRef tref,
const ValueRef packed,
const vkapi::ParamsBindList& params,
const vkapi::SpecVarList& spec_vars)
const vkapi::SpecVarList& spec_vars,
const std::vector<PushConstantDataInfo>& push_constants)
: shader_(shader),
noop_shader_(get_noop_shader(graph, packed)),
global_workgroup_size_(global_workgroup_size),
local_workgroup_size_(local_workgroup_size),
tref_(tref),
packed_(packed),
params_(params),
spec_vars_(spec_vars) {
spec_vars_(spec_vars),
push_constants_(push_constants) {
graph.update_descriptor_counts(shader, /*execute = */ false);
graph.update_descriptor_counts(noop_shader_, /*execute = */ false);
}
Expand Down Expand Up @@ -75,10 +77,20 @@ void PrepackNode::encode(ComputeGraph* graph) {

std::unique_lock<std::mutex> cmd_lock = context->dispatch_lock();

std::array<uint8_t, kMaxPushConstantSize> push_constants_data;
uint32_t push_constants_offset = 0;

for (const auto& push_constant : push_constants_) {
push_constants_offset += push_constant.write(
push_constants_data.data(),
push_constants_offset,
kMaxPushConstantSize);
}

{
vkapi::PipelineBarrier pipeline_barrier{};
vkapi::DescriptorSet descriptor_set = context->get_descriptor_set(
shader_, local_workgroup_size_, spec_vars_, 0u);
shader_, local_workgroup_size_, spec_vars_, push_constants_offset);

uint32_t idx = 0;
bind_tensor_to_descriptor_set(
Expand All @@ -91,7 +103,12 @@ void PrepackNode::encode(ComputeGraph* graph) {
bind_params_to_descriptor_set(params_, descriptor_set, idx);

context->register_shader_dispatch(
descriptor_set, pipeline_barrier, shader_, global_workgroup_size_);
descriptor_set,
pipeline_barrier,
shader_,
global_workgroup_size_,
push_constants_data.data(),
push_constants_offset);
}

// Submit a compute shader that performs a no-op with the packed tensor in
Expand Down
5 changes: 4 additions & 1 deletion backends/vulkan/runtime/graph/ops/PrepackNode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

#include <executorch/backends/vulkan/runtime/api/api.h>

#include <executorch/backends/vulkan/runtime/graph/containers/PushConstantData.h>
#include <executorch/backends/vulkan/runtime/graph/containers/Value.h>

namespace vkcompute {
Expand All @@ -34,7 +35,8 @@ class PrepackNode final {
const ValueRef tref,
const ValueRef packed,
const vkapi::ParamsBindList& params,
const vkapi::SpecVarList& spec_vars = {});
const vkapi::SpecVarList& spec_vars = {},
const std::vector<PushConstantDataInfo>& push_constants = {});

~PrepackNode() = default;

Expand All @@ -54,6 +56,7 @@ class PrepackNode final {
const ValueRef packed_;
const vkapi::ParamsBindList params_;
const vkapi::SpecVarList spec_vars_;
const std::vector<PushConstantDataInfo> push_constants_;

private:
api::StagingBuffer create_staging_buffer(ComputeGraph* graph);
Expand Down
Loading