i965/vec4: consider subregister offset in live variables

Take into account offset values less than a full register (32 bytes)
when getting the var from register.

This is required when dealing with an operation that writes half of the
register (like one d2x in IVB/BYT, which uses exec_size == 4).

v2:
- Take in account this offset < 32 in liveness analysis too (Curro)

v3:
- Change formula in var_from_reg() (Curro)
- Remove useless changes (Curro)

Signed-off-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
Reviewed-by: Francisco Jerez <currojerez@riseup.net>

diff --git a/src/intel/compiler/brw_vec4_live_variables.h b/src/intel/compiler/brw_vec4_live_variables.h
index 2946b98aacc254d8a571a9691568c0ce278f812a..92f79550fd49ff9dcf0285e43d4e09301156a8b6 100644 (file)
--- a/src/intel/compiler/brw_vec4_live_variables.h
+++ b/src/intel/compiler/brw_vec4_live_variables.h
@@ -91,7 +91,7 @@ var_from_reg(const simple_allocator &alloc, const src_reg &reg,
    assert(reg.file == VGRF && reg.nr < alloc.count && c < 4);
    const unsigned csize = DIV_ROUND_UP(type_sz(reg.type), 4);
    unsigned result =
-      8 * (alloc.offsets[reg.nr] + reg.offset / REG_SIZE) +
+      8 * alloc.offsets[reg.nr] + reg.offset / 4 +
       (BRW_GET_SWZ(reg.swizzle, c) + k / csize * 4) * csize + k % csize;
    /* Do not exceed the limit for this register */
    assert(result < 8 * (alloc.offsets[reg.nr] + alloc.sizes[reg.nr]));
@@ -105,7 +105,7 @@ var_from_reg(const simple_allocator &alloc, const dst_reg &reg,
    assert(reg.file == VGRF && reg.nr < alloc.count && c < 4);
    const unsigned csize = DIV_ROUND_UP(type_sz(reg.type), 4);
    unsigned result =
-      8 * (alloc.offsets[reg.nr] + reg.offset / REG_SIZE) +
+      8 * alloc.offsets[reg.nr] + reg.offset / 4 +
       (c + k / csize * 4) * csize + k % csize;
    /* Do not exceed the limit for this register */
    assert(result < 8 * (alloc.offsets[reg.nr] + alloc.sizes[reg.nr]));