[Mesa-dev] [PATCH 14/30] i965/ir: Pass detailed dependency classes to invalidate_analysis().
Francisco Jerez
currojerez at riseup.net
Mon Mar 14 03:47:18 UTC 2016
Have fun reading through the whole back-end optimizer to verify
whether I've missed any dependency flags -- Or alternatively, just
trust that any mistake here will trigger an assertion failure during
analysis pass validation if it ever poses a problem for the
consistency of any of the analysis passes managed by the framework.
---
.../drivers/dri/i965/brw_dead_control_flow.cpp | 2 +-
src/mesa/drivers/dri/i965/brw_fs.cpp | 41 +++++++++++-----------
.../drivers/dri/i965/brw_fs_cmod_propagation.cpp | 2 +-
.../drivers/dri/i965/brw_fs_combine_constants.cpp | 2 +-
.../drivers/dri/i965/brw_fs_copy_propagation.cpp | 3 +-
src/mesa/drivers/dri/i965/brw_fs_cse.cpp | 2 +-
.../dri/i965/brw_fs_dead_code_eliminate.cpp | 2 +-
src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp | 2 +-
.../drivers/dri/i965/brw_fs_register_coalesce.cpp | 2 +-
src/mesa/drivers/dri/i965/brw_fs_sel_peephole.cpp | 2 +-
src/mesa/drivers/dri/i965/brw_predicated_break.cpp | 2 +-
.../drivers/dri/i965/brw_schedule_instructions.cpp | 4 +--
src/mesa/drivers/dri/i965/brw_vec4.cpp | 15 ++++----
.../drivers/dri/i965/brw_vec4_cmod_propagation.cpp | 2 +-
.../drivers/dri/i965/brw_vec4_copy_propagation.cpp | 3 +-
src/mesa/drivers/dri/i965/brw_vec4_cse.cpp | 2 +-
.../dri/i965/brw_vec4_dead_code_eliminate.cpp | 2 +-
.../drivers/dri/i965/brw_vec4_reg_allocate.cpp | 2 +-
18 files changed, 48 insertions(+), 44 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_dead_control_flow.cpp b/src/mesa/drivers/dri/i965/brw_dead_control_flow.cpp
index 65e009c..75c7be3 100644
--- a/src/mesa/drivers/dri/i965/brw_dead_control_flow.cpp
+++ b/src/mesa/drivers/dri/i965/brw_dead_control_flow.cpp
@@ -111,7 +111,7 @@ dead_control_flow_eliminate(backend_shader *s)
}
if (progress)
- s->invalidate_analysis(DEPENDENCY_EVERYTHING);
+ s->invalidate_analysis(DEPENDENCY_BLOCKS | DEPENDENCY_INSTRUCTIONS);
return progress;
}
diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
index 60924b6..9183d1f 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -1843,7 +1843,7 @@ fs_visitor::split_virtual_grfs()
}
}
}
- invalidate_analysis(DEPENDENCY_EVERYTHING);
+ invalidate_analysis(DEPENDENCY_INSTRUCTION_DETAIL | DEPENDENCY_VARIABLES);
}
/**
@@ -1884,7 +1884,7 @@ fs_visitor::compact_virtual_grfs()
} else {
remap_table[i] = new_index;
alloc.sizes[new_index] = alloc.sizes[i];
- invalidate_analysis(DEPENDENCY_EVERYTHING);
+ invalidate_analysis(DEPENDENCY_INSTRUCTION_DETAIL | DEPENDENCY_VARIABLES);
++new_index;
}
}
@@ -2088,7 +2088,7 @@ fs_visitor::demote_pull_constants()
inst->src[i].reg_offset = 0;
}
}
- invalidate_analysis(DEPENDENCY_EVERYTHING);
+ invalidate_analysis(DEPENDENCY_INSTRUCTIONS | DEPENDENCY_VARIABLES);
}
bool
@@ -2316,7 +2316,8 @@ fs_visitor::opt_algebraic()
}
if (progress)
- invalidate_analysis(DEPENDENCY_EVERYTHING);
+ invalidate_analysis(DEPENDENCY_INSTRUCTION_DATA_FLOW |
+ DEPENDENCY_INSTRUCTION_DETAIL);
return progress;
}
@@ -2367,7 +2368,7 @@ fs_visitor::opt_zero_samples()
}
if (progress)
- invalidate_analysis(DEPENDENCY_EVERYTHING);
+ invalidate_analysis(DEPENDENCY_INSTRUCTION_DETAIL);
return progress;
}
@@ -2446,7 +2447,7 @@ fs_visitor::opt_sampler_eot()
* the instruction that this will replace.
*/
if (tex_inst->header_size != 0) {
- invalidate_analysis(DEPENDENCY_EVERYTHING);
+ invalidate_analysis(DEPENDENCY_INSTRUCTIONS);
return true;
}
@@ -2479,7 +2480,7 @@ fs_visitor::opt_sampler_eot()
tex_inst->insert_before(cfg->blocks[cfg->num_blocks - 1], new_load_payload);
tex_inst->src[0] = send_header;
- invalidate_analysis(DEPENDENCY_EVERYTHING);
+ invalidate_analysis(DEPENDENCY_INSTRUCTIONS | DEPENDENCY_VARIABLES);
return true;
}
@@ -2532,7 +2533,7 @@ fs_visitor::opt_register_renaming()
}
if (progress) {
- invalidate_analysis(DEPENDENCY_EVERYTHING);
+ invalidate_analysis(DEPENDENCY_INSTRUCTION_DETAIL | DEPENDENCY_VARIABLES);
for (unsigned i = 0; i < ARRAY_SIZE(delta_xy); i++) {
if (delta_xy[i].file == VGRF && remap[delta_xy[i].nr] != -1) {
@@ -2580,7 +2581,7 @@ fs_visitor::opt_redundant_discard_jumps()
}
if (progress)
- invalidate_analysis(DEPENDENCY_EVERYTHING);
+ invalidate_analysis(DEPENDENCY_INSTRUCTIONS);
return progress;
}
@@ -2740,7 +2741,7 @@ fs_visitor::compute_to_mrf()
}
if (progress)
- invalidate_analysis(DEPENDENCY_EVERYTHING);
+ invalidate_analysis(DEPENDENCY_INSTRUCTIONS);
return progress;
}
@@ -2790,7 +2791,7 @@ fs_visitor::eliminate_find_live_channel()
}
if (progress)
- invalidate_analysis(DEPENDENCY_EVERYTHING);
+ invalidate_analysis(DEPENDENCY_INSTRUCTION_DETAIL);
return progress;
}
@@ -2905,7 +2906,7 @@ fs_visitor::remove_duplicate_mrf_writes()
}
if (progress)
- invalidate_analysis(DEPENDENCY_EVERYTHING);
+ invalidate_analysis(DEPENDENCY_INSTRUCTIONS);
return progress;
}
@@ -3090,7 +3091,7 @@ fs_visitor::insert_gen4_send_dependency_workarounds()
}
if (progress)
- invalidate_analysis(DEPENDENCY_EVERYTHING);
+ invalidate_analysis(DEPENDENCY_INSTRUCTIONS);
}
/**
@@ -3157,7 +3158,7 @@ fs_visitor::lower_uniform_pull_constant_loads()
inst->src[1] = payload;
inst->base_mrf = -1;
- invalidate_analysis(DEPENDENCY_EVERYTHING);
+ invalidate_analysis(DEPENDENCY_INSTRUCTIONS | DEPENDENCY_VARIABLES);
} else {
/* Before register allocation, we didn't tell the scheduler about the
* MRF we use. We know it's safe to use this MRF because nothing
@@ -3263,7 +3264,7 @@ fs_visitor::lower_load_payload()
}
if (progress)
- invalidate_analysis(DEPENDENCY_EVERYTHING);
+ invalidate_analysis(DEPENDENCY_INSTRUCTIONS);
return progress;
}
@@ -3481,7 +3482,7 @@ fs_visitor::lower_integer_multiplication()
}
if (progress)
- invalidate_analysis(DEPENDENCY_EVERYTHING);
+ invalidate_analysis(DEPENDENCY_INSTRUCTIONS | DEPENDENCY_VARIABLES);
return progress;
}
@@ -3511,7 +3512,7 @@ fs_visitor::lower_minmax()
}
if (progress)
- invalidate_analysis(DEPENDENCY_EVERYTHING);
+ invalidate_analysis(DEPENDENCY_INSTRUCTIONS);
return progress;
}
@@ -4336,7 +4337,7 @@ fs_visitor::lower_logical_sends()
}
if (progress)
- invalidate_analysis(DEPENDENCY_EVERYTHING);
+ invalidate_analysis(DEPENDENCY_INSTRUCTIONS | DEPENDENCY_VARIABLES);
return progress;
}
@@ -4613,7 +4614,7 @@ fs_visitor::lower_simd_width()
}
if (progress)
- invalidate_analysis(DEPENDENCY_EVERYTHING);
+ invalidate_analysis(DEPENDENCY_INSTRUCTIONS | DEPENDENCY_VARIABLES);
return progress;
}
@@ -5214,7 +5215,7 @@ fs_visitor::fixup_3src_null_dest()
}
if (progress)
- invalidate_analysis(DEPENDENCY_EVERYTHING);
+ invalidate_analysis(DEPENDENCY_INSTRUCTION_DETAIL | DEPENDENCY_VARIABLES);
}
void
diff --git a/src/mesa/drivers/dri/i965/brw_fs_cmod_propagation.cpp b/src/mesa/drivers/dri/i965/brw_fs_cmod_propagation.cpp
index 03835dd..4d971ad 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_cmod_propagation.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_cmod_propagation.cpp
@@ -166,7 +166,7 @@ fs_visitor::opt_cmod_propagation()
}
if (progress)
- invalidate_analysis(DEPENDENCY_EVERYTHING);
+ invalidate_analysis(DEPENDENCY_INSTRUCTIONS);
return progress;
}
diff --git a/src/mesa/drivers/dri/i965/brw_fs_combine_constants.cpp b/src/mesa/drivers/dri/i965/brw_fs_combine_constants.cpp
index c89fc47..d556935 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_combine_constants.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_combine_constants.cpp
@@ -324,7 +324,7 @@ fs_visitor::opt_combine_constants()
}
ralloc_free(const_ctx);
- invalidate_analysis(DEPENDENCY_EVERYTHING);
+ invalidate_analysis(DEPENDENCY_INSTRUCTIONS | DEPENDENCY_VARIABLES);
return true;
}
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 590b92f..b27c6ab 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp
@@ -843,7 +843,8 @@ fs_visitor::opt_copy_propagate()
ralloc_free(copy_prop_ctx);
if (progress)
- invalidate_analysis(DEPENDENCY_EVERYTHING);
+ invalidate_analysis(DEPENDENCY_INSTRUCTION_DATA_FLOW |
+ DEPENDENCY_INSTRUCTION_DETAIL);
return progress;
}
diff --git a/src/mesa/drivers/dri/i965/brw_fs_cse.cpp b/src/mesa/drivers/dri/i965/brw_fs_cse.cpp
index 4e85fb9..a484caf 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_cse.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_cse.cpp
@@ -356,7 +356,7 @@ fs_visitor::opt_cse()
}
if (progress)
- invalidate_analysis(DEPENDENCY_EVERYTHING);
+ invalidate_analysis(DEPENDENCY_INSTRUCTIONS | DEPENDENCY_VARIABLES);
return progress;
}
diff --git a/src/mesa/drivers/dri/i965/brw_fs_dead_code_eliminate.cpp b/src/mesa/drivers/dri/i965/brw_fs_dead_code_eliminate.cpp
index 84e4741..540230c 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_dead_code_eliminate.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_dead_code_eliminate.cpp
@@ -133,7 +133,7 @@ fs_visitor::dead_code_eliminate()
ralloc_free(flag_live);
if (progress)
- invalidate_analysis(DEPENDENCY_EVERYTHING);
+ invalidate_analysis(DEPENDENCY_INSTRUCTIONS);
return progress;
}
diff --git a/src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp b/src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp
index 654bf03..f880206 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp
@@ -947,5 +947,5 @@ fs_visitor::spill_reg(int spill_reg)
}
}
- invalidate_analysis(DEPENDENCY_EVERYTHING);
+ invalidate_analysis(DEPENDENCY_INSTRUCTIONS | DEPENDENCY_VARIABLES);
}
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 16bef19..4a9a502 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_register_coalesce.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_register_coalesce.cpp
@@ -287,7 +287,7 @@ fs_visitor::register_coalesce()
}
}
- invalidate_analysis(DEPENDENCY_EVERYTHING);
+ invalidate_analysis(DEPENDENCY_INSTRUCTIONS);
}
return progress;
diff --git a/src/mesa/drivers/dri/i965/brw_fs_sel_peephole.cpp b/src/mesa/drivers/dri/i965/brw_fs_sel_peephole.cpp
index a6799d0..6c7d190 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_sel_peephole.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_sel_peephole.cpp
@@ -214,7 +214,7 @@ fs_visitor::opt_peephole_sel()
}
if (progress)
- invalidate_analysis(DEPENDENCY_EVERYTHING);
+ invalidate_analysis(DEPENDENCY_INSTRUCTIONS | DEPENDENCY_VARIABLES);
return progress;
}
diff --git a/src/mesa/drivers/dri/i965/brw_predicated_break.cpp b/src/mesa/drivers/dri/i965/brw_predicated_break.cpp
index 46843a6..86359cc 100644
--- a/src/mesa/drivers/dri/i965/brw_predicated_break.cpp
+++ b/src/mesa/drivers/dri/i965/brw_predicated_break.cpp
@@ -142,7 +142,7 @@ opt_predicated_break(backend_shader *s)
}
if (progress)
- s->invalidate_analysis(DEPENDENCY_EVERYTHING);
+ s->invalidate_analysis(DEPENDENCY_BLOCKS | DEPENDENCY_INSTRUCTIONS);
return progress;
}
diff --git a/src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp b/src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp
index d2b6eb1..8f7ee5c 100644
--- a/src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp
+++ b/src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp
@@ -1679,7 +1679,7 @@ fs_visitor::schedule_instructions(instruction_scheduler_mode mode)
stage_abbrev, dispatch_width, sched.time);
}
- invalidate_analysis(DEPENDENCY_EVERYTHING);
+ invalidate_analysis(DEPENDENCY_INSTRUCTIONS);
}
void
@@ -1693,5 +1693,5 @@ vec4_visitor::opt_schedule_instructions()
stage_abbrev, sched.time);
}
- invalidate_analysis(DEPENDENCY_EVERYTHING);
+ invalidate_analysis(DEPENDENCY_INSTRUCTIONS);
}
diff --git a/src/mesa/drivers/dri/i965/brw_vec4.cpp b/src/mesa/drivers/dri/i965/brw_vec4.cpp
index 2e67b89..cf5b114 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4.cpp
@@ -400,7 +400,7 @@ vec4_visitor::opt_vector_float()
}
if (progress)
- invalidate_analysis(DEPENDENCY_EVERYTHING);
+ invalidate_analysis(DEPENDENCY_INSTRUCTIONS);
return progress;
}
@@ -469,7 +469,7 @@ vec4_visitor::opt_reduce_swizzle()
}
if (progress)
- invalidate_analysis(DEPENDENCY_EVERYTHING);
+ invalidate_analysis(DEPENDENCY_INSTRUCTION_DETAIL);
return progress;
}
@@ -725,7 +725,8 @@ vec4_visitor::opt_algebraic()
}
if (progress)
- invalidate_analysis(DEPENDENCY_EVERYTHING);
+ invalidate_analysis(DEPENDENCY_INSTRUCTION_DATA_FLOW |
+ DEPENDENCY_INSTRUCTION_DETAIL);
return progress;
}
@@ -1207,7 +1208,7 @@ vec4_visitor::opt_register_coalesce()
}
if (progress)
- invalidate_analysis(DEPENDENCY_EVERYTHING);
+ invalidate_analysis(DEPENDENCY_INSTRUCTIONS);
return progress;
}
@@ -1250,7 +1251,7 @@ vec4_visitor::eliminate_find_live_channel()
}
if (progress)
- invalidate_analysis(DEPENDENCY_EVERYTHING);
+ invalidate_analysis(DEPENDENCY_INSTRUCTION_DETAIL);
return progress;
}
@@ -1326,7 +1327,7 @@ vec4_visitor::split_virtual_grfs()
}
}
}
- invalidate_analysis(DEPENDENCY_EVERYTHING);
+ invalidate_analysis(DEPENDENCY_INSTRUCTION_DETAIL | DEPENDENCY_VARIABLES);
}
void
@@ -1679,7 +1680,7 @@ vec4_visitor::lower_minmax()
}
if (progress)
- invalidate_analysis(DEPENDENCY_EVERYTHING);
+ invalidate_analysis(DEPENDENCY_INSTRUCTIONS);
return progress;
}
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_cmod_propagation.cpp b/src/mesa/drivers/dri/i965/brw_vec4_cmod_propagation.cpp
index b22be97..fe08447 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4_cmod_propagation.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4_cmod_propagation.cpp
@@ -150,7 +150,7 @@ vec4_visitor::opt_cmod_propagation()
}
if (progress)
- invalidate_analysis(DEPENDENCY_EVERYTHING);
+ invalidate_analysis(DEPENDENCY_INSTRUCTIONS);
return progress;
}
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_copy_propagation.cpp b/src/mesa/drivers/dri/i965/brw_vec4_copy_propagation.cpp
index f5f6879..7e9a77b 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4_copy_propagation.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4_copy_propagation.cpp
@@ -488,7 +488,8 @@ vec4_visitor::opt_copy_propagation(bool do_constant_prop)
}
if (progress)
- invalidate_analysis(DEPENDENCY_EVERYTHING);
+ invalidate_analysis(DEPENDENCY_INSTRUCTION_DATA_FLOW |
+ DEPENDENCY_INSTRUCTION_DETAIL);
return progress;
}
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_cse.cpp b/src/mesa/drivers/dri/i965/brw_vec4_cse.cpp
index 57c2137..38dd3ed 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4_cse.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4_cse.cpp
@@ -275,7 +275,7 @@ vec4_visitor::opt_cse()
}
if (progress)
- invalidate_analysis(DEPENDENCY_EVERYTHING);
+ invalidate_analysis(DEPENDENCY_INSTRUCTIONS | DEPENDENCY_VARIABLES);
return progress;
}
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_dead_code_eliminate.cpp b/src/mesa/drivers/dri/i965/brw_vec4_dead_code_eliminate.cpp
index 22934fe..eefb48a 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4_dead_code_eliminate.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4_dead_code_eliminate.cpp
@@ -182,7 +182,7 @@ vec4_visitor::dead_code_eliminate()
ralloc_free(flag_live);
if (progress)
- invalidate_analysis(DEPENDENCY_EVERYTHING);
+ invalidate_analysis(DEPENDENCY_INSTRUCTIONS);
return progress;
}
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_reg_allocate.cpp b/src/mesa/drivers/dri/i965/brw_vec4_reg_allocate.cpp
index 3f90b4e..fdc15f9 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4_reg_allocate.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4_reg_allocate.cpp
@@ -482,7 +482,7 @@ vec4_visitor::spill_reg(int spill_reg_nr)
}
}
- invalidate_analysis(DEPENDENCY_EVERYTHING);
+ invalidate_analysis(DEPENDENCY_INSTRUCTIONS | DEPENDENCY_VARIABLES);
}
} /* namespace brw */
--
2.7.0
More information about the mesa-dev
mailing list