diff options
| author | Matt Turner <[email protected]> | 2014-08-28 13:34:22 -0700 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2014-09-25 11:02:36 -0700 |
| commit | b5466707d6632e7dd019b36ced8da2b4ec7d5297 (patch) | |
| tree | 566c5845617adc0b725069286130c78aa9d7730e | |
| parent | 23247e8059b92cd0330fbf9a4ec8b7227c53d50f (diff) | |
i965: Set JumpCount, not JIP, on ENDIF on Gen 6.
Despite what the Sandybridge PRM says, ENDIF has Jump Count in <dst>,
not JIP in <src1>. (The same mistake appears about WHILE as well).
Reviewed-by: Kenneth Graunke <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_eu_emit.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_eu_emit.c b/src/mesa/drivers/dri/i965/brw_eu_emit.c index 39f94e96059..937257b20a5 100644 --- a/src/mesa/drivers/dri/i965/brw_eu_emit.c +++ b/src/mesa/drivers/dri/i965/brw_eu_emit.c @@ -2557,12 +2557,15 @@ brw_set_uip_jip(struct brw_compile *p) assert(brw_inst_jip(brw, insn) != 0); break; - case BRW_OPCODE_ENDIF: - if (block_end_offset == 0) - brw_inst_set_jip(brw, insn, 1 * br); + case BRW_OPCODE_ENDIF: { + int32_t jump = (block_end_offset == 0) ? + 1 * br : (block_end_offset - offset) / scale; + if (brw->gen >= 7) + brw_inst_set_jip(brw, insn, jump); else - brw_inst_set_jip(brw, insn, (block_end_offset - offset) / scale); + brw_inst_set_gen6_jump_count(brw, insn, jump); break; + } case BRW_OPCODE_HALT: /* From the Sandy Bridge PRM (volume 4, part 2, section 8.3.19): |