Hardware
/
f4pga
mirror of https://github.com/chipsalliance/f4pga.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed CLI override function

This commit is contained in:
Mads Rumle Nordstroem 2023-10-01 20:01:42 +02:00
parent 9c049e21ac
commit 954d4590b6
3 changed files with 10 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
f4pga/flows/argparser.py
View File

@ -239,7 +239,7 @@ def p_parse_cli_value(s: str):
return s.replace("\\", "")
def get_cli_flow_config(args: Namespace, part: str):
def get_cli_flow_config(args: Namespace):
def create_defdict():
return {
"dependencies": {},
@ -261,4 +261,4 @@ def get_cli_flow_config(args: Namespace, part: str):
add_entries(args.dep, "dependencies")
add_entries(args.val, "values")
return {part: part_flow_config}
return part_flow_config

2
f4pga/flows/commands.py
View File

@ -224,7 +224,7 @@ def cmd_build(args: Namespace):
if (project_flow_cfg is None) and part_name is None:
fatal(-1, "No configuration was provided. Use `--flow`, and/or " "`--part` to configure flow.")
override_prj_flow_cfg_by_cli(project_flow_cfg, get_cli_flow_config(args, part_name))
project_flow_cfg = override_prj_flow_cfg_by_cli(project_flow_cfg, get_cli_flow_config(args))
flow_cfg = make_flow_config(project_flow_cfg, part_name)

52
f4pga/flows/flow_config.py
View File

@ -131,51 +131,13 @@ class ProjectFlowConfig:
def override_prj_flow_cfg_by_cli(cfg: ProjectFlowConfig, cli_d: "dict[str, dict[str, dict]]"):
for part_name, part_cfg in cli_d.items():
print(f"OVERRIDING CONFIG FOR {part_name}")
p_cfg = cfg.flow_cfg.get(part_name)
if p_cfg is None:
p_cfg = {}
cfg.flow_cfg[part_name] = p_cfg
cli_p_values = part_cfg.get("values")
cli_p_dependencies = part_cfg.get("dependencies")
p_values = p_cfg.get("values")
p_dependencies = p_cfg.get("dependencies")
if cli_p_values is not None:
if p_values is None:
p_values = {}
part_cfg["values"] = p_values
p_values.update(cli_p_values)
if cli_p_dependencies is not None:
if p_dependencies is None:
p_dependencies = {}
part_cfg["dependencies"] = p_dependencies
p_dependencies.update(cli_p_dependencies)
for stage_name, cli_stage_cfg in part_cfg.items():
if stage_name in KWORDS:
continue
stage_cfg = part_cfg.get(stage_name)
if stage_cfg is None:
stage_cfg = {}
part_cfg[stage_name] = stage_cfg
stage_values = stage_cfg.get("values")
stage_dependencies = stage_cfg.get("dependencies")
cli_stage_values = cli_stage_cfg.get("values")
cli_stage_dependencies = cli_stage_cfg.get("dependencies")
if cli_stage_values is not None:
if stage_values is None:
stage_values = {}
stage_cfg["values"] = stage_values
stage_values.update(cli_stage_values)
if cli_stage_dependencies is not None:
if stage_dependencies is None:
stage_dependencies = {}
stage_cfg["dependencies"] = stage_dependencies
stage_dependencies.update(cli_stage_dependencies)
if "dependencies" not in cfg.flow_cfg:
cfg.flow_cfg["dependencies"] = {}
if "values" not in cfg.flow_cfg:
cfg.flow_cfg["values"] = {}
cfg.flow_cfg["dependencies"] = {**cfg.flow_cfg["dependencies"], **cli_d["dependencies"]}
cfg.flow_cfg["values"] = {**cfg.flow_cfg["values"], **cli_d["values"]}
return cfg
class FlowConfig: