Mesa (staging/22.0): aco/ra: fix vgpr_limit

[GitLab Mirror]

Module: Mesa
Branch: staging/22.0
Commit: a9a5743cd9fe4e2365ee5479745eec6b3d35f34f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a9a5743cd9fe4e2365ee5479745eec6b3d35f34f

Author: Rhys Perry <pendingchaos02 at gmail.com>
Date:   Tue May  3 12:13:55 2022 +0100

aco/ra: fix vgpr_limit

Signed-off-by: Rhys Perry <pendingchaos02 at gmail.com>
Reviewed-by: Timur Kristóf <timur.kristof at gmail.com>
Fixes: b98a4d4dd7e ("aco: refactor GPR limit calculation")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16297>
(cherry picked from commit 1b639a0ce5b239ff06f1dfc8256f6512cb260144)

---

 .pick_status.json                            | 2 +-
 src/amd/compiler/aco_register_allocation.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 95cf5d10f3d..d9e8aa73272 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -476,7 +476,7 @@
         "description": "aco/ra: fix vgpr_limit",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "because_sha": "b98a4d4dd7eaf1f299a0e8cbf5c52d8f2a93da0d"
     },
     {
diff --git a/src/amd/compiler/aco_register_allocation.cpp b/src/amd/compiler/aco_register_allocation.cpp
index 459e232be99..5a84f046ce9 100644
--- a/src/amd/compiler/aco_register_allocation.cpp
+++ b/src/amd/compiler/aco_register_allocation.cpp
@@ -87,7 +87,7 @@ struct ra_ctx {
       pseudo_dummy.reset(
          create_instruction<Instruction>(aco_opcode::p_parallelcopy, Format::PSEUDO, 0, 0));
       sgpr_limit = get_addr_sgpr_from_waves(program, program->min_waves);
-      vgpr_limit = get_addr_sgpr_from_waves(program, program->min_waves);
+      vgpr_limit = get_addr_vgpr_from_waves(program, program->min_waves);
    }
 };