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

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>
This commit is contained in:
Gert Wollny
2023-01-17 09:03:26 +01:00
committed by Marge Bot
parent 42d51ef2bb
commit ca5bbff558
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -587,22 +587,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;
}