-
Notifications
You must be signed in to change notification settings - Fork 830
fix: update block size and tile size heuristic for 16+ num of token #2492
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
Open
nv-yunzheq
wants to merge
1
commit into
flashinfer-ai:main
Choose a base branch
from
nv-yunzheq:fix_2407
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1430,7 +1430,14 @@ cudaError_t allreduce_fusion_kernel_launcher(AllReduceFusionParams<T> const& par | |
|
|
||
| // FP4 optimization: apply BEFORE SM count check to avoid being overridden | ||
| // This allows FP4 to use smaller block_size even when cluster_num is large | ||
| if constexpr (GetQuantType<Pattern> == QuantType::kFP4) { | ||
| // NOTE: Only apply for oneshot mode or small token counts (<=16). | ||
| // For larger token counts with twoshot (oneshot=false), the original heuristic | ||
| // performs better. See benchmark data showing regression at token_num >= 32. | ||
| constexpr int kFP4OptimizationTokenThreshold = 16; | ||
| bool apply_fp4_optimization = (GetQuantType<Pattern> == QuantType::kFP4) && | ||
| (oneshot || token_num <= kFP4OptimizationTokenThreshold); | ||
|
|
||
| if (apply_fp4_optimization) { | ||
| // Try to use 160 as block_size if possible (better occupancy for FP4) | ||
| if (threads_per_token % 160 == 0 && 160 <= max_threads_per_block && 160 >= 128) { | ||
| block_size = 160; | ||
|
|
@@ -1458,13 +1465,13 @@ cudaError_t allreduce_fusion_kernel_launcher(AllReduceFusionParams<T> const& par | |
| threads_per_block *= 2; | ||
| cluster_size /= 2; | ||
| // If FP4 optimization was applied, update block_size to match | ||
| if constexpr (GetQuantType<Pattern> == QuantType::kFP4) { | ||
| if (apply_fp4_optimization) { | ||
| block_size = threads_per_block; | ||
| } | ||
| } | ||
|
|
||
| // Update block_size if not FP4 (FP4 already set it above) | ||
| if constexpr (GetQuantType<Pattern> != QuantType::kFP4) { | ||
| // Update block_size if FP4 optimization was not applied | ||
| if (!apply_fp4_optimization) { | ||
| block_size = threads_per_block; | ||
| } | ||
|
Comment on lines
+1474
to
1476
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
|
|
||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For simplification, this conditional update inside the loop can be removed.
block_sizeis not read within the loop, so it can be updated once after the loop finishes. This simplifies the logic when combined with the change I'm suggesting below.