Merge branch 'feature_ringbuffer_disable_reset' into develop

Author: shtaxxx

tests/extension/thread_/stream_ringbuffer_reuse/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_ringbuffer_reuse/test_thread_stream_ringbuffer_reuse.py

@@ -0,0 +1,18 @@
+from __future__ import absolute_import
+from __future__ import print_function
+
+import os
+import veriloggen
+import thread_stream_ringbuffer_reuse
+
+
+def test(request):
+    veriloggen.reset()
+
+    simtype = request.config.getoption('--sim')
+
+    rslt = thread_stream_ringbuffer_reuse.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_ringbuffer_reuse/thread_stream_ringbuffer_reuse.py

@@ -0,0 +1,153 @@
+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)
+
+    strm = vthread.Stream(m, 'mystream', clk, rst)
+    img_width = strm.constant('img_width')
+    wait_num = strm.constant('wait_num')
+
+    counter = strm.Counter()
+
+    a = strm.source('a')
+
+    buf = strm.RingBuffer(a, length=128)
+    a_old = buf.read(-img_width)
+
+    b = a + a_old
+
+    strm.sink(b, 'b', when=counter > wait_num)
+
+    def comp_stream(size, offset):
+        strm.set_source('a', ram_a, offset, size * 2)
+        strm.set_sink('b', ram_b, offset, size)
+        strm.set_constant('img_width', size)
+        strm.set_constant('wait_num', size)
+        strm.run()
+        strm.join()
+
+        strm.set_source('a', ram_a, offset + size * 2, size)
+        strm.set_sink('b', ram_b, offset + size, size)
+        strm.set_constant('img_width', size)
+        strm.set_constant('wait_num', 0)
+        strm.run()
+        strm.join()
+
+    def comp_sequential(size, offset):
+        for i in range(size * 2):
+            a_buf = ram_a.read(i + offset)
+            a = ram_a.read(i + offset + size)
+            b = a_buf + a
+            ram_b.write(i + offset, b)
+
+    def check(size, offset_stream, offset_seq):
+        all_ok = True
+        for i in range(size * 2):
+            st = ram_b.read(i + offset_stream)
+            sq = ram_b.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 * 3)
+        comp_stream(size, offset)
+        myaxi.dma_write(ram_b, offset, 1024, size * 2)
+
+        # sequential
+        offset = size * 4
+        myaxi.dma_read(ram_a, offset, 0, size * 3)
+        comp_sequential(size, offset)
+        myaxi.dma_write(ram_b, offset, 1024 * 2, size * 2)
+
+        # 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/stypes.py

@@ -2908,15 +2908,15 @@ def _implement(self, m, seq, svalid=None, senable=None):
         wdata.assign(self.right.sig_data)
 
         waddr = m.Reg(self.name('waddr'), addrwidth, initval=0)
+        self.waddr = waddr
 
         wcond = _and_vars(svalid, senable, enabledata)
 
         next_waddr = vtypes.Mux(waddr == self.length - 1, 0, waddr + 1)
         seq(waddr(next_waddr), cond=wcond)
 
-        reset_waddr = 0
         reset_cond = _and_vars(svalid, senable, enabledata, resetdata)
-        seq(waddr(reset_waddr), cond=reset_cond)
+        seq(waddr(waddr), cond=reset_cond)
 
         resetdata_x = vtypes.Not(resetdata) if resetdata is not None else 1
         wenable = _and_vars(svalid, senable, enabledata, resetdata_x)
@@ -2966,17 +2966,8 @@ def _implement(self, m, seq, svalid=None, senable=None):
 
         rdata = m.Wire(self.name('rdata'), datawidth, signed=signed)
 
-        raddr_base = m.Reg(self.name('raddr'), addrwidth, initval=0)
-
-        rcond = _and_vars(svalid, senable, enabledata)
-
-        next_raddr_base = vtypes.Mux(raddr_base == self.buf.length - 1,
-                                     0, raddr_base + 1)
-        seq(raddr_base(next_raddr_base), cond=rcond)
-
-        reset_raddr_base = 0
-        reset_cond = _and_vars(svalid, senable, enabledata, resetdata)
-        seq(raddr_base(reset_raddr_base), cond=reset_cond)
+        diff_latency = self.start_stage - self.buf.start_stage
+        raddr_base = seq.Prev(self.buf.waddr, diff_latency)
 
         raddr = raddr_base + self.right.sig_data
         raddr = vtypes.Mux(raddr >= self.buf.length,