Merge pull request #59 from coneoproject/log-flops

* log-flops:
  A few more tests of flop counting
  Use new rvalue property in For start and size
  Add lvalue and rvalue properties to Stmts
  base: cast to int in For properties

coffee/base.py

@@ -534,6 +534,14 @@ class Statement(Node):
     def __init__(self, children=None, pragma=None):
         super(Statement, self).__init__(children, pragma)
 
+    @property
+    def lvalue(self):
+        return None
+
+    @property
+    def rvalue(self):
+        return None
+
 
 class EmptyStatement(Statement):
 
@@ -561,6 +569,18 @@ class Assign(Statement, Writer):
     def __init__(self, sym, exp, pragma=None):
         super(Assign, self).__init__([sym, exp], pragma)
 
+    @property
+    def lvalue(self):
+        return self.children[0]
+
+    @property
+    def rvalue(self):
+        return self.children[1]
+
+    @rvalue.setter
+    def rvalue(self, val):
+        self.children[1] = val
+
     def gencode(self, not_scope=False):
         return assign(self.children[0].gencode(),
                       self.children[1].gencode()) + semicolon(not_scope)
@@ -571,6 +591,18 @@ class AugmentedAssign(Statement, Writer):
     def __init__(self, sym, exp, pragma=None):
         super(AugmentedAssign, self).__init__([sym, exp], pragma)
 
+    @property
+    def lvalue(self):
+        return self.children[0]
+
+    @property
+    def rvalue(self):
+        return self.children[1]
+
+    @rvalue.setter
+    def rvalue(self, val):
+        self.children[1] = val
+
     def gencode(self, not_scope=False):
         sym, exp = self.children
         return "%s %s %s%s" % (sym.gencode(), type(self).op, exp.gencode(), semicolon(not_scope))
@@ -619,6 +651,18 @@ def __init__(self, typ, sym, init=None, qualifiers=None, attributes=None, pragma
     def operands(self):
         return [self.typ, self.sym, self.init, self.qual, self.attr], {}
 
+    @property
+    def lvalue(self):
+        return self.sym
+
+    @property
+    def rvalue(self):
+        return self.init
+
+    @rvalue.setter
+    def rvalue(self, val):
+        self.init = val
+
     @property
     def size(self):
         """Return the size of the declared variable. In particular, return
@@ -730,10 +774,7 @@ def dim(self):
 
     @property
     def start(self):
-        if isinstance(self.init, Decl):
-            return self.init.init.symbol
-        elif isinstance(self.init, Assign):
-            return self.init.children[1]
+        return self.init.rvalue.symbol
 
     @property
     def end(self):
@@ -745,11 +786,11 @@ def end(self, value):
 
     @property
     def size(self):
-        return self.cond.children[1].symbol - self.init.init.symbol
+        return int(self.end) - int(self.start)
 
     @property
     def increment(self):
-        return self.incr.children[1].symbol
+        return int(self.incr.children[1].symbol)
 
     @increment.setter
     def increment(self, value):

tests/test_count_flops.py

@@ -16,6 +16,13 @@ def binop(request):
     return request.param(a, b)
 
 
+@pytest.fixture(scope="module",
+                params=[Incr, IMul, Decr, IDiv])
+def increment(request, binop):
+    d = Symbol("d")
+    return request.param(d, binop)
+
+
 @pytest.fixture(scope="module",
                 params=[Prod, Div, Sum, Sub])
 def nested_binop(request, binop):
@@ -65,6 +72,27 @@ def test_nested_for(v, binop):
     assert v.visit(tree) == 10*11
 
 
+def test_for_assign_init(v, increment):
+    idx = Symbol("i")
+    decl = Decl("int", idx)
+    loop = For(Assign(idx, 3), Less(idx, 10), Incr(idx, 3),
+               Block([increment]))
+    tree = Block([decl, loop])
+
+    assert v.visit(tree) == 2 * 2
+
+
+def test_for_assign_init_avx(v, avxbinop):
+    idx = Symbol("i")
+    c = Symbol("c")
+    decl = Decl("int", idx)
+    loop = For(Assign(idx, 3), Less(idx, 10), Incr(idx, 3),
+               Block([AVXStore(c, avxbinop)]))
+    tree = Block([decl, loop])
+
+    assert v.visit(tree) == 2 * 4
+
+
 if __name__ == "__main__":
     import os
     pytest.main(os.path.abspath(__file__))