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

aco: fix emitting literal offsets with SMEM on GFX7

Browse Source 
When the offset is negative, reg() isn't 255. Fix this by splitting
SGPR and literal emission. While we are at it, adjust a comment
saying that literals are also accepted on GFX6 which is wrong.

Fixes another batch of robustness tests.

Cc: 21.1 mesa-stable
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11247>
This commit is contained in:
Samuel Pitoiset
2021-06-08 18:06:46 +02:00
committed by Marge Bot
parent 6c6674d72c
commit d169dad393
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/amd/compiler/aco_assembler.cpp
+4 -2
View File
@@ -173,15 +173,17 @@ void emit_instruction(asm_context& ctx, std::vector<uint32_t>& out, Instruction*
encoding |= instr->definitions.size() ? instr->definitions[0].physReg() << 15 : 0;
encoding |= instr->operands.size() ? (instr->operands[0].physReg() >> 1) << 9 : 0;
if (instr->operands.size() >= 2) {
if (!instr->operands[1].isConstant() || instr->operands[1].constantValue() >= 1024) {
if (!instr->operands[1].isConstant()) {
encoding |= instr->operands[1].physReg().reg();
} else if (instr->operands[1].constantValue() >= 1024) {
encoding |= 255; /* SQ_SRC_LITERAL */
} else {
encoding |= instr->operands[1].constantValue() >> 2;
encoding |= 1 << 8;
}
}
out.push_back(encoding);
/* SMRD instructions can take a literal on GFX6 & GFX7 */
/* SMRD instructions can take a literal on GFX7 */
if (instr->operands.size() >= 2 && instr->operands[1].isConstant() && instr->operands[1].constantValue() >= 1024)
out.push_back(instr->operands[1].constantValue() >> 2);
return;