Merge branch 'develop' into feature_axi_stream

Author: shtaxxx

tests/extension/thread_/stream_counter/thread_stream_counter.py

@@ -27,9 +27,9 @@ def mkLed():
     strm = vthread.Stream(m, 'mystream', clk, rst)
     cnt1 = strm.Counter()
     cnt2 = strm.Counter(initval=1)
-    cnt3 = strm.Counter(initval=2, size=3)
+    cnt3 = strm.Counter(initval=2, size=5)
     cnt4 = strm.Counter(initval=3, interval=3)
-    cnt5 = strm.Counter(initval=4, interval=3, size=4)
+    cnt5 = strm.Counter(initval=4, interval=3, size=7)
     cnt6 = strm.Counter(initval=4, step=2, interval=2)
     a = strm.source('a')
     b = strm.source('b')
@@ -48,10 +48,10 @@ def comp_sequential(size, offset):
         for i in range(size):
             cnt1 = cnt
             cnt2 = 1 + cnt
-            cnt3 = cnt%3 + 2
-            cnt4 = (cnt//3) + 3
-            cnt5 = (cnt//3)%4 + 4
-            cnt6 = (cnt//2)*2 + 4
+            cnt3 = (cnt + 2) % 5
+            cnt4 = (cnt // 3) + 3
+            cnt5 = ((cnt // 3) + 4) % 7
+            cnt6 = (cnt // 2) * 2 + 4
             a = ram_a.read(i + offset)
             b = ram_b.read(i + offset)
             sum = a + b - a - b + cnt1 + cnt2 + cnt3 + cnt4 + cnt5 + cnt6
@@ -65,6 +65,7 @@ def check(size, offset_stream, offset_seq):
             sq = ram_c.read(i + offset_seq)
             if vthread.verilog.NotEql(st, sq):
                 all_ok = False
+                print(i, st, sq)
         if all_ok:
             print('# verify: PASSED')
         else:

tests/extension/thread_/stream_counter_enable/Makefile

@@ -0,0 +1,29 @@
+TARGET=$(shell ls *.py | grep -v test | grep -v parsetab.py)
+ARGS=
+
+PYTHON=python3
+#PYTHON=python
+#OPT=-m pdb
+#OPT=-m cProfile -s time
+#OPT=-m cProfile -o profile.rslt
+
+.PHONY: all
+all: test
+
+.PHONY: run
+run:
+	$(PYTHON) $(OPT) $(TARGET) $(ARGS)
+
+.PHONY: test
+test:
+	$(PYTHON) -m pytest -vv
+
+.PHONY: check
+check:
+	$(PYTHON) $(OPT) $(TARGET) $(ARGS) > tmp.v
+	iverilog -tnull -Wall tmp.v
+	rm -f tmp.v
+
+.PHONY: clean
+clean:
+	rm -rf *.pyc __pycache__ parsetab.py .cache *.out *.png *.dot tmp.v uut.vcd

tests/extension/thread_/stream_counter_enable/test_thread_stream_counter_enable.py

@@ -0,0 +1,18 @@
+from __future__ import absolute_import
+from __future__ import print_function
+
+import os
+import veriloggen
+import thread_stream_counter_enable
+
+
+def test(request):
+    veriloggen.reset()
+
+    simtype = request.config.getoption('--sim')
+
+    rslt = thread_stream_counter_enable.run(filename=None, simtype=simtype,
+                                            outputfile=os.path.splitext(os.path.basename(__file__))[0] + '.out')
+
+    verify_rslt = rslt.splitlines()[-1]
+    assert(verify_rslt == '# verify: PASSED')

tests/extension/thread_/stream_counter_enable/thread_stream_counter_enable.py

@@ -0,0 +1,157 @@
+from __future__ import absolute_import
+from __future__ import print_function
+import sys
+import os
+
+# the next line can be removed after installation
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(
+    os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))))
+
+from veriloggen import *
+import veriloggen.thread as vthread
+import veriloggen.types.axi as axi
+
+
+def mkLed():
+    m = Module('blinkled')
+    clk = m.Input('CLK')
+    rst = m.Input('RST')
+
+    datawidth = 32
+    addrwidth = 10
+    myaxi = vthread.AXIM(m, 'myaxi', clk, rst, datawidth)
+    ram_a = vthread.RAM(m, 'ram_a', clk, rst, datawidth, addrwidth)
+    ram_b = vthread.RAM(m, 'ram_b', clk, rst, datawidth, addrwidth)
+    ram_c = vthread.RAM(m, 'ram_c', clk, rst, datawidth, addrwidth)
+
+    strm = vthread.Stream(m, 'mystream', clk, rst)
+    a = strm.source('a')
+    b = strm.source('b')
+    x = strm.Counter(initval=0, size=4)
+    y = strm.Counter(initval=0, size=4, enable=x==3)
+    z = strm.Counter(initval=0, size=4, enable=y==3)
+    c = a + b - a - b + z + y + x
+    strm.sink(c, 'c')
+
+    def comp_stream(size, offset):
+        strm.set_source('a', ram_a, offset, size)
+        strm.set_source('b', ram_b, offset, size)
+        strm.set_sink('c', ram_c, offset, size)
+        strm.run()
+        strm.join()
+
+    def comp_sequential(size, offset):
+        sum = 0
+        x = 0
+        y = 0
+        z = 0
+        for i in range(size):
+            a = ram_a.read(i + offset)
+            b = ram_b.read(i + offset)
+            sum = a + b - a - b + z + y + x
+            ram_c.write(i + offset, sum)
+            if y == 3:
+                z += 1
+                if z == 4:
+                    z = 0
+            if x == 3:
+                y += 1
+                if y == 4:
+                    y = 0
+            x += 1
+            if x == 4:
+                x = 0
+
+    def check(size, offset_stream, offset_seq):
+        all_ok = True
+        for i in range(size):
+            st = ram_c.read(i + offset_stream)
+            sq = ram_c.read(i + offset_seq)
+            if vthread.verilog.NotEql(st, sq):
+                all_ok = False
+        if all_ok:
+            print('# verify: PASSED')
+        else:
+            print('# verify: FAILED')
+
+    def comp(size):
+        # stream
+        offset = 0
+        myaxi.dma_read(ram_a, offset, 0, size)
+        myaxi.dma_read(ram_b, offset, 512, size)
+        comp_stream(size, offset)
+        myaxi.dma_write(ram_c, offset, 1024, size)
+
+        # sequential
+        offset = size
+        myaxi.dma_read(ram_a, offset, 0, size)
+        myaxi.dma_read(ram_b, offset, 512, size)
+        comp_sequential(size, offset)
+        myaxi.dma_write(ram_c, offset, 1024 * 2, size)
+
+        # verification
+        check(size, 0, offset)
+
+        vthread.finish()
+
+    th = vthread.Thread(m, 'th_comp', clk, rst, comp)
+    fsm = th.start(32)
+
+    return m
+
+
+def mkTest(memimg_name=None):
+    m = Module('test')
+
+    # target instance
+    led = mkLed()
+
+    # copy paras and ports
+    params = m.copy_params(led)
+    ports = m.copy_sim_ports(led)
+
+    clk = ports['CLK']
+    rst = ports['RST']
+
+    memory = axi.AxiMemoryModel(m, 'memory', clk, rst, memimg_name=memimg_name)
+    memory.connect(ports, 'myaxi')
+
+    uut = m.Instance(led, 'uut',
+                     params=m.connect_params(led),
+                     ports=m.connect_ports(led))
+
+    #simulation.setup_waveform(m, uut)
+    simulation.setup_clock(m, clk, hperiod=5)
+    init = simulation.setup_reset(m, rst, m.make_reset(), period=100)
+
+    init.add(
+        Delay(1000000),
+        Systask('finish'),
+    )
+
+    return m
+
+
+def run(filename='tmp.v', simtype='iverilog', outputfile=None):
+
+    if outputfile is None:
+        outputfile = os.path.splitext(os.path.basename(__file__))[0] + '.out'
+
+    memimg_name = 'memimg_' + outputfile
+
+    test = mkTest(memimg_name=memimg_name)
+
+    if filename is not None:
+        test.to_verilog(filename)
+
+    sim = simulation.Simulator(test, sim=simtype)
+    rslt = sim.run(outputfile=outputfile)
+    lines = rslt.splitlines()
+    if simtype == 'verilator' and lines[-1].startswith('-'):
+        rslt = '\n'.join(lines[:-1])
+    return rslt
+
+
+if __name__ == '__main__':
+    rslt = run(filename='tmp.v')
+    print(rslt)

veriloggen/stream/graph.py

@@ -213,12 +213,16 @@ def visit__Accumulator(self, node):
 
         right = self.visit(node.right)
         initval = self.visit(node.initval)
+        if node.dependency is not None:
+            dependency = self.visit(node.dependency)
         if node.enable is not None:
             enable = self.visit(node.enable)
         if node.reset is not None:
             reset = self.visit(node.reset)
         self.graph.add_edge(right, node, label='data')
         self.graph.add_edge(initval, node, label='initval')
+        if node.dependency is not None:
+            self.graph.add_edge(dependency, node, label='dependency')
         if node.enable is not None:
             self.graph.add_edge(enable, node, label='enable')
         if node.reset is not None:

veriloggen/stream/scheduler.py

@@ -122,9 +122,11 @@ def visit__Accumulator(self, node):
             return node._get_end_stage()
         right = self.visit(node.right)
         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, enable, reset)
+        mine = self.max_stage(right, initval, dependency, enable, reset)
         node.right = self.fill_gap(node.right, mine)
         node.initval = self.fill_gap(node.initval, mine)
         if node.enable is not None: