Skip to content

Commit e614a10

Browse files
0cc4mwalidbr
authored andcommitted
vulkan: fix mmv subgroup16 selection (ggml-org#15775)
1 parent 30238ee commit e614a10

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3000,9 +3000,7 @@ static void ggml_vk_load_shaders(vk_device& device) {
30003000

30013001
const bool use_subgroups = device->subgroup_arithmetic && device->architecture != vk_device_architecture::AMD_GCN;
30023002
// Ensure a subgroup size >= 16 is available
3003-
const bool use_subgroups16 = use_subgroups &&
3004-
(!device->subgroup_size_control && device->subgroup_size >= 16 ||
3005-
device->subgroup_size_control && device->subgroup_min_size <= 16 && device->subgroup_max_size >= 16);
3003+
const bool use_subgroups16 = use_subgroups && subgroup_min_size_16;
30063004

30073005
const uint32_t subgroup_size = (device->vendor_id == VK_VENDOR_ID_INTEL && device->subgroup_size_control && device->subgroup_min_size <= 16 && device->subgroup_max_size >= 16) ? 16 : device->subgroup_size;
30083006
const uint32_t subgroup_size16 = std::max(subgroup_size, 16u);

0 commit comments

Comments
 (0)