diff options
| author | Jason Ekstrand <[email protected]> | 2017-08-31 11:42:00 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2017-10-25 16:14:09 -0700 |
| commit | 562b8d458c2de262019da2c056f75cb9feb5ee54 (patch) | |
| tree | 4186c551d799dc14cfe9d75218be0a59f78f4a92 | |
| parent | 4723933b8ea62cb100c5f21b4b42f838c6e948b1 (diff) | |
intel/eu: Use EXECUTE_1 for JMPI
The PRM says "The execution size must be 1." In 73137997e23ff6c11, the
execution size was set to 1 when it should have been BRW_EXECUTE_1
(which maps to 0). Later, in dc2d3a7f5c217a7cee9, JMPI was used for
line AA on gen6 and earlier and we started manually stomping the
exeution size to BRW_EXECUTE_1 in the generator. This commit fixes the
original bug and makes brw_JMPI just do the right thing.
Reviewed-by: Matt Turner <[email protected]>
Fixes: 73137997e23ff6c1145d036315d1a9ad96651281
| -rw-r--r-- | src/intel/compiler/brw_eu_emit.c | 2 | ||||
| -rw-r--r-- | src/intel/compiler/brw_fs_generator.cpp | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/intel/compiler/brw_eu_emit.c b/src/intel/compiler/brw_eu_emit.c index 062c6317372..4f0be550983 100644 --- a/src/intel/compiler/brw_eu_emit.c +++ b/src/intel/compiler/brw_eu_emit.c @@ -1190,7 +1190,7 @@ brw_JMPI(struct brw_codegen *p, struct brw_reg index, struct brw_reg ip = brw_ip_reg(); brw_inst *inst = brw_alu2(p, BRW_OPCODE_JMPI, ip, ip, index); - brw_inst_set_exec_size(devinfo, inst, BRW_EXECUTE_2); + brw_inst_set_exec_size(devinfo, inst, BRW_EXECUTE_1); brw_inst_set_qtr_control(devinfo, inst, BRW_COMPRESSION_NONE); brw_inst_set_mask_control(devinfo, inst, BRW_MASK_DISABLE); brw_inst_set_pred_control(devinfo, inst, predicate_control); diff --git a/src/intel/compiler/brw_fs_generator.cpp b/src/intel/compiler/brw_fs_generator.cpp index bdf2f916cba..0558c82dd32 100644 --- a/src/intel/compiler/brw_fs_generator.cpp +++ b/src/intel/compiler/brw_fs_generator.cpp @@ -402,7 +402,6 @@ fs_generator::generate_fb_write(fs_inst *inst, struct brw_reg payload) brw_inst_set_cond_modifier(p->devinfo, brw_last_inst, BRW_CONDITIONAL_NZ); int jmp = brw_JMPI(p, brw_imm_ud(0), BRW_PREDICATE_NORMAL) - p->store; - brw_inst_set_exec_size(p->devinfo, brw_last_inst, BRW_EXECUTE_1); { /* Don't send AA data */ fire_fb_write(inst, offset(payload, 1), implied_header, inst->mlen-1); |