ci: add cse ordering test

Author: mloubout

devito/passes/clusters/cse.py

@@ -265,7 +265,7 @@ def _toposort(exprs):
     dag = DAG(exprs)
 
     for e0 in exprs:
-        if not isinstance(e0.lhs, CTemp):
+        if not search(e0, CTemp):
             continue
 
         for e1 in exprs:
@@ -279,7 +279,7 @@ def choose_element(queue, scheduled):
             first = sorted(tmps, key=lambda i: i.lhs.name).pop(0)
             queue.remove(first)
         else:
-            first = queue.popleft()
+            first = queue.pop()
         return first
 
     processed = dag.topological_sort(choose_element)

tests/test_cse.py

@@ -246,3 +246,26 @@ def test_advanced_algo(exprs, expected):
 
     assert len(processed) == len(expected)
     assert all(str(i.rhs) == j for i, j in zip(processed, expected))
+
+
+def test_advanced_algo_order():
+    """
+    Test that smartsort/advanced doesn't break equation order.
+    """
+    grid = Grid((3, 3, 3))
+    u = TimeFunction(name="u", grid=grid, space_order=2)
+    v = TimeFunction(name="v", grid=grid, space_order=2)
+
+    eq0 = DummyEq(indexify(diffify(Eq(u.forward, u.dx).evaluate)))
+    eq1 = DummyEq(indexify(diffify(Eq(v, u.dx).evaluate)))
+    eq_b = DummyEq(indexify(diffify(Eq(v.forward, v + u.forward).evaluate)))
+
+    counter = generator()
+    make = lambda _: CTemp(name='r%d' % counter(), dtype=np.float32).indexify()
+    processed = _cse([eq0, eq1, eq_b], make, mode='advanced')
+
+    # Three input equation and 2 CTemps
+    assert len(processed) == 5
+    assert processed[0].lhs.name == 'r1'
+    # eq_b has to be last
+    assert processed[-1] == eq_b