[dv] fix spurious LSF enabling

Signed-off-by: Udi <udij@google.com>
This commit is contained in:
Udi 2020-04-21 10:48:14 -07:00 committed by udinator
parent dcf18d86c3
commit 321a3d267f
2 changed files with 9 additions and 3 deletions

View file

@ -325,10 +325,10 @@ $(OUT)/rtl_sim/.compile.stamp: \
@./sim.py \
--o=${OUT} \
--steps=compile \
--lsf_cmd="${LSF_CMD}" \
${COMMON_OPTS} \
--simulator="${SIMULATOR}" --simulator_yaml=yaml/rtl_simulation.yaml \
$(cov-arg) $(wave-arg) --cmp_opts="${COMPILE_OPTS}"
$(cov-arg) $(wave-arg) $(lsf-arg) \
--cmp_opts="${COMPILE_OPTS}"
$(call dump-vars,$(OUT)/rtl_sim/.compile-vars.mk,comp,$(compile-var-deps))
@touch $@
@ -361,7 +361,6 @@ $(metadata)/rtl_sim.run.stamp: \
@./sim.py \
--o=$(OUT-SEED) \
--steps=sim \
--lsf_cmd="${LSF_CMD}" \
${TEST_OPTS} \
--simulator="${SIMULATOR}" --simulator_yaml=yaml/rtl_simulation.yaml \
$(cov-arg) $(wave-arg) $(lsf-arg) \

View file

@ -499,6 +499,13 @@ def main():
setup_logging(args.verbose)
parser.set_defaults(verbose=False)
# If args.lsf_cmd is an empty string return an error message and exit from
# the script, as doing nothing will result in arbitrary simulation timeouts
# and errors later on in the run flow.
if args.lsf_cmd == "":
logging.error("The LSF command passed in is an empty string.")
return RET_FAIL
# Create the output directory
output_dir = ("%s/rtl_sim" % args.o)
bin_dir = ("%s/instr_gen/asm_tests" % args.o)