radv: Add forcecompress debug flag.

Enables DCC/HTILE/CMASK/FMASK when supported, not just when we think
it is beneficial.

This is helpful to detect compression bugs with CTS.

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6252>

diff --git a/docs/envvars.rst b/docs/envvars.rst
index 76397eec0416bc3246e182b3fd7a82367782d82b..4beba25b43f5a0e807b0b407b03ebfcf988d263c 100644 (file)
--- a/docs/envvars.rst
+++ b/docs/envvars.rst
@@ -527,6 +527,9 @@ RADV driver environment variables
       validate the LLVM IR before LLVM compiles the shader
    ``errors``
       display more info about errors
       validate the LLVM IR before LLVM compiles the shader
    ``errors``
       display more info about errors

+   ``forcecompress``
+      Enables DCC,FMASK,CMASK,HTILE in situations where the driver supports it
+      but normally does not deem it beneficial.

    ``info``
       show GPU-related information
    ``metashaders``
    ``info``
       show GPU-related information
    ``metashaders``

diff --git a/src/amd/vulkan/radv_debug.h b/src/amd/vulkan/radv_debug.h
index 9e74df77f40a6633b5582d8a5ad44263d218c541..2e7c4694a1558e33480da8fd30346f77d39e5cc1 100644 (file)
--- a/src/amd/vulkan/radv_debug.h
+++ b/src/amd/vulkan/radv_debug.h
@@ -56,6 +56,7 @@ enum {
        RADV_DEBUG_NO_MEMORY_CACHE   = 1 << 25,
        RADV_DEBUG_DISCARD_TO_DEMOTE = 1 << 26,
        RADV_DEBUG_LLVM              = 1 << 27,
        RADV_DEBUG_NO_MEMORY_CACHE   = 1 << 25,
        RADV_DEBUG_DISCARD_TO_DEMOTE = 1 << 26,
        RADV_DEBUG_LLVM              = 1 << 27,

+       RADV_DEBUG_FORCE_COMPRESS    = 1 << 28,

 };
 
 enum {
 };
 
 enum {

diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 799f291f0aeed67a03cc50b040b53383dcb947a8..275bbe525533c5605469b14876c6170b2e44ac09 100644 (file)
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -523,6 +523,7 @@ static const struct debug_control radv_debug_options[] = {
        {"metashaders", RADV_DEBUG_DUMP_META_SHADERS},
        {"nomemorycache", RADV_DEBUG_NO_MEMORY_CACHE},
        {"llvm", RADV_DEBUG_LLVM},
        {"metashaders", RADV_DEBUG_DUMP_META_SHADERS},
        {"nomemorycache", RADV_DEBUG_NO_MEMORY_CACHE},
        {"llvm", RADV_DEBUG_LLVM},

+       {"forcecompress", RADV_DEBUG_FORCE_COMPRESS},

        {NULL, 0}
 };
 
        {NULL, 0}
 };
 

diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c
index fc0fb81175e50a19a8faf78bb4de973ecde47375..8671a6ffb77f882526db63a816c16f07b7aafbf2 100644 (file)
--- a/src/amd/vulkan/radv_image.c
+++ b/src/amd/vulkan/radv_image.c
@@ -150,8 +150,12 @@ radv_surface_has_scanout(struct radv_device *device, const struct radv_image_cre
 }
 
 static bool
 }
 
 static bool

-radv_image_use_fast_clear_for_image(const struct radv_image *image)
+radv_image_use_fast_clear_for_image(const struct radv_device *device,
+                                    const struct radv_image *image)

 {
 {

+       if (device->instance->debug_flags & RADV_DEBUG_FORCE_COMPRESS)
+               return true;
+

        if (image->info.samples <= 1 &&
            image->info.width * image->info.height <= 512 * 512) {
                /* Do not enable CMASK or DCC for small surfaces where the cost
        if (image->info.samples <= 1 &&
            image->info.width * image->info.height <= 512 * 512) {
                /* Do not enable CMASK or DCC for small surfaces where the cost


@@ -196,7 +200,7 @@ radv_use_dcc_for_image(struct radv_device *device,
            vk_format_get_plane_count(format) > 1)
                return false;
 
            vk_format_get_plane_count(format) > 1)
                return false;
 

-       if (!radv_image_use_fast_clear_for_image(image))
+       if (!radv_image_use_fast_clear_for_image(device, image))

                return false;
 
        /* TODO: Enable DCC for mipmaps on GFX9+. */
                return false;
 
        /* TODO: Enable DCC for mipmaps on GFX9+. */


@@ -251,17 +255,21 @@ radv_use_dcc_for_image(struct radv_device *device,
 }
 
 static inline bool
 }
 
 static inline bool

-radv_use_fmask_for_image(const struct radv_image *image)
+radv_use_fmask_for_image(const struct radv_device *device,
+                         const struct radv_image *image)

 {
        return image->info.samples > 1 &&
 {
        return image->info.samples > 1 &&

-              image->usage & VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;
+              ((image->usage & VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT) ||
+               (device->instance->debug_flags & RADV_DEBUG_FORCE_COMPRESS));

 }
 
 static inline bool
 }
 
 static inline bool

-radv_use_htile_for_image(const struct radv_image *image)
+radv_use_htile_for_image(const struct radv_device *device,
+                         const struct radv_image *image)

 {
        return image->info.levels == 1 &&
 {
        return image->info.levels == 1 &&

-              image->info.width * image->info.height >= 8 * 8;
+              ((image->info.width * image->info.height >= 8 * 8) ||
+               (device->instance->debug_flags & RADV_DEBUG_FORCE_COMPRESS));

 }
 
 static bool
 }
 
 static bool


@@ -479,7 +487,7 @@ radv_init_surface(struct radv_device *device,
 
        if (is_depth) {
                surface->flags |= RADEON_SURF_ZBUFFER;
 
        if (is_depth) {
                surface->flags |= RADEON_SURF_ZBUFFER;

-               if (!radv_use_htile_for_image(image) ||
+               if (!radv_use_htile_for_image(device, image) ||

                    (device->instance->debug_flags & RADV_DEBUG_NO_HIZ))
                        surface->flags |= RADEON_SURF_NO_HTILE;
                if (radv_use_tc_compat_htile_for_image(device, pCreateInfo, image_format))
                    (device->instance->debug_flags & RADV_DEBUG_NO_HIZ))
                        surface->flags |= RADEON_SURF_NO_HTILE;
                if (radv_use_tc_compat_htile_for_image(device, pCreateInfo, image_format))


@@ -498,7 +506,7 @@ radv_init_surface(struct radv_device *device,
        if (!radv_use_dcc_for_image(device, image, pCreateInfo, image_format))
                surface->flags |= RADEON_SURF_DISABLE_DCC;
 
        if (!radv_use_dcc_for_image(device, image, pCreateInfo, image_format))
                surface->flags |= RADEON_SURF_DISABLE_DCC;
 

-       if (!radv_use_fmask_for_image(image))
+       if (!radv_use_fmask_for_image(device, image))

                surface->flags |= RADEON_SURF_NO_FMASK;
 
        return 0;
                surface->flags |= RADEON_SURF_NO_FMASK;
 
        return 0;


@@ -1230,12 +1238,14 @@ radv_image_override_offset_stride(struct radv_device *device,
 }
 
 static void
 }
 
 static void

-radv_image_alloc_single_sample_cmask(const struct radv_image *image,
+radv_image_alloc_single_sample_cmask(const struct radv_device *device,
+                                     const struct radv_image *image,

                                      struct radeon_surf *surf)
 {
        if (!surf->cmask_size || surf->cmask_offset || surf->bpe > 8 ||
            image->info.levels > 1 || image->info.depth > 1 ||
                                      struct radeon_surf *surf)
 {
        if (!surf->cmask_size || surf->cmask_offset || surf->bpe > 8 ||
            image->info.levels > 1 || image->info.depth > 1 ||

-           radv_image_has_dcc(image) || !radv_image_use_fast_clear_for_image(image))
+           radv_image_has_dcc(image) ||
+           !radv_image_use_fast_clear_for_image(device, image))

                return;
 
        assert(image->info.storage_samples == 1);
                return;
 
        assert(image->info.storage_samples == 1);


@@ -1313,7 +1323,7 @@ radv_image_create_layout(struct radv_device *device,
                device->ws->surface_init(device->ws, &info, &image->planes[plane].surface);
 
                if (!create_info.no_metadata_planes && image->plane_count == 1)
                device->ws->surface_init(device->ws, &info, &image->planes[plane].surface);
 
                if (!create_info.no_metadata_planes && image->plane_count == 1)

-                       radv_image_alloc_single_sample_cmask(image, &image->planes[plane].surface);
+                       radv_image_alloc_single_sample_cmask(device, image, &image->planes[plane].surface);

 
                image->planes[plane].offset = align(image->size, image->planes[plane].surface.alignment);
                image->size = image->planes[plane].offset + image->planes[plane].surface.total_size;
 
                image->planes[plane].offset = align(image->size, image->planes[plane].surface.alignment);
                image->size = image->planes[plane].offset + image->planes[plane].surface.total_size;