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

anv: allow simple shader spilling for complex ones

Browse source 
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31384>
This commit is contained in:
Lionel Landwerlin 2026-03-24 12:34:48 +02:00 • committed by Marge Bot
parent 068351f848
commit 5c3deebd6f
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/intel/vulkan/anv_internal_kernels.c
View file

@ -51,8 +51,8 @@ lower_base_workgroup_id(nir_builder *b, nir_intrinsic_instr *intrin,
static void static void
check_sends(struct genisa_stats *stats, unsigned send_count) check_sends(struct genisa_stats *stats, unsigned send_count)
{ {
assert(stats->spills == 0); assert(send_count == 0 || stats->spills == 0);
assert(stats->fills == 0); assert(send_count == 0 || stats->fills == 0);
assert(send_count == 0 || stats->sends == send_count); assert(send_count == 0 || stats->sends == send_count);
} }
@ -213,7 +213,8 @@ compile_shader(struct anv_device *device,
} }
} }
assert(prog_data.base.total_scratch == 0); /* Complex shaders are allowed to spill */
assert(sends_count_expectation == 0 || prog_data.base.total_scratch == 0);
assert(program != NULL); assert(program != NULL);
struct anv_shader_internal *kernel = NULL; struct anv_shader_internal *kernel = NULL;
if (program == NULL) if (program == NULL)

9
src/intel/vulkan/genX_simple_shader.c
View file

@ -397,11 +397,14 @@ genX(emit_simpler_shader_init_compute)(struct anv_simple_shader *state)
struct anv_shader_internal *cs_bin = state->kernel; struct anv_shader_internal *cs_bin = state->kernel;
const struct brw_cs_prog_data *prog_data = const struct brw_cs_prog_data *prog_data =
(const struct brw_cs_prog_data *) cs_bin->prog_data; (const struct brw_cs_prog_data *) cs_bin->prog_data;
/* Currently our simple shaders are simple enough that they never spill. */
assert(prog_data->base.total_scratch == 0);
if (state->cmd_buffer != NULL) { if (state->cmd_buffer != NULL) {
genX(cmd_buffer_ensure_cfe_state)(state->cmd_buffer, 0); genX(cmd_buffer_ensure_cfe_state)(state->cmd_buffer,
prog_data->base.total_scratch);
} else { } else {
/* Currently our simple shaders not in the command buffers are simple
* enough that they never spill.
*/
assert(prog_data->base.total_scratch == 0);
anv_batch_emit(state->batch, GENX(CFE_STATE), cfe) { anv_batch_emit(state->batch, GENX(CFE_STATE), cfe) {
cfe.MaximumNumberofThreads = cfe.MaximumNumberofThreads =
state->device->info->max_cs_threads * state->device->info->max_cs_threads *