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

zink: use blake3 instead of sha1 for program cache

Browse Source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30261>
This commit is contained in:
Mike Blumenkrantz
2024-07-10 08:30:06 -04:00
committed by Marge Bot
parent ce1236fe87
commit 53f249b921
3 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gallium/drivers/zink/zink_program.c
View File

@@ -1183,13 +1183,13 @@ gfx_program_init(struct zink_context *ctx, struct zink_gfx_program *prog)
if (prog->libs)
p_atomic_inc(&prog->libs->refcount);
struct mesa_sha1 sctx;
_mesa_sha1_init(&sctx);
struct mesa_blake3 sctx;
_mesa_blake3_init(&sctx);
for (int i = 0; i < ZINK_GFX_SHADER_COUNT; ++i) {
if (prog->shaders[i])
_mesa_sha1_update(&sctx, prog->shaders[i]->base.sha1, sizeof(prog->shaders[i]->base.sha1));
_mesa_blake3_update(&sctx, prog->shaders[i]->base.sha1, sizeof(prog->shaders[i]->base.sha1));
}
_mesa_sha1_final(&sctx, prog->base.sha1);
_mesa_blake3_final(&sctx, prog->base.blake3);
if (!zink_descriptor_program_init(ctx, &prog->base))
goto fail;
@@ -1498,10 +1498,10 @@ precompile_compute_job(void *data, void *gdata, int thread_index)
util_dynarray_init(&comp->shader_cache[0], comp);
util_dynarray_init(&comp->shader_cache[1], comp);
struct mesa_sha1 sha1_ctx;
_mesa_sha1_init(&sha1_ctx);
_mesa_sha1_update(&sha1_ctx, comp->shader->blob.data, comp->shader->blob.size);
_mesa_sha1_final(&sha1_ctx, comp->base.sha1);
struct mesa_blake3 blake3_ctx;
_mesa_blake3_init(&blake3_ctx);
_mesa_blake3_update(&blake3_ctx, comp->shader->blob.data, comp->shader->blob.size);
_mesa_blake3_final(&blake3_ctx, comp->base.blake3);
zink_descriptor_program_init(comp->base.ctx, &comp->base);

32
src/gallium/drivers/zink/zink_screen.c
View File

@@ -256,7 +256,7 @@ get_video_mem(struct zink_screen *screen)
* path.
*
* The output that gets stored in the frontend's cache is the result of
* zink_shader_finalize(). So, our sha1 cache key here needs to include
* zink_shader_finalize(). So, our blake3 cache key here needs to include
* everything that would change the NIR we generate from a given set of GLSL
* source, including our driver build, the Vulkan device and driver (which could
* affect the pipe caps we show the frontend), and any debug flags that change
@@ -272,16 +272,16 @@ disk_cache_init(struct zink_screen *screen)
return true;
#ifdef ENABLE_SHADER_CACHE
struct mesa_sha1 ctx;
_mesa_sha1_init(&ctx);
struct mesa_blake3 ctx;
_mesa_blake3_init(&ctx);
#ifdef HAVE_DL_ITERATE_PHDR
/* Hash in the zink driver build. */
const struct build_id_note *note =
build_id_find_nhdr_for_addr(disk_cache_init);
unsigned build_id_len = build_id_length(note);
assert(note && build_id_len == 20); /* sha1 */
_mesa_sha1_update(&ctx, build_id_data(note), build_id_len);
assert(note && build_id_len == 20); /* blake3 */
_mesa_blake3_update(&ctx, build_id_data(note), build_id_len);
#endif
/* Hash in the Vulkan pipeline cache UUID to identify the combination of
@@ -295,29 +295,29 @@ disk_cache_init(struct zink_screen *screen)
* latter is used to identify a compatible device and driver combination to
* use when serializing and de-serializing pipeline state."
*/
_mesa_sha1_update(&ctx, screen->info.props.pipelineCacheUUID, VK_UUID_SIZE);
_mesa_blake3_update(&ctx, screen->info.props.pipelineCacheUUID, VK_UUID_SIZE);
/* Hash in our debug flags that affect NIR generation as of finalize_nir */
unsigned shader_debug_flags = zink_debug & ZINK_DEBUG_COMPACT;
_mesa_sha1_update(&ctx, &shader_debug_flags, sizeof(shader_debug_flags));
_mesa_blake3_update(&ctx, &shader_debug_flags, sizeof(shader_debug_flags));
/* add in these shader keys */
_mesa_sha1_update(&ctx, &screen->driver_compiler_workarounds, sizeof(screen->driver_compiler_workarounds));
_mesa_blake3_update(&ctx, &screen->driver_compiler_workarounds, sizeof(screen->driver_compiler_workarounds));
/* Some of the driconf options change shaders. Let's just hash the whole
* thing to not forget any (especially as options get added).
*/
_mesa_sha1_update(&ctx, &screen->driconf, sizeof(screen->driconf));
_mesa_blake3_update(&ctx, &screen->driconf, sizeof(screen->driconf));
/* EXT_shader_object causes different descriptor layouts for separate shaders */
_mesa_sha1_update(&ctx, &screen->info.have_EXT_shader_object, sizeof(screen->info.have_EXT_shader_object));
_mesa_blake3_update(&ctx, &screen->info.have_EXT_shader_object, sizeof(screen->info.have_EXT_shader_object));
/* Finish the sha1 and format it as text. */
unsigned char sha1[20];
_mesa_sha1_final(&ctx, sha1);
/* Finish the blake3 and format it as text. */
blake3_hash blake3;
_mesa_blake3_final(&ctx, blake3);
char cache_id[20 * 2 + 1];
mesa_bytes_to_hex(cache_id, sha1, 20);
mesa_bytes_to_hex(cache_id, blake3, 20);
screen->disk_cache = disk_cache_create("zink", cache_id, 0);
@@ -366,7 +366,7 @@ cache_put_job(void *data, void *gdata, int thread_index)
pg->pipeline_cache_size = size;
cache_key key;
disk_cache_compute_key(screen->disk_cache, pg->sha1, sizeof(pg->sha1), key);
disk_cache_compute_key(screen->disk_cache, pg->blake3, sizeof(pg->blake3), key);
disk_cache_put_nocopy(screen->disk_cache, key, pipeline_data, size, NULL);
} else {
mesa_loge("ZINK: vkGetPipelineCacheData failed (%s)", vk_Result_to_str(result));
@@ -399,7 +399,7 @@ cache_get_job(void *data, void *gdata, int thread_index)
pcci.pInitialData = NULL;
cache_key key;
disk_cache_compute_key(screen->disk_cache, pg->sha1, sizeof(pg->sha1), key);
disk_cache_compute_key(screen->disk_cache, pg->blake3, sizeof(pg->blake3), key);
pcci.pInitialData = disk_cache_get(screen->disk_cache, key, &pg->pipeline_cache_size);
pcci.initialDataSize = pg->pipeline_cache_size;

2
src/gallium/drivers/zink/zink_types.h
View File

@@ -992,7 +992,7 @@ struct zink_shader_module {
struct zink_program {
struct pipe_reference reference;
struct zink_context *ctx;
unsigned char sha1[20];
blake3_hash blake3;
struct util_queue_fence cache_fence;
struct u_rwlock pipeline_cache_lock;
VkPipelineCache pipeline_cache;