Merge branch 'feature_axim_base_address' into develop

shtaxxx · shtaxxx · commit 7bc0accfb2dd · 2019-02-20T15:48:55.000+09:00
diff --git a/tests/extension/thread_/axi_dma_global_base_addr/Makefile b/tests/extension/thread_/axi_dma_global_base_addr/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
diff --git a/tests/extension/thread_/axi_dma_global_base_addr/test_thread_axi_dma_global_base_addr.py b/tests/extension/thread_/axi_dma_global_base_addr/test_thread_axi_dma_global_base_addr.py
@@ -0,0 +1,18 @@
+from __future__ import absolute_import
+from __future__ import print_function
+
+import os
+import veriloggen
+import thread_axi_dma_global_base_addr
+
+
+def test(request):
+    veriloggen.reset()
+
+    simtype = request.config.getoption('--sim')
+
+    rslt = thread_axi_dma_global_base_addr.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')
diff --git a/tests/extension/thread_/axi_dma_global_base_addr/thread_axi_dma_global_base_addr.py b/tests/extension/thread_/axi_dma_global_base_addr/thread_axi_dma_global_base_addr.py
@@ -0,0 +1,154 @@
+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,
+                         use_global_base_addr=True,
+                         num_cmd_delay=1, num_data_delay=1)
+    myram = vthread.RAM(m, 'myram', clk, rst, datawidth, addrwidth,
+                        numports=2)
+
+    all_ok = m.TmpReg(initval=0)
+
+    def blink(size):
+        all_ok.value = True
+
+        myaxi.set_global_base_addr(4096 * 4)
+
+        for i in range(4):
+            print('# iter %d start' % i)
+            # Test for 4KB boundary check
+            offset = i * 1024 * 16 + (myaxi.boundary_size - 4)
+            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 = i + 100
+            myram.write(i, wdata)
+
+        laddr = 0
+        gaddr = offset
+        myaxi.dma_write(myram, laddr, gaddr, size, port=0)
+        print('dma_write: [%d] -> [%d]' % (laddr, gaddr))
+
+        # write
+        for i in range(size):
+            wdata = i + 1000
+            myram.write(i, wdata)
+
+        laddr = 0
+        gaddr = (size + size) * 4 + offset
+        myaxi.dma_write(myram, laddr, gaddr, size, port=1)
+        print('dma_write: [%d] -> [%d]' % (laddr, gaddr))
+
+        # read
+        laddr = 0
+        gaddr = offset
+        myaxi.dma_read(myram, laddr, gaddr, size, port=1)
+        print('dma_read:  [%d] <- [%d]' % (laddr, gaddr))
+
+        for i in range(size):
+            rdata = myram.read(i)
+            if vthread.verilog.NotEql(rdata, i + 100):
+                print('rdata[%d] = %d' % (i, rdata))
+                all_ok.value = False
+
+        # read
+        laddr = 0
+        gaddr = (size + size) * 4 + offset
+        myaxi.dma_read(myram, laddr, gaddr, size, port=0)
+        print('dma_read:  [%d] <- [%d]' % (laddr, gaddr))
+
+        for i in range(size):
+            rdata = myram.read(i)
+            if vthread.verilog.NotEql(rdata, i + 1000):
+                print('rdata[%d] = %d' % (i, rdata))
+                all_ok.value = False
+
+    th = vthread.Thread(m, 'th_blink', clk, rst, blink)
+    fsm = th.start(16)
+
+    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)
diff --git a/veriloggen/thread/axi.py b/veriloggen/thread/axi.py
@@ -24,20 +24,22 @@ class AXIM(AxiMaster, _MutexFunction):
                       'dma_read', 'dma_read_async',
                       'dma_write', 'dma_write_async',
                       'dma_wait_read', 'dma_wait_write',
-                      'dma_wait') + _MutexFunction.__intrinsics__
+                      'dma_wait_read', 'dma_wait_write', 'dma_wait',
+                      'set_global_base_addr',) + _MutexFunction.__intrinsics__
 
     burstlen = 256
 
     def __init__(self, m, name, clk, rst,
                  datawidth=32, addrwidth=32, lite=False, noio=False,
-                 enable_async=False,
+                 enable_async=False, use_global_base_addr=False,
                  num_cmd_delay=0, num_data_delay=0,
                  op_sel_width=8, fsm_as_module=False):
 
         AxiMaster.__init__(self, m, name, clk, rst,
                            datawidth, addrwidth, lite=lite, noio=noio)
 
         self.enable_async = enable_async
+        self.use_global_base_addr = use_global_base_addr
         self.num_cmd_delay = num_cmd_delay
         self.num_data_delay = num_data_delay
         self.op_sel_width = op_sel_width
@@ -102,6 +104,12 @@ def __init__(self, m, name, clk, rst,
             self.write_start(0)
         )
 
+        if self.use_global_base_addr:
+            self.global_base_addr = self.m.Reg('_'.join(['', self.name, 'global_base_addr']),
+                                               self.addrwidth, initval=0)
+        else:
+            self.global_base_addr = None
+
         self.write_op_id_map = OrderedDict()
         self.write_op_id_count = 1
         self.write_reqs = OrderedDict()
@@ -219,6 +227,16 @@ def dma_wait(self, fsm):
 
         fsm.If(self.read_idle, self.write_idle).goto_next()
 
+    def set_global_base_addr(self, fsm, addr):
+
+        if not self.use_global_base_addr:
+            raise ValueError("global_base_addr is disabled.")
+
+        flag = self._set_flag(fsm)
+        self.seq.If(flag)(
+            self.global_base_addr(addr)
+        )
+
     # --------------------
     # read
     # --------------------
@@ -418,8 +436,13 @@ def _synthesize_read_fsm_same(self, ram, port, ram_method, ram_datawidth):
         ram_method(port, self.read_local_addr, w, self.read_size,
                    stride=self.read_local_stride, cond=cond)
 
+        if not self.use_global_base_addr:
+            gaddr = self.read_global_addr
+        else:
+            gaddr = self.read_global_addr + self.global_base_addr
+
         fsm.If(self.read_start)(
-            cur_global_addr(self.mask_addr(self.read_global_addr)),
+            cur_global_addr(self.mask_addr(gaddr)),
             rest_size(self.read_size)
         )
         fsm.If(cond).goto_next()
@@ -551,8 +574,13 @@ def _synthesize_read_fsm_narrow(self, ram, port, ram_method, ram_datawidth):
         ram_method(port, self.read_local_addr, w, self.read_size,
                    stride=self.read_local_stride, cond=cond)
 
+        if not self.use_global_base_addr:
+            gaddr = self.read_global_addr
+        else:
+            gaddr = self.read_global_addr + self.global_base_addr
+
         fsm.If(self.read_start)(
-            cur_global_addr(self.mask_addr(self.read_global_addr)),
+            cur_global_addr(self.mask_addr(gaddr)),
             rest_size(dma_size)
         )
         fsm.If(cond).goto_next()
@@ -700,8 +728,13 @@ def _synthesize_read_fsm_wide(self, ram, port, ram_method, ram_datawidth):
         ram_method(port, self.read_local_addr, w, actual_read_size,
                    stride=self.read_local_stride, cond=cond)
 
+        if not self.use_global_base_addr:
+            gaddr = self.read_global_addr
+        else:
+            gaddr = self.read_global_addr + self.global_base_addr
+
         fsm.If(self.read_start)(
-            cur_global_addr(self.mask_addr(self.read_global_addr)),
+            cur_global_addr(self.mask_addr(gaddr)),
             rest_size(dma_size)
         )
         fsm.If(cond).goto_next()
@@ -979,8 +1012,13 @@ def _synthesize_write_fsm_same(self, ram, port, ram_method, ram_datawidth):
                 data = self.df._Delay(data)
                 last = self.df._Delay(last)
 
+        if not self.use_global_base_addr:
+            gaddr = self.write_global_addr
+        else:
+            gaddr = self.write_global_addr + self.global_base_addr
+
         fsm.If(self.write_start)(
-            cur_global_addr(self.mask_addr(self.write_global_addr)),
+            cur_global_addr(self.mask_addr(gaddr)),
             rest_size(self.write_size)
         )
         fsm.If(cond).goto_next()
@@ -1118,8 +1156,13 @@ def _synthesize_write_fsm_narrow(self, ram, port, ram_method, ram_datawidth):
                 data = self.df._Delay(data)
                 last = self.df._Delay(last)
 
+        if not self.use_global_base_addr:
+            gaddr = self.write_global_addr
+        else:
+            gaddr = self.write_global_addr + self.global_base_addr
+
         fsm.If(self.write_start)(
-            cur_global_addr(self.mask_addr(self.write_global_addr)),
+            cur_global_addr(self.mask_addr(gaddr)),
             rest_size(dma_size)
         )
         fsm.If(cond).goto_next()
@@ -1298,8 +1341,13 @@ def _synthesize_write_fsm_wide(self, ram, port, ram_method, ram_datawidth):
                 data = self.df._Delay(data)
                 last = self.df._Delay(last)
 
+        if not self.use_global_base_addr:
+            gaddr = self.write_global_addr
+        else:
+            gaddr = self.write_global_addr + self.global_base_addr
+
         fsm.If(self.write_start)(
-            cur_global_addr(self.mask_addr(self.write_global_addr)),
+            cur_global_addr(self.mask_addr(gaddr)),
             rest_size(dma_size)
         )
         fsm.If(cond).goto_next()
