Merge pull request #2891 from devitocodes/hotfix-efunc-abstract

compiler: Fix efunc abstraction for MinMax pragma-based kernels

Author: mloubout

devito/ir/clusters/algorithms.py

@@ -20,7 +20,7 @@
 from devito.tools import (
     DefaultOrderedDict, Stamp, as_mapper, flatten, is_integer, split, timed_pass, toposort
 )
-from devito.types import Array, Eq, Symbol
+from devito.types import Array, Eq, Symbol, Temp
 from devito.types.dimension import BOTTOM, ModuloDimension
 
 __all__ = ['clusterize']
@@ -639,8 +639,8 @@ def normalize_reductions_minmax(cluster, sregistry):
             # NOTE: we need to create two different reduction variables here
             # (instead of using say `n[0]` and `n[1]` directly) because that's
             # essentially what OpenMP/OpenACC expect -- two different symbols
-            rmin = Symbol(name=sregistry.make_name(prefix='rmin'), dtype=lhs.dtype)
-            rmax = Symbol(name=sregistry.make_name(prefix='rmax'), dtype=lhs.dtype)
+            rmin = Temp(name=sregistry.make_name(prefix='rmin'), dtype=lhs.dtype)
+            rmax = Temp(name=sregistry.make_name(prefix='rmax'), dtype=lhs.dtype)
 
             expr0 = Eq(rmin, limits_mapper[lhs.dtype].max)
             expr1 = Eq(rmax, limits_mapper[lhs.dtype].min)

devito/ir/iet/visitors.py

@@ -1377,7 +1377,7 @@ class Uxreplace(Transformer):
     def visit_Expression(self, o):
         return o._rebuild(expr=uxreplace(o.expr, self.mapper))
 
-    def visit_Iteration(self, o):
+    def _visit_Iteration_common(self, o):
         nodes = self._visit(o.nodes)
         dimension = uxreplace(o.dim, self.mapper)
         limits = [uxreplace(i, self.mapper) for i in o.limits]
@@ -1386,9 +1386,25 @@ def visit_Iteration(self, o):
         uindices = [uxreplace(i, self.mapper) for i in o.uindices]
         uindices = filter_ordered(i for i in uindices if isinstance(i, Dimension))
 
+        return nodes, dimension, limits, pragmas, uindices
+
+    def visit_Iteration(self, o):
+        nodes, dimension, limits, pragmas, uindices = \
+            self._visit_Iteration_common(o)
+
         return o._rebuild(nodes=nodes, dimension=dimension, limits=limits,
                           pragmas=pragmas, uindices=uindices)
 
+    def visit_PragmaIteration(self, o):
+        nodes, dimension, limits, pragmas, uindices = \
+            self._visit_Iteration_common(o)
+
+        reduction = [(uxreplace(var, self.mapper), imask, op)
+                     for var, imask, op in (o.reduction or [])]
+
+        return o._rebuild(nodes=nodes, dimension=dimension, limits=limits,
+                          pragmas=pragmas, uindices=uindices, reduction=reduction)
+
     def visit_Definition(self, o):
         try:
             return o._rebuild(function=self.mapper[o.function])