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

aco: correctly set min/max_subgroup_size for wave32-as-wave64

Browse source 
Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26894>
This commit is contained in:
Rhys Perry 2024-01-04 15:14:56 +00:00 • committed by Marge Bot
parent 1e3541728b
commit 3009dcd102
3 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/amd/compiler/aco_instruction_selection_setup.cpp
View file

@ -293,12 +293,8 @@ init_context(isel_context* ctx, nir_shader* shader)
/* Init NIR range analysis. */
ctx->range_ht = _mesa_pointer_hash_table_create(NULL);
ctx->ub_config.min_subgroup_size = 64;
ctx->ub_config.max_subgroup_size = 64;
if (ctx->shader->info.stage == MESA_SHADER_COMPUTE && ctx->program->info.cs.subgroup_size) {
ctx->ub_config.min_subgroup_size = ctx->program->info.cs.subgroup_size;
ctx->ub_config.max_subgroup_size = ctx->program->info.cs.subgroup_size;
}
ctx->ub_config.min_subgroup_size = ctx->program->wave_size;
ctx->ub_config.max_subgroup_size = ctx->program->wave_size;
ctx->ub_config.max_workgroup_invocations = 2048;
ctx->ub_config.max_workgroup_count[0] = 65535;
ctx->ub_config.max_workgroup_count[1] = 65535;

1
src/amd/compiler/aco_shader_info.h
View file

@ -180,7 +180,6 @@ struct aco_shader_info {
struct ac_arg alpha_reference;
} ps;
struct {
uint8_t subgroup_size;
bool uses_full_subgroups;
} cs;

1
src/amd/vulkan/radv_aco_shader_info.h
View file

@ -58,7 +58,6 @@ radv_aco_convert_shader_info(struct aco_shader_info *aco_info, const struct radv
ASSIGN_FIELD(tcs.num_linked_patch_outputs);
ASSIGN_FIELD(tcs.tcs_vertices_out);
ASSIGN_FIELD(ps.num_interp);
ASSIGN_FIELD(cs.subgroup_size);
ASSIGN_FIELD(cs.uses_full_subgroups);
aco_info->ps.spi_ps_input_ena = radv->ps.spi_ps_input;
aco_info->ps.spi_ps_input_addr = radv->ps.spi_ps_input;