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

ac/nir: Do not set cursor in try_extract_additions

Browse source 
Fixes: 61ac5ac ("radv,ac/nir: lower global access to _amd global access intrinsics")
Signed-off-by: Konstantin Seurer <konstantin.seurer@gmail.com>
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16270>
(cherry picked from commit d639608b8b)
This commit is contained in:
Konstantin Seurer 2022-05-02 09:33:45 +02:00 • committed by Dylan Baker
parent a9d2d3b0b7
commit bedc452f8b
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -238,7 +238,7 @@
"description": "ac/nir: Do not set cursor in try_extract_additions",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "61ac5acca3b58ea4ebac45d1aa0732ae9c6517d5"
},

4
src/amd/common/ac_nir_lower_global_access.c
View file

@ -37,8 +37,6 @@ try_extract_additions(nir_builder *b, nir_ssa_scalar scalar, uint64_t *out_const
nir_ssa_scalar src0 = nir_ssa_scalar_chase_alu_src(scalar, 0);
nir_ssa_scalar src1 = nir_ssa_scalar_chase_alu_src(scalar, 1);
b->cursor = nir_before_instr(&alu->instr);
for (unsigned i = 0; i < 2; ++i) {
nir_ssa_scalar src = i ? src1 : src0;
if (nir_ssa_scalar_is_const(src)) {
@ -64,7 +62,6 @@ try_extract_additions(nir_builder *b, nir_ssa_scalar scalar, uint64_t *out_const
if (!replace_src0 && !replace_src1)
return NULL;
b->cursor = nir_before_instr(&alu->instr);
replace_src0 = replace_src0 ? replace_src0 : nir_channel(b, src0.def, src0.comp);
replace_src1 = replace_src1 ? replace_src1 : nir_channel(b, src1.def, src1.comp);
return nir_iadd(b, replace_src0, replace_src1);
@ -139,6 +136,7 @@ process_instr(nir_builder *b, nir_instr *instr, void *_)
uint64_t off_const = 0;
nir_ssa_def *offset = NULL;
nir_ssa_scalar src = {addr_src->ssa, 0};
b->cursor = nir_after_instr(addr_src->ssa->parent_instr);
nir_ssa_def *addr = try_extract_additions(b, src, &off_const, &offset);
addr = addr ? addr : addr_src->ssa;