From 46a8cab58bc8fa897c66831b17614da4e9a36706 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Mon, 2 Mar 2020 09:07:52 +0100 Subject: [PATCH] ac: rename min_vgpr_alloc to min_wave64_vgpr_alloc MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Samuel Pitoiset Reviewed-by: Marek Olšák Tested-by: Marge Bot Part-of: --- src/amd/common/ac_gpu_info.c | 4 ++-- src/amd/common/ac_gpu_info.h | 2 +- src/amd/vulkan/radv_device.c | 2 +- src/amd/vulkan/radv_rgp.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/amd/common/ac_gpu_info.c b/src/amd/common/ac_gpu_info.c index 353dfe91b81..67b09ed6ae4 100644 --- a/src/amd/common/ac_gpu_info.c +++ b/src/amd/common/ac_gpu_info.c @@ -727,7 +727,7 @@ bool ac_query_gpu_info(int fd, void *dev_p, info->max_sgpr_alloc = info->family == CHIP_TONGA || info->family == CHIP_ICELAND ? 96 : 104; - info->min_vgpr_alloc = 4; + info->min_wave64_vgpr_alloc = 4; info->max_vgpr_alloc = 256; info->wave64_vgpr_alloc_granularity = 4; @@ -893,7 +893,7 @@ void ac_print_gpu_info(struct radeon_info *info) printf(" min_sgpr_alloc = %i\n", info->min_sgpr_alloc); printf(" max_sgpr_alloc = %i\n", info->max_sgpr_alloc); printf(" sgpr_alloc_granularity = %i\n", info->sgpr_alloc_granularity); - printf(" min_vgpr_alloc = %i\n", info->min_vgpr_alloc); + printf(" min_wave64_vgpr_alloc = %i\n", info->min_wave64_vgpr_alloc); printf(" max_vgpr_alloc = %i\n", info->max_vgpr_alloc); printf(" wave64_vgpr_alloc_granularity = %i\n", info->wave64_vgpr_alloc_granularity); diff --git a/src/amd/common/ac_gpu_info.h b/src/amd/common/ac_gpu_info.h index 930a09bab29..2794119365d 100644 --- a/src/amd/common/ac_gpu_info.h +++ b/src/amd/common/ac_gpu_info.h @@ -165,7 +165,7 @@ struct radeon_info { uint32_t min_sgpr_alloc; uint32_t max_sgpr_alloc; uint32_t sgpr_alloc_granularity; - uint32_t min_vgpr_alloc; + uint32_t min_wave64_vgpr_alloc; uint32_t max_vgpr_alloc; uint32_t wave64_vgpr_alloc_granularity; diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index 8e4ae16d51a..5849edaa5e7 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -1720,7 +1720,7 @@ void radv_GetPhysicalDeviceProperties2( properties->vgprsPerSimd = pdevice->rad_info.num_physical_wave64_vgprs_per_simd; properties->minVgprAllocation = - pdevice->rad_info.min_vgpr_alloc; + pdevice->rad_info.min_wave64_vgpr_alloc; properties->maxVgprAllocation = pdevice->rad_info.max_vgpr_alloc; properties->vgprAllocationGranularity = diff --git a/src/amd/vulkan/radv_rgp.c b/src/amd/vulkan/radv_rgp.c index 8b068ae2200..c356f53fa06 100644 --- a/src/amd/vulkan/radv_rgp.c +++ b/src/amd/vulkan/radv_rgp.c @@ -357,7 +357,7 @@ radv_fill_sqtt_asic_info(struct radv_device *device, chunk->simd_per_compute_unit = rad_info->num_simd_per_compute_unit; chunk->wavefronts_per_simd = rad_info->max_wave64_per_simd; - chunk->minimum_vgpr_alloc = rad_info->min_vgpr_alloc; + chunk->minimum_vgpr_alloc = rad_info->min_wave64_vgpr_alloc; chunk->vgpr_alloc_granularity = rad_info->wave64_vgpr_alloc_granularity; chunk->minimum_sgpr_alloc = rad_info->min_sgpr_alloc; chunk->sgpr_alloc_granularity = rad_info->sgpr_alloc_granularity; -- 2.30.2