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

tools/litex_sim: move gtkw import to generate_gtkw_savefile. 

This fixes litex_sim use with python 3.6 and raise an error when --gtkwave-savefile
is used with python 3.6.
This commit is contained in:
Florent Kermarrec 2021-02-02 09:57:08 +01:00
parent 659751d202
commit ba7c503fb6
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
litex/tools/litex_sim.py
View File

@ -8,6 +8,7 @@
# Copyright (c) 2017 Pierre-Olivier Vauboin <po@lambdaconcept> # Copyright (c) 2017 Pierre-Olivier Vauboin <po@lambdaconcept>
# SPDX-License-Identifier: BSD-2-Clause # SPDX-License-Identifier: BSD-2-Clause
import sys
import argparse import argparse
from migen import * from migen import *
@ -23,7 +24,6 @@ from litex.soc.integration.builder import *
from litex.soc.integration.soc import * from litex.soc.integration.soc import *
from litex.soc.cores.bitbang import * from litex.soc.cores.bitbang import *
from litex.soc.cores.cpu import CPUS from litex.soc.cores.cpu import CPUS
from litex.build.sim import gtkwave as gtkw
from litedram import modules as litedram_modules from litedram import modules as litedram_modules
from litedram.modules import parse_spd_hexdump from litedram.modules import parse_spd_hexdump
@ -328,6 +328,7 @@ class SimSoC(SoCCore):
# Build -------------------------------------------------------------------------------------------- # Build --------------------------------------------------------------------------------------------
def generate_gtkw_savefile(builder, vns, trace_fst): def generate_gtkw_savefile(builder, vns, trace_fst):
from litex.build.sim import gtkwave as gtkw
dumpfile = os.path.join(builder.gateware_dir, "sim.{}".format("fst" if trace_fst else "vcd")) dumpfile = os.path.join(builder.gateware_dir, "sim.{}".format("fst" if trace_fst else "vcd"))
savefile = os.path.join(builder.gateware_dir, "sim.gtkw") savefile = os.path.join(builder.gateware_dir, "sim.gtkw")
soc = builder.soc soc = builder.soc
@ -471,6 +472,8 @@ def main():
if args.with_analyzer: if args.with_analyzer:
soc.analyzer.export_csv(vns, "analyzer.csv") soc.analyzer.export_csv(vns, "analyzer.csv")
if args.gtkwave_savefile: if args.gtkwave_savefile:
if sys.version_info[1] < 7:
raise OSError("--gtkwave-savefile option only supported for python 3.7+.")
generate_gtkw_savefile(builder, vns, args.trace_fst) generate_gtkw_savefile(builder, vns, args.trace_fst)
if __name__ == "__main__": if __name__ == "__main__":