ac: rename lds_size_per_cu to lds_size_per_workgroup

It's more accurate.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
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 097e5cfc3c94443bece5e468ed4edb6ab5c1ed4d..45be8492d0fd571eb165cf84620725808c774a33 100644 (file)
--- a/src/amd/common/ac_gpu_info.c
+++ b/src/amd/common/ac_gpu_info.c
@@ -544,7 +544,7 @@ bool ac_query_gpu_info(int fd, void *dev_p,
         *
         * LDS is 128KB in WGP mode and 64KB in CU mode. Assume the WGP mode is used.
         */
-       info->lds_size_per_cu = info->chip_class >= GFX10 ? 128 * 1024 : 64 * 1024;
+       info->lds_size_per_workgroup = info->chip_class >= GFX10 ? 128 * 1024 : 64 * 1024;
        info->lds_granularity = info->chip_class >= GFX7 ? 128 * 4 : 64 * 4;
 
        assert(util_is_power_of_two_or_zero(dma.available_rings + 1));
@@ -831,7 +831,7 @@ void ac_print_gpu_info(struct radeon_info *info)
        printf("    tcc_cache_line_size = %u\n", info->tcc_cache_line_size);
        printf("    tcc_harvested = %u\n", info->tcc_harvested);
        printf("    pc_lines = %u\n", info->pc_lines);
-       printf("    lds_size_per_cu = %u\n", info->lds_size_per_cu);
+       printf("    lds_size_per_workgroup = %u\n", info->lds_size_per_workgroup);
        printf("    lds_granularity = %i\n", info->lds_granularity);
        printf("    max_memory_clock = %i\n", info->max_memory_clock);
        printf("    ce_ram_size = %i\n", info->ce_ram_size);

diff --git a/src/amd/common/ac_gpu_info.h b/src/amd/common/ac_gpu_info.h
index fc961bbcd0d85db851dfa4a61850a482ba2b77e4..ce8c6e43c71d9e7328002ede2842e0ff3c794c8d 100644 (file)
--- a/src/amd/common/ac_gpu_info.h
+++ b/src/amd/common/ac_gpu_info.h
@@ -100,7 +100,7 @@ struct radeon_info {
        uint32_t                    tcc_cache_line_size;
        bool                        tcc_harvested;
        unsigned                    pc_lines;
-       uint32_t                    lds_size_per_cu;
+       uint32_t                    lds_size_per_workgroup;
        uint32_t                    lds_granularity;
        uint32_t                    max_memory_clock;
        uint32_t                    ce_ram_size;

diff --git a/src/amd/vulkan/radv_rgp.c b/src/amd/vulkan/radv_rgp.c
index 75a1c79c5346abf2d7a8aaabb4ae82ef3ecbe183..03d7ed8111963af40dc1e7f5d99aafc17b9ce64d 100644 (file)
--- a/src/amd/vulkan/radv_rgp.c
+++ b/src/amd/vulkan/radv_rgp.c
@@ -376,7 +376,7 @@ radv_fill_sqtt_asic_info(struct radv_device *device,
        chunk->vram_size = rad_info->vram_size;
        chunk->l2_cache_size = rad_info->l2_cache_size;
        chunk->l1_cache_size = rad_info->l1_cache_size;
-       chunk->lds_size = rad_info->lds_size_per_cu;
+       chunk->lds_size = rad_info->lds_size_per_workgroup;
 
        strncpy(chunk->gpu_name, device->physical_device->name, SQTT_GPU_NAME_MAX_SIZE);
 

diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c
index 367817c16f82c47ceb107c89ba07f954f62058e1..40fa3d783d48eb8fa2650afaeda3140a70392ea0 100644 (file)
--- a/src/amd/vulkan/radv_shader.c
+++ b/src/amd/vulkan/radv_shader.c
@@ -1336,7 +1336,7 @@ radv_get_max_waves(struct radv_device *device,
                             device->physical_device->rad_info.num_physical_wave64_vgprs_per_simd / vgprs);
        }
 
-       unsigned max_lds_per_simd = device->physical_device->rad_info.lds_size_per_cu / device->physical_device->rad_info.num_simd_per_compute_unit;
+       unsigned max_lds_per_simd = device->physical_device->rad_info.lds_size_per_workgroup / device->physical_device->rad_info.num_simd_per_compute_unit;
        if (lds_per_wave)
                max_simd_waves = MIN2(max_simd_waves, max_lds_per_simd / lds_per_wave);
 

diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index 12878cf97b93df05e53eb6c03ba19ee05498069a..01911cc8b54668971193a3009ee12170fa806e5c 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -1063,7 +1063,7 @@ static void si_calculate_max_simd_waves(struct si_shader *shader)
                max_simd_waves = MIN2(max_simd_waves, max_vgprs / conf->num_vgprs);
        }
 
-       unsigned max_lds_per_simd = sscreen->info.lds_size_per_cu / 4;
+       unsigned max_lds_per_simd = sscreen->info.lds_size_per_workgroup / 4;
        if (lds_per_wave)
                max_simd_waves = MIN2(max_simd_waves, max_lds_per_simd / lds_per_wave);