From: Kenneth Graunke <kenneth@whitecape.org>
Date: Wed, 7 Aug 2013 01:32:55 +0000 (-0700)
Subject: i965/fs: Remove start/end aliases in compute_live_intervals().
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=939b0f2c2ff41869fce8c99986607f5daf67b63a;p=mesa.git

i965/fs: Remove start/end aliases in compute_live_intervals().

In compute_live_intervals(), start and end are shorter names for
the virtual_grf_start and virtual_grf_end class members.

Now that the fs_live_intervals class has arrays named start and end
which are indexed by var, rather than VGRF, reusing the name is
confusing.  Plus, most of the code has been factored out, so using the
long names isn't as inconvenient.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
---

diff --git a/src/mesa/drivers/dri/i965/brw_fs_live_variables.cpp b/src/mesa/drivers/dri/i965/brw_fs_live_variables.cpp
index a07565cecd8..497a0db8e94 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_live_variables.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_live_variables.cpp
@@ -310,16 +310,14 @@ fs_visitor::calculate_live_intervals()
       return;
 
    int num_vgrfs = this->virtual_grf_count;
-   int *start = ralloc_array(mem_ctx, int, num_vgrfs);
-   int *end = ralloc_array(mem_ctx, int, num_vgrfs);
    ralloc_free(this->virtual_grf_start);
    ralloc_free(this->virtual_grf_end);
-   this->virtual_grf_start = start;
-   this->virtual_grf_end = end;
+   virtual_grf_start = ralloc_array(mem_ctx, int, num_vgrfs);
+   virtual_grf_end = ralloc_array(mem_ctx, int, num_vgrfs);
 
    for (int i = 0; i < num_vgrfs; i++) {
-      start[i] = MAX_INSTRUCTION;
-      end[i] = -1;
+      virtual_grf_start[i] = MAX_INSTRUCTION;
+      virtual_grf_end[i] = -1;
    }
 
    cfg_t cfg(this);
@@ -328,8 +326,8 @@ fs_visitor::calculate_live_intervals()
    /* Merge the per-component live ranges to whole VGRF live ranges. */
    for (int i = 0; i < livevars.num_vars; i++) {
       int vgrf = livevars.vgrf_from_var[i];
-      start[vgrf] = MIN2(start[vgrf], livevars.start[i]);
-      end[vgrf] = MAX2(end[vgrf], livevars.end[i]);
+      virtual_grf_start[vgrf] = MIN2(virtual_grf_start[vgrf], livevars.start[i]);
+      virtual_grf_end[vgrf] = MAX2(virtual_grf_end[vgrf], livevars.end[i]);
    }
 
    this->live_intervals_valid = true;