fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 00:38:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

vc4: Fix running process_mux_deps on irrelevant type of instructions

Browse source 
Only ALU and ALU Small Imm instructions have input mux.

Signed-off-by: Qiu Wenbo <qiuwenbo@kylinos.com.cn>
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
cc: mesa-stable

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20581>
(cherry picked from commit ee32f3873c)
This commit is contained in:
Qiu Wenbo 2023-01-09 17:19:00 +08:00 • committed by Eric Engestrom
parent 09676cf5e8
commit 888bb9c380
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -1201,7 +1201,7 @@
"description": "vc4: Fix running process_mux_deps on irrelevant type of instructions",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null
},

16
src/gallium/drivers/vc4/vc4_qpu_schedule.c
View file

@ -344,13 +344,15 @@ calculate_deps(struct schedule_state *state, struct schedule_node *n)
process_raddr_deps(state, n, raddr_b, false);
}
if (add_op != QPU_A_NOP) {
process_mux_deps(state, n, add_a);
process_mux_deps(state, n, add_b);
}
if (mul_op != QPU_M_NOP) {
process_mux_deps(state, n, mul_a);
process_mux_deps(state, n, mul_b);
if (sig != QPU_SIG_LOAD_IMM && sig != QPU_SIG_BRANCH) {
if (add_op != QPU_A_NOP) {
process_mux_deps(state, n, add_a);
process_mux_deps(state, n, add_b);
}
if (mul_op != QPU_M_NOP) {
process_mux_deps(state, n, mul_a);
process_mux_deps(state, n, mul_b);
}
}
process_waddr_deps(state, n, waddr_add, true);