Skip to content

Commit e62d1eb

Browse files
committed
Predicate
1 parent 791715a commit e62d1eb

File tree

4 files changed

+196
-0
lines changed

4 files changed

+196
-0
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_predicate
7+
8+
9+
def test(request):
10+
veriloggen.reset()
11+
12+
simtype = request.config.getoption('--sim')
13+
14+
rslt = thread_stream_predicate.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: 139 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,139 @@
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+
a = strm.source('a')
29+
b = strm.source('b')
30+
c = strm.Predicate(a, b > 128 + 16)
31+
strm.sink(c, 'c')
32+
33+
def comp_stream(size, offset):
34+
strm.set_source('a', ram_a, offset, size)
35+
strm.set_source('b', ram_b, offset, size)
36+
strm.set_sink('c', ram_c, offset, size)
37+
strm.run()
38+
strm.join()
39+
40+
def comp_sequential(size, offset):
41+
c = 0
42+
for i in range(size):
43+
a = ram_a.read(i + offset)
44+
b = ram_b.read(i + offset)
45+
if b > 128 + 16:
46+
c = a
47+
ram_c.write(i + offset, c)
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+
print(i, st, sq)
57+
if all_ok:
58+
print('# verify: PASSED')
59+
else:
60+
print('# verify: FAILED')
61+
62+
def comp(size):
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, 1)
68+
69+
offset = size
70+
myaxi.dma_read(ram_a, offset, 0, size)
71+
myaxi.dma_read(ram_b, offset, 512, size)
72+
comp_sequential(size, offset)
73+
myaxi.dma_write(ram_c, offset, 1024 * 2, 1)
74+
75+
check(size, 0, offset)
76+
77+
vthread.finish()
78+
79+
th = vthread.Thread(m, 'th_comp', clk, rst, comp)
80+
fsm = th.start(32)
81+
82+
return m
83+
84+
85+
def mkTest(memimg_name=None):
86+
m = Module('test')
87+
88+
# target instance
89+
led = mkLed()
90+
91+
# copy paras and ports
92+
params = m.copy_params(led)
93+
ports = m.copy_sim_ports(led)
94+
95+
clk = ports['CLK']
96+
rst = ports['RST']
97+
98+
memory = axi.AxiMemoryModel(m, 'memory', clk, rst, memimg_name=memimg_name)
99+
memory.connect(ports, 'myaxi')
100+
101+
uut = m.Instance(led, 'uut',
102+
params=m.connect_params(led),
103+
ports=m.connect_ports(led))
104+
105+
#simulation.setup_waveform(m, uut)
106+
simulation.setup_clock(m, clk, hperiod=5)
107+
init = simulation.setup_reset(m, rst, m.make_reset(), period=100)
108+
109+
init.add(
110+
Delay(1000000),
111+
Systask('finish'),
112+
)
113+
114+
return m
115+
116+
117+
def run(filename='tmp.v', simtype='iverilog', outputfile=None):
118+
119+
if outputfile is None:
120+
outputfile = os.path.splitext(os.path.basename(__file__))[0] + '.out'
121+
122+
memimg_name = 'memimg_' + outputfile
123+
124+
test = mkTest(memimg_name=memimg_name)
125+
126+
if filename is not None:
127+
test.to_verilog(filename)
128+
129+
sim = simulation.Simulator(test, sim=simtype)
130+
rslt = sim.run(outputfile=outputfile)
131+
lines = rslt.splitlines()
132+
if simtype == 'verilator' and lines[-1].startswith('-'):
133+
rslt = '\n'.join(lines[:-1])
134+
return rslt
135+
136+
137+
if __name__ == '__main__':
138+
rslt = run(filename='tmp.v')
139+
print(rslt)

veriloggen/stream/stypes.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2549,6 +2549,16 @@ def _implement(self, m, seq, svalid=None, senable=None):
25492549
seq(data(reset_value), cond=reset_cond)
25502550

25512551

2552+
class Predicate(_Accumulator):
2553+
ops = (lambda x, y: y, )
2554+
2555+
def __init__(self, value, condition, initval=0,
2556+
reset=None, width=32, signed=True):
2557+
size = 1
2558+
_Accumulator.__init__(self, value, size, initval,
2559+
condition, reset, width, signed)
2560+
2561+
25522562
class ReduceAdd(_Accumulator):
25532563
ops = (vtypes.Plus, )
25542564

0 commit comments

Comments
 (0)