From b046f550866790d3cfbc64add060f413f06d8f03 Mon Sep 17 00:00:00 2001
From: Rhys Perry <pendingchaos02@gmail.com>
Date: Tue, 14 Jan 2020 11:42:11 +0000
Subject: [PATCH] aco: use nir_move_copies
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/2421>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/2421>
---
 src/amd/compiler/aco_instruction_selection_setup.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/amd/compiler/aco_instruction_selection_setup.cpp b/src/amd/compiler/aco_instruction_selection_setup.cpp
index 2ad39180e2c..898ca7df69e 100644
--- a/src/amd/compiler/aco_instruction_selection_setup.cpp
+++ b/src/amd/compiler/aco_instruction_selection_setup.cpp
@@ -888,7 +888,8 @@ setup_nir(isel_context *ctx, nir_shader *nir)
    nir_lower_load_const_to_scalar(nir);
    nir_opt_shrink_load(nir);
    nir_move_options move_opts = (nir_move_options)(
-      nir_move_const_undef | nir_move_load_ubo | nir_move_load_input | nir_move_comparisons);
+      nir_move_const_undef | nir_move_load_ubo | nir_move_load_input |
+      nir_move_comparisons | nir_move_copies);
    nir_opt_sink(nir, move_opts);
    nir_opt_move(nir, move_opts);
    nir_convert_to_lcssa(nir, true, false);
-- 
2.30.2