Skip to content

Commit c467631

Browse files
giuseppeClaude
authored andcommitted
vulkan: implement SSM conv operation
Add State Space Model conv operation to the Vulkan backend. Signed-off-by: Giuseppe Scrivano <[email protected]>
1 parent 48003f1 commit c467631

File tree

3 files changed

+95
-0
lines changed

3 files changed

+95
-0
lines changed

ggml/src/ggml-vulkan/ggml-vulkan.cpp

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -585,6 +585,7 @@ struct vk_device_struct {
585585
vk_pipeline pipeline_ssm_scan_f32_d16;
586586
vk_pipeline pipeline_ssm_scan_f32_d128;
587587
vk_pipeline pipeline_ssm_scan_f32_d256;
588+
vk_pipeline pipeline_ssm_conv_f32;
588589
vk_pipeline pipeline_opt_step_adamw_f32;
589590
vk_pipeline pipeline_opt_step_sgd_f32;
590591
vk_pipeline pipeline_conv2d_f32[CONV_SHAPE_COUNT];
@@ -1097,6 +1098,12 @@ struct vk_op_ssm_scan_push_constants {
10971098
uint32_t s_off;
10981099
uint32_t n_head, d_head, n_group, n_tok;
10991100
};
1101+
struct vk_op_ssm_conv_push_constants {
1102+
uint32_t src0_nb1, src0_nb2;
1103+
uint32_t src1_nb1;
1104+
uint32_t dst_nb0, dst_nb1, dst_nb2;
1105+
uint32_t nc, ncs, nr, n_t, n_s;
1106+
};
11001107

11011108
struct vk_op_conv2d_push_constants {
11021109
uint32_t Cout;
@@ -3602,6 +3609,8 @@ static void ggml_vk_load_shaders(vk_device& device) {
36023609
ggml_vk_create_pipeline(device, device->pipeline_ssm_scan_f32_d128, "ssm_scan_f32", ssm_scan_f32_len, ssm_scan_f32_data, "main", 8, sizeof(vk_op_ssm_scan_push_constants), {1, 1, 1}, {128, device->subgroup_size, 16}, 1);
36033610
ggml_vk_create_pipeline(device, device->pipeline_ssm_scan_f32_d256, "ssm_scan_f32", ssm_scan_f32_len, ssm_scan_f32_data, "main", 8, sizeof(vk_op_ssm_scan_push_constants), {1, 1, 1}, {256, device->subgroup_size, 16}, 1);
36043611

3612+
ggml_vk_create_pipeline(device, device->pipeline_ssm_conv_f32, "ssm_conv_f32", ssm_conv_f32_len, ssm_conv_f32_data, "main", 3, sizeof(vk_op_ssm_conv_push_constants), {1, 1, 1}, {32}, 1);
3613+
36053614
ggml_vk_create_pipeline(device, device->pipeline_opt_step_adamw_f32, "opt_step_adamw_f32", opt_step_adamw_f32_len, opt_step_adamw_f32_data, "main", 5, sizeof(vk_op_push_constants), {512, 1, 1}, {}, 1);
36063615

36073616
ggml_vk_create_pipeline(device, device->pipeline_opt_step_sgd_f32, "opt_step_sgd_f32", opt_step_sgd_f32_len, opt_step_sgd_f32_data, "main", 3, sizeof(vk_op_push_constants), {512, 1, 1}, {}, 1);
@@ -8113,6 +8122,11 @@ static vk_pipeline ggml_vk_op_get_pipeline(ggml_backend_vk_context * ctx, const
81138122
}
81148123
}
81158124
return nullptr;
8125+
case GGML_OP_SSM_CONV:
8126+
if (src0->type == GGML_TYPE_F32 && dst->type == GGML_TYPE_F32) {
8127+
return ctx->device->pipeline_ssm_conv_f32;
8128+
}
8129+
return nullptr;
81168130
case GGML_OP_OPT_STEP_ADAMW:
81178131
if (src0->type == GGML_TYPE_F32 && dst->type == GGML_TYPE_F32) {
81188132
return ctx->device->pipeline_opt_step_adamw_f32;
@@ -8607,6 +8621,14 @@ static void ggml_vk_op_f32(ggml_backend_vk_context * ctx, vk_context& subctx, co
86078621
}
86088622
}
86098623
break;
8624+
case GGML_OP_SSM_CONV:
8625+
{
8626+
const uint32_t nr = src0->ne[1];
8627+
const uint32_t n_t = dst->ne[1];
8628+
const uint32_t n_s = dst->ne[2];
8629+
elements = { CEIL_DIV(nr, 32), n_t, n_s };
8630+
}
8631+
break;
86108632
default:
86118633
elements = { (uint32_t)ggml_nelements(src0), 1, 1 };
86128634
break;
@@ -9153,6 +9175,22 @@ static void ggml_vk_ssm_scan(ggml_backend_vk_context * ctx, vk_context& subctx,
91539175
}, pc, elements);
91549176
}
91559177

9178+
static void ggml_vk_ssm_conv(ggml_backend_vk_context * ctx, vk_context& subctx, ggml_tensor * dst, bool dryrun = false) {
9179+
const ggml_tensor * src0 = dst->src[0];
9180+
const ggml_tensor * src1 = dst->src[1];
9181+
9182+
ggml_vk_op_f32<vk_op_ssm_conv_push_constants>(ctx, subctx, src0, src1, nullptr, dst, GGML_OP_SSM_CONV, {
9183+
(uint32_t)src0->nb[1], (uint32_t)src0->nb[2],
9184+
(uint32_t)src1->nb[1],
9185+
(uint32_t)dst->nb[0], (uint32_t)dst->nb[1], (uint32_t)dst->nb[2],
9186+
(uint32_t)src1->ne[0],
9187+
(uint32_t)src0->ne[0],
9188+
(uint32_t)src0->ne[1],
9189+
(uint32_t)dst->ne[1],
9190+
(uint32_t)dst->ne[2],
9191+
}, dryrun);
9192+
}
9193+
91569194
static void ggml_vk_op_f32_opt_step_adamw(ggml_backend_vk_context * ctx, vk_context& subctx, ggml_tensor * dst, const vk_op_push_constants&& pc, bool dryrun = false) {
91579195
const ggml_tensor * x = dst->src[0];
91589196
const ggml_tensor * g = dst->src[1];
@@ -10986,6 +11024,7 @@ static bool ggml_vk_build_graph(ggml_backend_vk_context * ctx, ggml_cgraph * cgr
1098611024
case GGML_OP_RWKV_WKV6:
1098711025
case GGML_OP_RWKV_WKV7:
1098811026
case GGML_OP_SSM_SCAN:
11027+
case GGML_OP_SSM_CONV:
1098911028
case GGML_OP_LEAKY_RELU:
1099011029
case GGML_OP_FLASH_ATTN_EXT:
1099111030
case GGML_OP_OPT_STEP_ADAMW:
@@ -11408,6 +11447,11 @@ static bool ggml_vk_build_graph(ggml_backend_vk_context * ctx, ggml_cgraph * cgr
1140811447

1140911448
break;
1141011449

11450+
case GGML_OP_SSM_CONV:
11451+
ggml_vk_ssm_conv(ctx, compute_ctx, node, dryrun);
11452+
11453+
break;
11454+
1141111455
case GGML_OP_OPT_STEP_ADAMW:
1141211456
ggml_vk_opt_step_adamw(ctx, compute_ctx, node, dryrun);
1141311457

@@ -11520,6 +11564,7 @@ static bool ggml_vk_compute_forward(ggml_backend_vk_context * ctx, ggml_cgraph *
1152011564
case GGML_OP_RWKV_WKV6:
1152111565
case GGML_OP_RWKV_WKV7:
1152211566
case GGML_OP_SSM_SCAN:
11567+
case GGML_OP_SSM_CONV:
1152311568
case GGML_OP_LEAKY_RELU:
1152411569
case GGML_OP_REPEAT:
1152511570
case GGML_OP_REPEAT_BACK:
@@ -13053,6 +13098,8 @@ static bool ggml_backend_vk_device_supports_op(ggml_backend_dev_t dev, const ggm
1305313098

1305413099
return true;
1305513100
}
13101+
case GGML_OP_SSM_CONV:
13102+
return true;
1305613103
case GGML_OP_CONV_TRANSPOSE_1D:
1305713104
return op->src[0]->type == GGML_TYPE_F32 && op->src[1]->type == GGML_TYPE_F32;
1305813105
case GGML_OP_CONV_2D:
@@ -13714,6 +13761,8 @@ static void ggml_vk_check_results_0(ggml_backend_vk_context * ctx, ggml_cgraph *
1371413761
} else if (tensor->op == GGML_OP_SSM_SCAN) {
1371513762
tensor_clone = ggml_ssm_scan(ggml_ctx, src_clone[0], src_clone[1], src_clone[2],
1371613763
src_clone[3], src_clone[4], src_clone[5], src_clone[6]);
13764+
} else if (tensor->op == GGML_OP_SSM_CONV) {
13765+
tensor_clone = ggml_ssm_conv(ggml_ctx, src_clone[0], src_clone[1]);
1371713766
}
1371813767
else {
1371913768
std::cerr << "Missing vk_check_results OP: " << ggml_op_name(tensor->op) << std::endl;
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
#version 450
2+
3+
#extension GL_EXT_control_flow_attributes : require
4+
5+
#include "types.glsl"
6+
7+
layout(constant_id = 0) const int BLOCK_SIZE = 32;
8+
9+
layout(local_size_x_id = 0, local_size_y = 1, local_size_z = 1) in;
10+
11+
layout(binding = 0) readonly buffer Src0 { float src0[]; };
12+
layout(binding = 1) readonly buffer Src1 { float src1[]; };
13+
layout(binding = 2) buffer Dst { float dst[]; };
14+
15+
layout(push_constant) uniform PushConstants {
16+
uint src0_nb1; uint src0_nb2;
17+
uint src1_nb1;
18+
uint dst_nb0; uint dst_nb1; uint dst_nb2;
19+
uint nc; uint ncs; uint nr; uint n_t; uint n_s;
20+
};
21+
22+
void main() {
23+
const uint global_thread_id = gl_WorkGroupID.x * gl_WorkGroupSize.x + gl_LocalInvocationID.x;
24+
const uint i2 = gl_WorkGroupID.y;
25+
const uint i3 = gl_WorkGroupID.z;
26+
27+
if (global_thread_id >= nr || i2 >= n_t || i3 >= n_s) {
28+
return;
29+
}
30+
31+
const uint i1 = global_thread_id;
32+
const uint src0_base = i3 * (src0_nb2 / 4) + i2 + i1 * (src0_nb1 / 4);
33+
const uint src1_base = i1 * (src1_nb1 / 4);
34+
const uint dst_idx = i3 * (dst_nb2 / 4) + i2 * (dst_nb1 / 4) + i1;
35+
36+
float sum = 0.0;
37+
[[unroll]] for (uint i0 = 0; i0 < nc; i0++) {
38+
const uint src0_idx = src0_base + i0;
39+
const uint src1_idx = src1_base + i0;
40+
sum += src0[src0_idx] * src1[src1_idx];
41+
}
42+
43+
dst[dst_idx] = sum;
44+
}

ggml/src/ggml-vulkan/vulkan-shaders/vulkan-shaders-gen.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -921,6 +921,8 @@ void process_shaders() {
921921

922922
string_to_spv("ssm_scan_f32", "ssm_scan.comp", {{"A_TYPE", "float"}});
923923

924+
string_to_spv("ssm_conv_f32", "ssm_conv.comp", {{"A_TYPE", "float"}});
925+
924926
for (auto &c : compiles) {
925927
c.wait();
926928
}

0 commit comments

Comments
 (0)