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

sim: improve tracing reset value and behaviour with sim_debug=False

This commit is contained in:
Jędrzej Boczar 2020-09-07 15:29:02 +02:00
parent 3fd567c4c9
commit 7c3fbf1d06
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
litex/build/sim/core/veril.cpp
View File

@ -56,7 +56,7 @@ extern "C" void litex_sim_init_tracer(void *vsim, long start, long end)
extern "C" void litex_sim_tracer_dump() extern "C" void litex_sim_tracer_dump()
{ {
static int last_enabled = -1; static int last_enabled = 0;
bool dump_enabled = true; bool dump_enabled = true;
if (g_sim != nullptr) { if (g_sim != nullptr) {

17
litex/tools/litex_sim.py
View File

@ -183,6 +183,7 @@ class SimSoC(SoCCore):
with_i2c = False, with_i2c = False,
with_sdcard = False, with_sdcard = False,
sim_debug = False, sim_debug = False,
trace_reset_on = False,
**kwargs): **kwargs):
platform = Platform() platform = Platform()
sys_clk_freq = int(1e6) sys_clk_freq = int(1e6)
@ -317,7 +318,9 @@ class SimSoC(SoCCore):
# Simulatio debugging ---------------------------------------------------------------------- # Simulatio debugging ----------------------------------------------------------------------
if sim_debug: if sim_debug:
platform.add_debug(self) platform.add_debug(self, reset=1 if trace_reset_on else 0)
else:
self.comb += platform.trace.eq(1)
# Build -------------------------------------------------------------------------------------------- # Build --------------------------------------------------------------------------------------------
@ -343,8 +346,8 @@ def main():
parser.add_argument("--with-sdcard", action="store_true", help="Enable SDCard support") parser.add_argument("--with-sdcard", action="store_true", help="Enable SDCard support")
parser.add_argument("--trace", action="store_true", help="Enable Tracing") parser.add_argument("--trace", action="store_true", help="Enable Tracing")
parser.add_argument("--trace-fst", action="store_true", help="Enable FST tracing (default=VCD)") parser.add_argument("--trace-fst", action="store_true", help="Enable FST tracing (default=VCD)")
parser.add_argument("--trace-start", default=0, help="Cycle to start tracing") parser.add_argument("--trace-start", default="0", help="Time to start tracing (ps)")
parser.add_argument("--trace-end", default=-1, help="Cycle to end tracing") parser.add_argument("--trace-end", default="-1", help="Time to end tracing (ps)")
parser.add_argument("--opt-level", default="O3", help="Compilation optimization level") parser.add_argument("--opt-level", default="O3", help="Compilation optimization level")
parser.add_argument("--sim-debug", action="store_true", help="Add simulation debugging modules") parser.add_argument("--sim-debug", action="store_true", help="Add simulation debugging modules")
args = parser.parse_args() args = parser.parse_args()
@ -383,6 +386,9 @@ def main():
if args.with_i2c: if args.with_i2c:
sim_config.add_module("spdeeprom", "i2c") sim_config.add_module("spdeeprom", "i2c")
trace_start = int(float(args.trace_start))
trace_end = int(float(args.trace_end))
# SoC ------------------------------------------------------------------------------------------ # SoC ------------------------------------------------------------------------------------------
soc = SimSoC( soc = SimSoC(
with_sdram = args.with_sdram, with_sdram = args.with_sdram,
@ -392,6 +398,7 @@ def main():
with_i2c = args.with_i2c, with_i2c = args.with_i2c,
with_sdcard = args.with_sdcard, with_sdcard = args.with_sdcard,
sim_debug = args.sim_debug, sim_debug = args.sim_debug,
trace_reset_on = trace_start > 0 or trace_end > 0,
sdram_init = [] if args.sdram_init is None else get_mem_data(args.sdram_init, cpu.endianness), sdram_init = [] if args.sdram_init is None else get_mem_data(args.sdram_init, cpu.endianness),
**soc_kwargs) **soc_kwargs)
if args.ram_init is not None: if args.ram_init is not None:
@ -416,8 +423,8 @@ def main():
opt_level = args.opt_level, opt_level = args.opt_level,
trace = args.trace, trace = args.trace,
trace_fst = args.trace_fst, trace_fst = args.trace_fst,
trace_start = int(args.trace_start), trace_start = trace_start,
trace_end = int(args.trace_end) trace_end = trace_end
) )
if args.with_analyzer: if args.with_analyzer:
soc.analyzer.export_csv(vns, "analyzer.csv") soc.analyzer.export_csv(vns, "analyzer.csv")