highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vulkan: synchronize access to execution pool fences

Browse Source 
vkResetFences is specified as being user-synchronized
(yet vkWaitFences, is not).
This commit is contained in:
Lynne 2023-06-07 00:24:43 +02:00
parent 697382168d
commit 975cd48bb3
No known key found for this signature in database
GPG Key ID: A2FEA5F03F034464
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavutil/vulkan.c
View File

@ -241,6 +241,7 @@ void ff_vk_exec_pool_free(FFVulkanContext *s, FFVkExecPool *pool)
vk->WaitForFences(s->hwctx->act_dev, 1, &e->fence, VK_TRUE, UINT64_MAX); vk->WaitForFences(s->hwctx->act_dev, 1, &e->fence, VK_TRUE, UINT64_MAX);
vk->DestroyFence(s->hwctx->act_dev, e->fence, s->hwctx->alloc); vk->DestroyFence(s->hwctx->act_dev, e->fence, s->hwctx->alloc);
} }
pthread_mutex_destroy(&e->lock);
ff_vk_exec_discard_deps(s, e); ff_vk_exec_discard_deps(s, e);
@ -379,12 +380,17 @@ int ff_vk_exec_pool_init(FFVulkanContext *s, FFVkQueueFamilyCtx *qf,
/* Init contexts */ /* Init contexts */
for (int i = 0; i < pool->pool_size; i++) { for (int i = 0; i < pool->pool_size; i++) {
FFVkExecContext *e = &pool->contexts[i]; FFVkExecContext *e = &pool->contexts[i];
/* Fence */
VkFenceCreateInfo fence_create = { VkFenceCreateInfo fence_create = {
.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, .sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO,
.flags = VK_FENCE_CREATE_SIGNALED_BIT, .flags = VK_FENCE_CREATE_SIGNALED_BIT,
}; };
/* Mutex */
err = pthread_mutex_init(&e->lock, NULL);
if (err != 0)
return AVERROR(err);
/* Fence */
ret = vk->CreateFence(s->hwctx->act_dev, &fence_create, s->hwctx->alloc, ret = vk->CreateFence(s->hwctx->act_dev, &fence_create, s->hwctx->alloc,
&e->fence); &e->fence);
if (ret != VK_SUCCESS) { if (ret != VK_SUCCESS) {
@ -488,9 +494,13 @@ int ff_vk_exec_start(FFVulkanContext *s, FFVkExecContext *e)
.flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT, .flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT,
}; };
/* Create the fence and don't wait for it initially */ /* Wait for the fence to be signalled */
vk->WaitForFences(s->hwctx->act_dev, 1, &e->fence, VK_TRUE, UINT64_MAX); vk->WaitForFences(s->hwctx->act_dev, 1, &e->fence, VK_TRUE, UINT64_MAX);
/* vkResetFences is defined as being host-synchronized */
pthread_mutex_lock(&e->lock);
vk->ResetFences(s->hwctx->act_dev, 1, &e->fence); vk->ResetFences(s->hwctx->act_dev, 1, &e->fence);
pthread_mutex_unlock(&e->lock);
/* Discard queue dependencies */ /* Discard queue dependencies */
ff_vk_exec_discard_deps(s, e); ff_vk_exec_discard_deps(s, e);

2
libavutil/vulkan.h
View File

@ -23,6 +23,7 @@
#include <stdatomic.h> #include <stdatomic.h>
#include "thread.h"
#include "pixdesc.h" #include "pixdesc.h"
#include "bprint.h" #include "bprint.h"
#include "hwcontext.h" #include "hwcontext.h"
@ -152,6 +153,7 @@ typedef struct FFVulkanPipeline {
typedef struct FFVkExecContext { typedef struct FFVkExecContext {
int idx; int idx;
const struct FFVkExecPool *parent; const struct FFVkExecPool *parent;
pthread_mutex_t lock;
/* Queue for the execution context */ /* Queue for the execution context */
VkQueue queue; VkQueue queue;