Commit af5aed0
committed
[Cute] Apply review feedback: rename to mCuTotalMBlocks, drop num_head, use shared utility
Addresses @reubenconducts's May 22 review comments on Dao-AILab#2520:
1. Rename mTileCumsum -> mCuTotalMBlocks across all 9 kernels + scheduler
+ interface for consistency with the convention introduced in Dao-AILab#2224
(already in main; used by blocksparse, and by Dao-AILab#2559).
2. Drop num_head (and the related pack_gqa arch-conditional remap) from
the host cumsum. Per-batch cumsum is now pure m_blocks; the scheduler
handles num_head separately. Removes the SM80/SM120 vs SM90/100/110/MLA
branching that previously mirrored the pack_gqa_layout reshape behavior.
3. Replace the inline binary search in _varlen_coord_map's cumsum-on
branch with a call to utils.get_batch_from_cu_tensor (the shared
utility from Dao-AILab#2556). The existing snap-to-group-boundary + warp-scan
structure is preserved — the cumsum serves as a hint to skip ahead,
and the warp-scan refines to the exact batch using _get_num_m_blocks
(which already handles pack_gqa, q_stage, cluster, etc.). This matches
the scheduler-side approach in Dao-AILab#2559.
The pack_gqa seqlen multiplier stays in _compute_cu_total_m_blocks so
that per-batch m_block counts match the kernel's _get_num_m_blocks
formula — the snap is forward-only, so under-estimating per-batch counts
is safe but over-estimating (which dropping the multiplier would cause
when pack_gqa is on) would land the snap past the correct batch and the
warp-scan couldn't recover.
Verified on SM100:
- 72 new tests (test_varlen_scheduler_binary_search_correctness{,_bwd}): pass
- existing test_varlen (B=20 slice, 576 cases): pass
- existing test_flash_attn_mla_absorbed_varlen (480 cases): pass1 parent 5d4573c commit af5aed0
12 files changed
Lines changed: 119 additions & 123 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
382 | 382 | | |
383 | 383 | | |
384 | 384 | | |
385 | | - | |
| 385 | + | |
386 | 386 | | |
387 | 387 | | |
388 | 388 | | |
| |||
430 | 430 | | |
431 | 431 | | |
432 | 432 | | |
433 | | - | |
| 433 | + | |
434 | 434 | | |
435 | 435 | | |
436 | 436 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
215 | 215 | | |
216 | 216 | | |
217 | 217 | | |
218 | | - | |
| 218 | + | |
219 | 219 | | |
220 | 220 | | |
221 | 221 | | |
| |||
261 | 261 | | |
262 | 262 | | |
263 | 263 | | |
264 | | - | |
| 264 | + | |
265 | 265 | | |
266 | 266 | | |
267 | 267 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
136 | 136 | | |
137 | 137 | | |
138 | 138 | | |
139 | | - | |
| 139 | + | |
140 | 140 | | |
141 | 141 | | |
142 | 142 | | |
| |||
196 | 196 | | |
197 | 197 | | |
198 | 198 | | |
199 | | - | |
| 199 | + | |
200 | 200 | | |
201 | 201 | | |
202 | 202 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
458 | 458 | | |
459 | 459 | | |
460 | 460 | | |
461 | | - | |
| 461 | + | |
462 | 462 | | |
463 | 463 | | |
464 | 464 | | |
| |||
737 | 737 | | |
738 | 738 | | |
739 | 739 | | |
740 | | - | |
| 740 | + | |
741 | 741 | | |
742 | 742 | | |
743 | 743 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
350 | 350 | | |
351 | 351 | | |
352 | 352 | | |
353 | | - | |
| 353 | + | |
354 | 354 | | |
355 | 355 | | |
356 | 356 | | |
| |||
539 | 539 | | |
540 | 540 | | |
541 | 541 | | |
542 | | - | |
| 542 | + | |
543 | 543 | | |
544 | 544 | | |
545 | 545 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
631 | 631 | | |
632 | 632 | | |
633 | 633 | | |
634 | | - | |
| 634 | + | |
635 | 635 | | |
636 | 636 | | |
637 | 637 | | |
| |||
699 | 699 | | |
700 | 700 | | |
701 | 701 | | |
702 | | - | |
| 702 | + | |
703 | 703 | | |
704 | 704 | | |
705 | 705 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
361 | 361 | | |
362 | 362 | | |
363 | 363 | | |
364 | | - | |
| 364 | + | |
365 | 365 | | |
366 | 366 | | |
367 | 367 | | |
| |||
633 | 633 | | |
634 | 634 | | |
635 | 635 | | |
636 | | - | |
| 636 | + | |
637 | 637 | | |
638 | 638 | | |
639 | 639 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
373 | 373 | | |
374 | 374 | | |
375 | 375 | | |
376 | | - | |
| 376 | + | |
377 | 377 | | |
378 | 378 | | |
379 | 379 | | |
| |||
661 | 661 | | |
662 | 662 | | |
663 | 663 | | |
664 | | - | |
| 664 | + | |
665 | 665 | | |
666 | 666 | | |
667 | 667 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
166 | 166 | | |
167 | 167 | | |
168 | 168 | | |
169 | | - | |
| 169 | + | |
170 | 170 | | |
171 | 171 | | |
172 | 172 | | |
| |||
344 | 344 | | |
345 | 345 | | |
346 | 346 | | |
347 | | - | |
| 347 | + | |
348 | 348 | | |
349 | 349 | | |
350 | 350 | | |
| |||
0 commit comments