@@ -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
11011108struct 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, 32, 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, 32, 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+
91569194static 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];
@@ -10870,6 +10908,7 @@ static bool ggml_vk_compute_forward(ggml_backend_vk_context* ctx, ggml_cgraph *
1087010908// If submit is true the current all operations queued so far are being submitted to Vulkan to overlap cmdlist creation and GPU execution.
1087110909static 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){
1087210910 ggml_tensor * node = cgraph->nodes[node_idx];
10911+
1087310912 if (ggml_is_empty(node) || !node->buffer) {
1087410913 return false;
1087510914 }
@@ -10986,6 +11025,7 @@ static bool ggml_vk_build_graph(ggml_backend_vk_context * ctx, ggml_cgraph * cgr
1098611025 case GGML_OP_RWKV_WKV6:
1098711026 case GGML_OP_RWKV_WKV7:
1098811027 case GGML_OP_SSM_SCAN:
11028+ case GGML_OP_SSM_CONV:
1098911029 case GGML_OP_LEAKY_RELU:
1099011030 case GGML_OP_FLASH_ATTN_EXT:
1099111031 case GGML_OP_OPT_STEP_ADAMW:
@@ -11408,6 +11448,11 @@ static bool ggml_vk_build_graph(ggml_backend_vk_context * ctx, ggml_cgraph * cgr
1140811448
1140911449 break;
1141011450
11451+ case GGML_OP_SSM_CONV:
11452+ ggml_vk_ssm_conv(ctx, compute_ctx, node, dryrun);
11453+
11454+ break;
11455+
1141111456 case GGML_OP_OPT_STEP_ADAMW:
1141211457 ggml_vk_opt_step_adamw(ctx, compute_ctx, node, dryrun);
1141311458
@@ -11520,6 +11565,7 @@ static bool ggml_vk_compute_forward(ggml_backend_vk_context * ctx, ggml_cgraph *
1152011565 case GGML_OP_RWKV_WKV6:
1152111566 case GGML_OP_RWKV_WKV7:
1152211567 case GGML_OP_SSM_SCAN:
11568+ case GGML_OP_SSM_CONV:
1152311569 case GGML_OP_LEAKY_RELU:
1152411570 case GGML_OP_REPEAT:
1152511571 case GGML_OP_REPEAT_BACK:
@@ -13053,6 +13099,8 @@ static bool ggml_backend_vk_device_supports_op(ggml_backend_dev_t dev, const ggm
1305313099
1305413100 return true;
1305513101 }
13102+ case GGML_OP_SSM_CONV:
13103+ return true;
1305613104 case GGML_OP_CONV_TRANSPOSE_1D:
1305713105 return op->src[0]->type == GGML_TYPE_F32 && op->src[1]->type == GGML_TYPE_F32;
1305813106 case GGML_OP_CONV_2D:
@@ -13714,6 +13762,8 @@ static void ggml_vk_check_results_0(ggml_backend_vk_context * ctx, ggml_cgraph *
1371413762 } else if (tensor->op == GGML_OP_SSM_SCAN) {
1371513763 tensor_clone = ggml_ssm_scan(ggml_ctx, src_clone[0], src_clone[1], src_clone[2],
1371613764 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]);
1371713767 }
1371813768 else {
1371913769 std::cerr << "Missing vk_check_results OP: " << ggml_op_name(tensor->op) << std::endl;
0 commit comments