Skip to content

ggml-vulkan: serialize racy vk_instance initialization #3638

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

Open
d-e-s-o wants to merge 1 commit into
base: master
Choose a base branch
from
+3 −0
Open

ggml-vulkan: serialize racy vk_instance initialization #3638

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
3 changes: 3 additions & 0 deletions ggml/src/ggml-vulkan/ggml-vulkan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2060,6 +2060,7 @@ struct vk_instance_t {
vk_device devices[GGML_VK_MAX_DEVICES];
};

static std::recursive_mutex vk_instance_init_mutex;
static bool vk_instance_initialized = false;
static vk_instance_t vk_instance;

Expand Down Expand Up @@ -4779,6 +4780,7 @@ static uint32_t ggml_vk_intel_shader_core_count(const vk::PhysicalDevice& vkdev)
static vk_device ggml_vk_get_device(size_t idx) {
VK_LOG_DEBUG("ggml_vk_get_device(" << idx << ")");

std::lock_guard<std::recursive_mutex> lock(vk_instance_init_mutex);
if (vk_instance.devices[idx] == nullptr) {
VK_LOG_DEBUG("Initializing new vk_device");
vk_device device = std::make_shared<vk_device_struct>();
Expand Down Expand Up @@ -5713,6 +5715,7 @@ DispatchLoaderDynamic & ggml_vk_default_dispatcher() {
}

static void ggml_vk_instance_init() {
std::lock_guard<std::recursive_mutex> lock(vk_instance_init_mutex);
if (vk_instance_initialized) {
return;
}
Expand Down