Skip to content

vulkan: disable events for UMA systems to workaround directio failures #18397

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jeffbolznv wants to merge 1 commit into from
Closed

vulkan: disable events for UMA systems to workaround directio failures #18397

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion ggml/src/ggml-vulkan/ggml-vulkan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,6 +535,7 @@ struct vk_device_struct {
vk_queue transfer_queue;
bool single_queue;
bool support_async;
bool support_events;
uint32_t subgroup_size;
uint32_t subgroup_size_log2;
uint32_t shader_core_count;
Expand Down Expand Up @@ -4485,6 +4486,11 @@ static vk_device ggml_vk_get_device(size_t idx) {
device->subgroup_size = subgroup_props.subgroupSize;
device->subgroup_size_log2 = uint32_t(log2f(float(device->subgroup_size)));
device->uma = device->properties.deviceType == vk::PhysicalDeviceType::eIntegratedGpu;

// Events enable directio support which is showing failures on UMA systems, so disable
// it temporarily. See https://github.com/ggml-org/llama.cpp/issues/18317.
device->support_events = !device->uma && getenv("GGML_VK_DISABLE_EVENTS") == nullptr;

if (sm_builtins) {
device->shader_core_count = sm_props.shaderSMCount;
} else if (amd_shader_core_properties2) {
Expand Down Expand Up @@ -13965,6 +13971,8 @@ static enum ggml_backend_dev_type ggml_backend_vk_device_get_type(ggml_backend_d
static void ggml_backend_vk_device_get_props(ggml_backend_dev_t dev, struct ggml_backend_dev_props * props) {
ggml_backend_vk_device_context * ctx = (ggml_backend_vk_device_context *)dev->context;

const vk_device& device = ggml_vk_get_device(ctx->device);

props->name = ggml_backend_vk_device_get_name(dev);
props->description = ggml_backend_vk_device_get_description(dev);
props->type = ggml_backend_vk_device_get_type(dev);
Expand All @@ -13974,7 +13982,7 @@ static void ggml_backend_vk_device_get_props(ggml_backend_dev_t dev, struct ggml
/* .async = */ true,
/* .host_buffer = */ true,
/* .buffer_from_host_ptr = */ false,
/* .events = */ true,
/* .events = */ device->support_events,
};
}

Expand Down
Loading