fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-21 11:30:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ac/surface/tests: cosmetic changes

Browse source 
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26055>
This commit is contained in:
Marek Olšák 2023-10-23 22:14:36 -04:00
parent dfcc7f83a4
commit 44eaf50a34
1 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/amd/common/ac_surface_modifier_test.c
View file

@ -66,7 +66,7 @@ block_count(unsigned w, unsigned h, unsigned elem_bits, unsigned block_bits,
static ADDR2_COMPUTE_DCC_ADDRFROMCOORD_INPUT static ADDR2_COMPUTE_DCC_ADDRFROMCOORD_INPUT
get_addr_from_coord_base(ADDR_HANDLE addrlib, const struct radeon_surf *surf, gfx9_get_addr_from_coord_base(ADDR_HANDLE addrlib, const struct radeon_surf *surf,
unsigned w, unsigned h, enum pipe_format format, unsigned w, unsigned h, enum pipe_format format,
bool rb_aligned, bool pipe_aligned) bool rb_aligned, bool pipe_aligned)
{ {
@ -111,8 +111,7 @@ get_addr_from_coord_base(ADDR_HANDLE addrlib, const struct radeon_surf *surf,
return dcc_input; return dcc_input;
} }
static static void gfx9_generate_hash(struct ac_addrlib *ac_addrlib,
void generate_hash(struct ac_addrlib *ac_addrlib,
struct test_entry *entry, struct test_entry *entry,
const struct radeon_surf *surf) const struct radeon_surf *surf)
{ {
@ -143,7 +142,7 @@ void generate_hash(struct ac_addrlib *ac_addrlib,
ADDR2_COMPUTE_DCC_ADDRFROMCOORD_INPUT dcc_input = {0}; ADDR2_COMPUTE_DCC_ADDRFROMCOORD_INPUT dcc_input = {0};
if (surf->meta_offset) { if (surf->meta_offset) {
dcc_input = get_addr_from_coord_base(addrlib, surf, entry->w, dcc_input = gfx9_get_addr_from_coord_base(addrlib, surf, entry->w,
entry->h, entry->format, entry->h, entry->format,
surf->u.gfx9.color.dcc.rb_aligned, surf->u.gfx9.color.dcc.rb_aligned,
surf->u.gfx9.color.dcc.pipe_aligned); surf->u.gfx9.color.dcc.pipe_aligned);
@ -151,7 +150,7 @@ void generate_hash(struct ac_addrlib *ac_addrlib,
ADDR2_COMPUTE_DCC_ADDRFROMCOORD_INPUT display_dcc_input = {0}; ADDR2_COMPUTE_DCC_ADDRFROMCOORD_INPUT display_dcc_input = {0};
if (surf->display_dcc_offset) { if (surf->display_dcc_offset) {
display_dcc_input = get_addr_from_coord_base(addrlib, surf, entry->w, display_dcc_input = gfx9_get_addr_from_coord_base(addrlib, surf, entry->w,
entry->h, entry->format, entry->h, entry->format,
false, false); false, false);
} }
@ -258,20 +257,22 @@ static void test_modifier(const struct radeon_info *info,
assert(surf.cmask_offset == 0); assert(surf.cmask_offset == 0);
assert(surf.fmask_offset == 0); assert(surf.fmask_offset == 0);
unsigned block_size_bits = surf.u.gfx9.swizzle_mode >= ADDR_SW_256KB_Z_X ? 18 : 16;
uint64_t surf_size; uint64_t surf_size;
unsigned aligned_pitch, aligned_height; unsigned aligned_pitch, aligned_height;
if (modifier != DRM_FORMAT_MOD_LINEAR) { if (modifier != DRM_FORMAT_MOD_LINEAR) {
unsigned block_size_bits =
block_size_bits = surf.u.gfx9.swizzle_mode >= ADDR_SW_256KB_Z_X ? 18 : 16;
surf_size = block_count(dims[i][0], dims[i][1], surf_size = block_count(dims[i][0], dims[i][1],
elem_bits, block_size_bits, &aligned_pitch, elem_bits, block_size_bits, &aligned_pitch,
&aligned_height) << block_size_bits; &aligned_height) << block_size_bits;
} else { } else {
aligned_pitch = align(dims[i][0], 256 / util_format_get_blocksize(format)); unsigned alignment = 256;
aligned_height = dims[i][1];
surf_size = align(dims[i][0] * util_format_get_blocksize(format), 256) * dims[i][1];
}
aligned_pitch = align(dims[i][0], alignment / util_format_get_blocksize(format));
aligned_height = dims[i][1];
surf_size = align(dims[i][0] * util_format_get_blocksize(format), alignment) * dims[i][1];
}
assert(surf.u.gfx9.surf_pitch == aligned_pitch); assert(surf.u.gfx9.surf_pitch == aligned_pitch);
assert(surf.u.gfx9.surf_height == aligned_height); assert(surf.u.gfx9.surf_height == aligned_height);
@ -331,10 +332,9 @@ static void test_modifier(const struct radeon_info *info,
assert(surf.total_size == expected_offset); assert(surf.total_size == expected_offset);
generate_hash(addrlib, &entry, &surf); gfx9_generate_hash(addrlib, &entry, &surf);
*(struct test_entry*)u_vector_add(test_entries) = entry; *(struct test_entry*)u_vector_add(test_entries) = entry;
} }
} }
static void run_modifier_test(struct u_vector *test_entries, const char *name, static void run_modifier_test(struct u_vector *test_entries, const char *name,
@ -390,7 +390,7 @@ static bool test_entry_value_equal(const struct test_entry *a, const struct test
static void print_test_entry(const struct test_entry *e) static void print_test_entry(const struct test_entry *e)
{ {
printf("%.16" PRIx64 " %.4d %.4d %.2d %s %d %d %d %d\n", e->modifier, e->w, e->h, fprintf(stderr, "%.16" PRIx64 " %.4d %.4d %.2d %s %d %d %d %d\n", e->modifier, e->w, e->h,
util_format_get_blocksize(e->format), e->name, e->pipes, e->rb, e->se, e->banks_or_pkrs); util_format_get_blocksize(e->format), e->name, e->pipes, e->rb, e->se, e->banks_or_pkrs);
} }