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

radeonsi/sqtt: rework pm4.reg_va_low_idx

Browse Source 
The initial logic was to remember the place were SPI_SHADER_PGM_LO_*
are written, then assume that we can get the register offset because
the sequence would always be:

   PKT3_SET_SH_REG
   SPI_SHADER_PGM_LO_* register offset
   VA low 32 bits value <- reg_va_low_idx

The problem is that this sequence isn't guaranteed, for instance we
can get this instead:

   0   c0067600 |
   1   00000046 |
   2   003ffffd | SPI_SHADER_PGM_RSRC3_VS
   3   00000020 | SPI_SHADER_LATE_ALLOC_VS
   4 * 00002080 | SPI_SHADER_PGM_LO_VS
   5   00000080 | SPI_SHADER_PGM_HI_VS

So the assert in si_state_draw.cpp would fail as well as the VA
update logic.

So instead remember which the SPI_SHADER_PGM_LO_* offset, and the low
32 bits of the VA in si_update_shaders.

Fixes: 8034a71430 ("radeonsi/sqtt: re-export shaders in a single bo")
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26774>
(cherry picked from commit b55a2065e0)
This commit is contained in:
Pierre-Eric Pelloux-Prayer
2023-11-07 16:05:52 +01:00
committed by Eric Engestrom
parent 4425ef5653
commit fab56a0d03
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.pick_status.json
View File

@@ -184,7 +184,7 @@
"description": "radeonsi/sqtt: rework pm4.reg_va_low_idx", "description": "radeonsi/sqtt: rework pm4.reg_va_low_idx",
"nominated": true, "nominated": true,
"nomination_type": 1, "nomination_type": 1,
"resolution": 0, "resolution": 1,
"main_sha": null, "main_sha": null,
"because_sha": "8034a71430be0b6473449028d90937729b77d6d9", "because_sha": "8034a71430be0b6473449028d90937729b77d6d9",
"notes": null "notes": null

5
src/gallium/drivers/radeonsi/si_pm4.c
View File

@@ -135,7 +135,7 @@ void si_pm4_finalize(struct si_pm4_state *state)
if (strstr(ac_get_register_name(state->screen->info.gfx_level, if (strstr(ac_get_register_name(state->screen->info.gfx_level,
state->screen->info.family, reg_offset), state->screen->info.family, reg_offset),
"SPI_SHADER_PGM_LO_")) { "SPI_SHADER_PGM_LO_")) {
state->reg_va_low_idx = get_packed_reg_valueN_idx(state, i); state->spi_shader_pgm_lo_reg = reg_offset;
break; break;
} }
} }
@@ -162,7 +162,8 @@ void si_pm4_finalize(struct si_pm4_state *state)
if (strstr(ac_get_register_name(state->screen->info.gfx_level, if (strstr(ac_get_register_name(state->screen->info.gfx_level,
state->screen->info.family, reg_base_offset + i * 4), state->screen->info.family, reg_base_offset + i * 4),
"SPI_SHADER_PGM_LO_")) { "SPI_SHADER_PGM_LO_")) {
state->reg_va_low_idx = state->last_pm4 + 2 + i; state->spi_shader_pgm_lo_reg = reg_base_offset + i * 4;
break; break;
} }
} }

2
src/gallium/drivers/radeonsi/si_pm4.h
View File

@@ -45,7 +45,7 @@ struct si_pm4_state {
uint16_t max_dw; uint16_t max_dw;
/* Used by SQTT to override the shader address */ /* Used by SQTT to override the shader address */
uint16_t reg_va_low_idx; uint32_t spi_shader_pgm_lo_reg;
/* This must be the last field because the array can continue after the structure. */ /* This must be the last field because the array can continue after the structure. */
uint32_t pm4[64]; uint32_t pm4[64];

5
src/gallium/drivers/radeonsi/si_state_draw.cpp
View File

@@ -370,9 +370,8 @@ static bool si_update_shaders(struct si_context *sctx)
struct si_pm4_state *pm4 = &shader->pm4; struct si_pm4_state *pm4 = &shader->pm4;
uint32_t va_low = (pipeline->bo->gpu_address + pipeline->offset[i]) >> 8; uint64_t va_low = (pipeline->bo->gpu_address + pipeline->offset[i]) >> 8;
assert(PKT3_IT_OPCODE_G(pm4->pm4[pm4->reg_va_low_idx - 2]) == PKT3_SET_SH_REG); uint32_t reg = pm4->spi_shader_pgm_lo_reg;
uint32_t reg = (pm4->pm4[pm4->reg_va_low_idx - 1] << 2) + SI_SH_REG_OFFSET;
si_pm4_set_reg(&pipeline->pm4, reg, va_low); si_pm4_set_reg(&pipeline->pm4, reg, va_low);
} }
} }

2
src/gallium/drivers/radeonsi/si_state_shaders.cpp
View File

@@ -1983,7 +1983,7 @@ static void si_shader_init_pm4_state(struct si_screen *sscreen, struct si_shader
assert(0); assert(0);
} }
assert(!(sscreen->debug_flags & DBG(SQTT)) || shader->pm4.reg_va_low_idx != 0); assert(!(sscreen->debug_flags & DBG(SQTT)) || shader->pm4.spi_shader_pgm_lo_reg != 0);
} }
static void si_clear_vs_key_inputs(struct si_context *sctx, union si_shader_key *key, static void si_clear_vs_key_inputs(struct si_context *sctx, union si_shader_key *key,