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

aco: disallow SGPRs on DPP instructions

Browse source 
They can't be encoded.

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10841>
(cherry picked from commit 3013670dfd)
This commit is contained in:
Rhys Perry 2021-05-17 14:37:54 +01:00 • committed by Eric Engestrom
parent 1d357aa784
commit 88bd86baa0
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -211,7 +211,7 @@
"description": "aco: disallow SGPRs on DPP instructions",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": null
},

2
src/amd/compiler/aco_optimizer.cpp
View file

@ -715,7 +715,7 @@ bool pseudo_propagate_temp(opt_ctx& ctx, aco_ptr<Instruction>& instr,
bool can_apply_sgprs(opt_ctx& ctx, aco_ptr<Instruction>& instr)
{
if (instr->isSDWA() && ctx.program->chip_class < GFX9)
if ((instr->isSDWA() && ctx.program->chip_class < GFX9) || instr->isDPP())
return false;
return instr->opcode != aco_opcode::v_readfirstlane_b32 &&
instr->opcode != aco_opcode::v_readlane_b32 &&

2
src/amd/compiler/aco_validate.cpp
View file

@ -253,6 +253,8 @@ bool validate_ir(Program* program)
uint32_t scalar_mask = instr->isVOP3() || instr->isVOP3P() ? 0x7 : 0x5;
if (instr->isSDWA())
scalar_mask = program->chip_class >= GFX9 ? 0x7 : 0x4;
else if (instr->isDPP())
scalar_mask = 0x0;
if (instr->isVOPC() ||
instr->opcode == aco_opcode::v_readfirstlane_b32 ||