From: Jesse Natalie <jenatali@microsoft.com>
Date: Mon, 8 Jun 2020 12:56:59 +0000 (-0700)
Subject: nir: Relax opt_if logic to prevent re-merging 64bit phis for loop headers
X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=commitdiff_plain;h=0d595f72b2ccea462d01923e02957f1458acdd35;hp=43d22c8f2011b780467df97e58981522edccfa21

nir: Relax opt_if logic to prevent re-merging 64bit phis for loop headers

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6313>
---

diff --git a/src/compiler/nir/nir_opt_if.c b/src/compiler/nir/nir_opt_if.c
index a97126cb0d8..8b35b167013 100644
--- a/src/compiler/nir/nir_opt_if.c
+++ b/src/compiler/nir/nir_opt_if.c
@@ -292,8 +292,7 @@ static bool
 alu_instr_is_type_conversion(const nir_alu_instr *alu)
 {
    return nir_op_infos[alu->op].num_inputs == 1 &&
-          nir_alu_type_get_base_type(nir_op_infos[alu->op].output_type) !=
-          nir_alu_type_get_base_type(nir_op_infos[alu->op].input_types[0]);
+          nir_op_infos[alu->op].output_type != nir_op_infos[alu->op].input_types[0];
 }
 
 /**