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

radv: fix configuring the memory violation exception for the compute stage

Browse Source 
The compute stage has two EXCP_EN fields and the memory violation bit
is in EXCP_EN_MSB. Confirmed by writing a small test on GFX8.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31902>
This commit is contained in:
Samuel Pitoiset
2024-10-30 12:24:52 +01:00
committed by Marge Bot
parent e474d4ebee
commit 6b5a0f57ba
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/amd/vulkan/radv_shader.c
View File

@@ -1939,7 +1939,7 @@ radv_postprocess_binary_config(struct radv_device *device, struct radv_shader_bi
assert((pdev->info.gfx_level >= GFX10 && num_shared_vgprs % 8 == 0) || assert((pdev->info.gfx_level >= GFX10 && num_shared_vgprs % 8 == 0) ||
(pdev->info.gfx_level < GFX10 && num_shared_vgprs == 0)); (pdev->info.gfx_level < GFX10 && num_shared_vgprs == 0));
unsigned num_shared_vgpr_blocks = num_shared_vgprs / 8; unsigned num_shared_vgpr_blocks = num_shared_vgprs / 8;
unsigned excp_en = 0; unsigned excp_en = 0, excp_en_msb = 0;
config->num_vgprs = num_vgprs; config->num_vgprs = num_vgprs;
config->num_sgprs = num_sgprs; config->num_sgprs = num_sgprs;
@@ -1952,7 +1952,8 @@ radv_postprocess_binary_config(struct radv_device *device, struct radv_shader_bi
/* Configure the shader exceptions like memory violation, etc. /* Configure the shader exceptions like memory violation, etc.
* TODO: Enable (and validate) more exceptions. * TODO: Enable (and validate) more exceptions.
*/ */
excp_en = 1 << 8; /* mem_viol */ excp_en = 1 << 8; /* mem_viol for the graphics stages */
excp_en_msb = 1 << 1; /* mem_viol for the compute stage */
} }
if (!pdev->use_ngg_streamout) { if (!pdev->use_ngg_streamout) {
@@ -2097,7 +2098,7 @@ radv_postprocess_binary_config(struct radv_device *device, struct radv_shader_bi
: info->cs.uses_thread_id[1] ? 1 : info->cs.uses_thread_id[1] ? 1
: 0) | : 0) |
S_00B84C_TG_SIZE_EN(info->cs.uses_local_invocation_idx) | S_00B84C_LDS_SIZE(config->lds_size) | S_00B84C_TG_SIZE_EN(info->cs.uses_local_invocation_idx) | S_00B84C_LDS_SIZE(config->lds_size) |
S_00B84C_EXCP_EN(excp_en); S_00B84C_EXCP_EN(excp_en) | S_00B84C_EXCP_EN_MSB(excp_en_msb);
config->rsrc3 |= S_00B8A0_SHARED_VGPR_CNT(num_shared_vgpr_blocks); config->rsrc3 |= S_00B8A0_SHARED_VGPR_CNT(num_shared_vgpr_blocks);
break; break;