@@ -2405,7 +2405,7 @@ static void ggml_vk_load_shaders(vk_device& device) {
24052405    }
24062406
24072407    std::vector<std::future<void>> compiles;
2408-     auto const &ggml_vk_create_pipeline = [&](vk_device& device, vk_pipeline& pipeline, const std::string & name, size_t spv_size, const void* spv_data, const std::string & entrypoint,
2408+     auto const &ggml_vk_create_pipeline = [&](vk_device& device, vk_pipeline& pipeline, const char * name, size_t spv_size, const void* spv_data, const char * entrypoint,
24092409                                              uint32_t parameter_count, uint32_t push_constant_size, std::array<uint32_t, 3> wg_denoms, const std::vector<uint32_t>& specialization_constants,
24102410                                              uint32_t align, bool disable_robustness = false, bool require_full_subgroups = false, uint32_t required_subgroup_size = 0) {
24112411
@@ -2442,6 +2442,14 @@ static void ggml_vk_load_shaders(vk_device& device) {
24422442                                      parameter_count, wg_denoms, specialization_constants, disable_robustness, require_full_subgroups, required_subgroup_size));
24432443    };
24442444
2445+     auto const &ggml_vk_create_pipeline2 = [&](vk_device& device, vk_pipeline& pipeline, const std::string &name, size_t spv_size, const void* spv_data, const char *entrypoint,
2446+                                               uint32_t parameter_count, uint32_t push_constant_size, std::array<uint32_t, 3> wg_denoms, const std::vector<uint32_t>& specialization_constants,
2447+                                               uint32_t align, bool disable_robustness = false, bool require_full_subgroups = false, uint32_t required_subgroup_size = 0) {
2448+         return ggml_vk_create_pipeline(device, pipeline, name.c_str(), spv_size, spv_data, entrypoint,
2449+                                        parameter_count, push_constant_size, wg_denoms, specialization_constants,
2450+                                        align, disable_robustness, require_full_subgroups, required_subgroup_size);
2451+     };
2452+ 
24452453    auto const &fa_wg_denoms = [&](FaCodePath path, uint32_t hsk, uint32_t hsv, uint32_t clamp, ggml_type type, bool small_rows) -> std::array<uint32_t, 3> {
24462454        return {fa_rows_cols(path, hsk, hsv, clamp, type, small_rows)[0], 1, 1};
24472455    };
@@ -3177,9 +3185,9 @@ static void ggml_vk_load_shaders(vk_device& device) {
31773185
31783186    for (uint32_t i = 0; i < p021_max_gqa_ratio; ++i) {
31793187        if (device->subgroup_arithmetic && device->subgroup_require_full_support) {
3180-             ggml_vk_create_pipeline (device, device->pipeline_mul_mat_vec_p021_f16_f32[i], "mul_mat_vec_p021_f16_f32"+std::to_string(i+1), mul_mat_vec_p021_f16_f32_subgroup_add_len, mul_mat_vec_p021_f16_f32_subgroup_add_data, "main", 3, 6 * sizeof(uint32_t), {1, 1, 1}, {device->subgroup_size, i + 1}, 1, true, true);
3188+             ggml_vk_create_pipeline2 (device, device->pipeline_mul_mat_vec_p021_f16_f32[i], "mul_mat_vec_p021_f16_f32"+std::to_string(i+1), mul_mat_vec_p021_f16_f32_subgroup_add_len, mul_mat_vec_p021_f16_f32_subgroup_add_data, "main", 3, 6 * sizeof(uint32_t), {1, 1, 1}, {device->subgroup_size, i + 1}, 1, true, true);
31813189        } else {
3182-             ggml_vk_create_pipeline (device, device->pipeline_mul_mat_vec_p021_f16_f32[i], "mul_mat_vec_p021_f16_f32"+std::to_string(i+1), mul_mat_vec_p021_f16_f32_len,              mul_mat_vec_p021_f16_f32_data,              "main", 3, 6 * sizeof(uint32_t), {1, 1, 1}, {device->subgroup_size, i + 1}, 1, true);
3190+             ggml_vk_create_pipeline2 (device, device->pipeline_mul_mat_vec_p021_f16_f32[i], "mul_mat_vec_p021_f16_f32"+std::to_string(i+1), mul_mat_vec_p021_f16_f32_len,              mul_mat_vec_p021_f16_f32_data,              "main", 3, 6 * sizeof(uint32_t), {1, 1, 1}, {device->subgroup_size, i + 1}, 1, true);
31833191        }
31843192    }
31853193    ggml_vk_create_pipeline(device, device->pipeline_mul_mat_vec_nc_f16_f32, "mul_mat_vec_nc_f16_f32", mul_mat_vec_nc_f16_f32_len, mul_mat_vec_nc_f16_f32_data, "main", 3, 12 * sizeof(uint32_t), {1, 1, 1}, {}, 1);
@@ -3263,7 +3271,7 @@ static void ggml_vk_load_shaders(vk_device& device) {
32633271    bool rte = device->float_controls_rte_fp16;
32643272#define CREATE_BINARY(name, namemod, spec, bindings) \
32653273    for (int s0 : {0,1}) for (int s1 : {0,1}) for (int d : {0,1}) \
3266-         ggml_vk_create_pipeline (device, device->pipeline_ ## name ## namemod[s0][s1][d], \
3274+         ggml_vk_create_pipeline2 (device, device->pipeline_ ## name ## namemod[s0][s1][d], \
32673275                                #name + get_suffix(s0, s1, d) + #namemod, name ## _len[s0][s1][d][rte], name ## _data[s0][s1][d][rte], \
32683276                                "main", (bindings), sizeof(vk_op_binary_push_constants), {512, 1, 1}, spec, 1);
32693277
@@ -3281,8 +3289,8 @@ static void ggml_vk_load_shaders(vk_device& device) {
32813289
32823290    if (device->multi_add) {
32833291        for (uint32_t i = 0; i < MAX_FUSED_ADDS; ++i) {
3284-             ggml_vk_create_pipeline (device, device->pipeline_multi_add[i],     "multi_add_f32_"     + std::to_string(i+1), multi_add_f32_len,     multi_add_f32_data,     "main", MAX_PARAMETER_COUNT, sizeof(vk_op_multi_add_push_constants), {512, 1, 1}, {i+2}, 1);
3285-             ggml_vk_create_pipeline (device, device->pipeline_multi_add_rms[i], "multi_add_rms_f32_" + std::to_string(i+1), multi_add_rms_f32_len, multi_add_rms_f32_data, "main", MAX_PARAMETER_COUNT, sizeof(vk_op_multi_add_push_constants), {512, 1, 1}, {i+2}, 1);
3292+             ggml_vk_create_pipeline2 (device, device->pipeline_multi_add[i],     "multi_add_f32_"     + std::to_string(i+1), multi_add_f32_len,     multi_add_f32_data,     "main", MAX_PARAMETER_COUNT, sizeof(vk_op_multi_add_push_constants), {512, 1, 1}, {i+2}, 1);
3293+             ggml_vk_create_pipeline2 (device, device->pipeline_multi_add_rms[i], "multi_add_rms_f32_" + std::to_string(i+1), multi_add_rms_f32_len, multi_add_rms_f32_data, "main", MAX_PARAMETER_COUNT, sizeof(vk_op_multi_add_push_constants), {512, 1, 1}, {i+2}, 1);
32863294        }
32873295    }
32883296
@@ -3376,7 +3384,7 @@ static void ggml_vk_load_shaders(vk_device& device) {
33763384    }
33773385
33783386    for (uint32_t i = 0; i < num_argsort_pipelines; ++i) {
3379-         ggml_vk_create_pipeline (device, device->pipeline_argsort_f32[i], "argsort_f32_"+std::to_string(i), argsort_f32_len, argsort_f32_data, "main", 2, sizeof(vk_op_argsort_push_constants), {1u<<i, 1, 1}, {1u<<i, i}, 1, true);
3387+         ggml_vk_create_pipeline2 (device, device->pipeline_argsort_f32[i], "argsort_f32_"+std::to_string(i), argsort_f32_len, argsort_f32_data, "main", 2, sizeof(vk_op_argsort_push_constants), {1u<<i, 1, 1}, {1u<<i, i}, 1, true);
33803388    }
33813389
33823390    ggml_vk_create_pipeline(device, device->pipeline_argmax_f32, "argmax_f32", argmax_f32_len, argmax_f32_data, "main", 2, sizeof(vk_op_push_constants), {1, 1, 1}, { device->subgroup_size }, 1);
0 commit comments