riscv
/
OpenFPGA
mirror of https://github.com/lnis-uofu/OpenFPGA.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/ganesh_dev' into dev

This commit is contained in:
Ganesh Gore 2019-09-17 22:12:11 -06:00
parent d7ac7d3649 169732ccc1
commit 56c40ca06d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openfpga_flow/scripts/run_fpga_flow.py
View File

@ -659,6 +659,9 @@ def run_standard_vpr(bench_blif, fixed_chan_width, logfile, route_only=False):
if args.vpr_use_tileable_route_chan_width: if args.vpr_use_tileable_route_chan_width:
command += ["--use_tileable_route_chan_width"] command += ["--use_tileable_route_chan_width"]
if args.vpr_fpga_x2p_compact_routing_hierarchy:
command += ["--fpga_x2p_compact_routing_hierarchy"]
# FPGA_Spice Options # FPGA_Spice Options
if (args.power and args.vpr_fpga_spice): if (args.power and args.vpr_fpga_spice):
command += ["--fpga_spice"] command += ["--fpga_spice"]
@ -668,8 +671,6 @@ def run_standard_vpr(bench_blif, fixed_chan_width, logfile, route_only=False):
if args.vpr_fpga_x2p_sim_window_size: if args.vpr_fpga_x2p_sim_window_size:
command += ["--fpga_x2p_sim_window_size", command += ["--fpga_x2p_sim_window_size",
args.vpr_fpga_x2p_sim_window_size] args.vpr_fpga_x2p_sim_window_size]
if args.vpr_fpga_x2p_compact_routing_hierarchy:
command += ["--fpga_x2p_compact_routing_hierarchy"]
if args.vpr_fpga_spice_sim_mt_num: if args.vpr_fpga_spice_sim_mt_num:
command += ["--fpga_spice_sim_mt_num", command += ["--fpga_spice_sim_mt_num",
@ -853,7 +854,7 @@ def run_netlists_verification():
command += [tb_top_autochecked] command += [tb_top_autochecked]
run_command("iverilog_verification", "iverilog_output.txt", command) run_command("iverilog_verification", "iverilog_output.txt", command)
vvp_command = ["vvp", "-Ns", compiled_file] vvp_command = ["vvp", "-Nvs", compiled_file]
output = run_command("vvp_verification", "vvp_sim_output.txt", vvp_command) output = run_command("vvp_verification", "vvp_sim_output.txt", vvp_command)
if "Succeed" in output: if "Succeed" in output:
logger.info("VVP Simulation Successful") logger.info("VVP Simulation Successful")