AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

broadcom/compiler: move code block around

Browse Source 
These checks depend on prev_inst being set, so move them down below
with all the other checks with the same requirement.

Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9471>
This commit is contained in:
Iago Toral Quiroga
2021-03-09 09:19:45 +01:00
committed by Marge Bot
parent 8bcda472a0
commit d37241bdc4
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/broadcom/compiler/qpu_schedule.c
+16 -15
View File
@@ -903,21 +903,6 @@ choose_instruction_to_schedule(struct v3d_compile *c,
const struct v3d_qpu_instr *inst = &n->inst->qpu;
/* Simulator complains if we have two uniforms loaded in the
* the same instruction, which could happen if we have a ldunif
* or sideband uniform and we pair that with ldunifa.
*/
if (prev_inst) {
if (vir_has_uniform(prev_inst->inst) &&
(inst->sig.ldunifa || inst->sig.ldunifarf)) {
continue;
}
if ((prev_inst->inst->qpu.sig.ldunifa ||
prev_inst->inst->qpu.sig.ldunifarf) &&
vir_has_uniform(n->inst)) {
continue;
}
}
/* Don't choose the branch instruction until it's the last one
* left. We'll move it up to fit its delay slots after we
@@ -977,6 +962,22 @@ choose_instruction_to_schedule(struct v3d_compile *c,
n->inst->uniform != -1)
continue;
/* Simulator complains if we have two uniforms loaded in
* the the same instruction, which could happen if we
* have a ldunif or sideband uniform and we pair that
* with ldunifa.
*/
if (vir_has_uniform(prev_inst->inst) &&
(inst->sig.ldunifa || inst->sig.ldunifarf)) {
continue;
}
if ((prev_inst->inst->qpu.sig.ldunifa ||
prev_inst->inst->qpu.sig.ldunifarf) &&
vir_has_uniform(n->inst)) {
continue;
}
/* Don't merge in something that will lock the TLB.
* Hopwefully what we have in inst will release some
* other instructions, allowing us to delay the