From: Eric Anholt <eric@anholt.net>
Date: Sat, 7 Feb 2015 01:16:29 +0000 (-0800)
Subject: nir: Fix load_const comparisons for CSE.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2919bdf466295bc3fbf6f6e796ef8d301404d3d9;p=mesa.git

nir: Fix load_const comparisons for CSE.

We want the size of a float per component, not the size of a whole vec4.

NIR instructions on i965:
total instructions in shared programs: 1261937 -> 1261929 (-0.00%)
instructions in affected programs:     114 -> 106 (-7.02%)

Looking at one of these examples (tesseract), it's from vec4 load_consts
for a MRT solid fill, which do get CSEed now that we don't memcmp off the
end of the const value and into the SSA def.  For the 1-component loads
that are common in i965, we were only memcmping off into the rest of the
usually zero-filled const_value.

Reviewed-by: Connor Abbott <cwabbott0@gmail.com>
---

diff --git a/src/glsl/nir/nir_opt_cse.c b/src/glsl/nir/nir_opt_cse.c
index b3e9c0d9ea8..9b383202db2 100644
--- a/src/glsl/nir/nir_opt_cse.c
+++ b/src/glsl/nir/nir_opt_cse.c
@@ -90,7 +90,7 @@ nir_instrs_equal(nir_instr *instr1, nir_instr *instr2)
          return false;
 
       return memcmp(load1->value.f, load2->value.f,
-                    load1->def.num_components * sizeof load2->value.f) == 0;
+                    load1->def.num_components * sizeof(*load2->value.f)) == 0;
    }
    case nir_instr_type_phi: {
       nir_phi_instr *phi1 = nir_instr_as_phi(instr1);