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

lavapipe: Make shader compilation thread safe

Browse source 
Fixes random crashes because the LLVM context is not thread safe.

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22828>
This commit is contained in:
Konstantin Seurer 2023-05-21 12:06:32 +02:00 • committed by Marge Bot
parent 83a7a88d6b
commit 8f003569dd
3 changed files with 24 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gallium/frontends/lavapipe/lvp_execute.c
View file

@ -323,11 +323,11 @@ update_inline_shader_state(struct rendering_state *state, enum pipe_shader_type
/* not enough change; don't inline further */
shader->inlines.can_inline = 0;
ralloc_free(nir);
shader->shader_cso = lvp_shader_compile(state->device, shader, nir_shader_clone(NULL, shader->pipeline_nir->nir));
shader->shader_cso = lvp_shader_compile(state->device, shader, nir_shader_clone(NULL, shader->pipeline_nir->nir), true);
_mesa_set_remove(&shader->inlines.variants, entry);
shader_state = shader->shader_cso;
} else {
shader_state = lvp_shader_compile(state->device, shader, nir);
shader_state = lvp_shader_compile(state->device, shader, nir, true);
struct lvp_inline_variant *variant = mem_dup(&v, sizeof(v));
variant->cso = shader_state;
entry->key = variant;
@ -721,7 +721,7 @@ static void handle_graphics_pipeline(struct lvp_pipeline *pipeline,
struct rendering_state *state)
{
const struct vk_graphics_pipeline_state *ps = &pipeline->graphics_state;
lvp_pipeline_shaders_compile(pipeline);
lvp_pipeline_shaders_compile(pipeline, true);
bool dynamic_tess_origin = BITSET_TEST(ps->dynamic, MESA_VK_DYNAMIC_TS_DOMAIN_ORIGIN);
unbind_graphics_stages(state,
(~pipeline->graphics_state.shader_stages) &

29
src/gallium/frontends/lavapipe/lvp_pipeline.c
View file

@ -565,7 +565,7 @@ lvp_pipeline_xfb_init(struct lvp_pipeline *pipeline)
lvp_shader_xfb_init(&pipeline->shaders[stage]);
}
void *
static void *
lvp_shader_compile_stage(struct lvp_device *device, struct lvp_shader *shader, nir_shader *nir)
{
if (nir->info.stage == MESA_SHADER_COMPUTE) {
@ -604,10 +604,19 @@ lvp_shader_compile_stage(struct lvp_device *device, struct lvp_shader *shader, n
}
void *
lvp_shader_compile(struct lvp_device *device, struct lvp_shader *shader, nir_shader *nir)
lvp_shader_compile(struct lvp_device *device, struct lvp_shader *shader, nir_shader *nir, bool locked)
{
device->physical_device->pscreen->finalize_nir(device->physical_device->pscreen, nir);
return lvp_shader_compile_stage(device, shader, nir);
if (!locked)
simple_mtx_lock(&device->queue.lock);
void *state = lvp_shader_compile_stage(device, shader, nir);
if (!locked)
simple_mtx_unlock(&device->queue.lock);
return state;
}
#ifndef NDEBUG
@ -874,7 +883,7 @@ lvp_graphics_pipeline_init(struct lvp_pipeline *pipeline,
lvp_pipeline_xfb_init(pipeline);
}
if (!libstate && !pipeline->library)
lvp_pipeline_shaders_compile(pipeline);
lvp_pipeline_shaders_compile(pipeline, false);
return VK_SUCCESS;
@ -888,7 +897,7 @@ fail:
}
void
lvp_pipeline_shaders_compile(struct lvp_pipeline *pipeline)
lvp_pipeline_shaders_compile(struct lvp_pipeline *pipeline, bool locked)
{
if (pipeline->compiled)
return;
@ -901,10 +910,10 @@ lvp_pipeline_shaders_compile(struct lvp_pipeline *pipeline)
if (!pipeline->shaders[stage].inlines.can_inline) {
pipeline->shaders[stage].shader_cso = lvp_shader_compile(pipeline->device, &pipeline->shaders[stage],
nir_shader_clone(NULL, pipeline->shaders[stage].pipeline_nir->nir));
nir_shader_clone(NULL, pipeline->shaders[stage].pipeline_nir->nir), locked);
if (pipeline->shaders[MESA_SHADER_TESS_EVAL].tess_ccw)
pipeline->shaders[MESA_SHADER_TESS_EVAL].tess_ccw_cso = lvp_shader_compile(pipeline->device, &pipeline->shaders[stage],
nir_shader_clone(NULL, pipeline->shaders[MESA_SHADER_TESS_EVAL].tess_ccw->nir));
nir_shader_clone(NULL, pipeline->shaders[MESA_SHADER_TESS_EVAL].tess_ccw->nir), locked);
}
}
pipeline->compiled = true;
@ -1028,7 +1037,7 @@ lvp_compute_pipeline_init(struct lvp_pipeline *pipeline,
struct lvp_shader *shader = &pipeline->shaders[MESA_SHADER_COMPUTE];
if (!shader->inlines.can_inline)
shader->shader_cso = lvp_shader_compile(pipeline->device, shader, nir_shader_clone(NULL, shader->pipeline_nir->nir));
shader->shader_cso = lvp_shader_compile(pipeline->device, shader, nir_shader_clone(NULL, shader->pipeline_nir->nir), false);
pipeline->compiled = true;
return VK_SUCCESS;
}
@ -1204,7 +1213,7 @@ create_shader_object(struct lvp_device *device, const VkShaderCreateInfoEXT *pCr
nir_lower_patch_vertices(shader->pipeline_nir->nir, shader->pipeline_nir->nir->info.tess.tcs_vertices_out, NULL);
shader->tess_ccw = create_pipeline_nir(nir_shader_clone(NULL, shader->pipeline_nir->nir));
shader->tess_ccw->nir->info.tess.ccw = !shader->pipeline_nir->nir->info.tess.ccw;
shader->tess_ccw_cso = lvp_shader_compile(device, shader, nir_shader_clone(NULL, shader->tess_ccw->nir));
shader->tess_ccw_cso = lvp_shader_compile(device, shader, nir_shader_clone(NULL, shader->tess_ccw->nir), false);
} else if (stage == MESA_SHADER_FRAGMENT && nir->info.fs.uses_fbfetch_output) {
/* this is (currently) illegal */
assert(!nir->info.fs.uses_fbfetch_output);
@ -1215,7 +1224,7 @@ create_shader_object(struct lvp_device *device, const VkShaderCreateInfoEXT *pCr
return VK_NULL_HANDLE;
}
nir_serialize(&shader->blob, nir, true);
shader->shader_cso = lvp_shader_compile(device, shader, nir_shader_clone(NULL, nir));
shader->shader_cso = lvp_shader_compile(device, shader, nir_shader_clone(NULL, nir), false);
return lvp_shader_to_handle(shader);
fail:
ralloc_free(nir);

6
src/gallium/frontends/lavapipe/lvp_private.h
View file

@ -479,7 +479,7 @@ struct lvp_pipeline {
};
void
lvp_pipeline_shaders_compile(struct lvp_pipeline *pipeline);
lvp_pipeline_shaders_compile(struct lvp_pipeline *pipeline, bool locked);
struct lvp_event {
struct vk_object_base base;
@ -651,14 +651,12 @@ queue_thread_noop(void *data, void *gdata, int thread_index);
void
lvp_shader_optimize(nir_shader *nir);
void *
lvp_shader_compile_stage(struct lvp_device *device, struct lvp_shader *shader, nir_shader *nir);
bool
lvp_find_inlinable_uniforms(struct lvp_shader *shader, nir_shader *nir);
void
lvp_inline_uniforms(nir_shader *nir, const struct lvp_shader *shader, const uint32_t *uniform_values, uint32_t ubo);
void *
lvp_shader_compile(struct lvp_device *device, struct lvp_shader *shader, nir_shader *nir);
lvp_shader_compile(struct lvp_device *device, struct lvp_shader *shader, nir_shader *nir, bool locked);
enum vk_cmd_type
lvp_nv_dgc_token_to_cmd_type(const VkIndirectCommandsLayoutTokenNV *token);
#ifdef __cplusplus