Skip to content

Use Linear tiling by default for executorch vulkan tensor images #6838

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 1 commit into from
Nov 14, 2024
Merged

Use Linear tiling by default for executorch vulkan tensor images #6838

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
5 changes: 4 additions & 1 deletion backends/vulkan/runtime/graph/ops/glsl/q_8w_linear.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,10 @@ VEC4_T q_8w_linear(const u16vec3 out_pos, const uint16_t K) {
}

void main() {
const u16vec3 out_pos = u16vec3(gl_GlobalInvocationID);
const u16vec3 out_pos = u16vec3(
gl_GlobalInvocationID.x / (out_limits.y * out_limits.z),
(gl_GlobalInvocationID.x / out_limits.z) % out_limits.y,
gl_GlobalInvocationID.x % out_limits.z);
if (any(greaterThanEqual(out_pos, out_limits))) {
return;
}
Expand Down
8 changes: 6 additions & 2 deletions backends/vulkan/runtime/graph/ops/impl/QuantizedLinear.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,15 @@ void add_q_8w_linear_node(
graph.sizes_ubo(mat1_W_packed)});
}

// set global work group size to be 1 dimensional
const utils::uvec3 wg_size = {
static_cast<uint32_t>(graph.numel_of(out_W_packed)), 1, 1};

graph.execute_nodes().emplace_back(new DispatchNode(
graph,
VK_KERNEL_FROM_STR(kernel_name),
graph.create_global_wg_size(out_W_packed),
graph.create_local_wg_size(out_W_packed),
wg_size,
graph.create_local_wg_size(wg_size),
// Inputs and Outputs
{{out_W_packed, vkapi::MemoryAccessType::WRITE},
{{mat1_W_packed, q_mat2, scales}, vkapi::MemoryAccessType::READ}},
Expand Down
2 changes: 1 addition & 1 deletion backends/vulkan/runtime/vk_api/memory/Image.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ VulkanImage::VulkanImage(
1u, // mipLevels
1u, // arrayLayers
VK_SAMPLE_COUNT_1_BIT, // samples
VK_IMAGE_TILING_OPTIMAL, // tiling
VK_IMAGE_TILING_LINEAR, // tiling
image_properties_.image_usage, // usage
VK_SHARING_MODE_EXCLUSIVE, // sharingMode
0u, // queueFamilyIndexCount
Expand Down
Loading