Commit Graph

787 Commits

Author SHA1 Message Date
03fd055be0 Fix CuTeDSL variable scoping: define tOrP0 and tCrP in both branches 2026-05-23 05:07:30 +00:00
531f1a12b4 Fix p_tmem_s: use ComposedLayout from make_smem_layout_a, pass as kernel arg 2026-05-23 05:06:45 +00:00
c5ed9e3119 Consolidate FMHA stages A/B/C into unified kernel module with SMEM-P stub 2026-05-23 05:04:43 +00:00
0c7a69cf34 WIP: make_tiled_copy_C for P→SMEM 2026-05-23 03:56:56 +00:00
abecc0bd77 fix: cpasync.CopyOp for reg→SMEM 2026-05-23 03:54:49 +00:00
9611d9bc19 fix: CopyAtomUniversalOp 2026-05-23 03:52:47 +00:00
cfe21685d1 WIP: tiled copy for P→SMEM (zero fill) 2026-05-23 03:51:58 +00:00
373c395810 fix: cute.copy(dst, src) order 2026-05-23 03:51:00 +00:00
6996abcef3 fix: BFloat16 not Float32 for bf16 reg 2026-05-23 03:50:09 +00:00
3a5083baf2 WIP: P→SMEM write stub (zero fill, proper mapping TODO) 2026-05-23 03:49:05 +00:00
c5d20d5bd4 fix: partition_A not partition_S 2026-05-23 03:47:53 +00:00
be19dc5e39 fix: make_smem_layout_epi not make_epilogue_smem_layout 2026-05-23 03:47:09 +00:00
c7cbfe3675 WIP: SMEM P path for PV (compiles but P write not implemented) 2026-05-23 03:46:01 +00:00
ddcb470005 debug: hd=64 with CUDA_LAUNCH_BLOCKING 2026-05-23 03:42:53 +00:00
49b3c2a5a2 D1: P store as BF16 using PV A-fragment layout (tOrP0)
Reverted tP to p_tmem_s.outer (needed for make_fragment_A profile).
P store now writes BF16 to TMEM using tOrP0's layout, matching PV A-fragment reads.
This fixes the layout mismatch at hd>64 where QK C-fragment composition
writes to different TMEM columns than PV A-fragment reads.
2026-05-23 03:42:07 +00:00
c99d78bf29 D1: align P store and PV A-fragment layouts via tP
Key insight: tP (PV A-fragment base) used p_tmem_s.outer layout,
but P store used QK C-fragment composition layout. These diverge at hd>64.

Fix: tP now uses the same QK C-fragment composition layout (tStP_layout)
as the P store. PV A-fragment is derived from tP, so it automatically
uses the same layout. No double-offset since tP includes P offset.
2026-05-23 03:40:10 +00:00
9c4167465f D1: P store as BF16 using PV A-fragment layout
- Changed P store from FP32 QK C-fragment layout to BF16 PV A-fragment layout
- rP_bf16_reg stores directly to TMEM using tOrP0 layout
- Ensures softmax writes P to same TMEM columns that PV GEMM reads
2026-05-23 03:38:24 +00:00
b7f3854092 D1: P store uses tOrP0.layout (PV A-fragment TMEM layout) 2026-05-23 03:36:40 +00:00
6b0f412c7f D1 fix: P store uses PV A-fragment layout (p_tmem_s.outer)
CRITICAL BUG: P was stored using QK C-fragment composition layout, but PV
A-fragment reads using p_tmem_s.outer (PV A-operand layout). These layouts
match at hd=64 (cos 0.999998) but diverge at hd>64 (cos 0.784 at hd=128).

The fix: tStP0 and tScP now use p_tmem_s.outer instead of
composition(tStS.layout, (128, p_cols_fp32)). This ensures the softmax
writes P in the same layout that the PV GEMM expects.
2026-05-23 03:35:49 +00:00
730e4f4328 D1: test raw unnormalized output via epilogue_tma_store 2026-05-23 03:33:59 +00:00
d262764c84 test: paired atoms epilog from old commit 6ee28d8 2026-05-23 03:32:53 +00:00
9d8f4b8a05 D1: paired atoms epilogue (no TMEM round-trip)
Replace NO-OP round-trip + normalize + epilogue_tma_store with:
- get_tmem_load_op + get_smem_store_op paired atoms
- One-way TMEM→reg (normalize) →SMEM→GMEM
- Eliminates ~3% error from TMEM layout mismatch
- O rescale disabled (single KV tile only for now)
- Pre-computed TMA partitions outside if blocks
2026-05-23 03:29:51 +00:00
6b655f682c d1: sweep hd=64,128,256 2026-05-23 03:26:10 +00:00
208dbe1d5c fix: use mV.iterator 2026-05-23 03:25:29 +00:00
55b1217282 fix: use mQ not q for LayoutEnum 2026-05-23 03:24:58 +00:00
a81ff939ee d1: add diagnostic script 2026-05-23 03:24:16 +00:00
ca51af99dd D1: N-tile support for HEAD_DIM>256
- pv_n_tile = min(head_dim, 256) — MMA instruction N limit
- n_pv_tiles = head_dim // pv_n_tile — outer loop count
- V FMHA layout uses pv_n_tile (not head_dim) for N-tile slicing
- Test loops over N-tiles at Python level, kernel processes (128, pv_n_tile)
- For hd=512: 2 kernel launches with V[:,0:256] and V[:,256:512]
2026-05-23 03:22:23 +00:00
af51455db1 d1: add hd=512 test 2026-05-23 03:20:46 +00:00
af2f133347 d1: add quick regression test (hd=64 only) 2026-05-23 03:20:12 +00:00
ea9264a469 D1: Parameterize HEAD_DIM in FmhaKernel (64→512)
- Promote HEAD_DIM from module constant to constructor parameter
- FmhaKernel(head_dim=64, s_k=128, ...) — default 64 for regression
- All references to HEAD_DIM replaced with self.head_dim
- PV MMA tiler, V layout, softmax corr_tiles all parameterized
- TMEM budget warning when num_tmem_alloc_cols > 512
- New test: test_fmha_v3_stage_d1.py tests hd=64 (regression) and hd=512
- Stage C test preserved as-is for reference
2026-05-23 03:19:52 +00:00
3be9d6ed8c docs: revised Stage D/E plan — indexer removes paged TMA, one kernel for CSA/HCA/SWA, sink merge 2026-05-23 03:10:41 +00:00
bf0bb8241c cleanup: remove archive/ (240 stale files), stale example9/10, fix test table, add Stage D plan 2026-05-23 03:05:08 +00:00
dbf76fbc87 docs: update README with Stage C TMEM layout mismatch findings and status 2026-05-23 03:01:04 +00:00
f1ec406434 fix: revert to composition layout for hand-constructed atoms (matching CUTLASS) 2026-05-23 02:54:54 +00:00
68d1d547e0 fix: use logical_divide (not composition) for O rescale/normalize atoms to match get_tmem_load_op layout 2026-05-23 02:53:59 +00:00
3d058bcc77 fix: add NO-OP TMEM round-trip to re-map O from MMA to epilog layout 2026-05-23 02:50:53 +00:00
b140a9cecf fix: use TMEM round-trip normalize + epilogue_tma_store (known ~3% error) 2026-05-23 02:49:46 +00:00
de8221ea58 fix: correct bSG_gC indexing (6 modes) 2026-05-23 02:45:30 +00:00
00e2922d6d diag: print bSG shapes for TMA store indexing 2026-05-23 02:44:47 +00:00
2e8820fbe2 fix: typo from_dlcap -> from_dlpack 2026-05-23 02:44:00 +00:00
78a336e3ca fix: correction_epilog with paired atoms + pre-partitioned TMA store outside if block 2026-05-23 02:41:07 +00:00
2bdeb0f649 test: NO-OP round-trip + normalize at n=128 and n=256 2026-05-23 02:37:50 +00:00
5286aa985b fix: correction_epilog with paired atoms + pre-partitioned TMA store 2026-05-23 02:34:33 +00:00
830cb8c394 diag: NO-OP round-trip before normalize on 2D pattern 2026-05-23 02:32:40 +00:00
33ff5578d6 fix: O rescale uses 2D register tensor pattern, remove fence_view_async_tmem_load 2026-05-23 02:31:28 +00:00
93be84cdda fix: use paired atoms for correction_epilog + cute.copy TMA store 2026-05-23 02:26:57 +00:00
9916c14e56 diag: add CUDA_LAUNCH_BLOCKING for crash debug 2026-05-23 02:25:46 +00:00
ef44a12498 fix: inline epilogue_tma_store with inv_row_sum multiply using paired atoms 2026-05-23 02:24:36 +00:00
3195e805d6 fix: use cute.copy instead of cpasync.copy for TMA store 2026-05-23 02:23:16 +00:00
a49b6109b5 fix: correction_epilog with get_tmem_load_op paired atoms + direct TMA store 2026-05-23 02:19:41 +00:00