Skip to content

metal: fix flash attention nsg8 dv64 path #3790

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

Open
adavyas wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −7
Open

metal: fix flash attention nsg8 dv64 path #3790

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
21 changes: 14 additions & 7 deletions ggml/src/ggml-metal/ggml-metal.metal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6239,17 +6239,24 @@ void kernel_flash_attn_ext_impl(
s8x8_t vs;
simdgroup_load(vs, ss + 8*cc, SH, 0, false);

FOR_UNROLL (short ii = 0; ii < NO/2; ++ii) {
v8x8_t mv[2];
if (NO == 1) {
v8x8_t mv;

simdgroup_load(mv, pv, NS20, 0, false);
simdgroup_multiply_accumulate(lo[0], vs, mv, lo[0]);
} else {
FOR_UNROLL (short ii = 0; ii < NO/2; ++ii) {
v8x8_t mv[2];

simdgroup_load(mv[0], pv + 0*NSG + 16*ii*NSG, NS20, 0, false);
simdgroup_load(mv[1], pv + 8*NSG + 16*ii*NSG, NS20, 0, false);
simdgroup_load(mv[0], pv + 0*NSG + 16*ii*NSG, NS20, 0, false);
simdgroup_load(mv[1], pv + 8*NSG + 16*ii*NSG, NS20, 0, false);

simdgroup_multiply_accumulate(lo[2*ii + 0], vs, mv[0], lo[2*ii + 0]);
simdgroup_multiply_accumulate(lo[2*ii + 1], vs, mv[1], lo[2*ii + 1]);
simdgroup_multiply_accumulate(lo[2*ii + 0], vs, mv[0], lo[2*ii + 0]);
simdgroup_multiply_accumulate(lo[2*ii + 1], vs, mv[1], lo[2*ii + 1]);
}
}

pv += 8*NS20;
pv += 8*NS20;
}
} else {
constexpr short NC = (C/8)/2;
Expand Down