From 31afe558219bf8a726d972dd4de7e427df4affef Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Thu, 3 Sep 2020 09:21:37 +0200 Subject: [PATCH] tools/litex_sim: avoid build/run duplication. --- litex/tools/litex_sim.py | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/litex/tools/litex_sim.py b/litex/tools/litex_sim.py index bac10e3d2..0404bec9c 100755 --- a/litex/tools/litex_sim.py +++ b/litex/tools/litex_sim.py @@ -398,21 +398,22 @@ def main(): # Build/Run ------------------------------------------------------------------------------------ builder_kwargs["csr_csv"] = "csr.csv" builder = Builder(soc, **builder_kwargs) - vns = builder.build(run=False, threads=args.threads, sim_config=sim_config, - opt_level = args.opt_level, - trace = args.trace, - trace_fst = args.trace_fst, - trace_start = int(args.trace_start), - trace_end = int(args.trace_end)) - if args.with_analyzer: - soc.analyzer.export_csv(vns, "analyzer.csv") - builder.build(build=False, threads=args.threads, sim_config=sim_config, - opt_level = args.opt_level, - trace = args.trace, - trace_fst = args.trace, - trace_start = int(args.trace_start), - trace_end = int(args.trace_end) - ) + for i in range(2): + build = (i == 0) + run = (i == 1) + vns = builder.build( + build = build, + run = run, + threads = args.threads, + sim_config = sim_config, + opt_level = args.opt_level, + trace = args.trace, + trace_fst = args.trace_fst, + trace_start = int(args.trace_start), + trace_end = int(args.trace_end) + ) + if args.with_analyzer: + soc.analyzer.export_csv(vns, "analyzer.csv") if __name__ == "__main__": main()