nir: Relax opt_if logic to prevent re-merging 64bit phis for loop headers
authorJesse Natalie <jenatali@microsoft.com>
Mon, 8 Jun 2020 12:56:59 +0000 (05:56 -0700)
committerMarge Bot <eric+marge@anholt.net>
Thu, 27 Aug 2020 16:57:42 +0000 (16:57 +0000)
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6313>

src/compiler/nir/nir_opt_if.c

index a97126cb0d8a715fb351436eb18bbdc6394bafe3..8b35b167013c1f87f3e29049f3eb6d644b403412 100644 (file)
@@ -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];
 }
 
 /**