Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

simplify and clean up

This commit is contained in:
Florent Kermarrec 2014-05-20 09:02:35 +02:00
parent 6f47a928b1
commit 2312127c1f
6 changed files with 35 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
miscope/host/vcd.py
View File

@ -161,6 +161,7 @@ class Vcd:
def p_vars(self): def p_vars(self):
r = "" r = ""
for var in self.vars: for var in self.vars:
print(var.name)
r += "$var " r += "$var "
r += var.type r += var.type
r += " " r += " "
@ -221,12 +222,12 @@ class Vcd:
def main(): def main():
myvcd = Vcd() myvcd = Vcd()
myvcd.add(Var(1, "foo1", [0,1,0,1,0,1])) myvcd.add(Var("foo1", 1, [0,1,0,1,0,1]))
myvcd.add(Var(2, "foo2", [1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0])) myvcd.add(Var("foo2", 2, [1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0]))
myvcd.add(Var(3, "foo3")) myvcd.add(Var("foo3", 3))
myvcd.add(Var(4, "foo4")) myvcd.add(Var("foo4", 4))
ramp = [i%128 for i in range(1024)] ramp = [i%128 for i in range(1024)]
myvcd.add(Var(16, "ramp", ramp)) myvcd.add(Var("ramp", 16, ramp))
print(myvcd) print(myvcd)
if __name__ == '__main__': if __name__ == '__main__':

10
miscope/miio.py
View File

@ -1,17 +1,15 @@
from migen.fhdl.structure import * from migen.fhdl.structure import *
from migen.bus import csr
from migen.bank import csrgen
from migen.bank.description import * from migen.bank.description import *
class MiIo(Module, AutoCSR): class MiIo(Module, AutoCSR):
def __init__(self, width): def __init__(self, width):
self.width = width self.width = width
self.i = Signal(self.width) self.i = Signal(width)
self.o = Signal(self.width) self.o = Signal(width)
self._r_i = CSRStatus(self.width) self._r_i = CSRStatus(width)
self._r_o = CSRStorage(self.width) self._r_o = CSRStorage(width)
self.sync +=[ self.sync +=[
self._r_i.status.eq(self.i), self._r_i.status.eq(self.i),

37
miscope/mila.py
View File

@ -1,8 +1,4 @@
from migen.fhdl.structure import * from migen.fhdl.structure import *
from migen.flow.actor import *
from migen.flow.network import *
from migen.bus import csr
from migen.bank import description, csrgen
from migen.bank.description import * from migen.bank.description import *
from miscope.std import * from miscope.std import *
@ -10,7 +6,7 @@ from miscope.trigger import Trigger
from miscope.storage import Recorder, RunLengthEncoder from miscope.storage import Recorder, RunLengthEncoder
class MiLa(Module, AutoCSR): class MiLa(Module, AutoCSR):
def __init__(self, width, depth, ports, rle=False): def __init__(self, width, depth, ports, with_rle=False):
self.width = width self.width = width
self.sink = rec_dat(width) self.sink = rec_dat(width)
@ -23,28 +19,13 @@ class MiLa(Module, AutoCSR):
self.comb += [ self.comb += [
self.sink.connect(trigger.sink),
trigger.sink.stb.eq(self.sink.stb), trigger.source.connect(recorder.trig_sink)
trigger.sink.dat.eq(self.sink.dat),
recorder.trig_sink.stb.eq(trigger.source.stb),
recorder.trig_sink.hit.eq(trigger.source.hit),
trigger.source.ack.eq(recorder.trig_sink.ack),
self.sink.ack.eq(1), #FIXME
] ]
if rle: recorder_dat_source = self.sink
self.submodules.rle = RunLengthEncoder(width, 1024) if with_rle:
self.comb +=[ self.submodules.rle = RunLengthEncoder(width)
self.rle.sink.stb.eq(self.sink.stb), self.comb += self.sink.connect(self.rle.sink)
self.rle.sink.dat.eq(self.sink.dat), recorder_dat_source = self.rle.source
self.comb += recorder_dat_source.connect(recorder.dat_sink)
recorder.dat_sink.stb.eq(self.rle.source.stb),
recorder.dat_sink.dat.eq(self.rle.source.dat),
]
else:
self.comb +=[
recorder.dat_sink.stb.eq(self.sink.stb),
recorder.dat_sink.dat.eq(self.sink.dat),
]

3
miscope/std.py
View File

@ -3,7 +3,6 @@ from migen.genlib.record import *
def rec_dat(width): def rec_dat(width):
layout = [ layout = [
("stb", 1, DIR_M_TO_S), ("stb", 1, DIR_M_TO_S),
("ack", 1, DIR_S_TO_M),
("dat", width, DIR_M_TO_S) ("dat", width, DIR_M_TO_S)
] ]
return Record(layout) return Record(layout)
@ -11,7 +10,6 @@ def rec_dat(width):
def rec_hit(): def rec_hit():
layout = [ layout = [
("stb", 1, DIR_M_TO_S), ("stb", 1, DIR_M_TO_S),
("ack", 1, DIR_S_TO_M),
("hit", 1, DIR_M_TO_S) ("hit", 1, DIR_M_TO_S)
] ]
return Record(layout) return Record(layout)
@ -19,7 +17,6 @@ def rec_hit():
def rec_dat_hit(width): def rec_dat_hit(width):
layout = [ layout = [
("stb", 1, DIR_M_TO_S), ("stb", 1, DIR_M_TO_S),
("ack", 1, DIR_S_TO_M),
("hit", 1, DIR_M_TO_S), ("hit", 1, DIR_M_TO_S),
("dat", width, DIR_M_TO_S) ("dat", width, DIR_M_TO_S)
] ]

27
miscope/storage.py
View File

@ -1,9 +1,4 @@
from migen.fhdl.std import * from migen.fhdl.std import *
from migen.flow.actor import *
from migen.flow.network import *
from migen.fhdl.specials import Memory
from migen.bus import csr
from migen.bank import description, csrgen
from migen.bank.description import * from migen.bank.description import *
from migen.genlib.fifo import SyncFIFO from migen.genlib.fifo import SyncFIFO
from migen.genlib.fsm import FSM, NextState from migen.genlib.fsm import FSM, NextState
@ -11,7 +6,7 @@ from migen.genlib.fsm import FSM, NextState
from miscope.std import * from miscope.std import *
class RunLengthEncoder(Module, AutoCSR): class RunLengthEncoder(Module, AutoCSR):
def __init__(self, width, length): def __init__(self, width, length=1024):
self.width = width self.width = width
self.length = length self.length = length
@ -25,22 +20,20 @@ class RunLengthEncoder(Module, AutoCSR):
enable = self._r_enable.storage enable = self._r_enable.storage
stb_i = self.sink.stb stb_i = self.sink.stb
dat_i = self.sink.dat dat_i = self.sink.dat
ack_i = self.sink.ack
# Register Input # Register Input
stb_i_d = Signal() stb_i_d = Signal()
dat_i_d = Signal(width) dat_i_d = Signal(width)
self.sync += [ self.sync += \
If(stb_i, If(stb_i,
dat_i_d.eq(dat_i), dat_i_d.eq(dat_i),
stb_i_d.eq(stb_i) stb_i_d.eq(stb_i)
) )
]
# Detect change # Detect change
change = Signal() change = Signal()
self.comb += [change.eq(stb_i & (~enable | (dat_i_d != dat_i)))] self.comb += change.eq(stb_i & (~enable | (dat_i_d != dat_i)))
change_d = Signal() change_d = Signal()
change_rising = Signal() change_rising = Signal()
@ -51,22 +44,20 @@ class RunLengthEncoder(Module, AutoCSR):
rle_cnt = Signal(max=length) rle_cnt = Signal(max=length)
rle_max = Signal() rle_max = Signal()
self.comb +=[If(rle_cnt == length, rle_max.eq(enable))] self.comb += If(rle_cnt == length, rle_max.eq(enable))
self.sync +=[ self.sync += \
If(change | rle_max, If(change | rle_max,
rle_cnt.eq(0) rle_cnt.eq(0)
).Else( ).Else(
rle_cnt.eq(rle_cnt + 1) rle_cnt.eq(rle_cnt + 1)
) )
]
# Mux RLE word and data # Mux RLE word and data
stb_o = self.source.stb stb_o = self.source.stb
dat_o = self.source.dat dat_o = self.source.dat
ack_o = self.source.ack
self.comb +=[ self.comb += \
If(change_rising & ~rle_max, If(change_rising & ~rle_max,
stb_o.eq(1), stb_o.eq(1),
dat_o[width-1].eq(1), dat_o[width-1].eq(1),
@ -76,9 +67,7 @@ class RunLengthEncoder(Module, AutoCSR):
dat_o.eq(dat_i_d) dat_o.eq(dat_i_d)
).Else( ).Else(
stb_o.eq(0), stb_o.eq(0),
), )
ack_i.eq(1) #FIXME
]
class Recorder(Module, AutoCSR): class Recorder(Module, AutoCSR):
def __init__(self, width, depth): def __init__(self, width, depth):
@ -122,7 +111,6 @@ class Recorder(Module, AutoCSR):
fsm.act("PRE_HIT_RECORDING", fsm.act("PRE_HIT_RECORDING",
fifo.we.eq(self.dat_sink.stb), fifo.we.eq(self.dat_sink.stb),
fifo.din.eq(self.dat_sink.dat), fifo.din.eq(self.dat_sink.dat),
self.dat_sink.ack.eq(fifo.writable),
fifo.re.eq(fifo.level >= self._r_offset.storage), fifo.re.eq(fifo.level >= self._r_offset.storage),
@ -132,7 +120,6 @@ class Recorder(Module, AutoCSR):
fsm.act("POST_HIT_RECORDING", fsm.act("POST_HIT_RECORDING",
fifo.we.eq(self.dat_sink.stb), fifo.we.eq(self.dat_sink.stb),
fifo.din.eq(self.dat_sink.dat), fifo.din.eq(self.dat_sink.dat),
self.dat_sink.ack.eq(fifo.writable),
If(~fifo.writable | (fifo.level >= self._r_length.storage), NextState("IDLE")) If(~fifo.writable | (fifo.level >= self._r_length.storage), NextState("IDLE"))
) )

19
miscope/trigger.py
View File

@ -1,9 +1,5 @@
from migen.fhdl.std import * from migen.fhdl.std import *
from migen.flow.actor import *
from migen.flow.network import *
from migen.fhdl.specials import Memory from migen.fhdl.specials import Memory
from migen.bus import csr
from migen.bank import description, csrgen
from migen.bank.description import * from migen.bank.description import *
from miscope.std import * from miscope.std import *
@ -27,8 +23,7 @@ class Term(Module, AutoCSR):
self.comb +=[ self.comb +=[
hit.eq((dat & mask) == trig), hit.eq((dat & mask) == trig),
self.source.stb.eq(self.sink.stb), self.source.stb.eq(self.sink.stb)
self.sink.ack.eq(self.sink.ack),
] ]
class RangeDetector(Module, AutoCSR): class RangeDetector(Module, AutoCSR):
@ -42,6 +37,7 @@ class RangeDetector(Module, AutoCSR):
self._r_high = CSRStorage(width) self._r_high = CSRStorage(width)
### ###
low = self._r_low.storage low = self._r_low.storage
high = self._r_high.storage high = self._r_high.storage
dat = self.sink.dat dat = self.sink.dat
@ -49,8 +45,7 @@ class RangeDetector(Module, AutoCSR):
self.comb +=[ self.comb +=[
hit.eq((dat >= low) & (dat <= high)), hit.eq((dat >= low) & (dat <= high)),
self.source.stb.eq(self.sink.stb), self.source.stb.eq(self.sink.stb)
self.sink.ack.eq(self.sink.ack),
] ]
@ -66,6 +61,7 @@ class EdgeDetector(Module, AutoCSR):
self._r_both_mask = CSRStorage(width) self._r_both_mask = CSRStorage(width)
### ###
rising_mask = self._r_rising_mask.storage rising_mask = self._r_rising_mask.storage
falling_mask = self._r_falling_mask.storage falling_mask = self._r_falling_mask.storage
both_mask = self._r_both_mask.storage both_mask = self._r_both_mask.storage
@ -84,8 +80,7 @@ class EdgeDetector(Module, AutoCSR):
falling_hit.eq(rising_mask & ~dat & dat_d), falling_hit.eq(rising_mask & ~dat & dat_d),
both_hit.eq((both_mask & dat) != (both_mask & dat_d)), both_hit.eq((both_mask & dat) != (both_mask & dat_d)),
hit.eq(rising_hit | falling_hit | both_hit), hit.eq(rising_hit | falling_hit | both_hit),
self.source.stb.eq(self.sink.stb), self.source.stb.eq(self.sink.stb)
self.sink.ack.eq(self.sink.ack),
] ]
class Sum(Module, AutoCSR): class Sum(Module, AutoCSR):
@ -121,7 +116,6 @@ class Sum(Module, AutoCSR):
self.comb +=[ self.comb +=[
self.source.stb.eq(optree("&", [sink.stb for sink in self.sinks])), self.source.stb.eq(optree("&", [sink.stb for sink in self.sinks])),
self.source.hit.eq(lut_port.dat_r), self.source.hit.eq(lut_port.dat_r),
[sink.ack.eq(self.source.ack) for sink in self.sinks]
] ]
@ -145,7 +139,6 @@ class Trigger(Module, AutoCSR):
### ###
for i, port in enumerate(ports): for i, port in enumerate(ports):
self.comb +=[ self.comb +=[
port.sink.stb.eq(self.sink.stb), self.sink.connect(port.sink),
port.sink.dat.eq(self.sink.dat),
port.source.connect(self.sum.sinks[i]) port.source.connect(self.sum.sinks[i])
] ]