Fixed bugs in project.cfg for ghdl in formal

Signed-off-by: Joppe Blondel <joppe@blondel.nl>
This commit is contained in:
2022-09-06 13:15:47 +02:00
parent d823739fbc
commit a9a33499a6
2 changed files with 6 additions and 6 deletions

View File

@ -18,9 +18,9 @@ toolchain = ghdl
# Toolchain settings # Toolchain settings
toplevel = tb_counter toplevel = tb_counter
runtime = all runtime = all
#ghdla_opts = ghdla_opts = --std=08
#ghdle_opts = ghdle_opts = --std=08
#ghdlr_opts = ghdlr_opts = --std=08
# Fileset # Fileset
files_vhdl = RTL/counter.vhd files_vhdl = RTL/counter.vhd

View File

@ -39,7 +39,7 @@ def do(config, target, log, subprocesses, prefix='.'):
log(" - analyze files") log(" - analyze files")
res = 0 res = 0
for f in files_vhdl: for f in files_vhdl:
res = execp(f"echo +++{f} >> a.log && ghdl -a {ghdla_opts} {prefix}/{f} 2>&1 >> a.log", subprocesses, build_dir) res = execp(f"echo +++{f} >> a.log && ghdl -a {ghdla_opts} {prefix}/{f} 2>> a.log", subprocesses, build_dir)
if res!=0: if res!=0:
break break
log(" - copy logs") log(" - copy logs")
@ -49,7 +49,7 @@ def do(config, target, log, subprocesses, prefix='.'):
return res return res
log(" - elaborate") log(" - elaborate")
res = execp(f"echo {toplevel} >> e.log && ghdl -e {ghdle_opts} {toplevel} 2>&1 >> e.log", subprocesses, build_dir) res = execp(f"echo {toplevel} >> e.log && ghdl -e {ghdle_opts} {toplevel} 2>> e.log", subprocesses, build_dir)
log(" - copy logs") log(" - copy logs")
shutil.copy(f'{build_dir}/e.log', f'{out_dir}/e.log') shutil.copy(f'{build_dir}/e.log', f'{out_dir}/e.log')
if res!=0: if res!=0:
@ -60,7 +60,7 @@ def do(config, target, log, subprocesses, prefix='.'):
extra = '' extra = ''
if runtime!='all': if runtime!='all':
extra = f'--stop-time={runtime.replace(" ", "")}' extra = f'--stop-time={runtime.replace(" ", "")}'
res = execp(f"echo {toplevel} >> r.log && ghdl -r {ghdlr_opts} {extra} {toplevel} --vcd=out.vcd 2>&1 >> r.log", subprocesses, build_dir) res = execp(f"echo {toplevel} >> r.log && ghdl -r {ghdlr_opts} {extra} {toplevel} --vcd=out.vcd 2>&1 1>> r.log", subprocesses, build_dir)
log(" - copy logs") log(" - copy logs")
shutil.copy(f'{build_dir}/r.log', f'{out_dir}/r.log') shutil.copy(f'{build_dir}/r.log', f'{out_dir}/r.log')
# Ignore simulation errors: vhdl stopping with failure results in returned with 1 # Ignore simulation errors: vhdl stopping with failure results in returned with 1