Skip to content

[Kernels] Use empty for modular MoE workspaces #19667

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.

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
Jun 16, 2025

Conversation

bnellnm
Copy link
Contributor

@bnellnm bnellnm commented Jun 15, 2025

The MoE workspaces only needed to be cleared for BatchedTritonExperts + fp8. Use empty for workspace instead.

TODO: defer workspace creation/clearing to individual Experts.

cc @tlrmchlsmth , @varun-sundar-rabindranath

Signed-off-by: Bill Nell <bnell@redhat.com>
Copy link

👋 Hi! Thank you for contributing to the vLLM project.

💬 Join our developer Slack at https://slack.vllm.ai to discuss your PR in #pr-reviews, coordinate on features in #feat- channels, or join special interest groups in #sig- channels.

Just a reminder: PRs would not trigger full CI run by default. Instead, it would only run fastcheck CI which starts running only a small and essential subset of CI tests to quickly catch errors. You can run other CI tests on top of those by going to your fastcheck build on Buildkite UI (linked in the PR checks section) and unblock them. If you do not have permission to unblock, ping simon-mo or khluu to add you in our Buildkite org.

Once the PR is approved and ready to go, your PR reviewer(s) can run CI to test the changes comprehensively before merging.

To run CI, PR reviewers can either: Add ready label to the PR or enable auto-merge.

🚀

Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Summary of Changes

Hello @bnellnm, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request optimizes memory allocation for Mixture of Experts (MoE) workspaces within the modular kernel implementation. By switching from zero-initialized tensors (torch.zeros) to uninitialized tensors (torch.empty) for the main workspaces, it avoids unnecessary overhead. The necessary zeroing for specific configurations, like FP8, is now handled conditionally within the fused batched MoE layer, ensuring correctness without impacting performance in other cases.

Highlights

  • Memory Optimization: Changed the default allocation for MoE workspaces (workspace13 and workspace2) in the modular kernel from torch.zeros (zero-initialized) to torch.empty (uninitialized) to improve performance by avoiding unnecessary memory writes.
  • Conditional Zeroing: Added a conditional zeroing step for the intermediate_cache1 workspace specifically when using FP8 weights and activations in the fused batched MoE layer, as zeroing is required for correctness in this configuration.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point in your pull request via creating an issue comment (i.e. comment on the pull request page) using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in issue comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist is currently in preview and may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments to provide feedback.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configureGemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request optimizes MoE workspace initialization by using torch.empty instead of torch.zeros, which can improve performance by avoiding unnecessary zero-filling.

Concurrently, a necessary change is introduced in BatchedTritonExperts: intermediate_cache1 (derived from the now uninitialized workspace13) is explicitly zero-filled if use_fp8_w8a8 is true. My analysis suggests this is crucial for correctness because:

  1. In BatchedTritonExperts, tokens beyond expert_num_tokens[expert] (i.e., padding tokens up to max_num_tokens) do not have their corresponding entries in intermediate_cache1 overwritten by the first GEMM. These entries would thus contain uninitialized data from torch.empty.
  2. This intermediate_cache1 (including uninitialized padding) is then passed to the activation function.
  3. The output of the activation, intermediate_cache2, would also contain garbage in these padded areas.
  4. When intermediate_cache2 is subsequently quantized for FP8 (in moe_kernel_quantize_input), uninitialized large values could corrupt the FP8 scale calculation, leading to incorrect results in the second GEMM.

Zeroing intermediate_cache1 when use_fp8_w8a8 ensures that padded regions are zero, which behave predictably through activation and FP8 quantization.

The PR description correctly notes this clearing is specific to BatchedTritonExperts + fp8. Other expert types like TritonExperts (the non-batched version) appear to handle padding differently (e.g., via moe_align_block_size and tl.load(..., other=0.0)), which results in padded areas of intermediate_cache1 being effectively zeroed by the GEMM itself, thus not requiring this explicit fill_(0).

The changes appear well-reasoned and correctly implemented. The TODO item regarding deferring workspace creation/clearing to individual experts is also acknowledged, and this PR is a step in that direction.

No issues of medium or higher severity were identified in the diff.

Copy link
Collaborator

@tlrmchlsmth tlrmchlsmth left a comment

Choose a reason for hiding this comment

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

Very nice

@tlrmchlsmth tlrmchlsmth added the ready ONLY add when PR is ready to merge/full CI is needed label Jun 15, 2025
@tlrmchlsmth tlrmchlsmth enabled auto-merge (squash) June 15, 2025 21:02
Copy link
Member

@mgoin mgoin left a comment

Choose a reason for hiding this comment

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

Can you run an eval on a model that uses the non-fp8 pathway to make sure?

@tlrmchlsmth tlrmchlsmth merged commit 5e5baa9 into vllm-project:main Jun 16, 2025
78 checks passed
@bnellnm
Copy link
Contributor Author

bnellnm commented Jun 16, 2025

Update: I ran an lm_eval on deepseek-ai/DeepSeek-Coder-V2-Lite-Instruct and didn't encounter any problems.

yeqcharlotte pushed a commit to yeqcharlotte/vllm that referenced this pull request Jun 22, 2025
minpeter pushed a commit to minpeter/vllm that referenced this pull request Jun 24, 2025
Signed-off-by: Bill Nell <bnell@redhat.com>
Signed-off-by: minpeter <kali2005611@gmail.com>
yangw-dev pushed a commit to yangw-dev/vllm that referenced this pull request Jun 24, 2025
Signed-off-by: Bill Nell <bnell@redhat.com>
Signed-off-by: Yang Wang <elainewy@meta.com>
xjpang pushed a commit to xjpang/vllm that referenced this pull request Jun 30, 2025
Signed-off-by: Bill Nell <bnell@redhat.com>
wseaton pushed a commit to wseaton/vllm that referenced this pull request Jun 30, 2025
Signed-off-by: Bill Nell <bnell@redhat.com>
avigny pushed a commit to avigny/vllm that referenced this pull request Jul 31, 2025
Signed-off-by: Bill Nell <bnell@redhat.com>
Signed-off-by: avigny <47987522+avigny@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready ONLY add when PR is ready to merge/full CI is needed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants