@@ -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];
@@ -1098,6 +1099,12 @@ struct vk_op_ssm_scan_push_constants {
1098
1099
uint32_t s_off;
1099
1100
uint32_t n_head, d_head, n_group, n_tok;
1100
1101
};
1102
+ struct vk_op_ssm_conv_push_constants {
1103
+ uint32_t src0_nb1, src0_nb2;
1104
+ uint32_t src1_nb1;
1105
+ uint32_t dst_nb0, dst_nb1, dst_nb2;
1106
+ uint32_t nc, ncs, nr, n_t, n_s;
1107
+ };
1101
1108
1102
1109
struct vk_op_conv2d_push_constants {
1103
1110
uint32_t Cout;
@@ -3603,6 +3610,8 @@ static void ggml_vk_load_shaders(vk_device& device) {
3603
3610
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, 1, 1}, 1);
3604
3611
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, 1, 1}, 1);
3605
3612
3613
+ 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}, {}, 1);
3614
+
3606
3615
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);
3607
3616
3608
3617
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);
@@ -8117,6 +8126,11 @@ static vk_pipeline ggml_vk_op_get_pipeline(ggml_backend_vk_context * ctx, const
8117
8126
}
8118
8127
}
8119
8128
return nullptr;
8129
+ case GGML_OP_SSM_CONV:
8130
+ if (src0->type == GGML_TYPE_F32 && dst->type == GGML_TYPE_F32) {
8131
+ return ctx->device->pipeline_ssm_conv_f32;
8132
+ }
8133
+ return nullptr;
8120
8134
case GGML_OP_OPT_STEP_ADAMW:
8121
8135
if (src0->type == GGML_TYPE_F32 && dst->type == GGML_TYPE_F32) {
8122
8136
return ctx->device->pipeline_opt_step_adamw_f32;
@@ -9180,6 +9194,77 @@ static void ggml_vk_ssm_scan(ggml_backend_vk_context * ctx, vk_context& subctx,
9180
9194
}, pc, elements);
9181
9195
}
9182
9196
9197
+ static void ggml_vk_ssm_conv(ggml_backend_vk_context * ctx, vk_context& subctx, ggml_tensor * dst, bool dryrun = false) {
9198
+ const ggml_tensor * src0 = dst->src[0];
9199
+ const ggml_tensor * src1 = dst->src[1];
9200
+
9201
+ GGML_ASSERT(!ggml_is_quantized(src0->type));
9202
+ GGML_ASSERT(!ggml_is_quantized(src1->type));
9203
+ GGML_ASSERT(dst->buffer != nullptr);
9204
+
9205
+ const uint32_t nc = src1->ne[0];
9206
+ const uint32_t ncs = src0->ne[0];
9207
+ const uint32_t nr = src0->ne[1];
9208
+ const uint32_t n_t = dst->ne[1];
9209
+ const uint32_t n_s = dst->ne[2];
9210
+
9211
+ vk_pipeline pipeline = ggml_vk_op_get_pipeline(ctx, src0, src1, nullptr, dst, dst->op);
9212
+ GGML_ASSERT(pipeline != nullptr);
9213
+
9214
+ if (dryrun) {
9215
+ ggml_pipeline_request_descriptor_sets(ctx, pipeline, 1);
9216
+ return;
9217
+ }
9218
+
9219
+ const vk_op_ssm_conv_push_constants pc = {
9220
+ (uint32_t)src0->nb[1], (uint32_t)src0->nb[2],
9221
+ (uint32_t)src1->nb[1],
9222
+ (uint32_t)dst->nb[0], (uint32_t)dst->nb[1], (uint32_t)dst->nb[2],
9223
+ nc, ncs, nr, n_t, n_s
9224
+ };
9225
+
9226
+ ggml_backend_vk_buffer_context * dst_buf_ctx = (ggml_backend_vk_buffer_context *)dst->buffer->context;
9227
+ ggml_backend_vk_buffer_context * src0_buf_ctx = (ggml_backend_vk_buffer_context *)src0->buffer->context;
9228
+ ggml_backend_vk_buffer_context * src1_buf_ctx = (ggml_backend_vk_buffer_context *)src1->buffer->context;
9229
+
9230
+ vk_buffer d_D = nullptr, d_src0 = nullptr, d_src1 = nullptr;
9231
+ size_t dst_offset = 0, src0_offset = 0, src1_offset = 0;
9232
+ bool dst_uma = false, src0_uma = false, src1_uma = false;
9233
+
9234
+ if (ctx->device->uma) {
9235
+ ggml_vk_host_get(ctx->device, src0->data, d_src0, src0_offset);
9236
+ src0_uma = d_src0 != nullptr;
9237
+ ggml_vk_host_get(ctx->device, src1->data, d_src1, src1_offset);
9238
+ src1_uma = d_src1 != nullptr;
9239
+ ggml_vk_host_get(ctx->device, dst->data, d_D, dst_offset);
9240
+ dst_uma = d_D != nullptr;
9241
+ }
9242
+
9243
+ if (!dst_uma) {
9244
+ d_D = dst_buf_ctx->dev_buffer;
9245
+ dst_offset = vk_tensor_offset(dst) + dst->view_offs;
9246
+ }
9247
+ if (!src0_uma) {
9248
+ d_src0 = src0_buf_ctx->dev_buffer;
9249
+ src0_offset = vk_tensor_offset(src0) + src0->view_offs;
9250
+ }
9251
+ if (!src1_uma) {
9252
+ d_src1 = src1_buf_ctx->dev_buffer;
9253
+ src1_offset = vk_tensor_offset(src1) + src1->view_offs;
9254
+ }
9255
+
9256
+ size_t dst_size = ggml_nbytes(dst);
9257
+ size_t src0_size = ggml_nbytes(src0);
9258
+ size_t src1_size = ggml_nbytes(src1);
9259
+
9260
+ std::array<uint32_t, 3> elements = { nr, n_t, n_s };
9261
+ ggml_vk_dispatch_pipeline(ctx, subctx, pipeline, {
9262
+ vk_subbuffer{ d_src0, src0_offset, src0_size },
9263
+ vk_subbuffer{ d_src1, src1_offset, src1_size },
9264
+ vk_subbuffer{ d_D, dst_offset, dst_size }
9265
+ }, pc, elements);
9266
+ }
9267
+
9183
9268
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) {
9184
9269
const ggml_tensor * x = dst->src[0];
9185
9270
const ggml_tensor * g = dst->src[1];
@@ -10897,6 +10982,7 @@ static bool ggml_vk_compute_forward(ggml_backend_vk_context* ctx, ggml_cgraph *
10897
10982
// If submit is true the current all operations queued so far are being submitted to Vulkan to overlap cmdlist creation and GPU execution.
10898
10983
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){
10899
10984
ggml_tensor * node = cgraph->nodes[node_idx];
10985
+
10900
10986
if (ggml_is_empty(node) || !node->buffer) {
10901
10987
return false;
10902
10988
}
@@ -11013,6 +11099,7 @@ static bool ggml_vk_build_graph(ggml_backend_vk_context * ctx, ggml_cgraph * cgr
11013
11099
case GGML_OP_RWKV_WKV6:
11014
11100
case GGML_OP_RWKV_WKV7:
11015
11101
case GGML_OP_SSM_SCAN:
11102
+ case GGML_OP_SSM_CONV:
11016
11103
case GGML_OP_LEAKY_RELU:
11017
11104
case GGML_OP_FLASH_ATTN_EXT:
11018
11105
case GGML_OP_OPT_STEP_ADAMW:
@@ -11435,6 +11522,11 @@ static bool ggml_vk_build_graph(ggml_backend_vk_context * ctx, ggml_cgraph * cgr
11435
11522
11436
11523
break;
11437
11524
11525
+ case GGML_OP_SSM_CONV:
11526
+ ggml_vk_ssm_conv(ctx, compute_ctx, node, dryrun);
11527
+
11528
+ break;
11529
+
11438
11530
case GGML_OP_OPT_STEP_ADAMW:
11439
11531
ggml_vk_opt_step_adamw(ctx, compute_ctx, node, dryrun);
11440
11532
@@ -11547,6 +11639,7 @@ static bool ggml_vk_compute_forward(ggml_backend_vk_context * ctx, ggml_cgraph *
11547
11639
case GGML_OP_RWKV_WKV6:
11548
11640
case GGML_OP_RWKV_WKV7:
11549
11641
case GGML_OP_SSM_SCAN:
11642
+ case GGML_OP_SSM_CONV:
11550
11643
case GGML_OP_LEAKY_RELU:
11551
11644
case GGML_OP_REPEAT:
11552
11645
case GGML_OP_REPEAT_BACK:
@@ -13027,6 +13120,7 @@ static bool ggml_backend_vk_device_supports_op(ggml_backend_dev_t dev, const ggm
13027
13120
case GGML_OP_RWKV_WKV6:
13028
13121
case GGML_OP_RWKV_WKV7:
13029
13122
case GGML_OP_SSM_SCAN:
13123
+ case GGML_OP_SSM_CONV:
13030
13124
return true;
13031
13125
case GGML_OP_CONV_TRANSPOSE_1D:
13032
13126
return op->src[0]->type == GGML_TYPE_F32 && op->src[1]->type == GGML_TYPE_F32;
@@ -13689,6 +13783,8 @@ static void ggml_vk_check_results_0(ggml_backend_vk_context * ctx, ggml_cgraph *
13689
13783
} else if (tensor->op == GGML_OP_SSM_SCAN) {
13690
13784
tensor_clone = ggml_ssm_scan(ggml_ctx, src_clone[0], src_clone[1], src_clone[2],
13691
13785
src_clone[3], src_clone[4], src_clone[5], src_clone[6]);
13786
+ } else if (tensor->op == GGML_OP_SSM_CONV) {
13787
+ tensor_clone = ggml_ssm_conv(ggml_ctx, src_clone[0], src_clone[1]);
13692
13788
}
13693
13789
else {
13694
13790
std::cerr << "Missing vk_check_results OP: " << ggml_op_name(tensor->op) << std::endl;
0 commit comments