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

aco: don't allow unaligned subdword accesses on GFX6/7 

There are no SDWA instructions which means that only
full registers can be accessed.

Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5070>
This commit is contained in:
Daniel Schürmann 2020-05-06 11:00:24 +01:00 committed by Marge Bot
parent ae390755fe
commit 51f4b22fee
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/amd/compiler/aco_register_allocation.cpp
View File

@ -81,8 +81,10 @@ struct ra_ctx {
}
};
bool instr_can_access_subdword(aco_ptr<Instruction>& instr)
bool instr_can_access_subdword(ra_ctx& ctx, aco_ptr<Instruction>& instr)
{
if (ctx.program->chip_class < GFX8)
return false;
return instr->isSDWA() || instr->format == Format::PSEUDO;
}
@ -111,7 +113,7 @@ struct DefInfo {
if (rc.is_subdword()) {
/* stride in bytes */
if(!instr_can_access_subdword(instr))
if(!instr_can_access_subdword(ctx, instr))
stride = 4;
else if (rc.bytes() % 4 == 0)
stride = 4;
@ -878,7 +880,7 @@ bool get_reg_specified(ra_ctx& ctx,
aco_ptr<Instruction>& instr,
PhysReg reg)
{
if (rc.is_subdword() && reg.byte() && !instr_can_access_subdword(instr))
if (rc.is_subdword() && reg.byte() && !instr_can_access_subdword(ctx, instr))
return false;
if (!rc.is_subdword() && reg.byte())
return false;
@ -1216,12 +1218,12 @@ void handle_pseudo(ra_ctx& ctx,
}
}
bool operand_can_use_reg(aco_ptr<Instruction>& instr, unsigned idx, PhysReg reg)
bool operand_can_use_reg(ra_ctx& ctx, aco_ptr<Instruction>& instr, unsigned idx, PhysReg reg)
{
if (instr->operands[idx].isFixed())
return instr->operands[idx].physReg() == reg;
if (!instr_can_access_subdword(instr) && reg.byte())
if (reg.byte() && !instr_can_access_subdword(ctx, instr))
return false;
switch (instr->format) {
@ -1737,7 +1739,7 @@ void register_allocation(Program *program, std::vector<TempSet>& live_out_per_bl
assert(ctx.assignments[operand.tempId()].assigned);
PhysReg reg = ctx.assignments[operand.tempId()].reg;
if (operand_can_use_reg(instr, i, reg))
if (operand_can_use_reg(ctx, instr, i, reg))
operand.setFixed(reg);
else
get_reg_for_operand(ctx, register_file, parallelcopy, instr, operand);
@ -1898,7 +1900,7 @@ void register_allocation(Program *program, std::vector<TempSet>& live_out_per_bl
Temp tmp = definition.getTemp();
/* subdword instructions before RDNA write full registers */
if (tmp.regClass().is_subdword() &&
!instr_can_access_subdword(instr) &&
!instr_can_access_subdword(ctx, instr) &&
ctx.program->chip_class <= GFX9) {
assert(tmp.bytes() <= 4);
tmp = Temp(definition.tempId(), v1);

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

@ -46,11 +46,6 @@ void perfwarn(bool cond, const char *msg, Instruction *instr)
}
#endif
bool instr_can_access_subdword(aco_ptr<Instruction>& instr)
{
return instr->isSDWA() || instr->format == Format::PSEUDO;
}
void validate(Program* program, FILE * output)
{
if (!(debug_flags & DEBUG_VALIDATE))
@ -178,7 +173,7 @@ void validate(Program* program, FILE * output)
/* check subdword definitions */
for (unsigned i = 0; i < instr->definitions.size(); i++) {
if (instr->definitions[i].regClass().is_subdword())
check(instr_can_access_subdword(instr) || instr->definitions[i].bytes() <= 4, "Only SDWA and Pseudo instructions can write subdword registers larger than 4 bytes", instr.get());
check(instr->format == Format::PSEUDO || instr->definitions[i].bytes() <= 4, "Only Pseudo instructions can write subdword registers larger than 4 bytes", instr.get());
}
if (instr->isSALU() || instr->isVALU()) {
@ -434,6 +429,13 @@ bool ra_fail(FILE *output, Location loc, Location loc2, const char *fmt, ...) {
return true;
}
bool instr_can_access_subdword(Program* program, aco_ptr<Instruction>& instr)
{
if (program->chip_class < GFX8)
return false;
return instr->isSDWA() || instr->format == Format::PSEUDO;
}
} /* end namespace */
bool validate_ra(Program *program, const struct radv_nir_compiler_options *options, FILE *output) {
@ -472,7 +474,7 @@ bool validate_ra(Program *program, const struct radv_nir_compiler_options *optio
err |= ra_fail(output, loc, assignments.at(op.tempId()).firstloc, "Operand %d has an out-of-bounds register assignment", i);
if (op.physReg() == vcc && !program->needs_vcc)
err |= ra_fail(output, loc, Location(), "Operand %d fixed to vcc but needs_vcc=false", i);
if (!instr_can_access_subdword(instr) && op.regClass().is_subdword() && op.physReg().byte())
if (!instr_can_access_subdword(program, instr) && op.regClass().is_subdword() && op.physReg().byte())
err |= ra_fail(output, loc, assignments.at(op.tempId()).firstloc, "Operand %d must be aligned to a full register", i);
if (!assignments[op.tempId()].firstloc.block)
assignments[op.tempId()].firstloc = loc;
@ -493,7 +495,7 @@ bool validate_ra(Program *program, const struct radv_nir_compiler_options *optio
err |= ra_fail(output, loc, assignments.at(def.tempId()).firstloc, "Definition %d has an out-of-bounds register assignment", i);
if (def.physReg() == vcc && !program->needs_vcc)
err |= ra_fail(output, loc, Location(), "Definition %d fixed to vcc but needs_vcc=false", i);
if (!instr_can_access_subdword(instr) && def.regClass().is_subdword() && def.physReg().byte())
if (!instr_can_access_subdword(program, instr) && def.regClass().is_subdword() && def.physReg().byte())
err |= ra_fail(output, loc, assignments.at(def.tempId()).firstloc, "Definition %d must be aligned to a full register", i);
if (!assignments[def.tempId()].firstloc.block)
assignments[def.tempId()].firstloc = loc;
@ -600,7 +602,7 @@ bool validate_ra(Program *program, const struct radv_nir_compiler_options *optio
err |= ra_fail(output, loc, assignments.at(regs[reg.reg_b + j]).defloc, "Assignment of element %d of %%%d already taken by %%%d from instruction", i, tmp.id(), regs[reg.reg_b + j]);
regs[reg.reg_b + j] = tmp.id();
}
if (def.regClass().is_subdword() && !instr_can_access_subdword(instr)) {
if (def.regClass().is_subdword() && !instr_can_access_subdword(program, instr)) {
for (unsigned j = tmp.bytes(); j < 4; j++)
if (regs[reg.reg_b + j])
err |= ra_fail(output, loc, assignments.at(regs[reg.reg_b + j]).defloc, "Assignment of element %d of %%%d overwrites the full register taken by %%%d from instruction", i, tmp.id(), regs[reg.reg_b + j]);