Commit Graph

170 Commits

Author SHA1 Message Date
c58ca550ae feat: SMEM-P with make_tiled_copy_tv + manual fill 2026-05-24 02:43:12 +00:00
8faac948fc feat: SMEM-P using make_tiled_copy_tv + logical sP view 2026-05-24 02:42:27 +00:00
eda7d40df2 Merge branch 'master' of ssh://sweetapi.com:2222/biondizzle/nvfp4-megamoe-kernel 2026-05-24 02:41:39 +00:00
952c25e227 D1.5: Use tCtO_fake layout for epilogue_tma_store (needs STAGE dim) 2026-05-24 02:41:32 +00:00
0a980de7ad feat: SMEM-P using make_cotiled_copy (one-row-per-thread) 2026-05-24 02:41:19 +00:00
85eb2bc4bb D1.5: Remove duplicate tTMrO definition (keep unconditional one) 2026-05-24 02:40:40 +00:00
cd223e1b98 fix: reorder tTMrO definition after tTMEM_LOADcO 2026-05-24 02:36:08 +00:00
54e94d44ef fix: tTMrO scoping + restore SMEM-P coordinate write 2026-05-24 02:34:53 +00:00
6ead708c7d D1.5: Move tTMrO def before softmax loop (CuTeDSL scoping) 2026-05-24 02:32:51 +00:00
5a34865062 debug: zero-fill sP to check deadlock 2026-05-24 02:31:12 +00:00
81652629e3 D1.5: Use proven Stage C approach - normalize via TMEM round-trip + epilogue_tma_store 2026-05-24 02:30:25 +00:00
e50ba7212c test: SMEM-P coordinate verification test 2026-05-24 01:58:32 +00:00
8166898cc3 D1.5: Fix bSG_gC slicing - group trailing modes (CUTLASS pattern) 2026-05-24 01:41:52 +00:00
c7a692b75e D1.5: Dynamic slicing for tTR_gC (variable rest dims) 2026-05-24 01:40:44 +00:00
cb6eae4c4f D1.5: Fix flat_divide slice coordinates (4 modes, no STAGE dim) 2026-05-24 01:39:21 +00:00
d6a607d12e D1.5: Rewrite correction epilogue using CUTLASS pattern (transform_partitioned, flat_divide, paired atoms) 2026-05-24 01:37:53 +00:00
ef9fa86848 D1.5: Fix TMA store - group_modes on bSG_gC, use flat indexing 2026-05-24 01:36:01 +00:00
5a5cd19b81 D1.5: Fix TMA store - use flat_divide on tCgC instead of local_tile on mC 2026-05-24 01:35:10 +00:00
52a5aa61bc D1.5: Fix TMA store - use 3D tile for local_tile on 3D mC 2026-05-24 01:20:33 +00:00
865832f669 D1.5: Use group_modes on sC for 2D TMA view (preserves swizzle) 2026-05-24 00:52:57 +00:00
a8939ced1f D1.5: Use 2D sC_epi layout from c_smem_s for TMA partition 2026-05-24 00:51:18 +00:00
9705b07969 D1.5: Fix TMA store - use group_modes on sC and tCgC 2026-05-24 00:48:18 +00:00
d834836bb7 D1.5: Simplify TMA store - use 2D sC_epi and gC_epi views 2026-05-24 00:46:52 +00:00
c05a171e15 D1.5: Fix TMA store - use existing gC partition 2026-05-24 00:43:35 +00:00
74e1c0420a D1.5: Implement correction epilog with paired atoms (get_tmem_load_op + get_smem_store_op)
One-way: TMEM → registers (normalize) → SMEM → GMEM
Based on CUTLASS FMHA reference's correction_epilog pattern.
Eliminates TMEM round-trip error for O normalization.
O rescale (kt>0) still uses old atoms (separate fix).
2026-05-24 00:41:27 +00:00
d96786ec44 D1.5: Add TODO for correction epilog - keeping working TMEM round-trip for now 2026-05-24 00:37:36 +00:00
ae7a1f5e0a D1.5: Revert to pre-epilog backup - correction epilog refactor is complex, will do incrementally
The correction epilog (TMEM→reg→SMEM→GMEM one-way trip) is the right approach
but the TMA store from SMEM requires proper partitioning that needs more work.
Reverting to the known-working state (with 3% TMEM round-trip error) to focus
on the SMEM-P write first.
2026-05-24 00:35:00 +00:00
a59d57e4d5 D1.5: Fix TMA store - use local_tile with pv_mma_tiler 2026-05-24 00:32:35 +00:00
a6bf31a22e D1.5: Fix TMA store rank mismatch - use 2D sC_epi view 2026-05-24 00:31:45 +00:00
d316875145 D1.5: Implement correction epilog with get_tmem_load_op + get_smem_store_op paired atoms
- One-way: TMEM → registers (normalize) → SMEM → GMEM
- Eliminates TMEM round-trip error for O normalization
- O rescale (kt>0) still uses old atoms (fix later)
- Based on CUTLASS FMHA reference's correction_epilog pattern
2026-05-24 00:30:38 +00:00
8514a72ba0 D1.5: Replace TMEM round-trip normalize with correction epilog (one-way: TMEM→reg→SMEM→GMEM)
- Remove noop + normalize TMEM round-trips (3% error per trip)
- Use epilogue_tmem_copy_and_partition for TMEM→reg (paired atoms)
- Use epilogue_smem_copy_and_partition for reg→SMEM (paired atoms)
- Apply 1/row_sum normalization in register space (exact)
- TMA store from SMEM→GMEM (no TMEM write-back)
- Add iter_acc_early_release_in_epilogue attribute
- Update SMEM-P comments to reflect coordinate-indexed fallback
2026-05-24 00:24:24 +00:00
26de7254ad D1.3: Fix LSE tensor layout for weakly congruent store 2026-05-24 00:16:22 +00:00
d092a1743a D1.3: Re-enable coordinate-indexed SMEM-P write with identity tensor coords 2026-05-23 23:26:46 +00:00
a17dca508d D1.3: Revert to zero-fill for sP - need to verify sP→PV pipeline first 2026-05-23 23:26:07 +00:00
5be5d42e94 D1.3: Compute (m,k) directly from thread mapping instead of identity tensor 2026-05-23 23:24:54 +00:00
23964d28c0 D1.3: Add debug prints for SMEM-P coordinate mapping 2026-05-23 23:24:02 +00:00
1e5635b93f D1.3: Add SMEM-P coordinate diagnostic test 2026-05-23 23:23:05 +00:00
e0a11e32f8 D1.3: Fix coord extraction - identity tensor stores (m,k) pairs as values 2026-05-23 23:21:15 +00:00
a7171fa5e1 D1.3: Fix coordinate indexing - tTMEM_LOADcS first mode is (32,1) nested tuple 2026-05-23 23:20:12 +00:00
df7bc40d37 D1.3: Direct coordinate-indexed SMEM-P write using tTMEM_LOADcS coords
Each softmax thread writes its P values to sP using the (m,k) coordinates
from tTMEM_LOADcS. The k coordinate is decomposed into (k0,k1,k2) to
match sP's ((128,16),1,(4,2)) layout. CuTeDSL tensor indexing handles
the swizzle automatically. No make_tiled_copy needed.
2026-05-23 23:19:21 +00:00
2bbe55b08c D1.3: Use make_cotiled_copy for SMEM-P — custom TV layout from TMEM-load coords to sP
Per CUTLASS guidance:
- make_tiled_copy_C/D encode wrong invariants for this transfer
- Build custom R→S copy where TV map comes from tTMEM_LOADcS (softmax thread
  ownership) and destination addresses come from sP layout (PV A-operand swizzled SMEM)
- Use composition(sP_2d_layout, p_coord_layout) for atom_layout_tv
- Start with scalar BF16 (16-bit) stores — vectorize later
- Zero-fill source for compile test, will fill with actual P values next
2026-05-23 23:17:30 +00:00
029c21a2af D1.3: Use const_expr for lse None check 2026-05-23 22:30:55 +00:00
1720a0e86b D1.3: Fix LSE with const_expr, always create valid mLSE tensor 2026-05-23 22:30:14 +00:00
bce31176aa D1.3: Try make_tiled_copy_C(qk_mma) for SMEM-P copy - zero-fill source for compile test 2026-05-23 22:29:10 +00:00
c80bd021c9 D1.3: Define SMEM-P copy atoms unconditionally (CuTeDSL scoping) 2026-05-23 22:28:12 +00:00
43bb501acb D1.3: Use full sP (4D) for make_tiled_copy_D partition 2026-05-23 22:27:11 +00:00
06fd2f63e9 D1.3: SMEM-P via get_smem_store_op + make_tiled_copy_D
Uses the CUTLASS blackwell_helpers pattern:
- get_smem_store_op creates a SMEM store atom paired with the TMEM load
- make_tiled_copy_D uses the same thread partition as the TMEM load
- Softmax warps write P to sP using the same thread mapping they use for reading S
- MMA warp reads P from sP via pv_mma.make_fragment_A(sP)
- Replaces the zero-fill stub with a proper register→SMEM copy
2026-05-23 22:26:09 +00:00
70763030c0 D5b: Use normalized O + LSE for merge (correct formula), always output LSE 2026-05-23 21:35:40 +00:00
edc283e6c1 D5a: Fix LSE formula - lse = ln(row_sum) + row_max * ln(2)
row_max is in scale_log2 domain, need to convert to natural log domain.
attn_max = row_max * ln(2), so lse = ln(row_sum) + row_max * ln(2).
2026-05-23 21:15:14 +00:00
6ca294ed6d D5a: Use tensor indexing for LSE write 2026-05-23 21:13:52 +00:00