@@ -2342,7 +2342,7 @@ static void ggml_vk_load_shaders(vk_device& device) {
23422342 }
23432343
23442344 std::vector<std::future<void>> compiles;
2345- 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,
2345+ 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,
23462346 uint32_t parameter_count, uint32_t push_constant_size, std::array<uint32_t, 3> wg_denoms, const std::vector<uint32_t>& specialization_constants,
23472347 uint32_t align, bool disable_robustness = false, bool require_full_subgroups = false, uint32_t required_subgroup_size = 0) {
23482348
@@ -2379,6 +2379,14 @@ static void ggml_vk_load_shaders(vk_device& device) {
23792379 parameter_count, wg_denoms, specialization_constants, disable_robustness, require_full_subgroups, required_subgroup_size));
23802380 };
23812381
2382+ 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,
2383+ uint32_t parameter_count, uint32_t push_constant_size, std::array<uint32_t, 3> wg_denoms, const std::vector<uint32_t>& specialization_constants,
2384+ uint32_t align, bool disable_robustness = false, bool require_full_subgroups = false, uint32_t required_subgroup_size = 0) {
2385+ return ggml_vk_create_pipeline(device, pipeline, name.c_str(), spv_size, spv_data, entrypoint,
2386+ parameter_count, push_constant_size, wg_denoms, specialization_constants,
2387+ align, disable_robustness, require_full_subgroups, required_subgroup_size);
2388+ };
2389+
23822390 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> {
23832391 return {fa_rows_cols(path, hsk, hsv, clamp, type, small_rows)[0], 1, 1};
23842392 };
@@ -3114,9 +3122,9 @@ static void ggml_vk_load_shaders(vk_device& device) {
31143122
31153123 for (uint32_t i = 0; i < p021_max_gqa_ratio; ++i) {
31163124 if (device->subgroup_arithmetic && device->subgroup_require_full_support) {
3117- 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);
3125+ 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);
31183126 } else {
3119- 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);
3127+ 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);
31203128 }
31213129 }
31223130 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);
@@ -3200,7 +3208,7 @@ static void ggml_vk_load_shaders(vk_device& device) {
32003208 bool rte = device->float_controls_rte_fp16;
32013209#define CREATE_BINARY(name, namemod, spec, bindings) \
32023210 for (int s0 : {0,1}) for (int s1 : {0,1}) for (int d : {0,1}) \
3203- ggml_vk_create_pipeline (device, device->pipeline_ ## name ## namemod[s0][s1][d], \
3211+ ggml_vk_create_pipeline2 (device, device->pipeline_ ## name ## namemod[s0][s1][d], \
32043212 #name + get_suffix(s0, s1, d) + #namemod, name ## _len[s0][s1][d][rte], name ## _data[s0][s1][d][rte], \
32053213 "main", (bindings), sizeof(vk_op_binary_push_constants), {512, 1, 1}, spec, 1);
32063214
@@ -3218,8 +3226,8 @@ static void ggml_vk_load_shaders(vk_device& device) {
32183226
32193227 if (device->multi_add) {
32203228 for (uint32_t i = 0; i < MAX_FUSED_ADDS; ++i) {
3221- 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);
3222- 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);
3229+ 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);
3230+ 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);
32233231 }
32243232 }
32253233
@@ -3313,7 +3321,7 @@ static void ggml_vk_load_shaders(vk_device& device) {
33133321 }
33143322
33153323 for (uint32_t i = 0; i < num_argsort_pipelines; ++i) {
3316- 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);
3324+ 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);
33173325 }
33183326
33193327 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