Skip to content
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

[webgpu] Restore MatMulNBits workgroup size for Phi-3.5 #23349

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[webgpu] Restore MatMulNBits workgroup size for Phi-3.5 #23349

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
3 changes: 2 additions & 1 deletion onnxruntime/contrib_ops/webgpu/quantization/matmul_nbits.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,7 +583,8 @@ Status MatMulNBits::ComputeInternal(onnxruntime::webgpu::ComputeContext& context
program.CacheHint("T_M" + std::to_string(tile_m) + "Subgroup" + std::to_string(use_subgroup));
} else if (block_size == 32) {
components = 1;
constexpr uint32_t workgroup_size = 64;
// TODO: Tune the workgroup size when `M=1`.
constexpr uint32_t workgroup_size = 128;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for catching it. I changed it by accident. Maybe just restore it as before:

    constexpr uint32_t workgroup_size = 128;
    const uint32_t workgroup_y = N % 8 == 0 ? 8 : N % 4 == 0 ? 4
                                                             : 1;

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We tested various combinations of workgroup_size_x, workgroup_size_y, and output_number (e.g. (32, 8, 1), (32, 16, 1), (16, 16, 1) ...), with initial results showing a 5-15% performance improvement (M=1) compared to (16, 8, 1) , with results varying across devices.

This TODO tracks upcoming tuning.

const uint32_t workgroup_y = N % 8 == 0 ? 8 : 1;
const uint32_t workgroup_x = workgroup_size / workgroup_y;
program.SetWorkgroupSize(workgroup_x, workgroup_y, 1);
Expand Down