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

Merge branch 'ganesh_dev' of https://github.com/LNIS-Projects/OpenFPGA into dev

This commit is contained in:
tangxifan 2020-04-08 12:56:06 -06:00
parent 1fb37f4c71 583a4d8767
commit caef468c95
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openfpga_flow/scripts/run_fpga_flow.py
View File

@ -80,9 +80,6 @@ parser.add_argument('--run_dir', type=str,
default=os.path.join(openfpga_base_dir, 'tmp'), default=os.path.join(openfpga_base_dir, 'tmp'),
help="Directory to store intermidiate file & final results") help="Directory to store intermidiate file & final results")
parser.add_argument('--openfpga_shell_template', type=str, parser.add_argument('--openfpga_shell_template', type=str,
default=os.path.join(openfpga_base_dir, 'openfpga_flow',
'OpenFPGAShellScripts',
'example_script.openfpga'),
help="Sample openfpga shell script") help="Sample openfpga shell script")
parser.add_argument('--openfpga_arch_file', type=str, parser.add_argument('--openfpga_arch_file', type=str,
help="Openfpga architecture file for shell") help="Openfpga architecture file for shell")
@ -258,6 +255,7 @@ def main():
# if (args.fpga_flow == "vtr_standard"): # if (args.fpga_flow == "vtr_standard"):
# run_abc_for_standarad() # run_abc_for_standarad()
if args.openfpga_shell_template: if args.openfpga_shell_template:
logger.info("Runing OpenFPGA Shell Engine ")
run_openfpga_shell() run_openfpga_shell()
else: else:
run_vpr() run_vpr()
@ -591,8 +589,10 @@ def collect_files_for_vpr():
shutil.copy(args.base_verilog, args.top_module+"_output_verilog.v") shutil.copy(args.base_verilog, args.top_module+"_output_verilog.v")
# Sanitize provided openshell template, if provided # Sanitize provided openshell template, if provided
if (args.openfpga_shell_template):
if not os.path.isfile(args.openfpga_shell_template or ""): if not os.path.isfile(args.openfpga_shell_template or ""):
logger.error("Openfpga shell file - %s" % args.openfpga_shell_template) logger.error("Openfpga shell file - %s" %
args.openfpga_shell_template)
clean_up_and_exit("Provided openfpga_shell_template" + clean_up_and_exit("Provided openfpga_shell_template" +
f" {args.openfpga_shell_template} file not found") f" {args.openfpga_shell_template} file not found")
else: else: