OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Revert "radv: fallback to an in-memory cache when no pipline cache is provided""

Browse Source 
I tested this 10 times with
./deqp-vk --deqp-case=dEQP-VK.texture.filtering.3d.formats.r4g4b4a4*

and one full run of CTS, seems the issue is gone.

Also reduces CTS runtime by 30% or so.

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
This commit is contained in:
Bas Nieuwenhuizen
2017-09-25 05:47:25 +02:00
parent bb66af95a7
commit bf0397b6f5
3 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -153,7 +153,8 @@ radv_pipeline_compile(struct radv_pipeline *pipeline,
if (pipeline->gs_copy_shader) { if (pipeline->gs_copy_shader) {
pipeline->gs_copy_shader = pipeline->gs_copy_shader =
radv_pipeline_cache_insert_shader(cache, radv_pipeline_cache_insert_shader(pipeline->device,
cache,
gs_copy_sha1, gs_copy_sha1,
pipeline->gs_copy_shader, pipeline->gs_copy_shader,
gs_copy_code, gs_copy_code,
@@ -166,8 +167,10 @@ radv_pipeline_compile(struct radv_pipeline *pipeline,
ralloc_free(nir); ralloc_free(nir);
if (variant) if (variant)
variant = radv_pipeline_cache_insert_shader(cache, sha1, variant, variant = radv_pipeline_cache_insert_shader(pipeline->device,
code, code_size); cache, sha1,
variant, code,
code_size);
if (code) if (code)
free(code); free(code);
@@ -290,11 +293,11 @@ radv_tess_pipeline_compile(struct radv_pipeline *pipeline,
ralloc_free(tcs_nir); ralloc_free(tcs_nir);
if (tes_variant) if (tes_variant)
tes_variant = radv_pipeline_cache_insert_shader(cache, tes_sha1, tes_variant, tes_variant = radv_pipeline_cache_insert_shader(pipeline->device, cache, tes_sha1, tes_variant,
tes_code, tes_code_size); tes_code, tes_code_size);
if (tcs_variant) if (tcs_variant)
tcs_variant = radv_pipeline_cache_insert_shader(cache, tcs_sha1, tcs_variant, tcs_variant = radv_pipeline_cache_insert_shader(pipeline->device, cache, tcs_sha1, tcs_variant,
tcs_code, tcs_code_size); tcs_code, tcs_code_size);
if (tes_code) if (tes_code)

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

@@ -162,6 +162,8 @@ radv_create_shader_variant_from_pipeline_cache(struct radv_device *device,
if (cache) if (cache)
entry = radv_pipeline_cache_search(cache, sha1); entry = radv_pipeline_cache_search(cache, sha1);
else
entry = radv_pipeline_cache_search(device->mem_cache, sha1);
if (!entry) if (!entry)
return NULL; return NULL;
@@ -262,13 +264,14 @@ radv_pipeline_cache_add_entry(struct radv_pipeline_cache *cache,
} }
struct radv_shader_variant * struct radv_shader_variant *
radv_pipeline_cache_insert_shader(struct radv_pipeline_cache *cache, radv_pipeline_cache_insert_shader(struct radv_device *device,
struct radv_pipeline_cache *cache,
const unsigned char *sha1, const unsigned char *sha1,
struct radv_shader_variant *variant, struct radv_shader_variant *variant,
const void *code, unsigned code_size) const void *code, unsigned code_size)
{ {
if (!cache) if (!cache)
return variant; cache = device->mem_cache;
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);

3
src/amd/vulkan/radv_private.h
View File

@@ -327,7 +327,8 @@ radv_create_shader_variant_from_pipeline_cache(struct radv_device *device,
const unsigned char *sha1); const unsigned char *sha1);
struct radv_shader_variant * struct radv_shader_variant *
radv_pipeline_cache_insert_shader(struct radv_pipeline_cache *cache, radv_pipeline_cache_insert_shader(struct radv_device *device,
struct radv_pipeline_cache *cache,
const unsigned char *sha1, const unsigned char *sha1,
struct radv_shader_variant *variant, struct radv_shader_variant *variant,
const void *code, unsigned code_size); const void *code, unsigned code_size);