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

sim/verilator: add an option to limit the number of compiler jobs

This commit is contained in:
Ilia Sergachev 2022-07-20 12:20:25 +02:00
parent 66015a346e
commit bc62b5ad9f
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
litex/build/sim/core/Makefile
View File

@ -52,7 +52,7 @@ sim: $(OBJS_SIM) | mkdir
$(INC_DIR) \ $(INC_DIR) \
-Wno-BLKANDNBLK \ -Wno-BLKANDNBLK \
-Wno-WIDTH -Wno-WIDTH
make -j -C $(OBJ_DIR) -f Vsim.mk Vsim make -j$(JOBS) -C $(OBJ_DIR) -f Vsim.mk Vsim
.PHONY: modules .PHONY: modules
modules: modules:

10
litex/build/sim/verilator.py
View File

@ -130,7 +130,7 @@ def _generate_sim_config(config):
tools.write_to_file("sim_config.js", content) tools.write_to_file("sim_config.js", content)
def _build_sim(build_name, sources, threads, coverage, opt_level="O3", trace_fst=False): def _build_sim(build_name, sources, jobs, threads, coverage, opt_level="O3", trace_fst=False):
makefile = os.path.join(core_directory, 'Makefile') makefile = os.path.join(core_directory, 'Makefile')
cc_srcs = [] cc_srcs = []
for filename, language, library, *copy in sources: for filename, language, library, *copy in sources:
@ -140,6 +140,7 @@ rm -rf obj_dir/
make -C . -f {} {} {} {} {} {} make -C . -f {} {} {} {} {} {}
""".format(makefile, """.format(makefile,
"CC_SRCS=\"{}\"".format("".join(cc_srcs)), "CC_SRCS=\"{}\"".format("".join(cc_srcs)),
"JOBS={}".format(jobs) if jobs else "",
"THREADS={}".format(threads) if int(threads) > 1 else "", "THREADS={}".format(threads) if int(threads) > 1 else "",
"COVERAGE=1" if coverage else "", "COVERAGE=1" if coverage else "",
"OPT_LEVEL={}".format(opt_level), "OPT_LEVEL={}".format(opt_level),
@ -188,6 +189,7 @@ class SimVerilatorToolchain:
build = True, build = True,
run = True, run = True,
build_backend = None, build_backend = None,
jobs = None,
threads = 1, threads = 1,
verbose = True, verbose = True,
sim_config = None, sim_config = None,
@ -237,7 +239,7 @@ class SimVerilatorToolchain:
_generate_sim_config(sim_config) _generate_sim_config(sim_config)
# Build # Build
_build_sim(build_name, platform.sources, threads, coverage, opt_level, trace_fst) _build_sim(build_name, platform.sources, jobs, threads, coverage, opt_level, trace_fst)
# Run # Run
if run: if run:
@ -263,7 +265,8 @@ class SimVerilatorToolchain:
def verilator_build_args(parser): def verilator_build_args(parser):
toolchain_group = parser.add_argument_group(title="Toolchain options") toolchain_group = parser.add_argument_group(title="Toolchain options")
toolchain_group.add_argument("--threads", default=1, help="Set number of threads.") toolchain_group.add_argument("--jobs", default=None, help="Limit the number of compiler jobs.")
toolchain_group.add_argument("--threads", default=1, help="Set number of simulation threads.")
toolchain_group.add_argument("--trace", action="store_true", help="Enable Tracing.") toolchain_group.add_argument("--trace", action="store_true", help="Enable Tracing.")
toolchain_group.add_argument("--trace-fst", action="store_true", help="Enable FST tracing.") toolchain_group.add_argument("--trace-fst", action="store_true", help="Enable FST tracing.")
toolchain_group.add_argument("--trace-start", default="0", help="Time to start tracing (ps).") toolchain_group.add_argument("--trace-start", default="0", help="Time to start tracing (ps).")
@ -272,6 +275,7 @@ def verilator_build_args(parser):
def verilator_build_argdict(args): def verilator_build_argdict(args):
return { return {
"jobs" : args.jobs,
"threads" : args.threads, "threads" : args.threads,
"trace" : args.trace, "trace" : args.trace,
"trace_fst" : args.trace_fst, "trace_fst" : args.trace_fst,