@@ -585,6 +585,7 @@ struct vk_device_struct {
585
585
vk_pipeline pipeline_ssm_scan_f32_d16;
586
586
vk_pipeline pipeline_ssm_scan_f32_d128;
587
587
vk_pipeline pipeline_ssm_scan_f32_d256;
588
+ vk_pipeline pipeline_ssm_conv_f32;
588
589
vk_pipeline pipeline_opt_step_adamw_f32;
589
590
vk_pipeline pipeline_opt_step_sgd_f32;
590
591
vk_pipeline pipeline_conv2d_f32[CONV_SHAPE_COUNT];
@@ -1097,6 +1098,12 @@ struct vk_op_ssm_scan_push_constants {
1097
1098
uint32_t s_off;
1098
1099
uint32_t n_head, d_head, n_group, n_tok;
1099
1100
};
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
+ };
1100
1107
1101
1108
struct vk_op_conv2d_push_constants {
1102
1109
uint32_t Cout;
@@ -3602,6 +3609,8 @@ static void ggml_vk_load_shaders(vk_device& device) {
3602
3609
ggml_vk_create_pipeline(device, device->pipeline_ssm_scan_f32_d128, "ssm_scan_f32_d128", ssm_scan_f32_d128_len, ssm_scan_f32_d128_data, "main", 8, sizeof(vk_op_ssm_scan_push_constants), {1, 1, 1}, {128, 32, 16}, 1);
3603
3610
ggml_vk_create_pipeline(device, device->pipeline_ssm_scan_f32_d256, "ssm_scan_f32_d256", ssm_scan_f32_d256_len, ssm_scan_f32_d256_data, "main", 8, sizeof(vk_op_ssm_scan_push_constants), {1, 1, 1}, {256, 32, 16}, 1);
3604
3611
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
+
3605
3614
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);
3606
3615
3607
3616
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
8113
8122
}
8114
8123
}
8115
8124
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;
8116
8130
case GGML_OP_OPT_STEP_ADAMW:
8117
8131
if (src0->type == GGML_TYPE_F32 && dst->type == GGML_TYPE_F32) {
8118
8132
return ctx->device->pipeline_opt_step_adamw_f32;
@@ -9153,6 +9167,77 @@ static void ggml_vk_ssm_scan(ggml_backend_vk_context * ctx, vk_context& subctx,
9153
9167
}, pc, elements);
9154
9168
}
9155
9169
9170
+ static void ggml_vk_ssm_conv(ggml_backend_vk_context * ctx, vk_context& subctx, ggml_tensor * dst, bool dryrun = false) {
9171
+ const ggml_tensor * src0 = dst->src[0];
9172
+ const ggml_tensor * src1 = dst->src[1];
9173
+
9174
+ GGML_ASSERT(!ggml_is_quantized(src0->type));
9175
+ GGML_ASSERT(!ggml_is_quantized(src1->type));
9176
+ GGML_ASSERT(dst->buffer != nullptr);
9177
+
9178
+ const uint32_t nc = src1->ne[0];
9179
+ const uint32_t ncs = src0->ne[0];
9180
+ const uint32_t nr = src0->ne[1];
9181
+ const uint32_t n_t = dst->ne[1];
9182
+ const uint32_t n_s = dst->ne[2];
9183
+
9184
+ vk_pipeline pipeline = ggml_vk_op_get_pipeline(ctx, src0, src1, nullptr, dst, dst->op);
9185
+ GGML_ASSERT(pipeline != nullptr);
9186
+
9187
+ if (dryrun) {
9188
+ ggml_pipeline_request_descriptor_sets(ctx, pipeline, 1);
9189
+ return;
9190
+ }
9191
+
9192
+ const vk_op_ssm_conv_push_constants pc = {
9193
+ (uint32_t)src0->nb[1], (uint32_t)src0->nb[2],
9194
+ (uint32_t)src1->nb[1],
9195
+ (uint32_t)dst->nb[0], (uint32_t)dst->nb[1], (uint32_t)dst->nb[2],
9196
+ nc, ncs, nr, n_t, n_s
9197
+ };
9198
+
9199
+ ggml_backend_vk_buffer_context * dst_buf_ctx = (ggml_backend_vk_buffer_context *)dst->buffer->context;
9200
+ ggml_backend_vk_buffer_context * src0_buf_ctx = (ggml_backend_vk_buffer_context *)src0->buffer->context;
9201
+ ggml_backend_vk_buffer_context * src1_buf_ctx = (ggml_backend_vk_buffer_context *)src1->buffer->context;
9202
+
9203
+ vk_buffer d_D = nullptr, d_src0 = nullptr, d_src1 = nullptr;
9204
+ size_t dst_offset = 0, src0_offset = 0, src1_offset = 0;
9205
+ bool dst_uma = false, src0_uma = false, src1_uma = false;
9206
+
9207
+ if (ctx->device->uma) {
9208
+ ggml_vk_host_get(ctx->device, src0->data, d_src0, src0_offset);
9209
+ src0_uma = d_src0 != nullptr;
9210
+ ggml_vk_host_get(ctx->device, src1->data, d_src1, src1_offset);
9211
+ src1_uma = d_src1 != nullptr;
9212
+ ggml_vk_host_get(ctx->device, dst->data, d_D, dst_offset);
9213
+ dst_uma = d_D != nullptr;
9214
+ }
9215
+
9216
+ if (!dst_uma) {
9217
+ d_D = dst_buf_ctx->dev_buffer;
9218
+ dst_offset = vk_tensor_offset(dst) + dst->view_offs;
9219
+ }
9220
+ if (!src0_uma) {
9221
+ d_src0 = src0_buf_ctx->dev_buffer;
9222
+ src0_offset = vk_tensor_offset(src0) + src0->view_offs;
9223
+ }
9224
+ if (!src1_uma) {
9225
+ d_src1 = src1_buf_ctx->dev_buffer;
9226
+ src1_offset = vk_tensor_offset(src1) + src1->view_offs;
9227
+ }
9228
+
9229
+ size_t dst_size = ggml_nbytes(dst);
9230
+ size_t src0_size = ggml_nbytes(src0);
9231
+ size_t src1_size = ggml_nbytes(src1);
9232
+
9233
+ std::array<uint32_t, 3> elements = { CEIL_DIV(nr, 32), n_t, n_s };
9234
+ ggml_vk_dispatch_pipeline(ctx, subctx, pipeline, {
9235
+ vk_subbuffer{ d_src0, src0_offset, src0_size },
9236
+ vk_subbuffer{ d_src1, src1_offset, src1_size },
9237
+ vk_subbuffer{ d_D, dst_offset, dst_size }
9238
+ }, pc, elements);
9239
+ }
9240
+
9156
9241
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) {
9157
9242
const ggml_tensor * x = dst->src[0];
9158
9243
const ggml_tensor * g = dst->src[1];
@@ -10870,6 +10955,7 @@ static bool ggml_vk_compute_forward(ggml_backend_vk_context* ctx, ggml_cgraph *
10870
10955
// If submit is true the current all operations queued so far are being submitted to Vulkan to overlap cmdlist creation and GPU execution.
10871
10956
static bool ggml_vk_build_graph(ggml_backend_vk_context * ctx, ggml_cgraph * cgraph, int node_idx, ggml_tensor *node_begin, int node_idx_begin, bool dryrun, bool last_node, bool almost_ready, bool submit){
10872
10957
ggml_tensor * node = cgraph->nodes[node_idx];
10958
+
10873
10959
if (ggml_is_empty(node) || !node->buffer) {
10874
10960
return false;
10875
10961
}
@@ -10986,6 +11072,7 @@ static bool ggml_vk_build_graph(ggml_backend_vk_context * ctx, ggml_cgraph * cgr
10986
11072
case GGML_OP_RWKV_WKV6:
10987
11073
case GGML_OP_RWKV_WKV7:
10988
11074
case GGML_OP_SSM_SCAN:
11075
+ case GGML_OP_SSM_CONV:
10989
11076
case GGML_OP_LEAKY_RELU:
10990
11077
case GGML_OP_FLASH_ATTN_EXT:
10991
11078
case GGML_OP_OPT_STEP_ADAMW:
@@ -11408,6 +11495,11 @@ static bool ggml_vk_build_graph(ggml_backend_vk_context * ctx, ggml_cgraph * cgr
11408
11495
11409
11496
break;
11410
11497
11498
+ case GGML_OP_SSM_CONV:
11499
+ ggml_vk_ssm_conv(ctx, compute_ctx, node, dryrun);
11500
+
11501
+ break;
11502
+
11411
11503
case GGML_OP_OPT_STEP_ADAMW:
11412
11504
ggml_vk_opt_step_adamw(ctx, compute_ctx, node, dryrun);
11413
11505
@@ -11520,6 +11612,7 @@ static bool ggml_vk_compute_forward(ggml_backend_vk_context * ctx, ggml_cgraph *
11520
11612
case GGML_OP_RWKV_WKV6:
11521
11613
case GGML_OP_RWKV_WKV7:
11522
11614
case GGML_OP_SSM_SCAN:
11615
+ case GGML_OP_SSM_CONV:
11523
11616
case GGML_OP_LEAKY_RELU:
11524
11617
case GGML_OP_REPEAT:
11525
11618
case GGML_OP_REPEAT_BACK:
@@ -13053,6 +13146,8 @@ static bool ggml_backend_vk_device_supports_op(ggml_backend_dev_t dev, const ggm
13053
13146
13054
13147
return true;
13055
13148
}
13149
+ case GGML_OP_SSM_CONV:
13150
+ return true;
13056
13151
case GGML_OP_CONV_TRANSPOSE_1D:
13057
13152
return op->src[0]->type == GGML_TYPE_F32 && op->src[1]->type == GGML_TYPE_F32;
13058
13153
case GGML_OP_CONV_2D:
@@ -13714,6 +13809,8 @@ static void ggml_vk_check_results_0(ggml_backend_vk_context * ctx, ggml_cgraph *
13714
13809
} else if (tensor->op == GGML_OP_SSM_SCAN) {
13715
13810
tensor_clone = ggml_ssm_scan(ggml_ctx, src_clone[0], src_clone[1], src_clone[2],
13716
13811
src_clone[3], src_clone[4], src_clone[5], src_clone[6]);
13812
+ } else if (tensor->op == GGML_OP_SSM_CONV) {
13813
+ tensor_clone = ggml_ssm_conv(ggml_ctx, src_clone[0], src_clone[1]);
13717
13814
}
13718
13815
else {
13719
13816
std::cerr << "Missing vk_check_results OP: " << ggml_op_name(tensor->op) << std::endl;
0 commit comments