compiler: Fix syncs carry-over at CIRE

Author: FabioLuporini

devito/passes/clusters/aliases.py

@@ -306,9 +306,13 @@ def process(self, clusters):
     def callback(self, clusters, prefix, xtracted=None):
         if not prefix:
             return clusters
+
         p = prefix[-1]
         d = p.dim
 
+        if d.is_Virtual:
+            return clusters
+
         # Rule out extractions that would break data dependencies
         exclude = set().union(*[c.scope.writes for c in clusters])
 
@@ -340,7 +344,7 @@ def _lookup_key(self, c, d):
         intervals = c.ispace.intervals.drop(d).reset()
         properties = frozendict({d: relax_properties(v) for d, v in c.properties.items()})
 
-        return AliasKey(ispace, intervals, c.dtype, c.guards, properties)
+        return AliasKey(ispace, intervals, c.dtype, c.guards, properties, c.syncs)
 
     def _select(self, variants):
         return pick_best(variants)
@@ -441,7 +445,7 @@ def _generate(self, cgroup, exclude):
             yield self._do_generate(exprs, exclude, cbk_search, self._cbk_compose)
 
     def _lookup_key(self, c):
-        return AliasKey(c.ispace, None, c.dtype, c.guards, c.properties)
+        return AliasKey(c.ispace, None, c.dtype, c.guards, c.properties, c.syncs)
 
     def _select(self, variants):
         if isinstance(self.opt_schedule_strategy, int):
@@ -1050,7 +1054,9 @@ def lower_schedule(schedule, meta, sregistry, opt_ftemps, opt_min_dtype, opt_min
             properties[Hyperplane(writeto.itdims)] = {SEPARABLE}
 
         # Finally, build the alias Cluster
-        clusters.append(Cluster(expression, ispace, guards, properties))
+        clusters.append(
+            Cluster(expression, ispace, guards, properties, meta.syncs)
+        )
 
     return clusters, subs
 
@@ -1392,7 +1398,7 @@ def _pivot_legal_shifts(self):
         return ret
 
 
-AliasKey = namedtuple('AliasKey', 'ispace intervals dtype guards properties')
+AliasKey = namedtuple('AliasKey', 'ispace intervals dtype guards properties syncs')
 Variant = namedtuple('Variant', 'schedule exprs')
 
 

tests/test_dse.py

@@ -423,7 +423,7 @@ def test_collection(self, exprs, expected):
 
         extracted = {i.rhs: i.lhs for i in exprs}
         ispace = exprs[0].ispace
-        meta = AliasKey(ispace, None, None, None, None)
+        meta = AliasKey(ispace, None, None, None, None, None)
 
         aliases = collect(extracted, meta, False)
         aliases.filter(lambda a: a.score > 0)