example_designs: use new litescope

This commit is contained in:
Florent Kermarrec 2016-03-31 21:27:08 +02:00
parent e006223fee
commit c6875b7bff
4 changed files with 24 additions and 32 deletions

View file

@ -60,12 +60,11 @@ set_false_path -from [get_clocks eth_tx_clk] -to [get_clocks sys_clk]
class BaseSoCDevel(BaseSoC): class BaseSoCDevel(BaseSoC):
csr_map = { csr_map = {
"logic_analyzer": 20 "analyzer": 20
} }
csr_map.update(BaseSoC.csr_map) csr_map.update(BaseSoC.csr_map)
def __init__(self, platform): def __init__(self, platform):
from litescope.frontend.logic_analyzer import LiteScopeLogicAnalyzer from litescope import LiteScopeAnalyzer
from litescope.core.port import LiteScopeTerm
BaseSoC.__init__(self, platform) BaseSoC.__init__(self, platform)
self.core_icmp_rx_fsm_state = Signal(4) self.core_icmp_rx_fsm_state = Signal(4)
@ -78,7 +77,7 @@ class BaseSoCDevel(BaseSoC):
self.core_arp_tx_fsm_state = Signal(4) self.core_arp_tx_fsm_state = Signal(4)
self.core_arp_table_fsm_state = Signal(4) self.core_arp_table_fsm_state = Signal(4)
debug = ( debug = [
# MAC interface # MAC interface
self.core.mac.core.sink.valid, self.core.mac.core.sink.valid,
self.core.mac.core.sink.last, self.core.mac.core.sink.last,
@ -122,9 +121,8 @@ class BaseSoCDevel(BaseSoC):
self.core_udp_rx_fsm_state, self.core_udp_rx_fsm_state,
self.core_udp_tx_fsm_state self.core_udp_tx_fsm_state
) ]
self.submodules.logic_analyzer = LiteScopeLogicAnalyzer(debug, 4096) self.submodules.analyzer = LiteScopeAnalyzer(debug, 4096)
self.logic_analyzer.trigger.add_port(LiteScopeTerm(self.logic_analyzer.dw))
def do_finalize(self): def do_finalize(self):
BaseSoC.do_finalize(self) BaseSoC.do_finalize(self)
@ -144,6 +142,6 @@ class BaseSoCDevel(BaseSoC):
] ]
def do_exit(self, vns): def do_exit(self, vns):
self.logic_analyzer.export(vns, "test/logic_analyzer.csv") self.analyzer.export_csv(vns, "test/analyzer.csv")
default_subtarget = BaseSoC default_subtarget = BaseSoC

View file

@ -16,14 +16,13 @@ class EtherboneSoC(BaseSoC):
class EtherboneSoCDevel(EtherboneSoC): class EtherboneSoCDevel(EtherboneSoC):
csr_map = { csr_map = {
"logic_analyzer": 20 "analyzer": 20
} }
csr_map.update(EtherboneSoC.csr_map) csr_map.update(EtherboneSoC.csr_map)
def __init__(self, platform): def __init__(self, platform):
from litescope.frontend.logic_analyzer import LiteScopeLogicAnalyzer from litescope import LiteScopeAnalyzer
from litescope.core.port import LiteScopeTerm
EtherboneSoC.__init__(self, platform) EtherboneSoC.__init__(self, platform)
debug = ( debug = [
# mmap stream from HOST # mmap stream from HOST
self.etherbone.master.sink.valid, self.etherbone.master.sink.valid,
self.etherbone.master.sink.last, self.etherbone.master.sink.last,
@ -58,11 +57,10 @@ class EtherboneSoCDevel(EtherboneSoC):
self.etherbone.master.bus.cti, self.etherbone.master.bus.cti,
self.etherbone.master.bus.bte, self.etherbone.master.bus.bte,
self.etherbone.master.bus.err self.etherbone.master.bus.err
) ]
self.submodules.logic_analyzer = LiteScopeLogicAnalyzer(debug, 4096) self.submodules.analyzer = LiteScopeAnalyzer(debug, 4096)
self.logic_analyzer.trigger.add_port(LiteScopeTerm(self.logic_analyzer.dw))
def do_exit(self, vns): def do_exit(self, vns):
self.logic_analyzer.export(vns, "test/logic_analyzer.csv") self.analyzer.export_csv(vns, "test/analyzer.csv")
default_subtarget = EtherboneSoC default_subtarget = EtherboneSoC

View file

@ -16,14 +16,13 @@ class TTYSoC(BaseSoC):
class TTYSoCDevel(TTYSoC): class TTYSoCDevel(TTYSoC):
csr_map = { csr_map = {
"logic_analyzer": 20 "analyzer": 20
} }
csr_map.update(TTYSoC.csr_map) csr_map.update(TTYSoC.csr_map)
def __init__(self, platform): def __init__(self, platform):
from litescope.frontend.logic_analyzer import LiteScopeLogicAnalyzer from litescope import LiteScopeAnalyzer
from litescope.core.port import LiteScopeTerm
TTYSoC.__init__(self, platform) TTYSoC.__init__(self, platform)
debug = ( debug = [
self.tty.sink.valid, self.tty.sink.valid,
self.tty.sink.ready, self.tty.sink.ready,
self.tty.sink.data, self.tty.sink.data,
@ -31,11 +30,10 @@ class TTYSoCDevel(TTYSoC):
self.tty.source.valid, self.tty.source.valid,
self.tty.source.ready, self.tty.source.ready,
self.tty.source.data self.tty.source.data
) ]
self.submodules.logic_analyzer = LiteScopeLogicAnalyzer(debug, 4096) self.submodules.analyzer = LiteScopeAnalyzer(debug, 4096)
self.logic_analyzer.trigger.add_port(LiteScopeTerm(self.logic_analyzer.dw))
def do_exit(self, vns): def do_exit(self, vns):
self.logic_analyzer.export(vns, "test/logic_analyzer.csv") self.analyzer.export_csv(vns, "test/analyzer.csv")
default_subtarget = TTYSoC default_subtarget = TTYSoC

View file

@ -27,14 +27,13 @@ class UDPSoC(BaseSoC):
class UDPSoCDevel(UDPSoC): class UDPSoCDevel(UDPSoC):
csr_map = { csr_map = {
"logic_analyzer": 20 "analyzer": 20
} }
csr_map.update(UDPSoC.csr_map) csr_map.update(UDPSoC.csr_map)
def __init__(self, platform): def __init__(self, platform):
from litescope.frontend.logic_analyzer import LiteScopeLogicAnalyzer from litescope import LiteScopeAnalyzer
from litescope.core.port import LiteScopeTerm
UDPSoC.__init__(self, platform) UDPSoC.__init__(self, platform)
debug = ( debug = [
self.loopback_8.sink.valid, self.loopback_8.sink.valid,
self.loopback_8.sink.last, self.loopback_8.sink.last,
self.loopback_8.sink.ready, self.loopback_8.sink.ready,
@ -54,11 +53,10 @@ class UDPSoCDevel(UDPSoC):
self.loopback_32.source.last, self.loopback_32.source.last,
self.loopback_32.source.ready, self.loopback_32.source.ready,
self.loopback_32.source.data self.loopback_32.source.data
) ]
self.submodules.logic_analyzer = LiteScopeLogicAnalyzer(debug, 4096) self.submodules.analyzer = LiteScopeAnalyzer(debug, 4096)
self.logic_analyzer.trigger.add_port(LiteScopeTerm(self.logic_analyzer.dw))
def do_exit(self, vns): def do_exit(self, vns):
self.logic_analyzer.export(vns, "test/logic_analyzer.csv") self.analyzer.export_csv(vns, "test/analyzer.csv")
default_subtarget = UDPSoC default_subtarget = UDPSoC