Skip to content

Commit b685daf

Browse files
authored
vulkan: request round-to-even for fp16 in im2col/rope_head (#10767)
Vulkan doesn't mandate a specific rounding mode, but the shader_float_controls feature allows rounding mode to be requested if the implementation supports it.
1 parent dafae66 commit b685daf

File tree

4 files changed

+31
-5
lines changed

4 files changed

+31
-5
lines changed

ggml/src/ggml-vulkan/ggml-vulkan.cpp

+18-5
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ struct vk_device_struct {
162162
uint32_t subgroup_size;
163163
uint32_t shader_core_count;
164164
bool uma;
165+
bool float_controls_rte_fp16;
165166
bool coopmat2;
166167

167168
bool coopmat_support;
@@ -1916,17 +1917,26 @@ static void ggml_vk_load_shaders(vk_device& device) {
19161917
ggml_vk_create_pipeline(device, device->pipeline_soft_max_f32_f16_wg512, "soft_max_f32_f16_wg512", soft_max_f32_f16_len, soft_max_f32_f16_data, "main", 3, sizeof(vk_op_soft_max_push_constants), {1, 1, 1}, { 512 }, 1);
19171918

19181919
ggml_vk_create_pipeline(device, device->pipeline_rope_norm_f32, "rope_norm_f32", rope_norm_f32_len, rope_norm_f32_data, "main", 4, sizeof(vk_op_rope_push_constants), {1, 512, 1}, {}, 1);
1919-
ggml_vk_create_pipeline(device, device->pipeline_rope_norm_f16, "rope_norm_f16", rope_norm_f16_len, rope_norm_f16_data, "main", 4, sizeof(vk_op_rope_push_constants), {1, 512, 1}, {}, 1);
1920-
19211920
ggml_vk_create_pipeline(device, device->pipeline_rope_neox_f32, "rope_neox_f32", rope_neox_f32_len, rope_neox_f32_data, "main", 4, sizeof(vk_op_rope_push_constants), {1, 512, 1}, {}, 1);
1922-
ggml_vk_create_pipeline(device, device->pipeline_rope_neox_f16, "rope_neox_f16", rope_neox_f16_len, rope_neox_f16_data, "main", 4, sizeof(vk_op_rope_push_constants), {1, 512, 1}, {}, 1);
1921+
1922+
if (device->float_controls_rte_fp16) {
1923+
ggml_vk_create_pipeline(device, device->pipeline_rope_norm_f16, "rope_norm_f16", rope_norm_f16_rte_len, rope_norm_f16_rte_data, "main", 4, sizeof(vk_op_rope_push_constants), {1, 512, 1}, {}, 1);
1924+
ggml_vk_create_pipeline(device, device->pipeline_rope_neox_f16, "rope_neox_f16", rope_neox_f16_rte_len, rope_neox_f16_rte_data, "main", 4, sizeof(vk_op_rope_push_constants), {1, 512, 1}, {}, 1);
1925+
} else {
1926+
ggml_vk_create_pipeline(device, device->pipeline_rope_norm_f16, "rope_norm_f16", rope_norm_f16_len, rope_norm_f16_data, "main", 4, sizeof(vk_op_rope_push_constants), {1, 512, 1}, {}, 1);
1927+
ggml_vk_create_pipeline(device, device->pipeline_rope_neox_f16, "rope_neox_f16", rope_neox_f16_len, rope_neox_f16_data, "main", 4, sizeof(vk_op_rope_push_constants), {1, 512, 1}, {}, 1);
1928+
}
19231929

19241930
ggml_vk_create_pipeline(device, device->pipeline_argsort_f32, "argsort_f32", argsort_f32_len, argsort_f32_data, "main", 2, sizeof(vk_op_argsort_push_constants), {1024, 1, 1}, {}, 1);
19251931

19261932
ggml_vk_create_pipeline(device, device->pipeline_sum_rows_f32, "sum_rows_f32", sum_rows_f32_len, sum_rows_f32_data, "main", 2, sizeof(vk_op_push_constants), {1, 1, 1}, { device->subgroup_size }, 1);
19271933

19281934
ggml_vk_create_pipeline(device, device->pipeline_im2col_f32, "im2col_f32", im2col_f32_len, im2col_f32_data, "main", 2, sizeof(vk_op_im2col_push_constants), {256, 1, 1}, {}, 1);
1929-
ggml_vk_create_pipeline(device, device->pipeline_im2col_f32_f16, "im2col_f32_f16", im2col_f32_f16_len, im2col_f32_f16_data, "main", 2, sizeof(vk_op_im2col_push_constants), {256, 1, 1}, {}, 1);
1935+
if (device->float_controls_rte_fp16) {
1936+
ggml_vk_create_pipeline(device, device->pipeline_im2col_f32_f16, "im2col_f32_f16", im2col_f32_f16_rte_len, im2col_f32_f16_rte_data, "main", 2, sizeof(vk_op_im2col_push_constants), {256, 1, 1}, {}, 1);
1937+
} else {
1938+
ggml_vk_create_pipeline(device, device->pipeline_im2col_f32_f16, "im2col_f32_f16", im2col_f32_f16_len, im2col_f32_f16_data, "main", 2, sizeof(vk_op_im2col_push_constants), {256, 1, 1}, {}, 1);
1939+
}
19301940

19311941
ggml_vk_create_pipeline(device, device->pipeline_timestep_embedding_f32, "timestep_embedding_f32", timestep_embedding_f32_len, timestep_embedding_f32_data, "main", 2, sizeof(vk_op_timestep_embedding_push_constants), {256, 1, 1}, {}, 1);
19321942

@@ -2007,11 +2017,13 @@ static vk_device ggml_vk_get_device(size_t idx) {
20072017
vk::PhysicalDeviceDriverProperties driver_props;
20082018
vk::PhysicalDeviceShaderSMBuiltinsPropertiesNV sm_props;
20092019
vk::PhysicalDeviceShaderCoreProperties2AMD amd_shader_core_properties2_props;
2020+
vk::PhysicalDeviceVulkan12Properties vk12_props;
20102021
props2.pNext = &props3;
20112022
props3.pNext = &subgroup_props;
20122023
subgroup_props.pNext = &driver_props;
2024+
driver_props.pNext = &vk12_props;
20132025

2014-
VkBaseOutStructure * last_struct = (VkBaseOutStructure *)&driver_props;
2026+
VkBaseOutStructure * last_struct = (VkBaseOutStructure *)&vk12_props;
20152027

20162028
if (maintenance4_support) {
20172029
last_struct->pNext = (VkBaseOutStructure *)&props4;
@@ -2057,6 +2069,7 @@ static vk_device ggml_vk_get_device(size_t idx) {
20572069
} else {
20582070
device->shader_core_count = 0;
20592071
}
2072+
device->float_controls_rte_fp16 = vk12_props.shaderRoundingModeRTEFloat16;
20602073

20612074
const bool force_disable_f16 = getenv("GGML_VK_DISABLE_F16") != nullptr;
20622075

ggml/src/ggml-vulkan/vulkan-shaders/im2col.comp

+5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
#version 450
22

33
#extension GL_EXT_shader_16bit_storage : require
4+
#extension GL_EXT_spirv_intrinsics: enable
5+
6+
#if RTE16
7+
spirv_execution_mode(capabilities = [4467], 4462, 16); // RoundingModeRTE, 16 bits
8+
#endif
49

510
layout (push_constant) uniform parameter
611
{

ggml/src/ggml-vulkan/vulkan-shaders/rope_head.comp

+5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
#include "types.comp"
22

33
#extension GL_EXT_shader_16bit_storage : require
4+
#extension GL_EXT_spirv_intrinsics: enable
5+
6+
#if RTE16
7+
spirv_execution_mode(capabilities = [4467], 4462, 16); // RoundingModeRTE, 16 bits
8+
#endif
49

510
layout(local_size_x = 1, local_size_y = 256, local_size_z = 1) in;
611

ggml/src/ggml-vulkan/vulkan-shaders/vulkan-shaders-gen.cpp

+3
Original file line numberDiff line numberDiff line change
@@ -461,16 +461,19 @@ void process_shaders() {
461461

462462
string_to_spv("rope_norm_f32", "rope_norm.comp", {{"A_TYPE", "float"}, {"D_TYPE", "float"}});
463463
string_to_spv("rope_norm_f16", "rope_norm.comp", {{"A_TYPE", "float16_t"}, {"D_TYPE", "float16_t"}});
464+
string_to_spv("rope_norm_f16_rte", "rope_norm.comp", {{"A_TYPE", "float16_t"}, {"D_TYPE", "float16_t"}, {"RTE16", "1"}});
464465

465466
string_to_spv("rope_neox_f32", "rope_neox.comp", {{"A_TYPE", "float"}, {"D_TYPE", "float"}});
466467
string_to_spv("rope_neox_f16", "rope_neox.comp", {{"A_TYPE", "float16_t"}, {"D_TYPE", "float16_t"}});
468+
string_to_spv("rope_neox_f16_rte", "rope_neox.comp", {{"A_TYPE", "float16_t"}, {"D_TYPE", "float16_t"}, {"RTE16", "1"}});
467469

468470
string_to_spv("argsort_f32", "argsort.comp", {{"A_TYPE", "float"}});
469471

470472
string_to_spv("sum_rows_f32", "sum_rows.comp", merge_maps(base_dict, {{"A_TYPE", "float"}, {"D_TYPE", "float"}}));
471473

472474
string_to_spv("im2col_f32", "im2col.comp", merge_maps(base_dict, {{"A_TYPE", "float"}, {"D_TYPE", "float"}}));
473475
string_to_spv("im2col_f32_f16", "im2col.comp", merge_maps(base_dict, {{"A_TYPE", "float"}, {"D_TYPE", "float16_t"}}));
476+
string_to_spv("im2col_f32_f16_rte", "im2col.comp", merge_maps(base_dict, {{"A_TYPE", "float"}, {"D_TYPE", "float16_t"}, {"RTE16", "1"}}));
474477

475478
string_to_spv("timestep_embedding_f32", "timestep_embedding.comp", merge_maps(base_dict, {{"A_TYPE", "float"}, {"D_TYPE", "float"}}));
476479

0 commit comments

Comments
 (0)