[PATCH vkd3d 6/6] vkd3d: Store compiled Vulkan pipelines in d3d12_graphics_pipeline_state.
Józef Kucia
joseph.kucia at gmail.com
Wed Oct 24 06:16:29 CDT 2018
From: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
---
libs/vkd3d/device.c | 116 -----------------------------------
libs/vkd3d/state.c | 122 +++++++++++++++++++++++++++++++------
libs/vkd3d/vkd3d_private.h | 21 -------
3 files changed, 105 insertions(+), 154 deletions(-)
diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c
index 727259a92e56..419b9042b178 100644
--- a/libs/vkd3d/device.c
+++ b/libs/vkd3d/device.c
@@ -1159,110 +1159,6 @@ static HRESULT d3d12_device_create_dummy_sampler(struct d3d12_device *device)
return vkd3d_create_static_sampler(device, &sampler_desc, &device->vk_dummy_sampler);
}
-static void destroy_compiled_pipeline(struct vkd3d_compiled_pipeline *pipeline,
- struct d3d12_device *device)
-{
- const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
-
- VK_CALL(vkDestroyPipeline(device->vk_device, pipeline->vk_pipeline, NULL));
- vkd3d_free(pipeline);
-}
-
-static int compare_pipeline_cache_entry(const void *key, const struct rb_entry *entry)
-{
- const struct vkd3d_compiled_pipeline *compiled_pipeline;
- const struct vkd3d_pipeline_key *pipeline_key;
-
- pipeline_key = key;
- compiled_pipeline = RB_ENTRY_VALUE(entry, const struct vkd3d_compiled_pipeline, entry);
- return memcmp(&compiled_pipeline->key, pipeline_key, sizeof(*pipeline_key));
-}
-
-static void destroy_pipeline_cache_entry(struct rb_entry *entry, void *context)
-{
- struct vkd3d_compiled_pipeline *pipeline;
- struct d3d12_device *device = context;
-
- pipeline = RB_ENTRY_VALUE(entry, struct vkd3d_compiled_pipeline, entry);
- destroy_compiled_pipeline(pipeline, device);
-}
-
-VkPipeline d3d12_device_find_cached_pipeline(struct d3d12_device *device,
- const struct vkd3d_pipeline_key *key)
-{
- VkPipeline vk_pipeline = VK_NULL_HANDLE;
- struct rb_entry *entry;
- int rc;
-
- if (!(rc = pthread_mutex_lock(&device->pipeline_cache_mutex)))
- {
- if ((entry = rb_get(&device->pipeline_cache, key)))
- vk_pipeline = RB_ENTRY_VALUE(entry, struct vkd3d_compiled_pipeline, entry)->vk_pipeline;
- pthread_mutex_unlock(&device->pipeline_cache_mutex);
- }
- else
- {
- ERR("Failed to lock mutex, error %d.\n", rc);
- }
-
- return vk_pipeline;
-}
-
-bool d3d12_device_put_pipeline_to_cache(struct d3d12_device *device,
- const struct vkd3d_pipeline_key *key, VkPipeline vk_pipeline, struct list *list)
-{
- struct vkd3d_compiled_pipeline *compiled_pipeline;
- bool ret = true;
- int rc;
-
- if (!(compiled_pipeline = vkd3d_malloc(sizeof(*compiled_pipeline))))
- return false;
-
- compiled_pipeline->key = *key;
- compiled_pipeline->vk_pipeline = vk_pipeline;
-
- if ((rc = pthread_mutex_lock(&device->pipeline_cache_mutex)))
- {
- ERR("Failed to lock mutex, error %d.\n", rc);
- vkd3d_free(compiled_pipeline);
- return false;
- }
-
- if (rb_put(&device->pipeline_cache, key, &compiled_pipeline->entry) >= 0)
- {
- list_add_tail(list, &compiled_pipeline->list);
- }
- else
- {
- WARN("Failed to put pipeline to cache.\n");
- vkd3d_free(compiled_pipeline);
- ret = false;
- }
-
- pthread_mutex_unlock(&device->pipeline_cache_mutex);
- return ret;
-}
-
-void d3d12_device_destroy_compiled_pipelines(struct d3d12_device *device, struct list *list)
-{
- struct vkd3d_compiled_pipeline *pipeline, *cursor;
- int rc;
-
- if ((rc = pthread_mutex_lock(&device->pipeline_cache_mutex)))
- {
- ERR("Failed to lock mutex, error %d.\n", rc);
- return;
- }
-
- LIST_FOR_EACH_ENTRY_SAFE(pipeline, cursor, list, struct vkd3d_compiled_pipeline, list)
- {
- rb_remove(&device->pipeline_cache, &pipeline->entry);
- destroy_compiled_pipeline(pipeline, device);
- }
-
- pthread_mutex_unlock(&device->pipeline_cache_mutex);
-}
-
static HRESULT d3d12_device_init_pipeline_cache(struct d3d12_device *device)
{
const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
@@ -1276,8 +1172,6 @@ static HRESULT d3d12_device_init_pipeline_cache(struct d3d12_device *device)
return E_FAIL;
}
- rb_init(&device->pipeline_cache, compare_pipeline_cache_entry);
-
cache_info.sType = VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO;
cache_info.pNext = NULL;
cache_info.flags = 0;
@@ -1296,20 +1190,10 @@ static HRESULT d3d12_device_init_pipeline_cache(struct d3d12_device *device)
static void d3d12_device_destroy_pipeline_cache(struct d3d12_device *device)
{
const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
- int rc;
if (device->vk_pipeline_cache)
VK_CALL(vkDestroyPipelineCache(device->vk_device, device->vk_pipeline_cache, NULL));
- if ((rc = pthread_mutex_lock(&device->pipeline_cache_mutex)))
- {
- ERR("Failed to lock mutex, error %d.\n", rc);
- return;
- }
-
- rb_destroy(&device->pipeline_cache, destroy_pipeline_cache_entry, device);
-
- pthread_mutex_unlock(&device->pipeline_cache_mutex);
pthread_mutex_destroy(&device->pipeline_cache_mutex);
}
diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c
index 7ee5f4dc19c5..f6ccb247553c 100644
--- a/libs/vkd3d/state.c
+++ b/libs/vkd3d/state.c
@@ -1042,6 +1042,19 @@ HRESULT d3d12_root_signature_create(struct d3d12_device *device,
return S_OK;
}
+struct vkd3d_pipeline_key
+{
+ VkPrimitiveTopology topology;
+ uint32_t strides[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT];
+};
+
+struct vkd3d_compiled_pipeline
+{
+ struct list entry;
+ struct vkd3d_pipeline_key key;
+ VkPipeline vk_pipeline;
+};
+
/* ID3D12PipelineState */
static inline struct d3d12_pipeline_state *impl_from_ID3D12PipelineState(ID3D12PipelineState *iface)
{
@@ -1080,6 +1093,27 @@ static ULONG STDMETHODCALLTYPE d3d12_pipeline_state_AddRef(ID3D12PipelineState *
return refcount;
}
+static void d3d12_pipeline_state_destroy_graphics(struct d3d12_pipeline_state *state,
+ struct d3d12_device *device)
+{
+ struct d3d12_graphics_pipeline_state *graphics = &state->u.graphics;
+ const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
+ struct vkd3d_compiled_pipeline *current, *e;
+ unsigned int i;
+
+ for (i = 0; i < graphics->stage_count; ++i)
+ {
+ VK_CALL(vkDestroyShaderModule(device->vk_device, graphics->stages[i].module, NULL));
+ }
+ VK_CALL(vkDestroyRenderPass(device->vk_device, graphics->render_pass, NULL));
+
+ LIST_FOR_EACH_ENTRY_SAFE(current, e, &graphics->compiled_pipelines, struct vkd3d_compiled_pipeline, entry)
+ {
+ VK_CALL(vkDestroyPipeline(device->vk_device, current->vk_pipeline, NULL));
+ vkd3d_free(current);
+ }
+}
+
static ULONG STDMETHODCALLTYPE d3d12_pipeline_state_Release(ID3D12PipelineState *iface)
{
struct d3d12_pipeline_state *state = impl_from_ID3D12PipelineState(iface);
@@ -1091,24 +1125,11 @@ static ULONG STDMETHODCALLTYPE d3d12_pipeline_state_Release(ID3D12PipelineState
{
struct d3d12_device *device = state->device;
const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
- unsigned int i;
if (d3d12_pipeline_state_is_graphics(state))
- {
- struct d3d12_graphics_pipeline_state *graphics = &state->u.graphics;
-
- for (i = 0; i < graphics->stage_count; ++i)
- {
- VK_CALL(vkDestroyShaderModule(device->vk_device, graphics->stages[i].module, NULL));
- }
- VK_CALL(vkDestroyRenderPass(device->vk_device, graphics->render_pass, NULL));
-
- d3d12_device_destroy_compiled_pipelines(device, &graphics->compiled_pipelines);
- }
+ d3d12_pipeline_state_destroy_graphics(state, device);
else if (d3d12_pipeline_state_is_compute(state))
- {
VK_CALL(vkDestroyPipeline(device->vk_device, state->u.compute.vk_pipeline, NULL));
- }
if (state->vk_set_layout)
VK_CALL(vkDestroyDescriptorSetLayout(device->vk_device, state->vk_set_layout, NULL));
@@ -2235,6 +2256,73 @@ HRESULT d3d12_pipeline_state_create_graphics(struct d3d12_device *device,
return S_OK;
}
+static VkPipeline d3d12_pipeline_state_find_compiled_pipeline(const struct d3d12_pipeline_state *state,
+ const struct vkd3d_pipeline_key *key)
+{
+ const struct d3d12_graphics_pipeline_state *graphics = &state->u.graphics;
+ struct d3d12_device *device = state->device;
+ VkPipeline vk_pipeline = VK_NULL_HANDLE;
+ struct vkd3d_compiled_pipeline *current;
+ int rc;
+
+ if (!(rc = pthread_mutex_lock(&device->pipeline_cache_mutex)))
+ {
+ LIST_FOR_EACH_ENTRY(current, &graphics->compiled_pipelines, struct vkd3d_compiled_pipeline, entry)
+ {
+ if (!memcmp(¤t->key, key, sizeof(*key)))
+ {
+ vk_pipeline = current->vk_pipeline;
+ break;
+ }
+ }
+ pthread_mutex_unlock(&device->pipeline_cache_mutex);
+ }
+ else
+ {
+ ERR("Failed to lock mutex, error %d.\n", rc);
+ }
+
+ return vk_pipeline;
+}
+
+static bool d3d12_pipeline_state_put_pipeline_to_cache(struct d3d12_pipeline_state *state,
+ const struct vkd3d_pipeline_key *key, VkPipeline vk_pipeline)
+{
+ struct d3d12_graphics_pipeline_state *graphics = &state->u.graphics;
+ struct vkd3d_compiled_pipeline *compiled_pipeline, *current;
+ struct d3d12_device *device = state->device;
+ int rc;
+
+ if (!(compiled_pipeline = vkd3d_malloc(sizeof(*compiled_pipeline))))
+ return false;
+
+ compiled_pipeline->key = *key;
+ compiled_pipeline->vk_pipeline = vk_pipeline;
+
+ if ((rc = pthread_mutex_lock(&device->pipeline_cache_mutex)))
+ {
+ ERR("Failed to lock mutex, error %d.\n", rc);
+ vkd3d_free(compiled_pipeline);
+ return false;
+ }
+
+ LIST_FOR_EACH_ENTRY(current, &graphics->compiled_pipelines, struct vkd3d_compiled_pipeline, entry)
+ {
+ if (!memcmp(¤t->key, key, sizeof(*key)))
+ {
+ vkd3d_free(compiled_pipeline);
+ compiled_pipeline = NULL;
+ break;
+ }
+ }
+
+ if (compiled_pipeline)
+ list_add_tail(&graphics->compiled_pipelines, &compiled_pipeline->entry);
+
+ pthread_mutex_unlock(&device->pipeline_cache_mutex);
+ return compiled_pipeline;
+}
+
VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_state *state,
VkPrimitiveTopology topology, const uint32_t *strides)
{
@@ -2313,7 +2401,7 @@ VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_sta
++binding_count;
}
- if ((vk_pipeline = d3d12_device_find_cached_pipeline(device, &pipeline_key)))
+ if ((vk_pipeline = d3d12_pipeline_state_find_compiled_pipeline(state, &pipeline_key)))
return vk_pipeline;
input_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO;
@@ -2368,12 +2456,12 @@ VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_sta
return VK_NULL_HANDLE;
}
- if (d3d12_device_put_pipeline_to_cache(device, &pipeline_key, vk_pipeline, &graphics->compiled_pipelines))
+ if (d3d12_pipeline_state_put_pipeline_to_cache(state, &pipeline_key, vk_pipeline))
return vk_pipeline;
/* Other thread compiled the pipeline before us. */
VK_CALL(vkDestroyPipeline(device->vk_device, vk_pipeline, NULL));
- vk_pipeline = d3d12_device_find_cached_pipeline(device, &pipeline_key);
+ vk_pipeline = d3d12_pipeline_state_find_compiled_pipeline(state, &pipeline_key);
if (!vk_pipeline)
ERR("Could not get the pipeline compiled by other thread from the cache.\n");
return vk_pipeline;
diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h
index 99a59cb7d018..f60dc5f96676 100644
--- a/libs/vkd3d/vkd3d_private.h
+++ b/libs/vkd3d/vkd3d_private.h
@@ -573,21 +573,6 @@ bool d3d12_pipeline_state_is_render_pass_compatible(const struct d3d12_pipeline_
const struct d3d12_pipeline_state *state_b) DECLSPEC_HIDDEN;
struct d3d12_pipeline_state *unsafe_impl_from_ID3D12PipelineState(ID3D12PipelineState *iface) DECLSPEC_HIDDEN;
-struct vkd3d_pipeline_key
-{
- const struct d3d12_graphics_pipeline_state *state;
- VkPrimitiveTopology topology;
- uint32_t strides[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT];
-};
-
-struct vkd3d_compiled_pipeline
-{
- struct rb_entry entry;
- struct vkd3d_pipeline_key key;
- VkPipeline vk_pipeline;
- struct list list;
-};
-
struct vkd3d_buffer
{
VkBuffer vk_buffer;
@@ -810,12 +795,6 @@ void d3d12_device_mark_as_removed(struct d3d12_device *device, HRESULT reason,
const char *message, ...) VKD3D_PRINTF_FUNC(3, 4) DECLSPEC_HIDDEN;
struct d3d12_device *unsafe_impl_from_ID3D12Device(ID3D12Device *iface) DECLSPEC_HIDDEN;
-void d3d12_device_destroy_compiled_pipelines(struct d3d12_device *device, struct list *list) DECLSPEC_HIDDEN;
-VkPipeline d3d12_device_find_cached_pipeline(struct d3d12_device *device,
- const struct vkd3d_pipeline_key *key) DECLSPEC_HIDDEN;
-bool d3d12_device_put_pipeline_to_cache(struct d3d12_device *device,
- const struct vkd3d_pipeline_key *key, VkPipeline vk_pipeline, struct list *list) DECLSPEC_HIDDEN;
-
/* utils */
struct vkd3d_format
{
--
2.18.1
More information about the wine-devel
mailing list