OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radv: Add forcecompress debug flag.

Browse Source 
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>
This commit is contained in:
Bas Nieuwenhuizen
2020-08-10 00:10:38 +02:00
committed by Marge Bot
parent a777b25350
commit 2fa83dc64d
4 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/envvars.rst
View File

@@ -527,6 +527,9 @@ RADV driver environment variables
validate the LLVM IR before LLVM compiles the shader validate the LLVM IR before LLVM compiles the shader
``errors`` ``errors``
display more info about 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`` ``info``
show GPU-related information show GPU-related information
``metashaders`` ``metashaders``

1
src/amd/vulkan/radv_debug.h
View File

@@ -56,6 +56,7 @@ enum {
RADV_DEBUG_NO_MEMORY_CACHE = 1 << 25, RADV_DEBUG_NO_MEMORY_CACHE = 1 << 25,
RADV_DEBUG_DISCARD_TO_DEMOTE = 1 << 26, RADV_DEBUG_DISCARD_TO_DEMOTE = 1 << 26,
RADV_DEBUG_LLVM = 1 << 27, RADV_DEBUG_LLVM = 1 << 27,
RADV_DEBUG_FORCE_COMPRESS = 1 << 28,
}; };
enum { enum {

1
src/amd/vulkan/radv_device.c
View File

@@ -523,6 +523,7 @@ static const struct debug_control radv_debug_options[] = {
{"metashaders", RADV_DEBUG_DUMP_META_SHADERS}, {"metashaders", RADV_DEBUG_DUMP_META_SHADERS},
{"nomemorycache", RADV_DEBUG_NO_MEMORY_CACHE}, {"nomemorycache", RADV_DEBUG_NO_MEMORY_CACHE},
{"llvm", RADV_DEBUG_LLVM}, {"llvm", RADV_DEBUG_LLVM},
{"forcecompress", RADV_DEBUG_FORCE_COMPRESS},
{NULL, 0} {NULL, 0}
}; };

32
src/amd/vulkan/radv_image.c
View File

@@ -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 && if (image->info.samples <= 1 &&
image->info.width * image->info.height <= 512 * 512) { image->info.width * image->info.height <= 512 * 512) {
/* Do not enable CMASK or DCC for small surfaces where the cost /* 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) vk_format_get_plane_count(format) > 1)
return false; return false;
if (!radv_image_use_fast_clear_for_image(image)) if (!radv_image_use_fast_clear_for_image(device, image))
return false; return false;
/* TODO: Enable DCC for mipmaps on GFX9+. */ /* 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) { if (is_depth) {
surface->flags |= RADEON_SURF_ZBUFFER; 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)) (device->instance->debug_flags & RADV_DEBUG_NO_HIZ))
surface->flags |= RADEON_SURF_NO_HTILE; surface->flags |= RADEON_SURF_NO_HTILE;
if (radv_use_tc_compat_htile_for_image(device, pCreateInfo, image_format)) 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)) if (!radv_use_dcc_for_image(device, image, pCreateInfo, image_format))
surface->flags |= RADEON_SURF_DISABLE_DCC; 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; surface->flags |= RADEON_SURF_NO_FMASK;
return 0; 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) struct radeon_surf *surf)
{ {
if (!surf->cmask_size || surf->cmask_offset || surf->bpe > 8 || if (!surf->cmask_size || surf->cmask_offset || surf->bpe > 8 ||
image->info.levels > 1 || image->info.depth > 1 || 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; return;
assert(image->info.storage_samples == 1); 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); device->ws->surface_init(device->ws, &info, &image->planes[plane].surface);
if (!create_info.no_metadata_planes && image->plane_count == 1) 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->planes[plane].offset = align(image->size, image->planes[plane].surface.alignment);
image->size = image->planes[plane].offset + image->planes[plane].surface.total_size; image->size = image->planes[plane].offset + image->planes[plane].surface.total_size;