Module: Mesa Branch: master Commit: cbc68c79a51b76e204ca30e532b23a9ccda78242 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cbc68c79a51b76e204ca30e532b23a9ccda78242
Author: Connor Abbott <[email protected]> Date: Wed Mar 10 15:01:33 2021 +0100 freedreno: Add local_size to ir3_shader_variant We want to use the local_size when available to calculate the threadsize in ir3, and we need it to work with e.g. computerator where we don't have a nir shader. Add a local_size field and use that in computerator instead of of a separate structure that's inaccessable to core ir3. Also set a dummy local_size in the tests to avoid a divide-by-zero. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9498> --- src/freedreno/computerator/ir3_asm.c | 4 +++- src/freedreno/ir3/ir3_assembler.c | 5 +++++ src/freedreno/ir3/ir3_assembler.h | 1 - src/freedreno/ir3/ir3_compiler_nir.c | 7 +++++++ src/freedreno/ir3/ir3_parser.y | 6 +++--- src/freedreno/ir3/ir3_shader.h | 3 +++ src/freedreno/vulkan/tu_pipeline.c | 2 +- 7 files changed, 22 insertions(+), 6 deletions(-) diff --git a/src/freedreno/computerator/ir3_asm.c b/src/freedreno/computerator/ir3_asm.c index 405bd170595..9c5e8d82a46 100644 --- a/src/freedreno/computerator/ir3_asm.c +++ b/src/freedreno/computerator/ir3_asm.c @@ -40,7 +40,9 @@ ir3_asm_assemble(struct ir3_compiler *c, FILE *in) kernel->v = v; kernel->bin = v->bin; - memcpy(kernel->base.local_size, kernel->info.local_size, sizeof(kernel->base.local_size)); + kernel->base.local_size[0] = v->local_size[0]; + kernel->base.local_size[1] = v->local_size[0]; + kernel->base.local_size[2] = v->local_size[0]; kernel->base.num_bufs = kernel->info.num_bufs; memcpy(kernel->base.buf_sizes, kernel->info.buf_sizes, sizeof(kernel->base.buf_sizes)); diff --git a/src/freedreno/ir3/ir3_assembler.c b/src/freedreno/ir3/ir3_assembler.c index 94da3c482ea..fda3ea472c4 100644 --- a/src/freedreno/ir3/ir3_assembler.c +++ b/src/freedreno/ir3/ir3_assembler.c @@ -47,6 +47,11 @@ ir3_parse_asm(struct ir3_compiler *c, struct ir3_kernel_info *info, FILE *in) info->numwg = INVALID_REG; + /* Provide a default local_size in case the shader doesn't set it, so that + * we don't crash at least. + */ + v->local_size[0] = v->local_size[1] = v->local_size[2] = 1; + v->ir = ir3_parse(v, info, in); if (!v->ir) goto error; diff --git a/src/freedreno/ir3/ir3_assembler.h b/src/freedreno/ir3/ir3_assembler.h index 93f40aeea57..e1b3e6521ee 100644 --- a/src/freedreno/ir3/ir3_assembler.h +++ b/src/freedreno/ir3/ir3_assembler.h @@ -30,7 +30,6 @@ #define MAX_BUFS 4 struct ir3_kernel_info { - uint32_t local_size[3]; uint32_t num_bufs; uint32_t buf_sizes[MAX_BUFS]; /* size in dwords */ diff --git a/src/freedreno/ir3/ir3_compiler_nir.c b/src/freedreno/ir3/ir3_compiler_nir.c index 62be47c5f32..8cb00c37a64 100644 --- a/src/freedreno/ir3/ir3_compiler_nir.c +++ b/src/freedreno/ir3/ir3_compiler_nir.c @@ -3903,6 +3903,13 @@ ir3_compile_shader_nir(struct ir3_compiler *compiler, ctx->s->info.fs.needs_quad_helper_invocations) so->need_pixlod = true; + if (so->type == MESA_SHADER_COMPUTE) { + so->local_size[0] = ctx->s->info.cs.local_size[0]; + so->local_size[1] = ctx->s->info.cs.local_size[1]; + so->local_size[2] = ctx->s->info.cs.local_size[2]; + so->local_size_variable = ctx->s->info.cs.local_size_variable; + } + out: if (ret) { if (so->ir) diff --git a/src/freedreno/ir3/ir3_parser.y b/src/freedreno/ir3/ir3_parser.y index 784e2899086..ce019c57f35 100644 --- a/src/freedreno/ir3/ir3_parser.y +++ b/src/freedreno/ir3/ir3_parser.y @@ -641,9 +641,9 @@ const_val: T_FLOAT { $$ = fui($1); } | T_HEX { $$ = $1; } localsize_header: T_A_LOCALSIZE const_val ',' const_val ',' const_val { - info->local_size[0] = $2; - info->local_size[1] = $4; - info->local_size[2] = $6; + variant->local_size[0] = $2; + variant->local_size[1] = $4; + variant->local_size[2] = $6; } const_header: T_A_CONST '(' T_CONSTANT ')' const_val ',' const_val ',' const_val ',' const_val { diff --git a/src/freedreno/ir3/ir3_shader.h b/src/freedreno/ir3/ir3_shader.h index 814c0a565f8..3d5abc9a788 100644 --- a/src/freedreno/ir3/ir3_shader.h +++ b/src/freedreno/ir3/ir3_shader.h @@ -660,6 +660,9 @@ struct ir3_shader_variant { /* texture sampler pre-dispatches */ uint32_t num_sampler_prefetch; struct ir3_sampler_prefetch sampler_prefetch[IR3_MAX_SAMPLER_PREFETCH]; + + uint16_t local_size[3]; + bool local_size_variable; }; static inline const char * diff --git a/src/freedreno/vulkan/tu_pipeline.c b/src/freedreno/vulkan/tu_pipeline.c index 510044aa7f8..40ed460fa8f 100644 --- a/src/freedreno/vulkan/tu_pipeline.c +++ b/src/freedreno/vulkan/tu_pipeline.c @@ -3050,7 +3050,7 @@ tu_compute_pipeline_create(VkDevice device, tu_setup_pvtmem(dev, pipeline, &pvtmem, v->pvtmem_size, v->pvtmem_per_wave); for (int i = 0; i < 3; i++) - pipeline->compute.local_size[i] = v->shader->nir->info.cs.local_size[i]; + pipeline->compute.local_size[i] = v->local_size[i]; struct tu_cs prog_cs; tu_cs_begin_sub_stream(&pipeline->cs, 512, &prog_cs); _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
