From 1b5c78d1f7863aa02991bfa720c38f201c6c6a5c Mon Sep 17 00:00:00 2001 From: Georg Lehmann Date: Tue, 9 Sep 2025 18:34:31 +0200 Subject: [PATCH] radeonsi: switch to new subgroup size info MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Marek Olšák Acked-by: Timur Kristóf Part-of: --- src/gallium/drivers/radeonsi/si_shader_info.c | 2 +- src/gallium/drivers/radeonsi/si_shader_info.h | 2 +- src/gallium/drivers/radeonsi/si_state_shaders.cpp | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_shader_info.c b/src/gallium/drivers/radeonsi/si_shader_info.c index 499807d8491..570b0002dd4 100644 --- a/src/gallium/drivers/radeonsi/si_shader_info.c +++ b/src/gallium/drivers/radeonsi/si_shader_info.c @@ -402,7 +402,7 @@ void si_nir_scan_shader(struct si_screen *sscreen, struct nir_shader *nir, info->base.use_aco_amd = nir->info.use_aco_amd; info->base.writes_memory = nir->info.writes_memory; - info->base.subgroup_size = nir->info.subgroup_size; + info->base.api_subgroup_size = nir->info.api_subgroup_size; info->base.num_ubos = nir->info.num_ubos; info->base.num_ssbos = nir->info.num_ssbos; diff --git a/src/gallium/drivers/radeonsi/si_shader_info.h b/src/gallium/drivers/radeonsi/si_shader_info.h index cdd0dd3079b..6cbf9ef048e 100644 --- a/src/gallium/drivers/radeonsi/si_shader_info.h +++ b/src/gallium/drivers/radeonsi/si_shader_info.h @@ -23,7 +23,7 @@ struct si_shader_info { bool use_aco_amd:1; bool writes_memory:1; - enum gl_subgroup_size subgroup_size; + uint8_t api_subgroup_size; uint8_t num_ubos; uint8_t num_ssbos; diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.cpp b/src/gallium/drivers/radeonsi/si_state_shaders.cpp index 0bea02ec0cd..546b6ccda41 100644 --- a/src/gallium/drivers/radeonsi/si_state_shaders.cpp +++ b/src/gallium/drivers/radeonsi/si_state_shaders.cpp @@ -45,9 +45,10 @@ unsigned si_determine_wave_size(struct si_screen *sscreen, struct si_shader *sha return 64; /* For KHR_shader_subgroup which require a constant subgroup size known by user. */ - if (info->base.subgroup_size == SUBGROUP_SIZE_API_CONSTANT || - (prev_sel && prev_sel->info.base.subgroup_size == SUBGROUP_SIZE_API_CONSTANT)) - return 64; + if (info->base.api_subgroup_size) + return info->base.api_subgroup_size; + else if (prev_sel && prev_sel->info.base.api_subgroup_size) + return prev_sel->info.base.api_subgroup_size; /* Workgroup sizes that are not divisible by 64 use Wave32. */ if (stage == MESA_SHADER_COMPUTE && !info->base.workgroup_size_variable &&