summaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2019-09-12 19:51:13 -0400
committerMarek Olšák <[email protected]>2019-09-18 14:39:06 -0400
commitaae35fbd3a3eba176ac6fdf6357be49002a561ee (patch)
treefad44d54b291302cca2c50534824fcd3e555b918 /src/gallium
parent0692ae34e939845e5185d3bdd33ddfe4afcdb995 (diff)
ac: move ac_get_num_physical_vgprs into radeon_info
Reviewed-by: Timothy Arceri <[email protected]> Reviewed-by: Samuel Pitoiset <[email protected]>
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/drivers/radeonsi/si_shader.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index fde6801fdce..49532b4c28a 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -5460,7 +5460,7 @@ static void si_calculate_max_simd_waves(struct si_shader *shader)
if (conf->num_vgprs) {
/* Always print wave limits as Wave64, so that we can compare
* Wave32 and Wave64 with shader-db fairly. */
- unsigned max_vgprs = ac_get_num_physical_vgprs(sscreen->info.chip_class, 64);
+ unsigned max_vgprs = sscreen->info.num_physical_wave64_vgprs_per_simd;
max_simd_waves = MIN2(max_simd_waves, max_vgprs / conf->num_vgprs);
}
@@ -7176,8 +7176,8 @@ int si_compile_tgsi_shader(struct si_screen *sscreen,
*/
if (sel->type == PIPE_SHADER_COMPUTE) {
unsigned wave_size = sscreen->compute_wave_size;
- unsigned max_vgprs = ac_get_num_physical_vgprs(sscreen->info.chip_class,
- wave_size);
+ unsigned max_vgprs = sscreen->info.num_physical_wave64_vgprs_per_simd *
+ (wave_size == 32 ? 2 : 1);
unsigned max_sgprs = sscreen->info.num_physical_sgprs_per_simd;
unsigned max_sgprs_per_wave = 128;
unsigned simds_per_tg = 4; /* assuming WGP mode on gfx10 */