nir/opt_vectorize: fix srcs_equal() with two different non-const
authorRhys Perry <pendingchaos02@gmail.com>
Fri, 8 Jan 2021 15:23:07 +0000 (15:23 +0000)
committerMarge Bot <eric+marge@anholt.net>
Sat, 9 Jan 2021 11:14:05 +0000 (11:14 +0000)
To match hash_alu_src(), this should return false if both are different
non-const ssa defs.

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8391>

src/compiler/nir/nir_opt_vectorize.c

index 80cfdbb..2e110a0 100644 (file)
@@ -80,7 +80,7 @@ srcs_equal(const nir_src *src1, const nir_src *src2)
    assert(src2->is_ssa);
 
    return src1->ssa == src2->ssa ||
-      nir_src_is_const(*src1) == nir_src_is_const(*src2);
+          (nir_src_is_const(*src1) && nir_src_is_const(*src2));
 }
 
 static bool