From 2cf46f2e3d89c9cd9a30835ee2ebdf24cdd8119b Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Fri, 22 May 2020 08:04:07 -0400 Subject: ac/gpu_info: replace num_good_cu_per_sh with min/max_good_cu_per_sa Perf counters use the new max number. Reviewed-by: Bas Nieuwenhuizen Part-of: --- src/amd/vulkan/radv_device.c | 2 +- src/amd/vulkan/radv_rgp.c | 2 +- src/amd/vulkan/si_cmd_buffer.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/amd/vulkan') diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index dee5563e824..6b8ab29d5a9 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -1753,7 +1753,7 @@ void radv_GetPhysicalDeviceProperties2( properties->shaderArraysPerEngineCount = pdevice->rad_info.max_sh_per_se; properties->computeUnitsPerShaderArray = - pdevice->rad_info.num_good_cu_per_sh; + pdevice->rad_info.min_good_cu_per_sa; properties->simdPerComputeUnit = pdevice->rad_info.num_simd_per_compute_unit; properties->wavefrontsPerSimd = diff --git a/src/amd/vulkan/radv_rgp.c b/src/amd/vulkan/radv_rgp.c index 94253aae6d9..7003cf456b2 100644 --- a/src/amd/vulkan/radv_rgp.c +++ b/src/amd/vulkan/radv_rgp.c @@ -358,7 +358,7 @@ radv_fill_sqtt_asic_info(struct radv_device *device, chunk->vgprs_per_simd = rad_info->num_physical_wave64_vgprs_per_simd; chunk->sgprs_per_simd = rad_info->num_physical_sgprs_per_simd; chunk->shader_engines = rad_info->max_se; - chunk->compute_unit_per_shader_engine = rad_info->num_good_cu_per_sh; + chunk->compute_unit_per_shader_engine = rad_info->min_good_cu_per_sa; chunk->simd_per_compute_unit = rad_info->num_simd_per_compute_unit; chunk->wavefronts_per_simd = rad_info->max_wave64_per_simd; diff --git a/src/amd/vulkan/si_cmd_buffer.c b/src/amd/vulkan/si_cmd_buffer.c index 28ca8560c09..a43821affb2 100644 --- a/src/amd/vulkan/si_cmd_buffer.c +++ b/src/amd/vulkan/si_cmd_buffer.c @@ -293,7 +293,7 @@ si_emit_graphics(struct radv_device *device, } /* Compute LATE_ALLOC_VS.LIMIT. */ - unsigned num_cu_per_sh = physical_device->rad_info.num_good_cu_per_sh; + unsigned num_cu_per_sh = physical_device->rad_info.min_good_cu_per_sa; unsigned late_alloc_wave64 = 0; /* The limit is per SH. */ unsigned late_alloc_wave64_gs = 0; unsigned cu_mask_vs = 0xffff; -- cgit v1.2.3