compiler: Tidy up new searches and functionality tweaks

Author: EdCaunt

devito/ir/clusters/algorithms.py

@@ -122,7 +122,6 @@ class Schedule(QueueStateful):
 
     @timed_pass(name='schedule')
     def process(self, clusters):
-        # from IPython import embed; embed()
         return self._process_fatd(clusters, 1)
 
     def callback(self, clusters, prefix, backlog=None, known_break=None):

devito/ir/support/basic.py

@@ -831,11 +831,6 @@ def __init__(self, exprs, rules=None):
         self.rules = as_tuple(rules)
         assert all(callable(i) for i in self.rules)
 
-    # FIXME: Should be put somewhere sensible
-    @cached_property
-    def thingy(self):
-        return any(i.cause for i in self.d_anti_gen())
-
     @memoized_generator
     def writes_gen(self):
         """
@@ -1128,6 +1123,10 @@ def d_anti(self):
         """Anti (or "write-after-read") dependences."""
         return DependenceGroup(self.d_anti_gen())
 
+    @cached_property
+    def has_antidependencies(self):
+        return any(i.cause for i in self.d_anti_gen())
+
     @memoized_generator
     def d_output_gen(self):
         """Generate the output (or "write-after-write") dependences."""

devito/passes/clusters/cse.py

@@ -13,6 +13,7 @@
 from devito.finite_differences.differentiable import IndexDerivative
 from devito.ir import Cluster, Scope, cluster_pass
 from devito.symbolics import estimate_cost, q_leaf, q_terminal
+from devito.symbolics.search import retrieve_ctemps
 from devito.symbolics.manipulation import _uxreplace
 from devito.tools import DAG, as_list, as_tuple, frozendict, extract_dtype
 from devito.types import Eq, Symbol, Temp
@@ -222,36 +223,17 @@ def _compact(exprs, exclude):
     `for (i = ...) { a = b; for (j = a ...) ... }`. Hence, this routine
     only targets CTemps.
     """
-    # FIXME: Can use is_CTemp rather than isinstance
     candidates = [e for e in exprs
                   if isinstance(e.lhs, CTemp) and e.lhs not in exclude]
 
     mapper = {e.lhs: e.rhs for e in candidates if q_leaf(e.rhs)}
 
-    # FIXME: Move this to searches as retrieve_ctemps
-    from devito.symbolics.search import search
-
-    def q_ctemp(expr):
-        try:
-            return expr.is_CTemp
-        except AttributeError:
-            return False
-
-    # Find all the CTemps in expressions without removing duplicates
-    # ctemps = search(exprs, q_ctemp, 'all', 'dfs')
-    # I think it was more like
-    ctemps = search([e.rhs for e in exprs], q_ctemp, 'all', 'dfs')
-
-    # print(ctemps, len(ctemps), len(set(ctemps)), len(candidates))
-
-    # FIXME: This line is kinda slow. I should find some way to replace it.
-    # FIXME: Specifically sum([i.rhs.count(e.lhs) for i in exprs]) == 1 is slow as hell
-    # mapper.update({e.lhs: e.rhs for e in candidates
-    #                if sum([i.rhs.count(e.lhs) for i in exprs]) == 1})
+    # Find all the CTemps in expression right-hand-sides without removing duplicates
+    ctemps = retrieve_ctemps([e.rhs for e in exprs])
 
     # If there are ctemps in the expressions, then add any to the mapper which only
     # appear once
-    # TODO: Double check this is exactly the prior behaviour?
+    # TODO: Double check this is exactly the prior behaviour
     if ctemps:
         mapper.update({e.lhs: e.rhs for e in candidates
                        if ctemps.count(e.lhs) == 1})

devito/passes/clusters/misc.py

@@ -362,8 +362,8 @@ def is_cross(source, sink):
                 # (intuitively, "the loop nests are to be kept separated")
                 # * All ClusterGroups between `cg0` and `cg1` must precede `cg1`
                 # * All ClusterGroups after `cg1` cannot precede `cg1`
-                # FIXME: This is a terrible variable name
-                if prefix and scope.thingy:
+                # TODO: Check that this is indeed what the attribute does
+                if prefix and scope.has_antidependencies:
                     for cg2 in cgroups[n:cgroups.index(cg1)]:
                         dag.add_edge(cg2, cg1)
                     for cg2 in cgroups[cgroups.index(cg1)+1:]:

devito/symbolics/queries.py

@@ -32,6 +32,13 @@ def q_symbol(expr):
         return False
 
 
+def q_ctemp(expr):
+    try:
+        return expr.is_CTemp
+    except AttributeError:
+        return False
+
+
 def q_comp_acc(expr):
     return isinstance(expr, ComponentAccess)
 

devito/symbolics/search.py

@@ -1,7 +1,7 @@
 import sympy
 
 from devito.symbolics.queries import (q_indexed, q_function, q_terminal, q_leaf,
-                                      q_symbol, q_dimension, q_derivative)
+                                      q_symbol, q_ctemp, q_dimension, q_derivative)
 from devito.tools import as_tuple
 
 __all__ = ['retrieve_indexed', 'retrieve_functions', 'retrieve_function_carriers',
@@ -155,10 +155,15 @@ def retrieve_functions(exprs, mode='all', deep=False):
 
 
 def retrieve_symbols(exprs, mode='all'):
-    """Shorthand to retrieve the Scalar in ``exprs``."""
+    """Shorthand to retrieve the Scalar in `exprs`."""
     return search(exprs, q_symbol, mode, 'dfs')
 
 
+def retrieve_ctemps(exprs, mode='all'):
+    """Shorthand to retrieve the CTemps in `exprs`"""
+    return search(exprs, q_ctemp, mode, 'dfs')
+
+
 def retrieve_function_carriers(exprs, mode='all'):
     """
     Shorthand to retrieve the DiscreteFunction carriers in ``exprs``. An