Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
60 changes: 60 additions & 0 deletions mlx/backend/metal/jit_kernels.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1438,6 +1438,66 @@ MTL::ComputePipelineState* get_steel_attention_nax_kernel(
return d.get_kernel(kernel_name, lib, hash_name, func_consts);
}

MTL::ComputePipelineState* get_steel_attention_split_kernel(
metal::Device& d,
const std::string& kernel_name,
const std::string& hash_name,
const metal::MTLFCList& func_consts,
const array& q,
int bq,
int bk,
int bd,
int wm,
int wn) {
const auto& lib_name = kernel_name;
auto lib = d.get_library(lib_name, [&]() {
std::string kernel_source;
concatenate(
kernel_source,
metal::utils(),
metal::steel_attention(),
get_template_definition(
lib_name,
"attention_split",
get_type_string(q.dtype()),
bq,
bk,
bd,
wm,
wn));
return kernel_source;
});
return d.get_kernel(kernel_name, lib, hash_name, func_consts);
}

MTL::ComputePipelineState* get_steel_attention_split_nax_kernel(
metal::Device& d,
const std::string& kernel_name,
const std::string& hash_name,
const metal::MTLFCList& func_consts,
const array& q,
int bk,
int bd,
int wn) {
const auto& lib_name = kernel_name;
auto lib = d.get_library(lib_name, [&]() {
std::string kernel_source;
concatenate(
kernel_source,
metal::utils(),
metal::steel_attention_nax(),
get_template_definition(
lib_name,
"attention_split_nax",
get_type_string(q.dtype()),
bk,
bd,
wn));
return kernel_source;
});
return d.get_kernel(kernel_name, lib, hash_name, func_consts);
}

MTL::ComputePipelineState* get_sdpa_vjp_kernel(
metal::Device& d,
const std::string& kernel_name,
Expand Down
22 changes: 22 additions & 0 deletions mlx/backend/metal/kernels.h
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,28 @@ MTL::ComputePipelineState* get_steel_attention_nax_kernel(
const array& m,
bool split_d);

MTL::ComputePipelineState* get_steel_attention_split_kernel(
metal::Device& d,
const std::string& kernel_name,
const std::string& hash_name,
const metal::MTLFCList& func_consts,
const array& q,
int bq,
int bk,
int bd,
int wm,
int wn);

MTL::ComputePipelineState* get_steel_attention_split_nax_kernel(
metal::Device& d,
const std::string& kernel_name,
const std::string& hash_name,
const metal::MTLFCList& func_consts,
const array& q,
int bk,
int bd,
int wn);

MTL::ComputePipelineState* get_gated_delta_kernel(
metal::Device& d,
const std::string& kernel_name,
Expand Down
20 changes: 20 additions & 0 deletions mlx/backend/metal/kernels/scaled_dot_product_attention.metal
Original file line number Diff line number Diff line change
Expand Up @@ -93,4 +93,24 @@ instantiate_sdpa_vector_tk1(float16_t, 256)
instantiate_sdpa_vector_tk1(bfloat16_t, 256)
instantiate_sdpa_vector_tk1(float, 192)
instantiate_sdpa_vector_tk1(float, 256)

#define instantiate_sdpa_split_reduce(type, value_dim) \
instantiate_kernel( \
"sdpa_split_reduce_" #type "_" #value_dim, \
sdpa_split_reduce, \
type, \
value_dim)

#define instantiate_sdpa_split_reduce_heads(type) \
instantiate_sdpa_split_reduce(type, 64) \
instantiate_sdpa_split_reduce(type, 72) \
instantiate_sdpa_split_reduce(type, 80) \
instantiate_sdpa_split_reduce(type, 96) \
instantiate_sdpa_split_reduce(type, 128) \
instantiate_sdpa_split_reduce(type, 192) \
instantiate_sdpa_split_reduce(type, 256)

instantiate_sdpa_split_reduce_heads(float)
instantiate_sdpa_split_reduce_heads(bfloat16_t)
instantiate_sdpa_split_reduce_heads(float16_t)
// clang-format on
62 changes: 62 additions & 0 deletions mlx/backend/metal/kernels/sdpa_vector.h
Original file line number Diff line number Diff line change
Expand Up @@ -684,3 +684,65 @@ template <typename T, int D>
}
}
}

template <typename T, int D>
[[kernel]] void sdpa_split_reduce(
const device float* partials [[buffer(0)]],
const device float* sums [[buffer(1)]],
const device float* maxs [[buffer(2)]],
device T* out [[buffer(3)]],
const constant int& blocks [[buffer(4)]],
const constant int64_t* out_strides [[buffer(5)]],
uint3 tid [[threadgroup_position_in_grid]],
uint3 tpg [[threadgroups_per_grid]],
uint simd_lid [[thread_index_in_simdgroup]]) {
constexpr int BN = 32;
constexpr int elem_per_thread = (D + BN - 1) / BN;
constexpr bool full_lanes = D % BN == 0;
const int lane_elems = full_lanes
? elem_per_thread
: clamp(D - int(simd_lid) * elem_per_thread, 0, elem_per_thread);

typedef float U;

const int q_seq_idx = tid.x;
const int head_idx = tid.y;
const int batch_idx = tid.z;
const int64_t row =
(int64_t(batch_idx) * tpg.y + head_idx) * tpg.x + q_seq_idx;
partials += row * blocks * D + simd_lid * elem_per_thread;
sums += row * blocks;
maxs += row * blocks;
out += batch_idx * out_strides[0] + head_idx * out_strides[1] +
q_seq_idx * out_strides[2] + simd_lid * elem_per_thread;

U max_score = Limits<U>::finite_min;
for (int b = simd_lid; b < blocks; b += BN) {
max_score = max(max_score, maxs[b]);
}
max_score = simd_max(max_score);

U sum_exp_score = 0;
for (int b = simd_lid; b < blocks; b += BN) {
sum_exp_score += fast::exp(maxs[b] - max_score) * sums[b];
}
sum_exp_score = simd_sum(sum_exp_score);

U o[elem_per_thread] = {0};
for (int b = 0; b < blocks; b++) {
U factor = fast::exp(maxs[b] - max_score);
for (int i = 0; i < elem_per_thread; i++) {
if (full_lanes || i < lane_elems) {
o[i] += factor * static_cast<U>(partials[i]);
}
}
partials += D;
}

U scale = sum_exp_score == 0 ? 0 : 1 / sum_exp_score;
for (int i = 0; i < elem_per_thread; i++) {
if (full_lanes || i < lane_elems) {
out[i] = static_cast<T>(o[i] * scale);
}
}
}
Loading
Loading