Mesa (master): Revert "i965/fs: Only sweep NOPs if register coalescing made progress."
Matt Turner
mattst88 at kemper.freedesktop.org
Wed Apr 16 01:26:15 UTC 2014
Module: Mesa
Branch: master
Commit: 9fed62723444fa76bd411ef4c2e4eeb98968a791
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9fed62723444fa76bd411ef4c2e4eeb98968a791
Author: Matt Turner <mattst88 at gmail.com>
Date: Tue Apr 15 17:27:55 2014 -0700
Revert "i965/fs: Only sweep NOPs if register coalescing made progress."
This reverts commit f092e8951ce5212ba3cbb382ce3a6666eb6c9bed.
Didn't mean to push this...
---
src/mesa/drivers/dri/i965/brw_fs_register_coalesce.cpp | 15 +++++++--------
1 file changed, 7 insertions(+), 8 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 d5dd2c2..4e3b611 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_register_coalesce.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_register_coalesce.cpp
@@ -215,18 +215,17 @@ fs_visitor::register_coalesce()
reg_from = -1;
}
- if (progress) {
- foreach_list_safe(node, &this->instructions) {
- fs_inst *inst = (fs_inst *)node;
+ 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();
+ progress = true;
}
+ }
+ if (progress)
invalidate_live_intervals();
- }
return progress;
}
More information about the mesa-commit
mailing list