Skip to content

[ET-VK] Add workgroup sizes to ShaderData #7875

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 2 commits into from
Jan 23, 2025
Merged

[ET-VK] Add workgroup sizes to ShaderData #7875

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
5b02812
[ET-VK] Add workgroup sizes to `ShaderData`
Jan 23, 2025
3c9ca1a
Update on "[ET-VK] Add workgroup sizes to `ShaderData`"
Jan 23, 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
4 changes: 3 additions & 1 deletion backends/vulkan/runtime/VulkanBackend.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,9 @@ class VulkanBackend final : public ::executorch::runtime::BackendInterface {
event_name.c_str(),
/* delegate_debug_id = */ -1,
r.start_time_ns,
r.end_time_ns);
r.end_time_ns,
(void*)(&r.metadata),
sizeof(r.metadata));
}
#endif // ET_EVENT_TRACER_ENABLED

Expand Down
12 changes: 11 additions & 1 deletion backends/vulkan/runtime/vk_api/QueryPool.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ std::string stringize(const VkExtent3D& extents) {
<< "}";
return ss.str();
}

std::vector<ShaderResult> QueryPool::get_shader_timestamp_data() {
if (querypool_ == VK_NULL_HANDLE) {
return {};
Expand All @@ -188,7 +189,16 @@ std::vector<ShaderResult> QueryPool::get_shader_timestamp_data() {
.dispatch_id = entry.dispatch_id,
.start_time_ns = entry.start_time_ns,
.end_time_ns = entry.end_time_ns,
});
.metadata = ShaderMetadata{
.global_workgroup_size =
{entry.global_workgroup_size.width,
entry.global_workgroup_size.height,
entry.global_workgroup_size.depth},
.local_workgroup_size =
{entry.local_workgroup_size.width,
entry.local_workgroup_size.height,
entry.local_workgroup_size.depth},
}});
}
return shader_result;
}
Expand Down
6 changes: 6 additions & 0 deletions backends/vulkan/runtime/vk_api/QueryPool.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,17 @@
namespace vkcompute {
namespace vkapi {

struct ShaderMetadata final {
const uint32_t global_workgroup_size[3];
const uint32_t local_workgroup_size[3];
};

struct ShaderResult final {
const std::string kernel_name;
const uint32_t dispatch_id;
const uint64_t start_time_ns;
const uint64_t end_time_ns;
const ShaderMetadata metadata;
};

struct QueryPoolConfig final {
Expand Down
Loading