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

aco: fix validation error from vgpr spill/restore code

Browse Source 
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:04 +01:00
committed by Marge Bot
parent d37deebde5
commit 1e791e51a6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/amd/compiler/aco_spill.cpp
View File

@@ -1573,7 +1573,7 @@ void assign_spill_slots(spill_ctx& ctx, unsigned spills_to_vgpr) {
for (unsigned i = 0; i < temp.size(); i++) for (unsigned i = 0; i < temp.size(); i++)
bld.mubuf(opcode, scratch_rsrc, Operand(), scratch_offset, split->definitions[i].getTemp(), offset + i * 4, false); bld.mubuf(opcode, scratch_rsrc, Operand(), scratch_offset, split->definitions[i].getTemp(), offset + i * 4, false);
} else { } else {
bld.mubuf(opcode, scratch_rsrc, Operand(), scratch_offset, temp, offset, false); bld.mubuf(opcode, scratch_rsrc, Operand(v1), scratch_offset, temp, offset, false);
} }
} else if (sgpr_slot.find(spill_id) != sgpr_slot.end()) { } else if (sgpr_slot.find(spill_id) != sgpr_slot.end()) {
ctx.program->config->spilled_sgprs += (*it)->operands[0].size(); ctx.program->config->spilled_sgprs += (*it)->operands[0].size();
@@ -1641,7 +1641,7 @@ void assign_spill_slots(spill_ctx& ctx, unsigned spills_to_vgpr) {
} }
bld.insert(vec); bld.insert(vec);
} else { } else {
bld.mubuf(opcode, def, scratch_rsrc, Operand(), scratch_offset, offset, false); bld.mubuf(opcode, def, scratch_rsrc, Operand(v1), scratch_offset, offset, false);
} }
} else if (sgpr_slot.find(spill_id) != sgpr_slot.end()) { } else if (sgpr_slot.find(spill_id) != sgpr_slot.end()) {
uint32_t spill_slot = sgpr_slot[spill_id]; uint32_t spill_slot = sgpr_slot[spill_id];