Skip to content

Commit d3b07c4

Browse files
committed
stream.write_RAM
1 parent c72c355 commit d3b07c4

File tree

5 files changed

+403
-2
lines changed

5 files changed

+403
-2
lines changed
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
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_write_ram
7+
8+
9+
def test(request):
10+
veriloggen.reset()
11+
12+
simtype = request.config.getoption('--sim')
13+
14+
rslt = thread_stream_write_ram.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')
Lines changed: 151 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,151 @@
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+
26+
ram_ext = vthread.RAM(m, 'ram_ext', clk, rst, datawidth, addrwidth, numports=2)
27+
28+
strm = vthread.Stream(m, 'mystream', clk, rst)
29+
img_width = strm.constant('img_width')
30+
31+
counter = strm.Counter()
32+
33+
a = strm.source('a')
34+
a_addr = strm.Counter() - 1
35+
36+
strm.write_RAM('write_ext', a_addr, a, when=counter <= img_width)
37+
38+
a_old_addr = strm.Counter() - img_width - 1
39+
a_old = strm.read_RAM('read_ext', a_old_addr)
40+
41+
b = a + a_old
42+
43+
strm.sink(b, 'b', when=counter > img_width)
44+
45+
def comp_stream(size, offset):
46+
strm.set_source('a', ram_a, offset, size * 2)
47+
strm.set_sink('b', ram_b, offset, size)
48+
strm.set_constant('img_width', size)
49+
strm.set_write_RAM('write_ext', ram_ext, port=0)
50+
strm.set_read_RAM('read_ext', ram_ext, port=1)
51+
strm.run()
52+
strm.join()
53+
54+
def comp_sequential(size, offset):
55+
for i in range(size):
56+
a_buf = ram_a.read(i + offset)
57+
a = ram_a.read(i + offset + size)
58+
b = a_buf + a
59+
ram_b.write(i + offset, b)
60+
61+
def check(size, offset_stream, offset_seq):
62+
all_ok = True
63+
for i in range(size):
64+
st = ram_b.read(i + offset_stream)
65+
sq = ram_b.read(i + offset_seq)
66+
if vthread.verilog.NotEql(st, sq):
67+
all_ok = False
68+
if all_ok:
69+
print('# verify: PASSED')
70+
else:
71+
print('# verify: FAILED')
72+
73+
def comp(size):
74+
# stream
75+
offset = 0
76+
myaxi.dma_read(ram_a, offset, 0, size * 2)
77+
comp_stream(size, offset)
78+
myaxi.dma_write(ram_b, offset, 1024, size)
79+
80+
# sequential
81+
offset = size * 4
82+
myaxi.dma_read(ram_a, offset, 0, size * 2)
83+
comp_sequential(size, offset)
84+
myaxi.dma_write(ram_b, offset, 1024 * 2, size)
85+
86+
# verification
87+
check(size, 0, offset)
88+
89+
vthread.finish()
90+
91+
th = vthread.Thread(m, 'th_comp', clk, rst, comp)
92+
fsm = th.start(32)
93+
94+
return m
95+
96+
97+
def mkTest(memimg_name=None):
98+
m = Module('test')
99+
100+
# target instance
101+
led = mkLed()
102+
103+
# copy paras and ports
104+
params = m.copy_params(led)
105+
ports = m.copy_sim_ports(led)
106+
107+
clk = ports['CLK']
108+
rst = ports['RST']
109+
110+
memory = axi.AxiMemoryModel(m, 'memory', clk, rst, memimg_name=memimg_name)
111+
memory.connect(ports, 'myaxi')
112+
113+
uut = m.Instance(led, 'uut',
114+
params=m.connect_params(led),
115+
ports=m.connect_ports(led))
116+
117+
# simulation.setup_waveform(m, uut)
118+
simulation.setup_clock(m, clk, hperiod=5)
119+
init = simulation.setup_reset(m, rst, m.make_reset(), period=100)
120+
121+
init.add(
122+
Delay(1000000),
123+
Systask('finish'),
124+
)
125+
126+
return m
127+
128+
129+
def run(filename='tmp.v', simtype='iverilog', outputfile=None):
130+
131+
if outputfile is None:
132+
outputfile = os.path.splitext(os.path.basename(__file__))[0] + '.out'
133+
134+
memimg_name = 'memimg_' + outputfile
135+
136+
test = mkTest(memimg_name=memimg_name)
137+
138+
if filename is not None:
139+
test.to_verilog(filename)
140+
141+
sim = simulation.Simulator(test, sim=simtype)
142+
rslt = sim.run(outputfile=outputfile)
143+
lines = rslt.splitlines()
144+
if simtype == 'verilator' and lines[-1].startswith('-'):
145+
rslt = '\n'.join(lines[:-1])
146+
return rslt
147+
148+
149+
if __name__ == '__main__':
150+
rslt = run(filename='tmp.v')
151+
print(rslt)

veriloggen/stream/stypes.py

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3251,6 +3251,45 @@ def enable(self):
32513251
return vtypes.Not(self.args[1].sig_data)
32523252

32533253

3254+
class WriteRAM(_SpecialOperator):
3255+
latency = 1
3256+
3257+
def __init__(self, addr, data, reset, when=None,
3258+
ram_name=None):
3259+
3260+
args = [addr, data, reset]
3261+
if when is not None:
3262+
args.append(when)
3263+
3264+
_SpecialOperator.__init__(self, *args)
3265+
3266+
self.graph_label = 'WriteRAM' if ram_name is None else ('WriteRAM\n%s' % ram_name)
3267+
self.graph_shape = 'box'
3268+
3269+
def _implement(self, m, seq, svalid=None, senable=None):
3270+
if self.latency != 1:
3271+
raise ValueError("Latency mismatch '%d' != '%s'" %
3272+
(self.latency, 1))
3273+
3274+
if senable is not None:
3275+
raise NotImplementedError('senable is not supported.')
3276+
3277+
self.sig_data = vtypes.Int(0)
3278+
3279+
@property
3280+
def addr(self):
3281+
return self.args[0].sig_data
3282+
3283+
@property
3284+
def write_data(self):
3285+
return self.args[1].sig_data
3286+
3287+
@property
3288+
def enable(self):
3289+
when_cond = self.args[3].sig_data if len(self.args) == 4 else None
3290+
return _and_vars(vtypes.Not(self.args[2].sig_data), when_cond)
3291+
3292+
32543293
def make_condition(*cond, **kwargs):
32553294
ready = kwargs['ready'] if 'ready' in kwargs else None
32563295

0 commit comments

Comments
 (0)