From f4d861696dfb11dc2b6242a683a13238981f705f Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Thu, 27 Aug 2020 14:37:11 +0200 Subject: [PATCH] radv: set BIG_PAGE to improve performance on GFX10.3 It reduces traffic between CB, DB and TCP blocks if buffers respect a certain alignment. Signed-off-by: Samuel Pitoiset Reviewed-by: Bas Nieuwenhuizen Part-of: --- src/amd/vulkan/radv_cmd_buffer.c | 18 ++++++++++++++++-- src/amd/vulkan/radv_image.c | 4 +++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index f6c053cb0ad..873549677c5 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -1747,6 +1747,9 @@ radv_emit_fb_ds_state(struct radv_cmd_buffer *cmd_buffer, meta_read_policy = V_02807C_CACHE_NOA_RD; /* don't cache reads */ } + bool zs_big_page = cmd_buffer->device->physical_device->rad_info.chip_class >= GFX10_3 && + (image->alignment % (64 * 1024) == 0); + radeon_set_context_reg(cmd_buffer->cs, R_028014_DB_HTILE_DATA_BASE, ds->db_htile_data_base); radeon_set_context_reg(cmd_buffer->cs, R_02801C_DB_DEPTH_SIZE_XY, ds->db_depth_size); @@ -1772,7 +1775,9 @@ radv_emit_fb_ds_state(struct radv_cmd_buffer *cmd_buffer, S_02807C_ZPCPSD_WR_POLICY(V_02807C_CACHE_STREAM_WR) | S_02807C_Z_RD_POLICY(V_02807C_CACHE_NOA_RD) | S_02807C_S_RD_POLICY(V_02807C_CACHE_NOA_RD) | - S_02807C_HTILE_RD_POLICY(meta_read_policy)); + S_02807C_HTILE_RD_POLICY(meta_read_policy) | + S_02807C_Z_BIG_PAGE(zs_big_page) | + S_02807C_S_BIG_PAGE(zs_big_page)); } else if (cmd_buffer->device->physical_device->rad_info.chip_class == GFX9) { radeon_set_context_reg_seq(cmd_buffer->cs, R_028014_DB_HTILE_DATA_BASE, 3); radeon_emit(cmd_buffer->cs, ds->db_htile_data_base); @@ -2247,6 +2252,7 @@ radv_emit_framebuffer_state(struct radv_cmd_buffer *cmd_buffer) int i; struct radv_framebuffer *framebuffer = cmd_buffer->state.framebuffer; const struct radv_subpass *subpass = cmd_buffer->state.subpass; + bool color_big_page = true; /* this may happen for inherited secondary recording */ if (!framebuffer) @@ -2271,6 +2277,12 @@ radv_emit_framebuffer_state(struct radv_cmd_buffer *cmd_buffer) radv_emit_fb_color_state(cmd_buffer, i, &cmd_buffer->state.attachments[idx].cb, iview, layout, in_render_loop); radv_load_color_clear_metadata(cmd_buffer, iview, i); + + /* BIG_PAGE is an optimization that can only be enabled if all + * color targets are compatible. + */ + color_big_page &= cmd_buffer->device->physical_device->rad_info.chip_class >= GFX10_3 && + (iview->image->alignment % (64 * 1024) == 0); } if (subpass->depth_stencil_attachment) { @@ -2333,7 +2345,9 @@ radv_emit_framebuffer_state(struct radv_cmd_buffer *cmd_buffer) S_028410_CMASK_RD_POLICY(meta_read_policy) | S_028410_FMASK_RD_POLICY(meta_read_policy) | S_028410_DCC_RD_POLICY(meta_read_policy) | - S_028410_COLOR_RD_POLICY(V_028410_CACHE_NOA_RD)); + S_028410_COLOR_RD_POLICY(V_028410_CACHE_NOA_RD) | + S_028410_FMASK_BIG_PAGE(color_big_page) | + S_028410_COLOR_BIG_PAGE(color_big_page)); } if (cmd_buffer->device->dfsm_allowed) { diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c index f4ef4fab778..a6f64009e7c 100644 --- a/src/amd/vulkan/radv_image.c +++ b/src/amd/vulkan/radv_image.c @@ -842,7 +842,9 @@ gfx10_make_texture_descriptor(struct radv_device *device, S_00A014_MAX_MIP(image->info.samples > 1 ? util_logbase2(image->info.samples) : image->info.levels - 1) | - S_00A014_PERF_MOD(4); + S_00A014_PERF_MOD(4) | + S_00A014_BIG_PAGE(device->physical_device->rad_info.chip_class >= GFX10_3 && + image->alignment % (64 * 1024) == 0); state[6] = 0; state[7] = 0; -- 2.30.2