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

r600/sfn: Fix readport check

Browse source 
We have to take multi-slot instructions into account, and we don't fail
when there are still possible bank swizzle values to be checked.

For clarity also rename the bank swizzle iterator iterator.

Fixes: 79ca456b48
   r600/sfn: rewrite NIR backend

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20739>
(cherry picked from commit ca5bbff558)
This commit is contained in:
Gert Wollny 2023-01-17 09:03:26 +01:00 • committed by Eric Engestrom
parent ff6a911fd4
commit a31d28210e
2 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -4135,7 +4135,7 @@
"description": "r600/sfn: Fix readport check",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "79ca456b4837b3bc21cf9ef3c03c505c4b4909f6"
},

22
src/gallium/drivers/r600/sfn/sfn_instr_alu.cpp
View file

@ -561,22 +561,24 @@ AluInstr::check_readport_validation(PRegister old_src, PVirtualValue new_src) co
assert(nsrc * m_alu_slots == m_src.size());
for (int s = 0; s < m_alu_slots && success; ++s) {
for (AluBankSwizzle i = alu_vec_012; i != alu_vec_unknown; ++i) {
auto ireg = m_src.begin() + s * nsrc;
PVirtualValue src[3];
auto ireg = m_src.begin() + s * nsrc;
for (unsigned i = 0; i < nsrc; ++i, ++ireg)
src[i] = old_src->equal_to(**ireg) ? new_src : *ireg;
AluBankSwizzle bs = alu_vec_012;
while (bs != alu_vec_unknown) {
AluReadportReservation rpr = rpr_sum;
PVirtualValue s[3];
for (unsigned i = 0; i < nsrc; ++i, ++ireg)
s[i] = old_src->equal_to(**ireg) ? new_src : *ireg;
if (rpr.schedule_vec_src(s, nsrc, i)) {
if (rpr.schedule_vec_src(src, nsrc, bs)) {
rpr_sum = rpr;
break;
} else {
success = false;
}
++bs;
}
if (bs == alu_vec_unknown)
success = false;
}
return success;
}