Hoist reduction loops

coffee/__init__.py

@@ -36,7 +36,6 @@
 import sys
 
 from coffee.citations import update_citations
-from coffee.vectorizer import VectStrategy
 from coffee.logger import LOG_DEFAULT, set_log_level, warn
 from coffee.system import set_architecture, set_compiler, set_isa
 
@@ -169,8 +168,6 @@ def set_opt_level(optlevel):
 O1 = OptimizationLevel('O1', rewrite=1)
 O2 = OptimizationLevel('O2', rewrite=2, dead_ops_elimination=True)
 O3 = OptimizationLevel('O3', align_pad=True, **O2)
-Ofast = OptimizationLevel('Ofast', vectorize=(VectStrategy.SPEC_UAJ_PADD, 2),
-                          precompute='noloops', **O3)
 
 initialized = False
 

coffee/base.py

@@ -447,11 +447,11 @@ class Symbol(Expr):
         a[i][3*j + 2].
     """
 
-    def __init__(self, symbol, rank=(), offset=()):
+    def __init__(self, symbol, rank=None, offset=None):
         super(Symbol, self).__init__([])
         self.symbol = symbol
-        self.rank = rank
-        self.offset = offset or tuple([(1, 0) for r in rank])
+        self.rank = Rank(rank or ())
+        self.offset = offset or tuple([(1, 0) for r in self.rank])
 
     def operands(self):
         return [self.symbol, self.rank, self.offset], {}
@@ -465,6 +465,14 @@ def is_const(self):
         from .utils import is_const_dim
         return not self.rank or all(is_const_dim(r) for r in self.rank)
 
+    @property
+    def is_number(self):
+        try:
+            float(self.symbol)
+            return True
+        except ValueError:
+            return False
+
     @property
     def is_const_offset(self):
         from .utils import is_const_dim, flatten
@@ -715,7 +723,8 @@ def __init__(self, typ, sym, init=None, qualifiers=None, attributes=None,
         self._scope = scope or UNKNOWN
 
     def operands(self):
-        return [self.typ, self.sym, self.init, self.qual, self.attr], {}
+        return [self.typ, self.sym, self.init, self.qual, self.attr,
+                self.pointers], {}
 
     def pad(self, new_rank):
         self.sym.rank = new_rank
@@ -893,6 +902,10 @@ def increment(self, value):
     def header(self):
         return (self.start, self.size, self.increment)
 
+    @property
+    def block(self):
+        return self.children[0]
+
     @property
     def body(self):
         return self.children[0].children
@@ -1209,6 +1222,26 @@ def gencode(self, not_scope=False):
         return self.children[0].gencode()
 
 
+class Rank(tuple):
+
+    def __contains__(self, val):
+        from coffee.visitors import FindInstances
+        if isinstance(val, Node):
+            val, search = str(val), type(Node)
+        elif isinstance(val, str):
+            val, search = val, Symbol
+        else:
+            return False
+        for i in self:
+            if isinstance(i, Node):
+                items = FindInstances(search).visit(i)
+                if any(val == str(i) for i in items[search]):
+                    return True
+            elif isinstance(i, str) and val == i:
+                return True
+        return False
+
+
 # Utility functions ###
 
 
@@ -1306,6 +1339,7 @@ def __init__(self, scope):
     def __str__(self):
         return self._scope
 
+
 LOCAL = Scope("LOCAL")
 EXTERNAL = Scope("EXTERNAL")
 BUFFER = Scope("BUFFER")