fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 04:20:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

zink: incrementally hash all pipeline component hashes

Browse source 
not the actual pipeline hash, just the components

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12605>
This commit is contained in:
Mike Blumenkrantz 2021-06-17 11:46:04 -04:00 • committed by Marge Bot
parent 12cf0099fd
commit 15450d2c2e
3 changed files with 22 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/gallium/drivers/zink/zink_draw.cpp
View file

@ -202,11 +202,12 @@ update_gfx_program(struct zink_context *ctx)
entry = _mesa_hash_table_insert_pre_hashed(ht, hash, prog->shaders, prog);
}
prog = (struct zink_gfx_program*)(entry ? entry->data : NULL);
if (prog && prog != ctx->curr_program) {
ctx->gfx_pipeline_state.combined_dirty = true;
if (prog && prog != ctx->curr_program)
zink_batch_reference_program(&ctx->batch, &prog->base);
}
if (ctx->curr_program)
ctx->gfx_pipeline_state.final_hash ^= ctx->curr_program->last_variant_hash;
ctx->curr_program = prog;
ctx->gfx_pipeline_state.final_hash ^= ctx->curr_program->last_variant_hash;
ctx->gfx_dirty = false;
} else if (ctx->dirty_shader_stages & bits) {
zink_update_gfx_program(ctx, ctx->curr_program);

5
src/gallium/drivers/zink/zink_pipeline.h
View file

@ -62,10 +62,7 @@ struct zink_gfx_pipeline_state {
bool primitive_restart; //dynamic state2
VkShaderModule modules[PIPE_SHADER_TYPES - 1];
uint32_t module_hash;
uint32_t combined_hash;
bool combined_dirty;
bool modules_changed;
struct zink_vertex_elements_hw_state *element_state;
uint32_t vertex_hash;

34
src/gallium/drivers/zink/zink_program.c
View file

@ -301,13 +301,17 @@ update_shader_modules(struct zink_context *ctx, struct zink_gfx_program *prog, u
}
if (hash_changed) {
if (!first && likely(ctx->gfx_pipeline_state.pipeline)) //avoid on first hash
ctx->gfx_pipeline_state.final_hash ^= prog->last_variant_hash;
if (default_variants && !first)
prog->last_variant_hash = prog->default_variant_hash;
else
prog->last_variant_hash = variant_hash;
ctx->gfx_pipeline_state.combined_dirty = true;
ctx->gfx_pipeline_state.final_hash ^= prog->last_variant_hash;
ctx->gfx_pipeline_state.modules_changed = true;
}
ctx->gfx_pipeline_state.module_hash = prog->last_variant_hash;
}
static uint32_t
@ -453,7 +457,7 @@ zink_create_gfx_program(struct zink_context *ctx,
assign_io(prog, prog->shaders);
update_shader_modules(ctx, prog, prog->stages_present);
prog->default_variant_hash = ctx->gfx_pipeline_state.module_hash;
prog->default_variant_hash = prog->last_variant_hash;
if (stages[PIPE_SHADER_GEOMETRY])
prog->last_vertex_stage = stages[PIPE_SHADER_GEOMETRY];
@ -784,7 +788,7 @@ zink_get_gfx_pipeline(struct zink_context *ctx,
VkPrimitiveTopology vkmode = zink_primitive_topology(mode);
const unsigned idx = get_pipeline_idx(screen->info.have_EXT_extended_dynamic_state, mode, vkmode);
assert(idx <= ARRAY_SIZE(prog->pipelines));
if (!state->dirty && !state->combined_dirty &&
if (!state->dirty && !state->modules_changed &&
(have_EXT_vertex_input_dynamic_state || !ctx->vertex_state_changed) &&
idx == state->idx)
return state->pipeline;
@ -792,20 +796,12 @@ zink_get_gfx_pipeline(struct zink_context *ctx,
struct hash_entry *entry = NULL;
if (state->dirty) {
if (!have_EXT_vertex_input_dynamic_state)
ctx->vertex_state_changed = true;
state->combined_dirty = true;
if (state->pipeline) //avoid on first hash
state->final_hash ^= state->hash;
state->hash = hash_gfx_pipeline_state(state);
state->final_hash ^= state->hash;
state->dirty = false;
}
if (state->combined_dirty) {
state->combined_hash = XXH32(&state->module_hash, sizeof(uint32_t), state->hash);
state->combined_dirty = false;
if (have_EXT_vertex_input_dynamic_state)
state->final_hash = state->combined_hash;
else
ctx->vertex_state_changed = true;
}
if (!have_EXT_vertex_input_dynamic_state && ctx->vertex_state_changed) {
if (state->pipeline)
state->final_hash ^= state->vertex_hash;
@ -823,9 +819,11 @@ zink_get_gfx_pipeline(struct zink_context *ctx,
state->vertex_hash = hash ^ state->element_state->hash;
} else
state->vertex_hash = state->element_state->hash;
state->final_hash = state->combined_hash ^ state->vertex_hash;
state->final_hash ^= state->vertex_hash;
}
state->modules_changed = false;
ctx->vertex_state_changed = false;
entry = _mesa_hash_table_search_pre_hashed(prog->pipelines[idx], state->final_hash, state);
if (!entry) {
@ -921,12 +919,14 @@ bind_stage(struct zink_context *ctx, enum pipe_shader_type stage,
ctx->gfx_hash ^= ctx->gfx_stages[stage]->hash;
ctx->gfx_stages[stage] = shader;
ctx->gfx_dirty = ctx->gfx_stages[PIPE_SHADER_FRAGMENT] && ctx->gfx_stages[PIPE_SHADER_VERTEX];
ctx->gfx_pipeline_state.combined_dirty = true;
ctx->gfx_pipeline_state.modules_changed = true;
if (shader) {
ctx->shader_stages |= BITFIELD_BIT(stage);
ctx->gfx_hash ^= ctx->gfx_stages[stage]->hash;
} else {
ctx->gfx_pipeline_state.modules[stage] = VK_NULL_HANDLE;
if (ctx->curr_program)
ctx->gfx_pipeline_state.final_hash ^= ctx->curr_program->last_variant_hash;
ctx->curr_program = NULL;
ctx->shader_stages &= ~BITFIELD_BIT(stage);
}