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

aco: fix nir_intrinsic_ballot with wave32

Browse source 
Found by inspection.

Fixes: 21db083504 ('aco/wave32: Allow setting the subgroup ballot size to 64-bit.')

Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8703>
(cherry picked from commit b06609e903)
This commit is contained in:
Daniel Schürmann 2021-01-25 18:37:29 +01:00 • committed by Dylan Baker
parent 343f1aba20
commit 1c4a92a7cd
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -391,7 +391,7 @@
"description": "aco: fix nir_intrinsic_ballot with wave32",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "21db083504fde3100f0b528f683a087357f5aaff"
},

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

@ -8139,7 +8139,7 @@ void visit_intrinsic(isel_context *ctx, nir_intrinsic_instr *instr)
Temp src = get_ssa_temp(ctx, instr->src[0].ssa);
Temp dst = get_ssa_temp(ctx, &instr->dest.ssa);
Definition tmp = bld.def(dst.regClass());
Definition lanemask_tmp = dst.size() == bld.lm.size() ? tmp : bld.def(src.regClass());
Definition lanemask_tmp = dst.size() == bld.lm.size() ? tmp : bld.def(bld.lm);
if (instr->src[0].ssa->bit_size == 1) {
assert(src.regClass() == bld.lm);
bld.sop2(Builder::s_and, lanemask_tmp, bld.def(s1, scc), Operand(exec, bld.lm), src);