From ef6127ff690031e0eec9eb9ee959cede542ad244 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Tue, 15 Apr 2014 16:28:04 -0700 Subject: [PATCH] i965/fs: Only sweep NOPs if register coalescing made progress. Otherwise there's nothing to do. Reviewed-by: Kenneth Graunke --- .../dri/i965/brw_fs_register_coalesce.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_fs_register_coalesce.cpp b/src/mesa/drivers/dri/i965/brw_fs_register_coalesce.cpp index 4e3b611197a..f6d9b680b22 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_register_coalesce.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_register_coalesce.cpp @@ -170,6 +170,8 @@ fs_visitor::register_coalesce() if (!can_coalesce) continue; + progress = true; + for (int i = 0; i < src_size; i++) { if (mov[i]) { mov[i]->opcode = BRW_OPCODE_NOP; @@ -215,17 +217,17 @@ fs_visitor::register_coalesce() reg_from = -1; } - foreach_list_safe(node, &this->instructions) { - fs_inst *inst = (fs_inst *)node; + if (progress) { + foreach_list_safe(node, &this->instructions) { + fs_inst *inst = (fs_inst *)node; - if (inst->opcode == BRW_OPCODE_NOP) { - inst->remove(); - progress = true; + if (inst->opcode == BRW_OPCODE_NOP) { + inst->remove(); + } } - } - if (progress) invalidate_live_intervals(); + } return progress; } -- 2.30.2