Updated Scheduler, Visitor, and GraphGenerator for _Accumulator and Counter

Author: shtaxxx

veriloggen/stream/graph.py

@@ -212,6 +212,10 @@ def visit__Accumulator(self, node):
                             peripheries=peripheries)
 
         right = self.visit(node.right)
+        if node.size is not None:
+            size = self.visit(node.size)
+        if node.interval is not None:
+            interval = self.visit(node.interval)
         initval = self.visit(node.initval)
         if node.dependency is not None:
             dependency = self.visit(node.dependency)
@@ -220,6 +224,10 @@ def visit__Accumulator(self, node):
         if node.reset is not None:
             reset = self.visit(node.reset)
         self.graph.add_edge(right, node, label='data')
+        if node.size is not None:
+            self.graph.add_edge(size, node, label='size')
+        if node.interval is not None:
+            self.graph.add_edge(interval, node, label='interval')
         self.graph.add_edge(initval, node, label='initval')
         if node.dependency is not None:
             self.graph.add_edge(dependency, node, label='dependency')

veriloggen/stream/scheduler.py

@@ -121,13 +121,20 @@ def visit__Accumulator(self, node):
         if node._has_start_stage():
             return node._get_end_stage()
         right = self.visit(node.right)
+        size = self.visit(node.size) if node.size is not None else None
+        interval = (self.visit(node.interval)
+                    if node.interval is not None else None)
         initval = self.visit(node.initval)
         dependency = (self.visit(node.dependency)
                       if node.dependency is not None else None)
         enable = self.visit(node.enable) if node.enable is not None else None
         reset = self.visit(node.reset) if node.reset is not None else None
-        mine = self.max_stage(right, initval, dependency, enable, reset)
+        mine = self.max_stage(right, size, interval, initval, dependency, enable, reset)
         node.right = self.fill_gap(node.right, mine)
+        if node.size is not None:
+            node.size = self.fill_gap(node.size, mine)
+        if node.interval is not None:
+            node.interval = self.fill_gap(node.interval, mine)
         node.initval = self.fill_gap(node.initval, mine)
         if node.enable is not None:
             node.enable = self.fill_gap(node.enable, mine)

veriloggen/stream/visitor.py

@@ -125,13 +125,15 @@ def visit__SpecialOperator(self, node):
     def visit__Accumulator(self, node):
         right = self.visit(node.right)
         size = self.visit(node.size) if node.size is not None else set()
+        interval = (self.visit(node.interval)
+                    if node.interval is not None else set())
         initval = (self.visit(node.initval)
                    if node.initval is not None else set())
         dependency = (self.visit(node.dependency)
                       if node.dependency is not None else set())
         enable = self.visit(node.enable) if node.enable is not None else set()
         reset = self.visit(node.reset) if node.reset is not None else set()
-        return right | size | initval | dependency | enable | reset
+        return right | size | interval | initval | dependency | enable | reset
 
     def visit_Substream(self, node):
         return self.visit__SpecialOperator(node)
@@ -195,6 +197,8 @@ def visit__SpecialOperator(self, node):
     def visit__Accumulator(self, node):
         right = self.visit(node.right)
         size = self.visit(node.size) if node.size is not None else set()
+        interval = (self.visit(node.interval)
+                    if node.interval is not None else set())
         initval = (self.visit(node.initval)
                    if node.initval is not None else set())
         dependency = (self.visit(node.dependency)
@@ -203,7 +207,7 @@ def visit__Accumulator(self, node):
         #reset = self.visit(node.reset) if node.reset is not None else set()
         reset = set()
         mine = set([node]) if node._has_output() else set()
-        return right | size | initval | dependency | enable | reset | mine
+        return right | size | interval | initval | dependency | enable | reset | mine
 
     def visit_Substream(self, node):
         return self.visit__SpecialOperator(node)
@@ -276,14 +280,16 @@ def visit__SpecialOperator(self, node):
     def visit__Accumulator(self, node):
         right = self.visit(node.right)
         size = self.visit(node.size) if node.size is not None else set()
+        interval = (self.visit(node.interval)
+                    if node.interval is not None else set())
         initval = (self.visit(node.initval)
                    if node.initval is not None else set())
         dependency = (self.visit(node.dependency)
                       if node.dependency is not None else set())
         enable = self.visit(node.enable) if node.enable is not None else set()
         reset = self.visit(node.reset) if node.reset is not None else set()
         mine = set([node])
-        return right | size | initval | dependency | enable | reset | mine
+        return right | size | interval | initval | dependency | enable | reset | mine
 
     def visit_Substream(self, node):
         return self.visit__SpecialOperator(node)