@@ -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", 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);
3603
3610
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);
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;
@@ -8607,6 +8621,14 @@ static void ggml_vk_op_f32(ggml_backend_vk_context * ctx, vk_context& subctx, co
8607
8621
}
8608
8622
}
8609
8623
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;
8610
8632
default:
8611
8633
elements = { (uint32_t)ggml_nelements(src0), 1, 1 };
8612
8634
break;
@@ -9153,6 +9175,22 @@ static void ggml_vk_ssm_scan(ggml_backend_vk_context * ctx, vk_context& subctx,
9153
9175
}, pc, elements);
9154
9176
}
9155
9177
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
+
9156
9194
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
9195
const ggml_tensor * x = dst->src[0];
9158
9196
const ggml_tensor * g = dst->src[1];
@@ -10870,6 +10908,7 @@ static bool ggml_vk_compute_forward(ggml_backend_vk_context* ctx, ggml_cgraph *
10870
10908
// If submit is true the current all operations queued so far are being submitted to Vulkan to overlap cmdlist creation and GPU execution.
10871
10909
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
10910
ggml_tensor * node = cgraph->nodes[node_idx];
10911
+
10873
10912
if (ggml_is_empty(node) || !node->buffer) {
10874
10913
return false;
10875
10914
}
@@ -10986,6 +11025,7 @@ static bool ggml_vk_build_graph(ggml_backend_vk_context * ctx, ggml_cgraph * cgr
10986
11025
case GGML_OP_RWKV_WKV6:
10987
11026
case GGML_OP_RWKV_WKV7:
10988
11027
case GGML_OP_SSM_SCAN:
11028
+ case GGML_OP_SSM_CONV:
10989
11029
case GGML_OP_LEAKY_RELU:
10990
11030
case GGML_OP_FLASH_ATTN_EXT:
10991
11031
case GGML_OP_OPT_STEP_ADAMW:
@@ -11408,6 +11448,11 @@ static bool ggml_vk_build_graph(ggml_backend_vk_context * ctx, ggml_cgraph * cgr
11408
11448
11409
11449
break;
11410
11450
11451
+ case GGML_OP_SSM_CONV:
11452
+ ggml_vk_ssm_conv(ctx, compute_ctx, node, dryrun);
11453
+
11454
+ break;
11455
+
11411
11456
case GGML_OP_OPT_STEP_ADAMW:
11412
11457
ggml_vk_opt_step_adamw(ctx, compute_ctx, node, dryrun);
11413
11458
@@ -11520,6 +11565,7 @@ static bool ggml_vk_compute_forward(ggml_backend_vk_context * ctx, ggml_cgraph *
11520
11565
case GGML_OP_RWKV_WKV6:
11521
11566
case GGML_OP_RWKV_WKV7:
11522
11567
case GGML_OP_SSM_SCAN:
11568
+ case GGML_OP_SSM_CONV:
11523
11569
case GGML_OP_LEAKY_RELU:
11524
11570
case GGML_OP_REPEAT:
11525
11571
case GGML_OP_REPEAT_BACK:
@@ -13053,6 +13099,8 @@ static bool ggml_backend_vk_device_supports_op(ggml_backend_dev_t dev, const ggm
13053
13099
13054
13100
return true;
13055
13101
}
13102
+ case GGML_OP_SSM_CONV:
13103
+ return true;
13056
13104
case GGML_OP_CONV_TRANSPOSE_1D:
13057
13105
return op->src[0]->type == GGML_TYPE_F32 && op->src[1]->type == GGML_TYPE_F32;
13058
13106
case GGML_OP_CONV_2D:
@@ -13714,6 +13762,8 @@ static void ggml_vk_check_results_0(ggml_backend_vk_context * ctx, ggml_cgraph *
13714
13762
} else if (tensor->op == GGML_OP_SSM_SCAN) {
13715
13763
tensor_clone = ggml_ssm_scan(ggml_ctx, src_clone[0], src_clone[1], src_clone[2],
13716
13764
src_clone[3], src_clone[4], src_clone[5], src_clone[6]);
13765
+ } else if (tensor->op == GGML_OP_SSM_CONV) {
13766
+ tensor_clone = ggml_ssm_conv(ggml_ctx, src_clone[0], src_clone[1]);
13717
13767
}
13718
13768
else {
13719
13769
std::cerr << "Missing vk_check_results OP: " << ggml_op_name(tensor->op) << std::endl;
0 commit comments