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

broadcom/compiler: validate rtop + thrsw hazard

Browse Source 
Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29909>
This commit is contained in:
Iago Toral Quiroga
2024-06-26 12:23:39 +02:00
committed by Marge Bot
parent d1f8351f3c
commit 0a7a36372f
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/broadcom/compiler/qpu_validate.c
View File

@@ -52,6 +52,9 @@ struct v3d_qpu_validate_state {
bool thrend_found; bool thrend_found;
int thrsw_count; int thrsw_count;
bool rtop_hazard;
bool rtop_valid;
}; };
static void static void
@@ -130,6 +133,16 @@ qpu_validate_inst(struct v3d_qpu_validate_state *state, struct qinst *qinst)
if (inst->type != V3D_QPU_INSTR_TYPE_ALU) if (inst->type != V3D_QPU_INSTR_TYPE_ALU)
return; return;
if (inst->alu.mul.op == V3D_QPU_M_MULTOP)
state->rtop_valid = true;
if (inst->alu.mul.op == V3D_QPU_M_UMUL24) {
if (state->rtop_hazard)
fail_instr(state, "UMUL24 reads rtop from MULTOP but it got cleared by a previous THRSW");
state->rtop_valid = false;
state->rtop_hazard = false;
}
if (inst->alu.add.op == V3D_QPU_A_SETMSF && if (inst->alu.add.op == V3D_QPU_A_SETMSF &&
state->first_tlb_z_write >= 0 && state->first_tlb_z_write >= 0 &&
state->ip > state->first_tlb_z_write) { state->ip > state->first_tlb_z_write) {
@@ -366,6 +379,11 @@ qpu_validate_inst(struct v3d_qpu_validate_state *state, struct qinst *qinst)
fail_instr(state, "TMUWT in last instruction"); fail_instr(state, "TMUWT in last instruction");
} }
if (state->rtop_valid && state->ip == state->last_thrsw_ip + 2) {
state->rtop_hazard = true;
state->rtop_valid = false;
}
if (inst->type == V3D_QPU_INSTR_TYPE_BRANCH) { if (inst->type == V3D_QPU_INSTR_TYPE_BRANCH) {
if (in_branch_delay_slots(state)) if (in_branch_delay_slots(state))
fail_instr(state, "branch in a branch delay slot."); fail_instr(state, "branch in a branch delay slot.");
@@ -410,6 +428,8 @@ qpu_validate(struct v3d_compile *c)
.ip = 0, .ip = 0,
.last_thrsw_found = !c->last_thrsw, .last_thrsw_found = !c->last_thrsw,
.rtop_hazard = false,
.rtop_valid = false,
}; };
vir_for_each_block(block, c) { vir_for_each_block(block, c) {