KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

radv: move cache check inside insert and search functions 

This will allow us to use fallback in-memory and on-disk caches
should the app not provide a pipeline cache.

Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
This commit is contained in:
Timothy Arceri 2017-03-15 12:40:53 +11:00
parent 124ec417f9
commit 4ffdab78b9
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/amd/vulkan/radv_pipeline.c
View File

@ -528,21 +528,19 @@ radv_pipeline_compile(struct radv_pipeline *pipeline,
radv_hash_shader(gs_copy_sha1, module, entrypoint, spec_info, radv_hash_shader(gs_copy_sha1, module, entrypoint, spec_info,
layout, key, 1); layout, key, 1);
if (cache) { variant = radv_create_shader_variant_from_pipeline_cache(pipeline->device,
variant = radv_create_shader_variant_from_pipeline_cache(pipeline->device, cache,
cache, sha1);
sha1);
if (stage == MESA_SHADER_GEOMETRY) { if (stage == MESA_SHADER_GEOMETRY) {
pipeline->gs_copy_shader = pipeline->gs_copy_shader =
radv_create_shader_variant_from_pipeline_cache( radv_create_shader_variant_from_pipeline_cache(
pipeline->device, pipeline->device,
cache, cache,
gs_copy_sha1); gs_copy_sha1);
}
if (variant)
return variant;
} }
if (variant)
return variant;
nir = radv_shader_compile_to_nir(pipeline->device, nir = radv_shader_compile_to_nir(pipeline->device,
module, entrypoint, stage, module, entrypoint, stage,
@ -559,7 +557,7 @@ radv_pipeline_compile(struct radv_pipeline *pipeline,
pipeline->gs_copy_shader = radv_pipeline_create_gs_copy_shader( pipeline->gs_copy_shader = radv_pipeline_create_gs_copy_shader(
pipeline, nir, &gs_copy_code, &gs_copy_code_size, dump); pipeline, nir, &gs_copy_code, &gs_copy_code_size, dump);
if (pipeline->gs_copy_shader && cache) { if (pipeline->gs_copy_shader) {
pipeline->gs_copy_shader = pipeline->gs_copy_shader =
radv_pipeline_cache_insert_shader(cache, radv_pipeline_cache_insert_shader(cache,
gs_copy_sha1, gs_copy_sha1,
@ -571,7 +569,7 @@ radv_pipeline_compile(struct radv_pipeline *pipeline,
if (!module->nir) if (!module->nir)
ralloc_free(nir); ralloc_free(nir);
if (variant && cache) if (variant)
variant = radv_pipeline_cache_insert_shader(cache, sha1, variant, variant = radv_pipeline_cache_insert_shader(cache, sha1, variant,
code, code_size); code, code_size);

8
src/amd/vulkan/radv_pipeline_cache.c
View File

@ -152,7 +152,10 @@ radv_create_shader_variant_from_pipeline_cache(struct radv_device *device,
struct radv_pipeline_cache *cache, struct radv_pipeline_cache *cache,
const unsigned char *sha1) const unsigned char *sha1)
{ {
struct cache_entry *entry = radv_pipeline_cache_search(cache, sha1); struct cache_entry *entry = NULL;
if (cache)
entry = radv_pipeline_cache_search(cache, sha1);
if (!entry) if (!entry)
return NULL; return NULL;
@ -260,6 +263,9 @@ radv_pipeline_cache_insert_shader(struct radv_pipeline_cache *cache,
struct radv_shader_variant *variant, struct radv_shader_variant *variant,
const void *code, unsigned code_size) const void *code, unsigned code_size)
{ {
if (!cache)
return variant;
pthread_mutex_lock(&cache->mutex); pthread_mutex_lock(&cache->mutex);
struct cache_entry *entry = radv_pipeline_cache_search_unlocked(cache, sha1); struct cache_entry *entry = radv_pipeline_cache_search_unlocked(cache, sha1);
if (entry) { if (entry) {