KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aco: fix sub-dword opsel/sdwa checks 

These should all check if the operand has a regclass. The opsel check
should also be skipped post-RA.

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5504>
This commit is contained in:
Rhys Perry 2020-06-16 19:13:34 +01:00 committed by Marge Bot
parent 1e791e51a6
commit de7c6950b3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/amd/compiler/aco_validate.cpp
View File

@ -148,7 +148,7 @@ void validate(Program* program, FILE * output)
}
for (unsigned i = 0; i < MIN2(instr->operands.size(), 2); i++) {
if (instr->operands[i].regClass().is_subdword())
if (instr->operands[i].hasRegClass() && instr->operands[i].regClass().is_subdword())
check((sdwa->sel[i] & sdwa_asuint) == (sdwa_isra | instr->operands[i].bytes()), "Unexpected SDWA sel for sub-dword operand", instr.get());
}
if (instr->definitions[0].regClass().is_subdword())
@ -162,10 +162,10 @@ void validate(Program* program, FILE * output)
check((vop3->opsel & ~(0x10 | ((1 << instr->operands.size()) - 1))) == 0, "Unused bits in opsel must be zeroed out", instr.get());
for (unsigned i = 0; i < instr->operands.size(); i++) {
if (instr->operands[i].regClass().is_subdword())
if (instr->operands[i].hasRegClass() && instr->operands[i].regClass().is_subdword() && !instr->operands[i].isFixed())
check((vop3->opsel & (1 << i)) == 0, "Unexpected opsel for sub-dword operand", instr.get());
}
if (instr->definitions[0].regClass().is_subdword())
if (instr->definitions[0].regClass().is_subdword() && !instr->definitions[0].isFixed())
check((vop3->opsel & (1 << 3)) == 0, "Unexpected opsel for sub-dword definition", instr.get());
}