Updated examples and tests accordingly.

Author: shtaxxx

examples/simulation_verilator/test_simulation_verilator.py

@@ -53,9 +53,6 @@ def blink(size):
     def body(size, offset):
         # narrow dma test
         myaxi.dma_read(myram0, 0, 0, size)
-
-        ### ???
-
         myaxi.dma_read(myram1, 0, 0, size)
         myaxi.dma_read(myram2, 0, 0, size)
         myaxi.dma_read(myram3, 0, 0, size)
@@ -83,8 +80,8 @@ def body(size, offset):
 
         laddr = 0
         gaddr = offset
-        myaxi.dma_write([myram0, myram1, myram2, myram3],
-                        laddr, gaddr, size)
+        myaxi.dma_write_packed([myram0, myram1, myram2, myram3],
+                               laddr, gaddr, size * 4)
         print('dma_write: [%d] -> [%d]' % (laddr, gaddr))
 
         # write
@@ -106,15 +103,15 @@ def body(size, offset):
 
         laddr = 0
         gaddr = array_size + offset
-        myaxi.dma_write([myram0, myram1, myram2, myram3],
-                        laddr, gaddr, size)
+        myaxi.dma_write_packed([myram0, myram1, myram2, myram3],
+                               laddr, gaddr, size * 4)
         print('dma_write: [%d] -> [%d]' % (laddr, gaddr))
 
         # read
         laddr = 0
         gaddr = offset
-        myaxi.dma_read([myram0, myram1, myram2, myram3],
-                       laddr, gaddr, size)
+        myaxi.dma_read_packed([myram0, myram1, myram2, myram3],
+                              laddr, gaddr, size * 4)
         print('dma_read:  [%d] <- [%d]' % (laddr, gaddr))
 
         for i in range(size):
@@ -148,8 +145,8 @@ def body(size, offset):
         # read
         laddr = 0
         gaddr = array_size + offset
-        myaxi.dma_read([myram0, myram1, myram2, myram3],
-                       laddr, gaddr, size)
+        myaxi.dma_read_packed([myram0, myram1, myram2, myram3],
+                              laddr, gaddr, size * 4)
         print('dma_read:  [%d] <- [%d]' % (laddr, gaddr))
 
         for i in range(size):

examples/stream_axi_stream_fifo_ipxact_ultra96v2_pynq/test_stream_axi_stream_fifo_ipxact.py

@@ -25,7 +25,9 @@ def mkLed(memory_datawidth=128):
                                   numbanks=numbanks)
     myram1 = vthread.MultibankRAM(m, 'myram1', clk, rst, datawidth, addrwidth,
                                   numbanks=numbanks)
-    myram = (myram0, myram1)
+
+    #myram = vthread.to_multibank_ram((myram0, myram1), keep_hierarchy=True)
+    myram = vthread.to_multibank_ram((myram0, myram1))
 
     all_ok = m.TmpReg(initval=0)
 
@@ -59,7 +61,7 @@ def body(size, offset):
 
         laddr = 0
         gaddr = offset
-        myaxi.dma_write(myram, laddr, gaddr, size)
+        myaxi.dma_write(myram, laddr, gaddr, size * 2 * numbanks)
         print('dma_write: [%d] -> [%d]' % (laddr, gaddr))
 
         # write
@@ -71,13 +73,13 @@ def body(size, offset):
 
         laddr = 0
         gaddr = array_size + offset
-        myaxi.dma_write(myram, laddr, gaddr, size)
+        myaxi.dma_write(myram, laddr, gaddr, size * 2 * numbanks)
         print('dma_write: [%d] -> [%d]' % (laddr, gaddr))
 
         # read
         laddr = 0
         gaddr = offset
-        myaxi.dma_read(myram, laddr, gaddr, size)
+        myaxi.dma_read(myram, laddr, gaddr, size * 2 * numbanks)
         print('dma_read:  [%d] <- [%d]' % (laddr, gaddr))
 
         for bank in range(numbanks):
@@ -94,7 +96,7 @@ def body(size, offset):
         # read
         laddr = 0
         gaddr = array_size + offset
-        myaxi.dma_read(myram, laddr, gaddr, size)
+        myaxi.dma_read(myram, laddr, gaddr, size * 2 * numbanks)
         print('dma_read:  [%d] <- [%d]' % (laddr, gaddr))
 
         for bank in range(numbanks):

examples/stream_axi_stream_fifo_ultra96v2_pynq/test_stream_axi_stream_fifo.py

@@ -23,7 +23,6 @@ def mkLed(memory_datawidth=128):
     myaxi = vthread.AXIM(m, 'myaxi', clk, rst, memory_datawidth)
 
     pack_size = memory_datawidth // datawidth
-
     rams = [vthread.MultibankRAM(m, 'myram%d' % i, clk, rst, datawidth, addrwidth,
                                  numbanks=pack_size)
             for i in range(numbanks)]
@@ -73,9 +72,7 @@ def body(size, offset):
 
         laddr = 0
         gaddr = offset
-        myram.dma_write_block(myaxi, laddr, gaddr,
-                              size // pack_size,
-                              block_size // pack_size)
+        myaxi.dma_write_block(myram, laddr, gaddr, size, block_size)
         print('dma_write: [%d] -> [%d]' % (laddr, gaddr))
 
         # write
@@ -99,17 +96,13 @@ def body(size, offset):
 
         laddr = 0
         gaddr = array_size + offset
-        myram.dma_write_block(myaxi, laddr, gaddr,
-                              size // pack_size,
-                              block_size // pack_size)
+        myaxi.dma_write_block(myram, laddr, gaddr, size, block_size)
         print('dma_write: [%d] -> [%d]' % (laddr, gaddr))
 
         # read
         laddr = 0
         gaddr = offset
-        myram.dma_read_block(myaxi, laddr, gaddr,
-                             size // pack_size,
-                             block_size // pack_size)
+        myaxi.dma_read_block(myram, laddr, gaddr, size, block_size)
         print('dma_read:  [%d] <- [%d]' % (laddr, gaddr))
 
         count = 0
@@ -136,8 +129,7 @@ def body(size, offset):
         # read
         laddr = 0
         gaddr = array_size + offset
-        myram.dma_read_block(myaxi, laddr, gaddr, size //
-                             pack_size, block_size // pack_size)
+        myaxi.dma_read_block(myram, laddr, gaddr, size, block_size)
         print('dma_read:  [%d] <- [%d]' % (laddr, gaddr))
 
         count = 0
@@ -187,7 +179,7 @@ def mkTest(memimg_name=None, memory_datawidth=128):
                      params=m.connect_params(led),
                      ports=m.connect_ports(led))
 
-    #simulation.setup_waveform(m, uut)
+    # simulation.setup_waveform(m, uut)
     simulation.setup_clock(m, clk, hperiod=5)
     init = simulation.setup_reset(m, rst, m.make_reset(), period=100)
 

examples/thread_embedded_verilog_ipxact/test_thread_embedded_verilog_ipxact.py

@@ -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

examples/thread_memcpy_ipxact_ultra96v2_pynq/test_thread_memcpy_ipxact.py

@@ -3,16 +3,16 @@
 
 import os
 import veriloggen
-import thread_multibank_ram_dma
+import thread_axi_dma
 
 
 def test(request):
     veriloggen.reset()
 
     simtype = request.config.getoption('--sim')
 
-    rslt = thread_multibank_ram_dma.run(filename=None, simtype=simtype,
-                                        outputfile=os.path.splitext(os.path.basename(__file__))[0] + '.out')
+    rslt = thread_axi_dma.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')

examples/thread_verilog_submodule_ipxact/test_thread_verilog_submodule_ipxact.py

@@ -0,0 +1,158 @@
+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
+    numbanks = 4
+    myaxi = vthread.AXIM(m, 'myaxi', clk, rst, datawidth)
+    myram0 = vthread.MultibankRAM(m, 'myram0', clk, rst, datawidth, addrwidth,
+                                  numbanks=numbanks)
+    myram1 = vthread.MultibankRAM(m, 'myram1', clk, rst, datawidth, addrwidth,
+                                  numbanks=numbanks)
+
+    all_ok = m.TmpReg(initval=0, prefix='all_ok')
+    wdata = m.TmpReg(width=datawidth, initval=0, prefix='wdata')
+    rdata = m.TmpReg(width=datawidth, initval=0, prefix='rdata')
+    rexpected = m.TmpReg(width=datawidth, initval=0, prefix='rexpected')
+
+    def blink(size):
+        all_ok.value = True
+
+        for i in range(4):
+            print('# iter %d start' % i)
+            # Test for 4KB boundary check
+            offset = i * 1024 * 16 + (myaxi.boundary_size - (datawidth // 8) * 3)
+            body(size, offset)
+            print('# iter %d end' % i)
+
+        if all_ok:
+            print('# verify: PASSED')
+        else:
+            print('# verify: FAILED')
+
+        vthread.finish()
+
+    def body(size, offset):
+        # write
+        for i in range(size):
+            wdata.value = i + 0x1000
+            myram0.write(i, wdata)
+
+        laddr = 0
+        gaddr = offset
+        myaxi.dma_write(myram0, laddr, gaddr, size)
+        print('dma_write: [%d] -> [%d]' % (laddr, gaddr))
+
+        # write
+        for i in range(size):
+            wdata.value = i + 0x4000
+            myram1.write(i, wdata)
+
+        laddr = 0
+        gaddr = (size + size) * 4 + offset
+        myaxi.dma_write(myram1, laddr, gaddr, size)
+        print('dma_write: [%d] -> [%d]' % (laddr, gaddr))
+
+        # read
+        laddr = 0
+        gaddr = offset
+        myaxi.dma_read(myram1, laddr, gaddr, size)
+        print('dma_read:  [%d] <- [%d]' % (laddr, gaddr))
+
+        for i in range(size):
+            rdata.value = myram1.read(i)
+            rexpected.value = i + 0x1000
+            if vthread.verilog.NotEql(rdata, rexpected):
+                print('rdata[%d] = %d (expected %d)' % (i, rdata, rexpected))
+                all_ok.value = False
+
+        # read
+        laddr = 0
+        gaddr = (size + size) * 4 + offset
+        myaxi.dma_read(myram0, laddr, gaddr, size)
+        print('dma_read:  [%d] <- [%d]' % (laddr, gaddr))
+
+        for i in range(size):
+            rdata.value = myram0.read(i)
+            rexpected.value = i + 0x4000
+            if vthread.verilog.NotEql(rdata, rexpected):
+                print('rdata[%d] = %d (expected %d)' % (i, rdata, rexpected))
+                all_ok.value = False
+
+    th = vthread.Thread(m, 'th_blink', clk, rst, blink)
+    fsm = th.start(17)
+
+    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)

tests/extension/thread_/axi_dma_multiram/thread_axi_dma_multiram.py

@@ -58,7 +58,7 @@ def body(bank, size, offset):
 
         laddr = 0
         gaddr = offset
-        myram0.dma_write_bank(bank, myaxi, laddr, gaddr, size)
+        myaxi.dma_write_bank(myram0, bank, laddr, gaddr, size)
         print('dma_write: [%d] -> [%d]' % (laddr, gaddr))
 
         # write
@@ -68,13 +68,13 @@ def body(bank, size, offset):
 
         laddr = 0
         gaddr = (size + size) * 4 + offset
-        myram1.dma_write_bank(bank, myaxi, laddr, gaddr, size)
+        myaxi.dma_write_bank(myram1, bank, laddr, gaddr, size)
         print('dma_write: [%d] -> [%d]' % (laddr, gaddr))
 
         # read
         laddr = 0
         gaddr = offset
-        myram1.dma_read_bank(bank, myaxi, laddr, gaddr, size)
+        myaxi.dma_read_bank(myram1, bank, laddr, gaddr, size)
         print('dma_read:  [%d] <- [%d]' % (laddr, gaddr))
 
         for i in range(size):
@@ -87,7 +87,7 @@ def body(bank, size, offset):
         # read
         laddr = 0
         gaddr = (size + size) * 4 + offset
-        myram0.dma_read_bank(bank, myaxi, laddr, gaddr, size)
+        myaxi.dma_read_bank(myram0, bank, laddr, gaddr, size)
         print('dma_read:  [%d] <- [%d]' % (laddr, gaddr))
 
         for i in range(size):