summaryrefslogtreecommitdiffstats
path: root/src/glsl/opt_tree_grafting.cpp
diff options
context:
space:
mode:
authorTimothy Arceri <[email protected]>2015-07-11 21:38:54 +1000
committerTimothy Arceri <[email protected]>2015-10-15 20:36:14 +1100
commit410609c9688d3f6ad808d33928a7d9589a708a40 (patch)
treef392a81d2c4b4bfda05a1e9c5922b295c02f9147 /src/glsl/opt_tree_grafting.cpp
parentd337da81f28d6a5a65d0a09f9b1ddf905dc7c3aa (diff)
glsl: remove dead code in a single pass
Currently only one ir assignment is removed for each var in a single dead code optimisation pass. This means if a var has more than one assignment, then it requires all the glsl optimisations to be run again for each additional assignment to be removed. Another pass is also required to remove the variable itself. With this change all assignments and the variable are removed in a single pass. Some of the arrays of arrays conformance tests that were looping through 8 dimensions ended up with a var with hundreds of assignments. This change helps ES31-CTS.arrays_of_arrays.InteractionFunctionCalls1 go from around 3 min 20 sec -> 2 min ES31-CTS.arrays_of_arrays.InteractionFunctionCalls2 went from around 9 min 20 sec to 7 min 30 sec I had difficulty getting the public shader-db to give a consistent result with or without this change but the results seemed unchanged at between 15-20 seconds. Thomas Helland measured change with shader-db on his machine from approx 117 secs to 112 secs. V3: Simplify freeing of list as suggested by Ian, and spelling fixes. V2: Add assert to be sure references are counted before assignments. Reviewed-by: Ian Romanick <[email protected]> Tested-By: Thomas Helland <[email protected]> Tested-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/glsl/opt_tree_grafting.cpp')
-rw-r--r--src/glsl/opt_tree_grafting.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/glsl/opt_tree_grafting.cpp b/src/glsl/opt_tree_grafting.cpp
index a7a219c55ca..e38a0e93058 100644
--- a/src/glsl/opt_tree_grafting.cpp
+++ b/src/glsl/opt_tree_grafting.cpp
@@ -373,8 +373,6 @@ tree_grafting_basic_block(ir_instruction *bb_first,
entry->referenced_count != 2)
continue;
- assert(assign == entry->assign);
-
/* Found a possibly graftable assignment. Now, walk through the
* rest of the BB seeing if the deref is here, and if nothing interfered with
* pasting its expression's values in between.