ac: rename min_vgpr_alloc to min_wave64_vgpr_alloc

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3975>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3975>

diff --git a/src/amd/common/ac_gpu_info.c b/src/amd/common/ac_gpu_info.c
index 353dfe91b81efa66b598821dee891d7e4634f721..67b09ed6ae4af381958a110e37ca842172031eb0 100644 (file)
--- 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 930a09bab29818db5d786e9ec6cd313bd1b0d09e..2794119365d123c5d452d42352b7be8a32019850 100644 (file)
--- 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 8e4ae16d51a55d53ff0e63e6131b9c0db0538d7c..5849edaa5e710b496f1208d097396d4b666374fc 100644 (file)
--- 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 8b068ae2200fdc00b97571e3e35e3a58c972906d..c356f53fa06f6b7430b2879f227f6687da074f2d 100644 (file)
--- 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;