diff options
| author | Connor Abbott <cwabbott0@gmail.com> | 2021-11-16 15:20:52 +0100 |
|---|---|---|
| committer | Dylan Baker <dylan.c.baker@intel.com> | 2021-11-24 15:47:19 -0800 |
| commit | d87dbff00ab4d392e5eb06c3478128479a3d74f9 (patch) | |
| tree | a632e4461774d2d71785861564067a9363e69094 | |
| parent | b3afa6e7ef33edd7388031ea3b685af3b377fcff (diff) | |
ir3/lower_pcopy: Fix bug with "illegal" copies and swaps
If the source and destination were within the same full register, like
hr90.x and hr90.y (which both map to r45.x), then we'd perform the
swap/copy with the wrong register. This broke
dEQP-VK.ssbo.phys.layout.random.16bit.scalar.35 once BDA is enabled.
Fixes: 0ffcb19b9d9 ("ir3: Rewrite register allocation")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13818>
(cherry picked from commit c98adc56f4fe08231b0fec84b6a92c89eb94d59b)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/freedreno/ir3/ir3_lower_parallelcopy.c | 18 |
2 files changed, 17 insertions, 3 deletions
diff --git a/.pick_status.json b/.pick_status.json index 27330018652..7ab749dcf47 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1093,7 +1093,7 @@ "description": "ir3/lower_pcopy: Fix bug with \"illegal\" copies and swaps", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "0ffcb19b9d9fbe902224542047c389a661fbf816" }, diff --git a/src/freedreno/ir3/ir3_lower_parallelcopy.c b/src/freedreno/ir3/ir3_lower_parallelcopy.c index 80a841662a4..d1690b22615 100644 --- a/src/freedreno/ir3/ir3_lower_parallelcopy.c +++ b/src/freedreno/ir3/ir3_lower_parallelcopy.c @@ -109,11 +109,18 @@ do_swap(struct ir3_compiler *compiler, struct ir3_instruction *instr, .flags = entry->flags & ~IR3_REG_HALF, }); + /* If src and dst are within the same full register, then swapping src + * with tmp above will also move dst to tmp. Account for that here. + */ + unsigned dst = + (entry->src.reg & ~1u) == (entry->dst & ~1u) ? + tmp + (entry->dst & 1u) : entry->dst; + /* Do the original swap with src replaced with tmp */ do_swap(compiler, instr, &(struct copy_entry){ .src = {.reg = tmp + (entry->src.reg & 1)}, - .dst = entry->dst, + .dst = dst, .flags = entry->flags, }); @@ -192,9 +199,16 @@ do_copy(struct ir3_compiler *compiler, struct ir3_instruction *instr, .flags = entry->flags & ~IR3_REG_HALF, }); + /* Similar to in do_swap(), account for src being swapped with tmp if + * src and dst are in the same register. + */ + struct copy_src src = entry->src; + if (!src.flags && (src.reg & ~1u) == (entry->dst & ~1u)) + src.reg = tmp + (src.reg & 1u); + do_copy(compiler, instr, &(struct copy_entry){ - .src = entry->src, + .src = src, .dst = tmp + (entry->dst & 1), .flags = entry->flags, }); |