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

aco: fix shared_atomic_comp_swap if the second source isn't a VGPR

Browse source 
Only VGPRs are valid with DS instructions.

Cc: 21.1 mesa-stable
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11777>
(cherry picked from commit 74a221bcfd)
This commit is contained in:
Samuel Pitoiset 2021-07-08 09:09:25 +02:00 • committed by Eric Engestrom
parent 36a10bcf10
commit 442df9d8f4
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -1696,7 +1696,7 @@
"description": "aco: fix shared_atomic_comp_swap if the second source isn't a VGPR",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null
},

6
src/amd/compiler/aco_instruction_selection.cpp
View file

@ -6882,8 +6882,10 @@ void visit_shared_atomic(isel_context *ctx, nir_intrinsic_instr *instr)
ds.reset(create_instruction<DS_instruction>(op, Format::DS, num_operands, return_previous ? 1 : 0));
ds->operands[0] = Operand(address);
ds->operands[1] = Operand(data);
if (num_operands == 4)
ds->operands[2] = Operand(get_ssa_temp(ctx, instr->src[2].ssa));
if (num_operands == 4) {
Temp data2 = as_vgpr(ctx, get_ssa_temp(ctx, instr->src[2].ssa));
ds->operands[2] = Operand(data2);
}
ds->operands[num_operands - 1] = m;
ds->offset0 = offset;
if (return_previous)