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-07-27 14:48:23 -06:00
parent 6592db3dfe 45af056304
commit 615b557dc4
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
openfpga_flow/scripts/run_fpga_task.py
View File

@ -190,6 +190,8 @@ def generate_each_task_actions(taskname):
# Read task configuration file and check consistency
task_conf = ConfigParser(allow_no_value=True,
interpolation=ExtendedInterpolation())
script_env_vars['PATH']["TASK_NAME"] = "/".join(taskname)
script_env_vars['PATH']["TASK_DIR"] = curr_task_dir
task_conf.read_dict(script_env_vars)
task_conf.read_file(open(curr_task_conf_file))
@ -343,6 +345,7 @@ def create_run_command(curr_job_dir, archfile, benchmark_obj, param, task_conf):
# Make execution command to run Open FPGA flow
task_gc = task_conf["GENERAL"]
task_OFPGAc = task_conf["OpenFPGA_SHELL"]
command = [archfile] + benchmark_obj["files"]
command += ["--top_module", benchmark_obj["top_module"]]
command += ["--run_dir", curr_job_dir]
@ -351,14 +354,9 @@ def create_run_command(curr_job_dir, archfile, benchmark_obj, param, task_conf):
command += ["--fpga_flow", task_gc.get("fpga_flow")]
if task_gc.get("run_engine") == "openfpga_shell":
command += ["--openfpga_shell_template",
task_gc.get("openfpga_shell_template")]
command += ["--openfpga_arch_file",
task_gc.get("openfpga_arch_file")]
command += ["--openfpga_sim_setting_file",
task_gc.get("openfpga_sim_setting_file")]
command += ["--external_fabric_key_file",
task_gc.get("external_fabric_key_file")]
for eachKey in task_OFPGAc.keys():
command += [f"--{eachKey}",
task_OFPGAc.get(f"{eachKey}")]
if benchmark_obj.get("activity_file"):
command += ["--activity_file", benchmark_obj.get("activity_file")]