Module: Mesa Branch: staging/20.0 Commit: db199be2c3ed667310defbe4818a138e671f20ef URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=db199be2c3ed667310defbe4818a138e671f20ef
Author: Rob Clark <[email protected]> Date: Sun Mar 22 12:37:12 2020 -0700 freedreno/ir3/ra: fix array liveranges Fixes: 1b658533e11 ("freedreno/ir3: extend liverange of arrays") Signed-off-by: Rob Clark <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4272> (cherry picked from commit d2cc92c747c20613190ba330f22f219d26422cfa) --- .pick_status.json | 2 +- src/freedreno/ir3/ir3_ra.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 729dfb2564c..5e2cecd5210 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -211,7 +211,7 @@ "description": "freedreno/ir3/ra: fix array liveranges", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "1b658533e1109b8ff9a6578a7eb4b390454e7876" }, diff --git a/src/freedreno/ir3/ir3_ra.c b/src/freedreno/ir3/ir3_ra.c index 789c08f42ed..ee119570a83 100644 --- a/src/freedreno/ir3/ir3_ra.c +++ b/src/freedreno/ir3/ir3_ra.c @@ -947,7 +947,7 @@ ra_add_interference(struct ir3_ra_ctx *ctx) if (BITSET_TEST(bd->livein, i + arr->base)) { arr->start_ip = MIN2(arr->start_ip, block->start_ip); } - if (BITSET_TEST(bd->livein, i + arr->base)) { + if (BITSET_TEST(bd->liveout, i + arr->base)) { arr->end_ip = MAX2(arr->end_ip, block->end_ip); } } _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
