projects
/
ieee754fpu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
output less-than test to ilang
[ieee754fpu.git]
/
src
/
add
/
test_buf_pipe.py
diff --git
a/src/add/test_buf_pipe.py
b/src/add/test_buf_pipe.py
index 9ba8449c853adc50d4bbb5dbfb45e6426c6fb766..e32e2d322bc87cab445f677d0067376ce0c6b5aa 100644
(file)
--- a/
src/add/test_buf_pipe.py
+++ b/
src/add/test_buf_pipe.py
@@
-1,43
+1,45
@@
from nmigen import Module, Signal, Mux
from nmigen.compat.sim import run_simulation
from nmigen import Module, Signal, Mux
from nmigen.compat.sim import run_simulation
+from nmigen.cli import verilog, rtlil
+
from example_buf_pipe import ExampleBufPipe, ExampleBufPipeAdd
from example_buf_pipe import ExampleCombPipe, CombPipe
from example_buf_pipe import ExampleBufPipe, ExampleBufPipeAdd
from example_buf_pipe import ExampleCombPipe, CombPipe
-from example_buf_pipe import
IOAckIn, IOAckOut
+from example_buf_pipe import
PrevControl, NextControl
from random import randint
def check_o_n_valid(dut, val):
from random import randint
def check_o_n_valid(dut, val):
- o_n_valid = yield dut.
o.n
_valid
+ o_n_valid = yield dut.
n.o
_valid
assert o_n_valid == val
def testbench(dut):
#yield dut.i_p_rst.eq(1)
assert o_n_valid == val
def testbench(dut):
#yield dut.i_p_rst.eq(1)
- yield dut.
i.n
_ready.eq(0)
- yield dut.
o.p
_ready.eq(0)
+ yield dut.
n.i
_ready.eq(0)
+ yield dut.
p.o
_ready.eq(0)
yield
yield
#yield dut.i_p_rst.eq(0)
yield
yield
#yield dut.i_p_rst.eq(0)
- yield dut.
i.n
_ready.eq(1)
- yield dut.
i.
data.eq(5)
- yield dut.
i.p
_valid.eq(1)
+ yield dut.
n.i
_ready.eq(1)
+ yield dut.
p.i_
data.eq(5)
+ yield dut.
p.i
_valid.eq(1)
yield
yield
- yield dut.
i.
data.eq(7)
+ yield dut.
p.i_
data.eq(7)
yield from check_o_n_valid(dut, 0) # effects of i_p_valid delayed
yield
yield from check_o_n_valid(dut, 1) # ok *now* i_p_valid effect is felt
yield from check_o_n_valid(dut, 0) # effects of i_p_valid delayed
yield
yield from check_o_n_valid(dut, 1) # ok *now* i_p_valid effect is felt
- yield dut.
i.
data.eq(2)
+ yield dut.
p.i_
data.eq(2)
yield
yield
- yield dut.
i.n
_ready.eq(0) # begin going into "stall" (next stage says ready)
- yield dut.
i.
data.eq(9)
+ yield dut.
n.i
_ready.eq(0) # begin going into "stall" (next stage says ready)
+ yield dut.
p.i_
data.eq(9)
yield
yield
- yield dut.
i.p
_valid.eq(0)
- yield dut.
i.
data.eq(12)
+ yield dut.
p.i
_valid.eq(0)
+ yield dut.
p.i_
data.eq(12)
yield
yield
- yield dut.
i.
data.eq(32)
- yield dut.
i.n
_ready.eq(1)
+ yield dut.
p.i_
data.eq(32)
+ yield dut.
n.i
_ready.eq(1)
yield
yield from check_o_n_valid(dut, 1) # buffer still needs to output
yield
yield
yield from check_o_n_valid(dut, 1) # buffer still needs to output
yield
@@
-48,33
+50,33
@@
def testbench(dut):
def testbench2(dut):
def testbench2(dut):
- #yield dut.
i.p
_rst.eq(1)
- yield dut.
i.n
_ready.eq(0)
- #yield dut.
o.p
_ready.eq(0)
+ #yield dut.
p.i
_rst.eq(1)
+ yield dut.
n.i
_ready.eq(0)
+ #yield dut.
p.o
_ready.eq(0)
yield
yield
yield
yield
- #yield dut.
i.p
_rst.eq(0)
- yield dut.
i.n
_ready.eq(1)
- yield dut.
i.
data.eq(5)
- yield dut.
i.p
_valid.eq(1)
+ #yield dut.
p.i
_rst.eq(0)
+ yield dut.
n.i
_ready.eq(1)
+ yield dut.
p.i_
data.eq(5)
+ yield dut.
p.i
_valid.eq(1)
yield
yield
- yield dut.
i.
data.eq(7)
+ yield dut.
p.i_
data.eq(7)
yield from check_o_n_valid(dut, 0) # effects of i_p_valid delayed 2 clocks
yield
yield from check_o_n_valid(dut, 0) # effects of i_p_valid delayed 2 clocks
yield from check_o_n_valid(dut, 0) # effects of i_p_valid delayed 2 clocks
yield
yield from check_o_n_valid(dut, 0) # effects of i_p_valid delayed 2 clocks
- yield dut.
i.
data.eq(2)
+ yield dut.
p.i_
data.eq(2)
yield
yield from check_o_n_valid(dut, 1) # ok *now* i_p_valid effect is felt
yield
yield from check_o_n_valid(dut, 1) # ok *now* i_p_valid effect is felt
- yield dut.
i.n
_ready.eq(0) # begin going into "stall" (next stage says ready)
- yield dut.
i.
data.eq(9)
+ yield dut.
n.i
_ready.eq(0) # begin going into "stall" (next stage says ready)
+ yield dut.
p.i_
data.eq(9)
yield
yield
- yield dut.
i.p
_valid.eq(0)
- yield dut.
i.
data.eq(12)
+ yield dut.
p.i
_valid.eq(0)
+ yield dut.
p.i_
data.eq(12)
yield
yield
- yield dut.
i.
data.eq(32)
- yield dut.
i.n
_ready.eq(1)
+ yield dut.
p.i_
data.eq(32)
+ yield dut.
n.i
_ready.eq(1)
yield
yield from check_o_n_valid(dut, 1) # buffer still needs to output
yield
yield
yield from check_o_n_valid(dut, 1) # buffer still needs to output
yield
@@
-107,16
+109,16
@@
class Test3:
send = True
else:
send = randint(0, send_range) != 0
send = True
else:
send = randint(0, send_range) != 0
- o_p_ready = yield self.dut.
o.p
_ready
+ o_p_ready = yield self.dut.
p.o
_ready
if not o_p_ready:
yield
continue
if send and self.i != len(self.data):
if not o_p_ready:
yield
continue
if send and self.i != len(self.data):
- yield self.dut.
i.p
_valid.eq(1)
- yield self.dut.
i.
data.eq(self.data[self.i])
+ yield self.dut.
p.i
_valid.eq(1)
+ yield self.dut.
p.i_
data.eq(self.data[self.i])
self.i += 1
else:
self.i += 1
else:
- yield self.dut.
i.p
_valid.eq(0)
+ yield self.dut.
p.i
_valid.eq(0)
yield
def rcv(self):
yield
def rcv(self):
@@
-124,13
+126,13
@@
class Test3:
stall_range = randint(0, 3)
for j in range(randint(1,10)):
stall = randint(0, stall_range) != 0
stall_range = randint(0, 3)
for j in range(randint(1,10)):
stall = randint(0, stall_range) != 0
- yield self.dut.
i.n
_ready.eq(stall)
+ yield self.dut.
n.i
_ready.eq(stall)
yield
yield
- o_n_valid = yield self.dut.
o.n
_valid
- i_n_ready = yield self.dut.
i.n
_ready
+ o_n_valid = yield self.dut.
n.o
_valid
+ i_n_ready = yield self.dut.
n.i
_ready
if not o_n_valid or not i_n_ready:
continue
if not o_n_valid or not i_n_ready:
continue
- o_data = yield self.dut.
o.
data
+ o_data = yield self.dut.
n.o_
data
self.resultfn(o_data, self.data[self.o], self.i, self.o)
self.o += 1
if self.o == len(self.data):
self.resultfn(o_data, self.data[self.o], self.i, self.o)
self.o += 1
if self.o == len(self.data):
@@
-159,17
+161,17
@@
class Test5:
send = True
else:
send = randint(0, send_range) != 0
send = True
else:
send = randint(0, send_range) != 0
- o_p_ready = yield self.dut.
o.p
_ready
+ o_p_ready = yield self.dut.
p.o
_ready
if not o_p_ready:
yield
continue
if send and self.i != len(self.data):
if not o_p_ready:
yield
continue
if send and self.i != len(self.data):
- yield self.dut.
i.p
_valid.eq(1)
+ yield self.dut.
p.i
_valid.eq(1)
for v in self.dut.set_input(self.data[self.i]):
yield v
self.i += 1
else:
for v in self.dut.set_input(self.data[self.i]):
yield v
self.i += 1
else:
- yield self.dut.
i.p
_valid.eq(0)
+ yield self.dut.
p.i
_valid.eq(0)
yield
def rcv(self):
yield
def rcv(self):
@@
-177,13
+179,13
@@
class Test5:
stall_range = randint(0, 3)
for j in range(randint(1,10)):
stall = randint(0, stall_range) != 0
stall_range = randint(0, 3)
for j in range(randint(1,10)):
stall = randint(0, stall_range) != 0
- yield self.dut.
i.n
_ready.eq(stall)
+ yield self.dut.
n.i
_ready.eq(stall)
yield
yield
- o_n_valid = yield self.dut.
o.n
_valid
- i_n_ready = yield self.dut.
i.n
_ready
+ o_n_valid = yield self.dut.
n.o
_valid
+ i_n_ready = yield self.dut.
n.i
_ready
if not o_n_valid or not i_n_ready:
continue
if not o_n_valid or not i_n_ready:
continue
- o_data = yield self.dut.
o.
data
+ o_data = yield self.dut.
n.o_
data
self.resultfn(o_data, self.data[self.o], self.i, self.o)
self.o += 1
if self.o == len(self.data):
self.resultfn(o_data, self.data[self.o], self.i, self.o)
self.o += 1
if self.o == len(self.data):
@@
-205,20
+207,20
@@
def testbench4(dut):
while True:
stall = randint(0, 3) != 0
send = randint(0, 5) != 0
while True:
stall = randint(0, 3) != 0
send = randint(0, 5) != 0
- yield dut.
i.n
_ready.eq(stall)
- o_p_ready = yield dut.
o.p
_ready
+ yield dut.
n.i
_ready.eq(stall)
+ o_p_ready = yield dut.
p.o
_ready
if o_p_ready:
if send and i != len(data):
if o_p_ready:
if send and i != len(data):
- yield dut.
i.p
_valid.eq(1)
- yield dut.
i.
data.eq(data[i])
+ yield dut.
p.i
_valid.eq(1)
+ yield dut.
p.i_
data.eq(data[i])
i += 1
else:
i += 1
else:
- yield dut.
i.p
_valid.eq(0)
+ yield dut.
p.i
_valid.eq(0)
yield
yield
- o_n_valid = yield dut.
o.n
_valid
- i_n_ready = yield dut.
i.n
_ready
+ o_n_valid = yield dut.
n.o
_valid
+ i_n_ready = yield dut.
n.i
_ready
if o_n_valid and i_n_ready:
if o_n_valid and i_n_ready:
- o_data = yield dut.
o.
data
+ o_data = yield dut.
n.o_
data
assert o_data == data[o] + 2, "%d-%d data %x not match %x\n" \
% (i, o, o_data, data[o])
o += 1
assert o_data == data[o] + 2, "%d-%d data %x not match %x\n" \
% (i, o, o_data, data[o])
o += 1
@@
-232,19
+234,19
@@
class ExampleBufPipe2:
v v
i_p_valid >>in pipe1 o_n_valid out>> i_p_valid >>in pipe2
o_p_ready <<out pipe1 i_n_ready <<in o_p_ready <<out pipe2
v v
i_p_valid >>in pipe1 o_n_valid out>> i_p_valid >>in pipe2
o_p_ready <<out pipe1 i_n_ready <<in o_p_ready <<out pipe2
-
i_data >>in pipe1 o_data out>> i_data
>>in pipe2
+
p_i_data >>in pipe1 p_i_data out>> n_o_data
>>in pipe2
"""
def __init__(self):
self.pipe1 = ExampleBufPipe()
self.pipe2 = ExampleBufPipe()
# input
"""
def __init__(self):
self.pipe1 = ExampleBufPipe()
self.pipe2 = ExampleBufPipe()
# input
- self.
i = IOAckIn
()
- self.
i.
data = Signal(32) # >>in - comes in from the PREVIOUS stage
+ self.
p = PrevControl
()
+ self.
p.i_
data = Signal(32) # >>in - comes in from the PREVIOUS stage
# output
# output
- self.
o = IOAckOut
()
- self.
o.
data = Signal(32) # out>> - goes out to the NEXT stage
+ self.
n = NextControl
()
+ self.
n.o_
data = Signal(32) # out>> - goes out to the NEXT stage
def elaborate(self, platform):
m = Module()
def elaborate(self, platform):
m = Module()
@@
-252,7
+254,7
@@
class ExampleBufPipe2:
m.submodules.pipe2 = self.pipe2
# connect inter-pipe input/output valid/ready/data
m.submodules.pipe2 = self.pipe2
# connect inter-pipe input/output valid/ready/data
- m.d.comb += self.pipe1.connect_next(self.pipe2)
+ m.d.comb += self.pipe1.connect_
to_
next(self.pipe2)
# inputs/outputs to the module: pipe1 connections here (LHS)
m.d.comb += self.pipe1.connect_in(self)
# inputs/outputs to the module: pipe1 connections here (LHS)
m.d.comb += self.pipe1.connect_in(self)
@@
-346,3
+348,10
@@
if __name__ == '__main__':
test = Test5(dut, test6_resultfn)
run_simulation(dut, [test.send, test.rcv], vcd_name="test_ltcomb6.vcd")
test = Test5(dut, test6_resultfn)
run_simulation(dut, [test.send, test.rcv], vcd_name="test_ltcomb6.vcd")
+ ports = [dut.p.i_valid, dut.n.i_ready,
+ dut.n.o_valid, dut.p.o_ready] + \
+ list(dut.p.i_data) + [dut.n.o_data]
+ vl = rtlil.convert(dut, ports=ports)
+ with open("test_ltcomb_pipe.il", "w") as f:
+ f.write(vl)
+