happyz
/
llama.cpp
mirror of https://github.com/ggerganov/llama.cpp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove event pending stage

This commit is contained in:
Ruben Ortlam 2026-03-15 08:59:39 +01:00
parent d287bbbb8a
commit a338a1e206
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ggml/src/ggml-vulkan/ggml-vulkan.cpp
View File

@ -950,7 +950,6 @@ struct vk_semaphore {
// and would lead to validation errors. // and would lead to validation errors.
struct vk_event { struct vk_event {
std::vector<vk::Event> events_free; // Events available for reuse std::vector<vk::Event> events_free; // Events available for reuse
std::vector<vk::Event> events_pending; // Events that may still be waited on
std::vector<vk::Event> events_submitted; // Events that are fully submitted and can be reused on next synchronize std::vector<vk::Event> events_submitted; // Events that are fully submitted and can be reused on next synchronize
vk::Event event; vk::Event event;
bool has_event; bool has_event;
@ -14878,11 +14877,8 @@ static void ggml_backend_vk_event_record(ggml_backend_t backend, ggml_backend_ev
auto* cmd_buf = compute_ctx->s->buffer; // retrieve pointer before it gets reset auto* cmd_buf = compute_ctx->s->buffer; // retrieve pointer before it gets reset
if (vkev->has_event) { if (vkev->has_event) {
// Move pending to submitted // Move existing event into submitted
vkev->events_submitted.insert(vkev->events_submitted.end(), vkev->events_pending.begin(), vkev->events_pending.end()); vkev->events_submitted.push_back(vkev->event);
vkev->events_pending.clear();
// Move existing event into pending
vkev->events_pending.push_back(vkev->event);
} }
// Grab the next event and record it, create one if necessary // Grab the next event and record it, create one if necessary
@ -15732,9 +15728,6 @@ static void ggml_backend_vk_device_event_free(ggml_backend_dev_t dev, ggml_backe
for (auto& event : vkev->events_free) { for (auto& event : vkev->events_free) {
device->device.destroyEvent(event); device->device.destroyEvent(event);
} }
for (auto& event : vkev->events_pending) {
device->device.destroyEvent(event);
}
for (auto& event : vkev->events_submitted) { for (auto& event : vkev->events_submitted) {
device->device.destroyEvent(event); device->device.destroyEvent(event);
} }