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

ac/radv/radeonsi: refactor max simd waves into common code.

Browse Source 
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
This commit is contained in:
Dave Airlie
2018-04-23 10:16:07 +10:00
parent 899df55ee0
commit f77caa7411
3 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -134,6 +134,22 @@ int ac_get_gs_table_depth(enum chip_class chip_class, enum radeon_family family)
void ac_get_raster_config(struct radeon_info *info, void ac_get_raster_config(struct radeon_info *info,
uint32_t *raster_config_p, uint32_t *raster_config_p,
uint32_t *raster_config_1_p); uint32_t *raster_config_1_p);
static inline unsigned ac_get_max_simd_waves(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;
}
}
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

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

@@ -615,17 +615,7 @@ generate_shader_stats(struct radv_device *device,
unsigned max_simd_waves; unsigned max_simd_waves;
unsigned lds_per_wave = 0; unsigned lds_per_wave = 0;
switch (device->physical_device->rad_info.family) { max_simd_waves = ac_get_max_simd_waves(device->physical_device->rad_info.family);
/* These always have 8 waves: */
case CHIP_POLARIS10:
case CHIP_POLARIS11:
case CHIP_POLARIS12:
case CHIP_VEGAM:
max_simd_waves = 8;
break;
default:
max_simd_waves = 10;
}
conf = &variant->config; conf = &variant->config;

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

@@ -5459,17 +5459,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;
switch (sscreen->info.family) { max_simd_waves = ac_get_max_simd_waves(sscreen->info.family);
/* These always have 8 waves: */
case CHIP_POLARIS10:
case CHIP_POLARIS11:
case CHIP_POLARIS12:
case CHIP_VEGAM:
max_simd_waves = 8;
break;
default:
max_simd_waves = 10;
}
/* Compute LDS usage for PS. */ /* Compute LDS usage for PS. */
switch (shader->selector->type) { switch (shader->selector->type) {