OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ac: move ac_get_max_wave64_per_simd into radeon_info

Browse Source 
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
This commit is contained in:
Marek Olšák
2019-09-12 19:39:02 -04:00
parent deab3a23f6
commit ca43006fd2
4 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/amd/common/ac_gpu_info.c
View File

@@ -584,6 +584,8 @@ bool ac_query_gpu_info(int fd, void *dev_p,
} }
} }
info->max_wave64_per_simd = info->family >= CHIP_POLARIS10 &&
info->family <= CHIP_VEGAM ? 8 : 10;
return true; return true;
} }

18
src/amd/common/ac_gpu_info.h
View File

@@ -141,6 +141,7 @@ struct radeon_info {
uint32_t num_tcc_blocks; uint32_t num_tcc_blocks;
uint32_t max_se; /* shader engines */ uint32_t max_se; /* shader engines */
uint32_t max_sh_per_se; /* shader arrays per shader engine */ uint32_t max_sh_per_se; /* shader arrays per shader engine */
uint32_t max_wave64_per_simd;
/* Render backends (color + depth blocks). */ /* Render backends (color + depth blocks). */
uint32_t r300_num_gb_pipes; uint32_t r300_num_gb_pipes;
@@ -189,21 +190,6 @@ unsigned ac_get_compute_resource_limits(struct radeon_info *info,
unsigned max_waves_per_sh, unsigned max_waves_per_sh,
unsigned threadgroups_per_cu); unsigned threadgroups_per_cu);
static inline unsigned ac_get_max_wave64_per_simd(enum radeon_family family)
{
switch (family) {
/* These always have 8 waves: */
case CHIP_POLARIS10:
case CHIP_POLARIS11:
case CHIP_POLARIS12:
case CHIP_VEGAM:
return 8;
default:
return 10;
}
}
static inline unsigned ac_get_num_physical_vgprs(enum chip_class chip_class, static inline unsigned ac_get_num_physical_vgprs(enum chip_class chip_class,
unsigned wave_size) unsigned wave_size)
{ {
@@ -221,7 +207,7 @@ ac_get_num_physical_sgprs(const struct radeon_info *info)
* of Wave32, which is double the number for Wave64. * of Wave32, which is double the number for Wave64.
*/ */
if (info->chip_class >= GFX10) if (info->chip_class >= GFX10)
return 128 * ac_get_max_wave64_per_simd(info->family) * 2; return 128 * info->max_wave64_per_simd * 2;
return info->chip_class >= GFX8 ? 800 : 512; return info->chip_class >= GFX8 ? 800 : 512;
} }

2
src/amd/vulkan/radv_shader.c
View File

@@ -1258,7 +1258,7 @@ radv_get_max_waves(struct radv_device *device,
unsigned max_simd_waves; unsigned max_simd_waves;
unsigned lds_per_wave = 0; unsigned lds_per_wave = 0;
max_simd_waves = ac_get_max_wave64_per_simd(device->physical_device->rad_info.family); max_simd_waves = device->physical_device->rad_info.max_wave64_per_simd;
if (stage == MESA_SHADER_FRAGMENT) { if (stage == MESA_SHADER_FRAGMENT) {
lds_per_wave = conf->lds_size * lds_increment + lds_per_wave = conf->lds_size * lds_increment +

2
src/gallium/drivers/radeonsi/si_shader.c
View File

@@ -5420,7 +5420,7 @@ static void si_calculate_max_simd_waves(struct si_shader *shader)
unsigned lds_per_wave = 0; unsigned lds_per_wave = 0;
unsigned max_simd_waves; unsigned max_simd_waves;
max_simd_waves = ac_get_max_wave64_per_simd(sscreen->info.family); max_simd_waves = sscreen->info.max_wave64_per_simd;
/* Compute LDS usage for PS. */ /* Compute LDS usage for PS. */
switch (shader->selector->type) { switch (shader->selector->type) {