Skip to content

Fix: disambiguate paged attention event casts #847

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.

Sign up for GitHub

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
jvjhfhg merged 1 commit into from
May 25, 2026
Merged

Fix: disambiguate paged attention event casts #847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions ...ensormap_and_ringbuffer/paged_attention_unroll_manual_scope/kernels/aic/aic_pv_matmul.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,30 +104,30 @@ static __aicore__ void pv_matmul_n_impl(

// Stage 1: TLOAD (MTE2: GM → L1[cur])
// Wait for MTE1 to release L1[cur] (reverse dep from previous iteration)
wait_flag(PIPE_MTE1, PIPE_MTE2, (event_t)cur);
wait_flag(PIPE_MTE1, PIPE_MTE2, static_cast<::event_t>(cur));
TLOAD(aMatTile[cur], pijGlobal);
set_flag(PIPE_MTE2, PIPE_MTE1, EVENT_ID0); // forward: A in L1 ready
TLOAD(bMatTile[cur], vjGlobal);
set_flag(PIPE_MTE2, PIPE_MTE1, EVENT_ID1); // forward: B in L1 ready

// Stage 2: TMOV (MTE1: L1[cur] → L0[cur])
// Wait for M-pipe to release L0[cur] (reverse dep from previous iteration)
wait_flag(PIPE_M, PIPE_MTE1, (event_t)cur);
wait_flag(PIPE_M, PIPE_MTE1, static_cast<::event_t>(cur));
wait_flag(PIPE_MTE2, PIPE_MTE1, EVENT_ID0); // forward: wait A loaded
TMOV(aTile[cur], aMatTile[cur]);
wait_flag(PIPE_MTE2, PIPE_MTE1, EVENT_ID1); // forward: wait B loaded
TMOV(bTile[cur], bMatTile[cur]);
set_flag(PIPE_MTE1, PIPE_MTE2, (event_t)cur); // reverse: release L1[cur]
set_flag(PIPE_MTE1, PIPE_MTE2, static_cast<::event_t>(cur)); // reverse: release L1[cur]

// Stage 3: TMATMUL (M-pipe: L0A[cur] × L0B[cur] → L0C)
set_flag(PIPE_MTE1, PIPE_M, (event_t)cur); // forward: L0[cur] ready
wait_flag(PIPE_MTE1, PIPE_M, (event_t)cur);
set_flag(PIPE_MTE1, PIPE_M, static_cast<::event_t>(cur)); // forward: L0[cur] ready
wait_flag(PIPE_MTE1, PIPE_M, static_cast<::event_t>(cur));
if (i == 0) {
TMATMUL(cTile, aTile[cur], bTile[cur]);
} else {
TMATMUL_ACC(cTile, cTile, aTile[cur], bTile[cur]);
}
set_flag(PIPE_M, PIPE_MTE1, (event_t)cur); // reverse: release L0[cur]
set_flag(PIPE_M, PIPE_MTE1, static_cast<::event_t>(cur)); // reverse: release L0[cur]
}

// Drain outstanding reverse-dependency flags
Expand Down
12 changes: 6 additions & 6 deletions ...ensormap_and_ringbuffer/paged_attention_unroll_manual_scope/kernels/aic/aic_pv_matmul.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,30 +105,30 @@ static __aicore__ void pv_matmul_n_impl(

// Stage 1: TLOAD (MTE2: GM → L1[cur])
// Wait for MTE1 to release L1[cur] (reverse dep from previous iteration)
wait_flag(PIPE_MTE1, PIPE_MTE2, (event_t)cur);
wait_flag(PIPE_MTE1, PIPE_MTE2, static_cast<::event_t>(cur));
TLOAD(aMatTile[cur], pijGlobal);
set_flag(PIPE_MTE2, PIPE_MTE1, EVENT_ID0); // forward: A in L1 ready
TLOAD(bMatTile[cur], vjGlobal);
set_flag(PIPE_MTE2, PIPE_MTE1, EVENT_ID1); // forward: B in L1 ready

// Stage 2: TMOV (MTE1: L1[cur] → L0[cur])
// Wait for M-pipe to release L0[cur] (reverse dep from previous iteration)
wait_flag(PIPE_M, PIPE_MTE1, (event_t)cur);
wait_flag(PIPE_M, PIPE_MTE1, static_cast<::event_t>(cur));
wait_flag(PIPE_MTE2, PIPE_MTE1, EVENT_ID0); // forward: wait A loaded
TMOV(aTile[cur], aMatTile[cur]);
wait_flag(PIPE_MTE2, PIPE_MTE1, EVENT_ID1); // forward: wait B loaded
TMOV(bTile[cur], bMatTile[cur]);
set_flag(PIPE_MTE1, PIPE_MTE2, (event_t)cur); // reverse: release L1[cur]
set_flag(PIPE_MTE1, PIPE_MTE2, static_cast<::event_t>(cur)); // reverse: release L1[cur]

// Stage 3: TMATMUL (M-pipe: L0A[cur] × L0B[cur] → L0C)
set_flag(PIPE_MTE1, PIPE_M, (event_t)cur); // forward: L0[cur] ready
wait_flag(PIPE_MTE1, PIPE_M, (event_t)cur);
set_flag(PIPE_MTE1, PIPE_M, static_cast<::event_t>(cur)); // forward: L0[cur] ready
wait_flag(PIPE_MTE1, PIPE_M, static_cast<::event_t>(cur));
if (i == 0) {
TMATMUL(cTile, aTile[cur], bTile[cur]);
} else {
TMATMUL_ACC(cTile, cTile, aTile[cur], bTile[cur]);
}
set_flag(PIPE_M, PIPE_MTE1, (event_t)cur); // reverse: release L0[cur]
set_flag(PIPE_M, PIPE_MTE1, static_cast<::event_t>(cur)); // reverse: release L0[cur]
}

// Drain outstanding reverse-dependency flags
Expand Down
12 changes: 6 additions & 6 deletions tests/st/a2a3/tensormap_and_ringbuffer/paged_attention_unroll/kernels/aic/aic_pv_matmul.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,30 +106,30 @@ static __aicore__ void pv_matmul_n_impl(

// Stage 1: TLOAD (MTE2: GM → L1[cur])
// Wait for MTE1 to release L1[cur] (reverse dep from previous iteration)
wait_flag(PIPE_MTE1, PIPE_MTE2, (event_t)cur);
wait_flag(PIPE_MTE1, PIPE_MTE2, static_cast<::event_t>(cur));
TLOAD(aMatTile[cur], pijGlobal);
set_flag(PIPE_MTE2, PIPE_MTE1, EVENT_ID0); // forward: A in L1 ready
TLOAD(bMatTile[cur], vjGlobal);
set_flag(PIPE_MTE2, PIPE_MTE1, EVENT_ID1); // forward: B in L1 ready

// Stage 2: TMOV (MTE1: L1[cur] → L0[cur])
// Wait for M-pipe to release L0[cur] (reverse dep from previous iteration)
wait_flag(PIPE_M, PIPE_MTE1, (event_t)cur);
wait_flag(PIPE_M, PIPE_MTE1, static_cast<::event_t>(cur));
wait_flag(PIPE_MTE2, PIPE_MTE1, EVENT_ID0); // forward: wait A loaded
TMOV(aTile[cur], aMatTile[cur]);
wait_flag(PIPE_MTE2, PIPE_MTE1, EVENT_ID1); // forward: wait B loaded
TMOV(bTile[cur], bMatTile[cur]);
set_flag(PIPE_MTE1, PIPE_MTE2, (event_t)cur); // reverse: release L1[cur]
set_flag(PIPE_MTE1, PIPE_MTE2, static_cast<::event_t>(cur)); // reverse: release L1[cur]

// Stage 3: TMATMUL (M-pipe: L0A[cur] × L0B[cur] → L0C)
set_flag(PIPE_MTE1, PIPE_M, (event_t)cur); // forward: L0[cur] ready
wait_flag(PIPE_MTE1, PIPE_M, (event_t)cur);
set_flag(PIPE_MTE1, PIPE_M, static_cast<::event_t>(cur)); // forward: L0[cur] ready
wait_flag(PIPE_MTE1, PIPE_M, static_cast<::event_t>(cur));
if (i == 0) {
TMATMUL(cTile, aTile[cur], bTile[cur]);
} else {
TMATMUL_ACC(cTile, cTile, aTile[cur], bTile[cur]);
}
set_flag(PIPE_M, PIPE_MTE1, (event_t)cur); // reverse: release L0[cur]
set_flag(PIPE_M, PIPE_MTE1, static_cast<::event_t>(cur)); // reverse: release L0[cur]
}

// Drain outstanding reverse-dependency flags
Expand Down
12 changes: 6 additions & 6 deletions .../a2a3/tensormap_and_ringbuffer/paged_attention_unroll_4dims/kernels/aic/aic_pv_matmul.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,30 +113,30 @@ static __aicore__ void pv_matmul_n_impl(

// Stage 1: TLOAD (MTE2: GM → L1[cur])
// Wait for MTE1 to release L1[cur] (reverse dep from previous iteration)
wait_flag(PIPE_MTE1, PIPE_MTE2, (event_t)cur);
wait_flag(PIPE_MTE1, PIPE_MTE2, static_cast<::event_t>(cur));
TLOAD(aMatTile[cur], pijGlobal);
set_flag(PIPE_MTE2, PIPE_MTE1, EVENT_ID0); // forward: A in L1 ready
TLOAD(bMatTile[cur], vjGlobal);
set_flag(PIPE_MTE2, PIPE_MTE1, EVENT_ID1); // forward: B in L1 ready

// Stage 2: TMOV (MTE1: L1[cur] → L0[cur])
// Wait for M-pipe to release L0[cur] (reverse dep from previous iteration)
wait_flag(PIPE_M, PIPE_MTE1, (event_t)cur);
wait_flag(PIPE_M, PIPE_MTE1, static_cast<::event_t>(cur));
wait_flag(PIPE_MTE2, PIPE_MTE1, EVENT_ID0); // forward: wait A loaded
TMOV(aTile[cur], aMatTile[cur]);
wait_flag(PIPE_MTE2, PIPE_MTE1, EVENT_ID1); // forward: wait B loaded
TMOV(bTile[cur], bMatTile[cur]);
set_flag(PIPE_MTE1, PIPE_MTE2, (event_t)cur); // reverse: release L1[cur]
set_flag(PIPE_MTE1, PIPE_MTE2, static_cast<::event_t>(cur)); // reverse: release L1[cur]

// Stage 3: TMATMUL (M-pipe: L0A[cur] × L0B[cur] → L0C)
set_flag(PIPE_MTE1, PIPE_M, (event_t)cur); // forward: L0[cur] ready
wait_flag(PIPE_MTE1, PIPE_M, (event_t)cur);
set_flag(PIPE_MTE1, PIPE_M, static_cast<::event_t>(cur)); // forward: L0[cur] ready
wait_flag(PIPE_MTE1, PIPE_M, static_cast<::event_t>(cur));
if (i == 0) {
TMATMUL(cTile, aTile[cur], bTile[cur]);
} else {
TMATMUL_ACC(cTile, cTile, aTile[cur], bTile[cur]);
}
set_flag(PIPE_M, PIPE_MTE1, (event_t)cur); // reverse: release L0[cur]
set_flag(PIPE_M, PIPE_MTE1, static_cast<::event_t>(cur)); // reverse: release L0[cur]
}

// Drain outstanding reverse-dependency flags
Expand Down
12 changes: 6 additions & 6 deletions tests/st/a5/tensormap_and_ringbuffer/paged_attention_unroll/kernels/aic/aic_pv_matmul.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,30 +105,30 @@ static __aicore__ void pv_matmul_n_impl(

// Stage 1: TLOAD (MTE2: GM → L1[cur])
// Wait for MTE1 to release L1[cur] (reverse dep from previous iteration)
wait_flag(PIPE_MTE1, PIPE_MTE2, (event_t)cur);
wait_flag(PIPE_MTE1, PIPE_MTE2, static_cast<::event_t>(cur));
TLOAD(aMatTile[cur], pijGlobal);
set_flag(PIPE_MTE2, PIPE_MTE1, EVENT_ID0); // forward: A in L1 ready
TLOAD(bMatTile[cur], vjGlobal);
set_flag(PIPE_MTE2, PIPE_MTE1, EVENT_ID1); // forward: B in L1 ready

// Stage 2: TMOV (MTE1: L1[cur] → L0[cur])
// Wait for M-pipe to release L0[cur] (reverse dep from previous iteration)
wait_flag(PIPE_M, PIPE_MTE1, (event_t)cur);
wait_flag(PIPE_M, PIPE_MTE1, static_cast<::event_t>(cur));
wait_flag(PIPE_MTE2, PIPE_MTE1, EVENT_ID0); // forward: wait A loaded
TMOV(aTile[cur], aMatTile[cur]);
wait_flag(PIPE_MTE2, PIPE_MTE1, EVENT_ID1); // forward: wait B loaded
TMOV(bTile[cur], bMatTile[cur]);
set_flag(PIPE_MTE1, PIPE_MTE2, (event_t)cur); // reverse: release L1[cur]
set_flag(PIPE_MTE1, PIPE_MTE2, static_cast<::event_t>(cur)); // reverse: release L1[cur]

// Stage 3: TMATMUL (M-pipe: L0A[cur] × L0B[cur] → L0C)
set_flag(PIPE_MTE1, PIPE_M, (event_t)cur); // forward: L0[cur] ready
wait_flag(PIPE_MTE1, PIPE_M, (event_t)cur);
set_flag(PIPE_MTE1, PIPE_M, static_cast<::event_t>(cur)); // forward: L0[cur] ready
wait_flag(PIPE_MTE1, PIPE_M, static_cast<::event_t>(cur));
if (i == 0) {
TMATMUL(cTile, aTile[cur], bTile[cur]);
} else {
TMATMUL_ACC(cTile, cTile, aTile[cur], bTile[cur]);
}
set_flag(PIPE_M, PIPE_MTE1, (event_t)cur); // reverse: release L0[cur]
set_flag(PIPE_M, PIPE_MTE1, static_cast<::event_t>(cur)); // reverse: release L0[cur]
}

// Drain outstanding reverse-dependency flags
Expand Down
Loading