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

Made verilog_file optional is end_with_test is not defined

This commit is contained in:
Ganesh Gore 2023-03-13 01:46:24 -06:00
parent e88006e67c
commit 1271fd1795
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openfpga_flow/scripts/run_fpga_flow.py
View File

@ -867,8 +867,8 @@ def collect_files_for_vpr():
# Sanitize provided Benchmark option # Sanitize provided Benchmark option
if not os.path.isfile(args.base_verilog or ""): if not os.path.isfile(args.base_verilog or ""):
logger.error("Base Verilog File - %s" % args.base_verilog) logger.warning("Base Verilog File - %s", args.base_verilog)
clean_up_and_exit("Provided base_verilog file not found") return
shutil.copy(args.base_verilog, args.top_module + "_output_verilog.v") shutil.copy(args.base_verilog, args.top_module + "_output_verilog.v")

20
openfpga_flow/scripts/run_fpga_task.py
View File

@ -352,13 +352,6 @@ def generate_each_task_actions(taskname):
else: else:
CurrBenchPara["activity_file"] = SynthSection.get(bech_name + "_act") CurrBenchPara["activity_file"] = SynthSection.get(bech_name + "_act")
# Check if base verilog file exists
if not SynthSection.get(bech_name + "_verilog"):
clean_up_and_exit(
"Missing argument %s for vpr_blif flow" % (bech_name + "_verilog")
)
CurrBenchPara["verilog_file"] = SynthSection.get(bech_name + "_verilog")
# Add script parameter list in current benchmark # Add script parameter list in current benchmark
ScriptSections = [x for x in TaskFileSections if "SCRIPT_PARAM" in x] ScriptSections = [x for x in TaskFileSections if "SCRIPT_PARAM" in x]
script_para_list = {} script_para_list = {}
@ -367,10 +360,23 @@ def generate_each_task_actions(taskname):
for key, values in task_conf[eachset].items(): for key, values in task_conf[eachset].items():
command += ["--" + key, values] if values else ["--" + key] command += ["--" + key, values] if values else ["--" + key]
if "end_flow_with_test" in command:
# Verilog script is only required when end_flow_with_test defined
# Check if base verilog file exists
if not SynthSection.get(bech_name + "_verilog"):
clean_up_and_exit(
"Missing argument %s for vpr_blif flow" % (bech_name + "_verilog")
)
# Set label for Sript Parameters # Set label for Sript Parameters
set_lbl = eachset.replace("SCRIPT_PARAM", "") set_lbl = eachset.replace("SCRIPT_PARAM", "")
set_lbl = set_lbl[1:] if set_lbl else "Common" set_lbl = set_lbl[1:] if set_lbl else "Common"
script_para_list[set_lbl] = command script_para_list[set_lbl] = command
CurrBenchPara["verilog_file"] = SynthSection.get(bech_name + "_verilog")
CurrBenchPara["script_params"] = script_para_list CurrBenchPara["script_params"] = script_para_list
benchmark_list.append(CurrBenchPara) benchmark_list.append(CurrBenchPara)