AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radeonsi: switch to new subgroup size info

Browse Source 
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Acked-by: Timur Kristóf <timur.kristof@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37258>
This commit is contained in:
Georg Lehmann
2025-09-09 18:34:31 +02:00
committed by Marge Bot
parent 79d02047b8
commit 1b5c78d1f7
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/radeonsi/si_shader_info.c
+1 -1
View File
@@ -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;
src/gallium/drivers/radeonsi/si_shader_info.h
+1 -1
View File
@@ -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;
src/gallium/drivers/radeonsi/si_state_shaders.cpp
+4 -3
View File
@@ -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 &&