@@ -584,6 +584,7 @@ struct vk_device_struct {
584584    vk_pipeline pipeline_rwkv_wkv7_f32;
585585    vk_pipeline pipeline_ssm_scan_f32_d128;
586586    vk_pipeline pipeline_ssm_scan_f32_d256;
587+     vk_pipeline pipeline_ssm_conv_f32;
587588    vk_pipeline pipeline_opt_step_adamw_f32;
588589    vk_pipeline pipeline_opt_step_sgd_f32;
589590    vk_pipeline pipeline_conv2d_f32[CONV_SHAPE_COUNT];
@@ -1096,6 +1097,12 @@ struct vk_op_ssm_scan_push_constants {
10961097    uint32_t s_off;
10971098    uint32_t n_head, d_head, n_group, n_tok;
10981099};
1100+ struct vk_op_ssm_conv_push_constants {
1101+     uint32_t nb01, nb02;
1102+     uint32_t nb11;
1103+     uint32_t dst_nb0, dst_nb1, dst_nb2;
1104+     uint32_t nc, ncs, nr, n_t, n_s;
1105+ };
10991106
11001107struct vk_op_conv2d_push_constants {
11011108    uint32_t Cout;
@@ -3603,6 +3610,8 @@ static void ggml_vk_load_shaders(vk_device& device) {
36033610    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);
36043611    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);
36053612
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), {32, 1, 1}, {32}, 1);
3614+ 
36063615    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);
36073616
36083617    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);
@@ -8120,6 +8129,11 @@ static vk_pipeline ggml_vk_op_get_pipeline(ggml_backend_vk_context * ctx, const
81208129            }
81218130        }
81228131        return nullptr;
8132+     case GGML_OP_SSM_CONV:
8133+         if (src0->type == GGML_TYPE_F32 && dst->type == GGML_TYPE_F32) {
8134+             return ctx->device->pipeline_ssm_conv_f32;
8135+         }
8136+         return nullptr;
81238137    case GGML_OP_OPT_STEP_ADAMW:
81248138        if (src0->type == GGML_TYPE_F32 && dst->type == GGML_TYPE_F32) {
81258139            return ctx->device->pipeline_opt_step_adamw_f32;
@@ -8614,6 +8628,14 @@ static void ggml_vk_op_f32(ggml_backend_vk_context * ctx, vk_context& subctx, co
86148628            }
86158629        }
86168630        break;
8631+     case GGML_OP_SSM_CONV:
8632+         {
8633+             const uint32_t nr  = src0->ne[1];
8634+             const uint32_t n_t = dst->ne[1];
8635+             const uint32_t n_s = dst->ne[2];
8636+             elements = { nr, n_t, n_s };
8637+         }
8638+         break;
86178639    default:
86188640        elements = { (uint32_t)ggml_nelements(src0), 1, 1 };
86198641        break;
@@ -9155,6 +9177,22 @@ static void ggml_vk_ssm_scan(ggml_backend_vk_context * ctx, vk_context& subctx,
91559177    }, pc, elements);
91569178}
91579179
9180+ static void ggml_vk_ssm_conv(ggml_backend_vk_context * ctx, vk_context& subctx, ggml_tensor * dst, bool dryrun = false) {
9181+     const ggml_tensor * src0 = dst->src[0];
9182+     const ggml_tensor * src1 = dst->src[1];
9183+ 
9184+     ggml_vk_op_f32<vk_op_ssm_conv_push_constants>(ctx, subctx, src0, src1, nullptr, dst, GGML_OP_SSM_CONV, {
9185+         (uint32_t)src0->nb[1], (uint32_t)src0->nb[2],
9186+         (uint32_t)src1->nb[1],
9187+         (uint32_t)dst->nb[0], (uint32_t)dst->nb[1], (uint32_t)dst->nb[2],
9188+         (uint32_t)src1->ne[0],
9189+         (uint32_t)src0->ne[0],
9190+         (uint32_t)src0->ne[1],
9191+         (uint32_t)dst->ne[1],
9192+         (uint32_t)dst->ne[2],
9193+     }, dryrun);
9194+ }
9195+ 
91589196static 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) {
91599197    const ggml_tensor * x = dst->src[0];
91609198    const ggml_tensor * g = dst->src[1];
@@ -10988,6 +11026,7 @@ static bool ggml_vk_build_graph(ggml_backend_vk_context * ctx, ggml_cgraph * cgr
1098811026    case GGML_OP_RWKV_WKV6:
1098911027    case GGML_OP_RWKV_WKV7:
1099011028    case GGML_OP_SSM_SCAN:
11029+     case GGML_OP_SSM_CONV:
1099111030    case GGML_OP_LEAKY_RELU:
1099211031    case GGML_OP_FLASH_ATTN_EXT:
1099311032    case GGML_OP_OPT_STEP_ADAMW:
@@ -11410,6 +11449,11 @@ static bool ggml_vk_build_graph(ggml_backend_vk_context * ctx, ggml_cgraph * cgr
1141011449
1141111450        break;
1141211451
11452+     case GGML_OP_SSM_CONV:
11453+         ggml_vk_ssm_conv(ctx, compute_ctx, node, dryrun);
11454+ 
11455+         break;
11456+ 
1141311457    case GGML_OP_OPT_STEP_ADAMW:
1141411458        ggml_vk_opt_step_adamw(ctx, compute_ctx, node, dryrun);
1141511459
@@ -11522,6 +11566,7 @@ static bool ggml_vk_compute_forward(ggml_backend_vk_context * ctx, ggml_cgraph *
1152211566    case GGML_OP_RWKV_WKV6:
1152311567    case GGML_OP_RWKV_WKV7:
1152411568    case GGML_OP_SSM_SCAN:
11569+     case GGML_OP_SSM_CONV:
1152511570    case GGML_OP_LEAKY_RELU:
1152611571    case GGML_OP_REPEAT:
1152711572    case GGML_OP_REPEAT_BACK:
@@ -13045,6 +13090,8 @@ static bool ggml_backend_vk_device_supports_op(ggml_backend_dev_t dev, const ggm
1304513090
1304613091                return true;
1304713092            }
13093+         case GGML_OP_SSM_CONV:
13094+             return true;
1304813095        case GGML_OP_CONV_TRANSPOSE_1D:
1304913096            return op->src[0]->type == GGML_TYPE_F32 && op->src[1]->type == GGML_TYPE_F32;
1305013097        case GGML_OP_CONV_2D:
@@ -13706,6 +13753,8 @@ static void ggml_vk_check_results_0(ggml_backend_vk_context * ctx, ggml_cgraph *
1370613753    } else if (tensor->op == GGML_OP_SSM_SCAN) {
1370713754        tensor_clone = ggml_ssm_scan(ggml_ctx, src_clone[0], src_clone[1], src_clone[2],
1370813755                                     src_clone[3], src_clone[4], src_clone[5], src_clone[6]);
13756+     } else if (tensor->op == GGML_OP_SSM_CONV) {
13757+         tensor_clone = ggml_ssm_conv(ggml_ctx, src_clone[0], src_clone[1]);
1370913758    }
1371013759    else {
1371113760        std::cerr << "Missing vk_check_results OP: " << ggml_op_name(tensor->op) << std::endl;
0 commit comments