Skip to content

Commit 55c42db

Browse files
shtaxxxshtaxxx
committed
Merge branch 'feature_stream_debug' into develop
2 parents 63db657 + ec9e1b5 commit 55c42db

File tree

11 files changed

+880
-12
lines changed

11 files changed

+880
-12
lines changed

‎tests/extension/thread_/stream_dump/Makefile

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
TARGET=$(shell ls *.py | grep -v test | grep -v parsetab.py)
2+
ARGS=
3+
4+
PYTHON=python3
5+
#PYTHON=python
6+
#OPT=-m pdb
7+
#OPT=-m cProfile -s time
8+
#OPT=-m cProfile -o profile.rslt
9+
10+
.PHONY: all
11+
all: test
12+
13+
.PHONY: run
14+
run:
15+
$(PYTHON) $(OPT) $(TARGET) $(ARGS)
16+
17+
.PHONY: test
18+
test:
19+
$(PYTHON) -m pytest -vv
20+
21+
.PHONY: check
22+
check:
23+
$(PYTHON) $(OPT) $(TARGET) $(ARGS) > tmp.v
24+
iverilog -tnull -Wall tmp.v
25+
rm -f tmp.v
26+
27+
.PHONY: clean
28+
clean:
29+
rm -rf *.pyc __pycache__ parsetab.py .cache *.out *.png *.dot tmp.v uut.vcd

‎tests/extension/thread_/stream_dump/test_thread_stream_dump.py

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
from __future__ import absolute_import
2+
from __future__ import print_function
3+
4+
import os
5+
import veriloggen
6+
import thread_stream_dump
7+
8+
9+
def test(request):
10+
veriloggen.reset()
11+
12+
simtype = request.config.getoption('--sim')
13+
14+
rslt = thread_stream_dump.run(filename=None, simtype=simtype,
15+
outputfile=os.path.splitext(os.path.basename(__file__))[0] + '.out')
16+
17+
verify_rslt = rslt.splitlines()[-1]
18+
assert(verify_rslt == '# verify: PASSED')

‎tests/extension/thread_/stream_dump/thread_stream_dump.py

Lines changed: 141 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,141 @@
1+
from __future__ import absolute_import
2+
from __future__ import print_function
3+
import sys
4+
import os
5+
6+
# the next line can be removed after installation
7+
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(
8+
os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))))
9+
10+
from veriloggen import *
11+
import veriloggen.thread as vthread
12+
import veriloggen.types.axi as axi
13+
14+
15+
def mkLed():
16+
m = Module('blinkled')
17+
clk = m.Input('CLK')
18+
rst = m.Input('RST')
19+
20+
datawidth = 32
21+
addrwidth = 10
22+
myaxi = vthread.AXIM(m, 'myaxi', clk, rst, datawidth)
23+
ram_a = vthread.RAM(m, 'ram_a', clk, rst, datawidth, addrwidth)
24+
ram_b = vthread.RAM(m, 'ram_b', clk, rst, datawidth, addrwidth)
25+
ram_c = vthread.RAM(m, 'ram_c', clk, rst, datawidth, addrwidth)
26+
27+
strm = vthread.Stream(m, 'mystream', clk, rst,
28+
dump=True, dump_mode='all')
29+
a = strm.source('a')
30+
b = strm.source('b')
31+
c = a + b
32+
strm.sink(c, 'c')
33+
34+
def comp_stream(size, offset):
35+
strm.set_source('a', ram_a, offset, size)
36+
strm.set_source('b', ram_b, offset, size)
37+
strm.set_sink('c', ram_c, offset, size)
38+
strm.run()
39+
strm.join()
40+
41+
def comp_sequential(size, offset):
42+
sum = 0
43+
for i in range(size):
44+
a = ram_a.read(i + offset)
45+
b = ram_b.read(i + offset)
46+
sum = a + b
47+
ram_c.write(i + offset, sum)
48+
49+
def check(size, offset_stream, offset_seq):
50+
all_ok = True
51+
for i in range(size):
52+
st = ram_c.read(i + offset_stream)
53+
sq = ram_c.read(i + offset_seq)
54+
if vthread.verilog.NotEql(st, sq):
55+
all_ok = False
56+
if all_ok:
57+
print('# verify: PASSED')
58+
else:
59+
print('# verify: FAILED')
60+
61+
def comp(size):
62+
# stream
63+
offset = 0
64+
myaxi.dma_read(ram_a, offset, 0, size)
65+
myaxi.dma_read(ram_b, offset, 512, size)
66+
comp_stream(size, offset)
67+
myaxi.dma_write(ram_c, offset, 1024, size)
68+
69+
# sequential
70+
offset = size
71+
myaxi.dma_read(ram_a, offset, 0, size)
72+
myaxi.dma_read(ram_b, offset, 512, size)
73+
comp_sequential(size, offset)
74+
myaxi.dma_write(ram_c, offset, 1024 * 2, size)
75+
76+
# verification
77+
check(size, 0, offset)
78+
79+
vthread.finish()
80+
81+
th = vthread.Thread(m, 'th_comp', clk, rst, comp)
82+
fsm = th.start(32)
83+
84+
return m
85+
86+
87+
def mkTest(memimg_name=None):
88+
m = Module('test')
89+
90+
# target instance
91+
led = mkLed()
92+
93+
# copy paras and ports
94+
params = m.copy_params(led)
95+
ports = m.copy_sim_ports(led)
96+
97+
clk = ports['CLK']
98+
rst = ports['RST']
99+
100+
memory = axi.AxiMemoryModel(m, 'memory', clk, rst, memimg_name=memimg_name)
101+
memory.connect(ports, 'myaxi')
102+
103+
uut = m.Instance(led, 'uut',
104+
params=m.connect_params(led),
105+
ports=m.connect_ports(led))
106+
107+
#simulation.setup_waveform(m, uut)
108+
simulation.setup_clock(m, clk, hperiod=5)
109+
init = simulation.setup_reset(m, rst, m.make_reset(), period=100)
110+
111+
init.add(
112+
Delay(1000000),
113+
Systask('finish'),
114+
)
115+
116+
return m
117+
118+
119+
def run(filename='tmp.v', simtype='iverilog', outputfile=None):
120+
121+
if outputfile is None:
122+
outputfile = os.path.splitext(os.path.basename(__file__))[0] + '.out'
123+
124+
memimg_name = 'memimg_' + outputfile
125+
126+
test = mkTest(memimg_name=memimg_name)
127+
128+
if filename is not None:
129+
test.to_verilog(filename)
130+
131+
sim = simulation.Simulator(test, sim=simtype)
132+
rslt = sim.run(outputfile=outputfile)
133+
lines = rslt.splitlines()
134+
if simtype == 'verilator' and lines[-1].startswith('-'):
135+
rslt = '\n'.join(lines[:-1])
136+
return rslt
137+
138+
139+
if __name__ == '__main__':
140+
rslt = run(filename='tmp.v')
141+
print(rslt)

‎tests/extension/thread_/stream_dump_selective/Makefile

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
TARGET=$(shell ls *.py | grep -v test | grep -v parsetab.py)
2+
ARGS=
3+
4+
PYTHON=python3
5+
#PYTHON=python
6+
#OPT=-m pdb
7+
#OPT=-m cProfile -s time
8+
#OPT=-m cProfile -o profile.rslt
9+
10+
.PHONY: all
11+
all: test
12+
13+
.PHONY: run
14+
run:
15+
$(PYTHON) $(OPT) $(TARGET) $(ARGS)
16+
17+
.PHONY: test
18+
test:
19+
$(PYTHON) -m pytest -vv
20+
21+
.PHONY: check
22+
check:
23+
$(PYTHON) $(OPT) $(TARGET) $(ARGS) > tmp.v
24+
iverilog -tnull -Wall tmp.v
25+
rm -f tmp.v
26+
27+
.PHONY: clean
28+
clean:
29+
rm -rf *.pyc __pycache__ parsetab.py .cache *.out *.png *.dot tmp.v uut.vcd

‎tests/extension/thread_/stream_dump_selective/test_thread_stream_dump_selective.py

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
from __future__ import absolute_import
2+
from __future__ import print_function
3+
4+
import os
5+
import veriloggen
6+
import thread_stream_dump_selective
7+
8+
9+
def test(request):
10+
veriloggen.reset()
11+
12+
simtype = request.config.getoption('--sim')
13+
14+
rslt = thread_stream_dump_selective.run(filename=None, simtype=simtype,
15+
outputfile=os.path.splitext(os.path.basename(__file__))[0] + '.out')
16+
17+
verify_rslt = rslt.splitlines()[-1]
18+
assert(verify_rslt == '# verify: PASSED')

‎tests/extension/thread_/stream_dump_selective/thread_stream_dump_selective.py

Lines changed: 142 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,142 @@
1+
from __future__ import absolute_import
2+
from __future__ import print_function
3+
import sys
4+
import os
5+
6+
# the next line can be removed after installation
7+
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(
8+
os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))))
9+
10+
from veriloggen import *
11+
import veriloggen.thread as vthread
12+
import veriloggen.types.axi as axi
13+
14+
15+
def mkLed():
16+
m = Module('blinkled')
17+
clk = m.Input('CLK')
18+
rst = m.Input('RST')
19+
20+
datawidth = 32
21+
addrwidth = 10
22+
myaxi = vthread.AXIM(m, 'myaxi', clk, rst, datawidth)
23+
ram_a = vthread.RAM(m, 'ram_a', clk, rst, datawidth, addrwidth)
24+
ram_b = vthread.RAM(m, 'ram_b', clk, rst, datawidth, addrwidth)
25+
ram_c = vthread.RAM(m, 'ram_c', clk, rst, datawidth, addrwidth)
26+
27+
strm = vthread.Stream(m, 'mystream', clk, rst,
28+
dump=True, dump_mode='selective')
29+
a = strm.source('a')
30+
b = strm.source('b')
31+
c = a + b
32+
c.dump = True
33+
strm.sink(c, 'c')
34+
35+
def comp_stream(size, offset):
36+
strm.set_source('a', ram_a, offset, size)
37+
strm.set_source('b', ram_b, offset, size)
38+
strm.set_sink('c', ram_c, offset, size)
39+
strm.run()
40+
strm.join()
41+
42+
def comp_sequential(size, offset):
43+
sum = 0
44+
for i in range(size):
45+
a = ram_a.read(i + offset)
46+
b = ram_b.read(i + offset)
47+
sum = a + b
48+
ram_c.write(i + offset, sum)
49+
50+
def check(size, offset_stream, offset_seq):
51+
all_ok = True
52+
for i in range(size):
53+
st = ram_c.read(i + offset_stream)
54+
sq = ram_c.read(i + offset_seq)
55+
if vthread.verilog.NotEql(st, sq):
56+
all_ok = False
57+
if all_ok:
58+
print('# verify: PASSED')
59+
else:
60+
print('# verify: FAILED')
61+
62+
def comp(size):
63+
# stream
64+
offset = 0
65+
myaxi.dma_read(ram_a, offset, 0, size)
66+
myaxi.dma_read(ram_b, offset, 512, size)
67+
comp_stream(size, offset)
68+
myaxi.dma_write(ram_c, offset, 1024, size)
69+
70+
# sequential
71+
offset = size
72+
myaxi.dma_read(ram_a, offset, 0, size)
73+
myaxi.dma_read(ram_b, offset, 512, size)
74+
comp_sequential(size, offset)
75+
myaxi.dma_write(ram_c, offset, 1024 * 2, size)
76+
77+
# verification
78+
check(size, 0, offset)
79+
80+
vthread.finish()
81+
82+
th = vthread.Thread(m, 'th_comp', clk, rst, comp)
83+
fsm = th.start(32)
84+
85+
return m
86+
87+
88+
def mkTest(memimg_name=None):
89+
m = Module('test')
90+
91+
# target instance
92+
led = mkLed()
93+
94+
# copy paras and ports
95+
params = m.copy_params(led)
96+
ports = m.copy_sim_ports(led)
97+
98+
clk = ports['CLK']
99+
rst = ports['RST']
100+
101+
memory = axi.AxiMemoryModel(m, 'memory', clk, rst, memimg_name=memimg_name)
102+
memory.connect(ports, 'myaxi')
103+
104+
uut = m.Instance(led, 'uut',
105+
params=m.connect_params(led),
106+
ports=m.connect_ports(led))
107+
108+
#simulation.setup_waveform(m, uut)
109+
simulation.setup_clock(m, clk, hperiod=5)
110+
init = simulation.setup_reset(m, rst, m.make_reset(), period=100)
111+
112+
init.add(
113+
Delay(1000000),
114+
Systask('finish'),
115+
)
116+
117+
return m
118+
119+
120+
def run(filename='tmp.v', simtype='iverilog', outputfile=None):
121+
122+
if outputfile is None:
123+
outputfile = os.path.splitext(os.path.basename(__file__))[0] + '.out'
124+
125+
memimg_name = 'memimg_' + outputfile
126+
127+
test = mkTest(memimg_name=memimg_name)
128+
129+
if filename is not None:
130+
test.to_verilog(filename)
131+
132+
sim = simulation.Simulator(test, sim=simtype)
133+
rslt = sim.run(outputfile=outputfile)
134+
lines = rslt.splitlines()
135+
if simtype == 'verilator' and lines[-1].startswith('-'):
136+
rslt = '\n'.join(lines[:-1])
137+
return rslt
138+
139+
140+
if __name__ == '__main__':
141+
rslt = run(filename='tmp.v')
142+
print(rslt)

0 commit comments

Comments
 (0)