From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Date: Tue, 16 Jul 2019 16:16:39 +0000 (-0700)
Subject: pan/midgard: Remove custom register selection callback
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1cabb8a706c86574a509f885065ac1e182bc04bc;p=mesa.git

pan/midgard: Remove custom register selection callback

What we have is equivalent to the default callback; let's use that.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
---

diff --git a/src/panfrost/midgard/midgard_ra.c b/src/panfrost/midgard/midgard_ra.c
index cfe091326ed..c089a7be3e8 100644
--- a/src/panfrost/midgard/midgard_ra.c
+++ b/src/panfrost/midgard/midgard_ra.c
@@ -138,23 +138,6 @@ find_or_allocate_temp(compiler_context *ctx, unsigned hash)
         return temp;
 }
 
-/* Callback for register allocation selection, trivial default for now */
-
-static unsigned int
-midgard_ra_select_callback(struct ra_graph *g, BITSET_WORD *regs, void *data)
-{
-        /* Choose the first available register to minimise register pressure */
-
-        for (int i = 0; i < (16 * WORK_STRIDE); ++i) {
-                if (BITSET_TEST(regs, i)) {
-                        return i;
-                }
-        }
-
-        assert(0);
-        return 0;
-}
-
 /* Helper to return the default phys_reg for a given register */
 
 static struct phys_reg
@@ -389,8 +372,6 @@ allocate_registers(compiler_context *ctx)
                 }
         }
 
-        ra_set_select_reg_callback(g, midgard_ra_select_callback, NULL);
-
         if (!ra_allocate(g)) {
                 unreachable("Error allocating registers\n");
         }