compiler: prevent adding breaking guard to nokey

devitocodes · Jul 7, 2023 · 2eceda4 · 2eceda4
1 parent 474b10c
commit 2eceda4
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/devito/ir/support/guards.py b/devito/ir/support/guards.py
@@ -234,6 +234,19 @@ def andg(self, d, guard):
 
         return Guards(m)
 
+    def xandg(self, d, guard):
+        m = dict(self)
+
+        if guard == true:
+            return Guards(m)
+
+        try:
+            m[d] = And(m[d], guard)
+        except KeyError:
+            pass
+
+        return Guards(m)
+
     def impose(self, d, guard):
         m = dict(self)
 

diff --git a/devito/passes/clusters/buffering.py b/devito/passes/clusters/buffering.py
@@ -228,7 +228,10 @@ def callback(self, clusters, prefix, cache=None):
 
                 expr = lower_exprs(Eq(lhs, rhs))
                 ispace = b.readfrom
-                guards = c.guards.andg(b.xd, GuardBound(0, b.firstidx.f))
+                try:
+                    guards = c.guards.xandg(b.xd, GuardBound(0, b.firstidx.f))
+                except KeyError:
+                    guards = c.guards
                 properties = c.properties.sequentialize(d)
 
                 processed.append(
@@ -262,7 +265,10 @@ def callback(self, clusters, prefix, cache=None):
 
                 expr = lower_exprs(uxreplace(Eq(lhs, rhs), b.subdims_mapper))
                 ispace = b.written
-                guards = c.guards.andg(b.xd, GuardBound(0, b.firstidx.f))
+                try:
+                    guards = c.guards.xandg(b.xd, GuardBound(0, b.firstidx.f))
+                except KeyError:
+                    guards = c.guards
                 properties = c.properties.sequentialize(d)
 
                 processed.append(