fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 18:08:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

radeonsi: restructure si_shader_cache_load_shader

Browse source 
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/2929>
This commit is contained in:
Marek Olšák 2020-01-15 20:49:06 -05:00
parent 0db74f479b
commit 2fd3bb23ab
1 changed files with 36 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
src/gallium/drivers/radeonsi/si_state_shaders.c
View file

@ -243,53 +243,45 @@ bool si_shader_cache_load_shader(struct si_screen *sscreen,
{ {
struct hash_entry *entry = struct hash_entry *entry =
_mesa_hash_table_search(sscreen->shader_cache, ir_sha1_cache_key); _mesa_hash_table_search(sscreen->shader_cache, ir_sha1_cache_key);
if (!entry) {
if (sscreen->disk_shader_cache) {
unsigned char sha1[CACHE_KEY_SIZE];
disk_cache_compute_key(sscreen->disk_shader_cache, if (entry) {
ir_sha1_cache_key, 20, sha1); if (si_load_shader_binary(shader, entry->data)) {
p_atomic_inc(&sscreen->num_shader_cache_hits);
size_t binary_size; return true;
uint8_t *buffer =
disk_cache_get(sscreen->disk_shader_cache,
sha1, &binary_size);
if (!buffer)
return false;
if (binary_size < sizeof(uint32_t) ||
*((uint32_t*)buffer) != binary_size) {
/* Something has gone wrong discard the item
* from the cache and rebuild/link from
* source.
*/
assert(!"Invalid radeonsi shader disk cache "
"item!");
disk_cache_remove(sscreen->disk_shader_cache,
sha1);
free(buffer);
return false;
}
if (!si_load_shader_binary(shader, buffer)) {
free(buffer);
return false;
}
free(buffer);
si_shader_cache_insert_shader(sscreen, ir_sha1_cache_key,
shader, false);
} else {
return false;
} }
} else {
if (!si_load_shader_binary(shader, entry->data))
return false;
} }
p_atomic_inc(&sscreen->num_shader_cache_hits);
return true; if (!sscreen->disk_shader_cache)
return false;
unsigned char sha1[CACHE_KEY_SIZE];
disk_cache_compute_key(sscreen->disk_shader_cache, ir_sha1_cache_key,
20, sha1);
size_t binary_size;
uint8_t *buffer = disk_cache_get(sscreen->disk_shader_cache, sha1,
&binary_size);
if (buffer) {
if (binary_size >= sizeof(uint32_t) &&
*((uint32_t*)buffer) == binary_size) {
if (si_load_shader_binary(shader, buffer)) {
free(buffer);
si_shader_cache_insert_shader(sscreen, ir_sha1_cache_key,
shader, false);
p_atomic_inc(&sscreen->num_shader_cache_hits);
return true;
}
} else {
/* Something has gone wrong discard the item from the cache and
* rebuild/link from source.
*/
assert(!"Invalid radeonsi shader disk cache item!");
disk_cache_remove(sscreen->disk_shader_cache, sha1);
}
}
free(buffer);
return false;
} }
static uint32_t si_shader_cache_key_hash(const void *key) static uint32_t si_shader_cache_key_hash(const void *key)