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

radeonsi/sqtt: use XXH64_update

Browse source 
No functional change, but this is the way the XXH API is meant
to be used.

Also avoid setting the pipeline_code_hash twice.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31171>
This commit is contained in:
Pierre-Eric Pelloux-Prayer 2024-09-13 17:11:03 +02:00 • committed by Marge Bot
parent 3ab34c5ffe
commit 721ccd0292
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/gallium/drivers/radeonsi/si_state_draw.cpp
View file

@ -320,25 +320,27 @@ static bool si_update_shaders(struct si_context *sctx)
* changes.
*/
uint64_t scratch_bo_size = sctx->scratch_buffer ? sctx->scratch_buffer->bo_size : 0;
uint64_t pipeline_code_hash = scratch_bo_size;
uint32_t total_size = 0;
/* Compute pipeline code hash. */
XXH64_state_t* xh = XXH64_createState();
XXH64_reset(xh, scratch_bo_size);
for (int i = 0; i < SI_NUM_GRAPHICS_SHADERS; i++) {
struct si_shader *shader = sctx->shaders[i].current;
if (sctx->shaders[i].cso && shader) {
/* Hash the key. */
pipeline_code_hash = XXH64(&shader->key, sizeof(shader->key), pipeline_code_hash);
XXH64_update(xh, &shader->key, sizeof(shader->key));
/* Hash the main part binary. */
pipeline_code_hash = XXH64(
shader->binary.code_buffer,
shader->binary.code_size,
pipeline_code_hash);
XXH64_update(xh, shader->binary.code_buffer, shader->binary.code_size);
total_size += (uint32_t)align_uintptr(shader->binary.uploaded_code_size, 256);
}
}
XXH64_hash_t pipeline_code_hash = XXH64_digest(xh);
XXH64_freeState(xh);
struct si_sqtt_fake_pipeline *pipeline = NULL;
if (!si_sqtt_pipeline_is_registered(sctx->sqtt, pipeline_code_hash)) {
/* This is a new pipeline. Allocate a new bo to hold all the shaders. Without
@ -402,10 +404,8 @@ static bool si_update_shaders(struct si_context *sctx)
}
assert(pipeline);
pipeline->code_hash = pipeline_code_hash;
radeon_add_to_buffer_list(sctx, &sctx->gfx_cs, pipeline->bo,
RADEON_USAGE_READ | RADEON_PRIO_SHADER_BINARY);
si_sqtt_describe_pipeline_bind(sctx, pipeline_code_hash, 0);
si_pm4_bind_state(sctx, sqtt_pipeline, pipeline);
}