Skip to content

Commit 8a8ab02

Browse files
committed
[GPU] Add support of per-head mask for sdpa_micro kernel
1 parent ed11461 commit 8a8ab02

File tree

2 files changed

+27
-4
lines changed

2 files changed

+27
-4
lines changed

src/plugins/intel_gpu/src/kernel_selector/cl_kernels/sdpa_micro.cl

+3
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,9 @@ KERNEL(micro_sdpa)(OPTIONAL_SHAPE_INFO_ARG
210210
Q += (QRY_OFF(b1, b0, 0, 0) + INPUT0_OFFSET);
211211
V += (VAL_OFF(b1, b0_kv, 0, 0) + INPUT2_OFFSET) / VAL_ELEMENTS_PER_BYTE;
212212
A += DST_OFF(b1, b0, 0, 0, 0);
213+
#if WITH_ATTN_MASK
214+
msk += MSK_OFF(b1 % MSK_D0, b0 % MSK_D1, 0, 0);
215+
#endif
213216

214217
#if KEY_SCALES
215218
K_scales += KEY_COMP_OFF(b1, b0_kv, 0, 0);

src/plugins/intel_gpu/src/kernel_selector/kernels/sdpa/sdpa_kernel_micro.cpp

+24-4
Original file line numberDiff line numberDiff line change
@@ -604,22 +604,37 @@ JitConstants SDPAKernelMicro::GetJitConstants(const sdpa_params& params, const m
604604
auto convert_strides = [](std::string target_prefix, std::string source_prefix, const std::vector<int64_t> order) {
605605
JitConstants definitions({});
606606

607-
std::vector<std::string> target_definitions = {
607+
std::vector<std::string> target_stride_definitions = {
608608
target_prefix + "_S0",
609609
target_prefix + "_S1",
610610
target_prefix + "_S2",
611611
target_prefix + "_S3",
612612
};
613613

614-
std::vector<std::string> source_definitions = {
614+
std::vector<std::string> source_stride_definitions = {
615615
source_prefix + "_BATCH_PITCH",
616616
source_prefix + "_FEATURE_PITCH",
617617
source_prefix + "_Y_PITCH",
618618
source_prefix + "_X_PITCH",
619619
};
620620

621-
for (size_t i = 0; i < target_definitions.size(); i++) {
622-
definitions.AddConstant(MakeJitConstant(target_definitions[i], source_definitions[order[i]]));
621+
std::vector<std::string> target_size_definitions = {
622+
target_prefix + "_D0",
623+
target_prefix + "_D1",
624+
target_prefix + "_D2",
625+
target_prefix + "_D3",
626+
};
627+
628+
std::vector<std::string> source_size_definitions = {
629+
source_prefix + "_BATCH_NUM",
630+
source_prefix + "_FEATURE_NUM",
631+
source_prefix + "_SIZE_Y",
632+
source_prefix + "_SIZE_X",
633+
};
634+
635+
for (size_t i = 0; i < target_stride_definitions.size(); i++) {
636+
definitions.AddConstant(MakeJitConstant(target_stride_definitions[i], source_stride_definitions[order[i]]));
637+
definitions.AddConstant(MakeJitConstant(target_size_definitions[i], source_size_definitions[order[i]]));
623638
}
624639

625640
return definitions;
@@ -635,6 +650,11 @@ JitConstants SDPAKernelMicro::GetJitConstants(const sdpa_params& params, const m
635650
jit.Merge(unit_parameters("VAL"));
636651
jit.Merge(unit_parameters("DST"));
637652

653+
if (params.inputs.size() > 3) {
654+
jit.Merge(convert_strides("MSK", "INPUT3", {0, 1, 2, 3}));
655+
jit.Merge(unit_parameters("MSK"));
656+
}
657+
638658
if (params.conf.is_kv_compressed) {
639659
jit.AddConstant(MakeJitConstant("KEY_SCALE", params.key_cache_comp_scale));
640660
jit.AddConstant(MakeJitConstant("VAL_SCALE", params.value_cache_comp_scale));

0 commit comments

Comments
 (0)