From b18fd234da275a0ec6b3c5cb77497a4c487c6366 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Sat, 16 Aug 2014 11:34:56 -0700 Subject: [PATCH] i965/fs: Use instruction execution sizes instead of heuristics Signed-off-by: Jason Ekstrand Reviewed-by: Matt Turner --- src/mesa/drivers/dri/i965/brw_fs.cpp | 19 ++++--------------- .../dri/i965/brw_fs_live_variables.cpp | 10 +++++----- .../dri/i965/brw_schedule_instructions.cpp | 4 +--- 3 files changed, 10 insertions(+), 23 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp index 0fe9cdd86e4..2f4ce5bd158 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs.cpp @@ -2426,8 +2426,7 @@ fs_visitor::compute_to_mrf() int mrf_high; if (inst->dst.reg & BRW_MRF_COMPR4) { mrf_high = mrf_low + 4; - } else if (dispatch_width == 16 && - (!inst->force_uncompressed && !inst->force_sechalf)) { + } else if (inst->exec_size == 16) { mrf_high = mrf_low + 1; } else { mrf_high = mrf_low; @@ -2517,9 +2516,7 @@ fs_visitor::compute_to_mrf() if (scan_inst->dst.reg & BRW_MRF_COMPR4) { scan_mrf_high = scan_mrf_low + 4; - } else if (dispatch_width == 16 && - (!scan_inst->force_uncompressed && - !scan_inst->force_sechalf)) { + } else if (scan_inst->exec_size == 16) { scan_mrf_high = scan_mrf_low + 1; } else { scan_mrf_high = scan_mrf_low; @@ -2675,10 +2672,6 @@ static void clear_deps_for_inst_src(fs_inst *inst, int dispatch_width, bool *deps, int first_grf, int grf_len) { - bool inst_simd16 = (dispatch_width > 8 && - !inst->force_uncompressed && - !inst->force_sechalf); - /* Clear the flag for registers that actually got read (as expected). */ for (int i = 0; i < inst->sources; i++) { int grf; @@ -2694,7 +2687,7 @@ clear_deps_for_inst_src(fs_inst *inst, int dispatch_width, bool *deps, if (grf >= first_grf && grf < first_grf + grf_len) { deps[grf - first_grf] = false; - if (inst_simd16) + if (inst->exec_size == 16) deps[grf - first_grf + 1] = false; } } @@ -2749,10 +2742,6 @@ fs_visitor::insert_gen4_pre_send_dependency_workarounds(bblock_t *block, return; } - bool scan_inst_simd16 = (dispatch_width > 8 && - !scan_inst->force_uncompressed && - !scan_inst->force_sechalf); - /* We insert our reads as late as possible on the assumption that any * instruction but a MOV that might have left us an outstanding * dependency has more latency than a MOV. @@ -2766,7 +2755,7 @@ fs_visitor::insert_gen4_pre_send_dependency_workarounds(bblock_t *block, needs_dep[reg - first_write_grf]) { inst->insert_before(block, DEP_RESOLVE_MOV(reg)); needs_dep[reg - first_write_grf] = false; - if (scan_inst_simd16) + if (scan_inst->exec_size == 16) needs_dep[reg - first_write_grf + 1] = false; } } 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 e5936e023c6..ea3c0d125cd 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_live_variables.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_live_variables.cpp @@ -85,11 +85,11 @@ fs_live_variables::setup_one_read(bblock_t *block, fs_inst *inst, * would get stomped by the first decode as well. */ int end_ip = ip; - if (v->dispatch_width == 16 && (reg.stride == 0 || - reg.type == BRW_REGISTER_TYPE_UW || - reg.type == BRW_REGISTER_TYPE_W || - reg.type == BRW_REGISTER_TYPE_UB || - reg.type == BRW_REGISTER_TYPE_B)) { + if (inst->exec_size == 16 && (reg.stride == 0 || + reg.type == BRW_REGISTER_TYPE_UW || + reg.type == BRW_REGISTER_TYPE_W || + reg.type == BRW_REGISTER_TYPE_UB || + reg.type == BRW_REGISTER_TYPE_B)) { end_ip++; } diff --git a/src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp b/src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp index 5e8c98a36df..f0d941fc35b 100644 --- a/src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp +++ b/src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp @@ -747,9 +747,7 @@ instruction_scheduler::add_barrier_deps(schedule_node *n) bool fs_instruction_scheduler::is_compressed(fs_inst *inst) { - return (v->dispatch_width == 16 && - !inst->force_uncompressed && - !inst->force_sechalf); + return inst->exec_size == 16; } void -- 2.30.2