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

pan/bi: Fix backwards registers ports

Browse Source 
Will matter when packing multiple instructions per bundle.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4505>
This commit is contained in:
Alyssa Rosenzweig
2020-04-08 19:06:27 -04:00
committed by Tomeu Vizoso
parent 23620d1830
commit e34add229f
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/panfrost/bifrost/bi_pack.c
View File

@@ -87,13 +87,13 @@ bi_print_ports(struct bi_registers *regs)
if (regs->write_fma || regs->write_add) { if (regs->write_fma || regs->write_add) {
printf("port 2 (%s): %u\n", printf("port 2 (%s): %u\n",
regs->write_fma ? "FMA" : "ADD", regs->write_add ? "ADD" : "FMA",
regs->port[2]); regs->port[2]);
} }
if ((regs->write_fma && regs->write_add) || regs->read_port3) { if ((regs->write_fma && regs->write_add) || regs->read_port3) {
printf("port 3 (%s): %u\n", printf("port 3 (%s): %u\n",
regs->read_port3 ? "read" : "ADD", regs->read_port3 ? "read" : "FMA",
regs->port[3]); regs->port[3]);
} }
} }
@@ -274,15 +274,15 @@ bi_assign_ports(bi_bundle now, bi_bundle prev)
/* Next, assign writes */ /* Next, assign writes */
if (prev.fma && prev.fma->dest & BIR_INDEX_REGISTER) { if (prev.add && prev.add->dest & BIR_INDEX_REGISTER && !write_dreg) {
regs.port[2] = prev.fma->dest & ~BIR_INDEX_REGISTER; regs.port[2] = prev.add->dest & ~BIR_INDEX_REGISTER;
regs.write_fma = true; regs.write_add = true;
} }
if (prev.add && prev.add->dest & BIR_INDEX_REGISTER && !write_dreg) { if (prev.fma && prev.fma->dest & BIR_INDEX_REGISTER) {
unsigned r = prev.add->dest & ~BIR_INDEX_REGISTER; unsigned r = prev.fma->dest & ~BIR_INDEX_REGISTER;
if (regs.write_fma) { if (regs.write_add) {
/* Scheduler constraint: cannot read 3 and write 2 */ /* Scheduler constraint: cannot read 3 and write 2 */
assert(!regs.read_port3); assert(!regs.read_port3);
regs.port[3] = r; regs.port[3] = r;
@@ -290,7 +290,7 @@ bi_assign_ports(bi_bundle now, bi_bundle prev)
regs.port[2] = r; regs.port[2] = r;
} }
regs.write_add = true; regs.write_fma = true;
} }
/* Finally, ensure port 1 > port 0 for the 63-x trick to function */ /* Finally, ensure port 1 > port 0 for the 63-x trick to function */