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

ir3: fix predicate splitting in scheduler

Browse Source 
Fix up src->def->instr, not src->instr.

Cc: mesa-stable
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/7014
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18096>
(cherry picked from commit b1cb764316)
This commit is contained in:
Chia-I Wu
2022-08-16 15:10:23 -07:00
committed by Dylan Baker
parent 0e9cbac188
commit 6a936dc090
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.pick_status.json
View File

@@ -9751,7 +9751,7 @@
"description": "ir3: fix predicate splitting in scheduler", "description": "ir3: fix predicate splitting in scheduler",
"nominated": true, "nominated": true,
"nomination_type": 0, "nomination_type": 0,
"resolution": 0, "resolution": 1,
"main_sha": null, "main_sha": null,
"because_sha": null "because_sha": null
}, },

4
src/freedreno/ir3/ir3.h
View File

@@ -196,8 +196,8 @@ struct ir3_register {
} array; } array;
}; };
/* For IR3_REG_DEST, pointer back to the instruction containing this /* For IR3_REG_SSA, dst registers contain pointer back to the instruction
* register. * containing this register.
*/ */
struct ir3_instruction *instr; struct ir3_instruction *instr;

2
src/freedreno/ir3/ir3_sched.c
View File

@@ -992,7 +992,7 @@ split_pred(struct ir3_sched_ctx *ctx)
/* original pred is scheduled, but new one isn't: */ /* original pred is scheduled, but new one isn't: */
new_pred->flags &= ~IR3_INSTR_MARK; new_pred->flags &= ~IR3_INSTR_MARK;
} }
predicated->srcs[0]->instr = new_pred; predicated->srcs[0]->def->instr = new_pred;
/* don't need to remove old dag edge since old pred is /* don't need to remove old dag edge since old pred is
* already scheduled: * already scheduled:
*/ */