Re: [Mesa-dev] [PATCH 1/4] i965/fs: Rename opt_copy_propagate -> opt_copy_propagation.

[Matt Turner]

Ping. This series fixes a real bug that affects multiple games.
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH 1/4] i965/fs: Rename opt_copy_propagate -> opt_copy_propagation.

[Matt Turner]

Matches the vec4 backend, cmod propagation, and saturate propagation.
---
 src/mesa/drivers/dri/i965/brw_fs.cpp  | 10 +-
 src/mesa/drivers/dri/i965/brw_fs.h|  6 +++---
 src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp | 15 ---
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp 
b/src/mesa/drivers/dri/i965/brw_fs.cpp
index c218f56..044dca4 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -5691,7 +5691,7 @@ fs_visitor::optimize()
 
   OPT(opt_algebraic);
   OPT(opt_cse);
-  OPT(opt_copy_propagate);
+  OPT(opt_copy_propagation);
   OPT(opt_predicated_break, this);
   OPT(opt_cmod_propagation);
   OPT(dead_code_eliminate);
@@ -5715,7 +5715,7 @@ fs_visitor::optimize()
}
 
if (OPT(lower_d2x)) {
-  OPT(opt_copy_propagate);
+  OPT(opt_copy_propagation);
   OPT(dead_code_eliminate);
}
 
@@ -5727,12 +5727,12 @@ fs_visitor::optimize()
OPT(lower_logical_sends);
 
if (progress) {
-  OPT(opt_copy_propagate);
+  OPT(opt_copy_propagation);
   /* Only run after logical send lowering because it's easier to implement
* in terms of physical sends.
*/
   if (OPT(opt_zero_samples))
- OPT(opt_copy_propagate);
+ OPT(opt_copy_propagation);
   /* Run after logical send lowering to give it a chance to CSE the
* LOAD_PAYLOAD instructions created to construct the payloads of
* e.g. texturing messages in cases where it wasn't possible to CSE the
@@ -5761,7 +5761,7 @@ fs_visitor::optimize()
if (devinfo->gen <= 5 && OPT(lower_minmax)) {
   OPT(opt_cmod_propagation);
   OPT(opt_cse);
-  OPT(opt_copy_propagate);
+  OPT(opt_copy_propagation);
   OPT(dead_code_eliminate);
}
 
diff --git a/src/mesa/drivers/dri/i965/brw_fs.h 
b/src/mesa/drivers/dri/i965/brw_fs.h
index 002cee8..91c3985 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.h
+++ b/src/mesa/drivers/dri/i965/brw_fs.h
@@ -133,11 +133,11 @@ public:
bool opt_redundant_discard_jumps();
bool opt_cse();
bool opt_cse_local(bblock_t *block);
-   bool opt_copy_propagate();
+   bool opt_copy_propagation();
bool try_copy_propagate(fs_inst *inst, int arg, acp_entry *entry);
bool try_constant_propagate(fs_inst *inst, acp_entry *entry);
-   bool opt_copy_propagate_local(void *mem_ctx, bblock_t *block,
- exec_list *acp);
+   bool opt_copy_propagation_local(void *mem_ctx, bblock_t *block,
+   exec_list *acp);
bool opt_drop_redundant_mov_to_flags();
bool opt_register_renaming();
bool register_coalesce();
diff --git a/src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp 
b/src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp
index da835cb..53cd111 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp
@@ -129,7 +129,7 @@ fs_copy_prop_dataflow::fs_copy_prop_dataflow(void *mem_ctx, 
cfg_t *cfg,
  foreach_in_list(acp_entry, entry, _acp[block->num][i]) {
 acp[next_acp] = entry;
 
-/* opt_copy_propagate_local populates out_acp with copies created
+/* opt_copy_propagation_local populates out_acp with copies created
  * in a block which are still live at the end of the block.  This
  * is exactly what we want in the COPY set.
  */
@@ -735,8 +735,8 @@ can_propagate_from(fs_inst *inst)
  * list.
  */
 bool
-fs_visitor::opt_copy_propagate_local(void *copy_prop_ctx, bblock_t *block,
- exec_list *acp)
+fs_visitor::opt_copy_propagation_local(void *copy_prop_ctx, bblock_t *block,
+   exec_list *acp)
 {
bool progress = false;
 
@@ -819,7 +819,7 @@ fs_visitor::opt_copy_propagate_local(void *copy_prop_ctx, 
bblock_t *block,
 }
 
 bool
-fs_visitor::opt_copy_propagate()
+fs_visitor::opt_copy_propagation()
 {
bool progress = false;
void *copy_prop_ctx = ralloc_context(NULL);
@@ -832,8 +832,8 @@ fs_visitor::opt_copy_propagate()
 * the set of copies available at the end of the block.
 */
foreach_block (block, cfg) {
-  progress = opt_copy_propagate_local(copy_prop_ctx, block,
-  out_acp[block->num]) || progress;
+  progress = opt_copy_propagation_local(copy_prop_ctx, block,
+out_acp[block->num]) || progress;
}
 
/* Do dataflow analysis for those available copies. */
@@ -852,7 +852,8 @@ fs_visitor::opt_copy_propagate()
  }
   }
 
-  progress = opt_copy_propagate_local(copy_prop_ctx, block, in_acp) || 
progress;
+  progress = opt_copy_propagation_local(copy_prop_ctx, block, in_acp) ||
+ progress;
}
 
for (int i = 0; i < cfg->num_blocks;