fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-14 14:28:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

aco/ra: use get_reg_specified() for p_extract_vector

Browse source 
On GFX6/7, it might violate validation rules, otherwise.

Fixes: 51f4b22fee ('aco: don't allow unaligned subdword accesses on GFX6/7')
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8047>
(cherry picked from commit fd49ba59a3)
This commit is contained in:
Daniel Schürmann 2020-12-11 09:23:04 +01:00 • committed by Dylan Baker
parent 07562fcf66
commit 69dd154c27
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -40,7 +40,7 @@
"description": "aco/ra: use get_reg_specified() for p_extract_vector", "description": "aco/ra: use get_reg_specified() for p_extract_vector",
"nominated": true, "nominated": true,
"nomination_type": 1, "nomination_type": 1,
"resolution": 0, "resolution": 1,
"master_sha": null, "master_sha": null,
"because_sha": "51f4b22feec3720c89458094a3245efc984115ee" "because_sha": "51f4b22feec3720c89458094a3245efc984115ee"
}, },

10
src/amd/compiler/aco_register_allocation.cpp
View file

@ -2201,14 +2201,10 @@ void register_allocation(Program *program, std::vector<TempSet>& live_out_per_bl
!register_file.test(reg, definition->bytes())) !register_file.test(reg, definition->bytes()))
definition->setFixed(reg); definition->setFixed(reg);
} else if (instr->opcode == aco_opcode::p_extract_vector) { } else if (instr->opcode == aco_opcode::p_extract_vector) {
PhysReg reg; PhysReg reg = instr->operands[0].physReg();
if (instr->operands[0].isKillBeforeDef() && reg.reg_b += definition->bytes() * instr->operands[1].constantValue();
instr->operands[0].getTemp().type() == definition->getTemp().type()) { if (get_reg_specified(ctx, register_file, definition->regClass(), parallelcopy, instr, reg))
reg = instr->operands[0].physReg();
reg.reg_b += definition->bytes() * instr->operands[1].constantValue();
assert(!register_file.test(reg, definition->bytes()));
definition->setFixed(reg); definition->setFixed(reg);
}
} else if (instr->opcode == aco_opcode::p_create_vector) { } else if (instr->opcode == aco_opcode::p_create_vector) {
PhysReg reg = get_reg_create_vector(ctx, register_file, definition->getTemp(), PhysReg reg = get_reg_create_vector(ctx, register_file, definition->getTemp(),
parallelcopy, instr); parallelcopy, instr);