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

aco: fix emitting SMEM instructions with no operands on GFX6-GFX7

Browse Source 
Like s_memtime.

Fixes dEQP-VK.glsl.shader_clock.* on GFX6.

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