f4pga/flows: vpr_specific_values as a list, not a function

Signed-off-by: Unai Martinez-Corral <umartinezcorral@antmicro.com>
This commit is contained in:
Unai Martinez-Corral 2022-09-30 20:05:55 +01:00
parent 6fc118b5fa
commit 18a2c00cdc
6 changed files with 6 additions and 13 deletions

View File

@ -179,7 +179,7 @@ def vpr(mode: str, vprargs: VprArgs, cwd=None):
) )
_vpr_specific_values = [ vpr_specific_values = [
"arch_def", "arch_def",
"rr_graph_lookahead_bin", "rr_graph_lookahead_bin",
"rr_graph_real_bin", "rr_graph_real_bin",
@ -189,11 +189,6 @@ _vpr_specific_values = [
] ]
def vpr_specific_values():
global _vpr_specific_values
return _vpr_specific_values
def options_dict_to_list(opt_dict: dict): def options_dict_to_list(opt_dict: dict):
""" """
Converts a dictionary of named options for CLI program to a list. Converts a dictionary of named options for CLI program to a list.

View File

@ -72,7 +72,7 @@ class analysisModule(Module):
self.no_of_phases = 2 self.no_of_phases = 2
self.takes = ["eblif", "route", "sdc?"] self.takes = ["eblif", "route", "sdc?"]
self.produces = ["merged_post_implementation_v", "post_implementation_v", "analysis_log"] self.produces = ["merged_post_implementation_v", "post_implementation_v", "analysis_log"]
self.values = ["device", "vpr_options?"] + vpr_specific_values() self.values = ["device", "vpr_options?"] + vpr_specific_values
ModuleClass = analysisModule ModuleClass = analysisModule

View File

@ -81,7 +81,7 @@ class FasmModule(Module):
self.no_of_phases = 2 self.no_of_phases = 2
self.takes = ["eblif", "net", "place", "route", "fasm_extra?", "sdc?"] self.takes = ["eblif", "net", "place", "route", "fasm_extra?", "sdc?"]
self.produces = ["fasm"] self.produces = ["fasm"]
self.values = ["device", "top", "pnr_corner?"] + vpr_specific_values() self.values = ["device", "top", "pnr_corner?"] + vpr_specific_values
self.prod_meta = {"fasm": "FPGA assembly file"} self.prod_meta = {"fasm": "FPGA assembly file"}

View File

@ -77,9 +77,7 @@ class PackModule(Module):
self.no_of_phases = 2 self.no_of_phases = 2
self.takes = ["eblif", "sdc?"] self.takes = ["eblif", "sdc?"]
self.produces = ["net", "util_rpt", "timing_rpt", "pack_log!"] self.produces = ["net", "util_rpt", "timing_rpt", "pack_log!"]
self.values = [ self.values = ["device"] + vpr_specific_values
"device",
] + vpr_specific_values()
ModuleClass = PackModule ModuleClass = PackModule

View File

@ -82,7 +82,7 @@ class PlaceModule(Module):
self.no_of_phases = 2 self.no_of_phases = 2
self.takes = ["build_dir", "eblif", "sdc?", "place_constraints?", "io_place?"] self.takes = ["build_dir", "eblif", "sdc?", "place_constraints?", "io_place?"]
self.produces = ["place"] self.produces = ["place"]
self.values = ["device", "vpr_options?"] + vpr_specific_values() self.values = ["device", "vpr_options?"] + vpr_specific_values
ModuleClass = PlaceModule ModuleClass = PlaceModule

View File

@ -62,7 +62,7 @@ class RouteModule(Module):
self.no_of_phases = 2 self.no_of_phases = 2
self.takes = ["eblif", "place", "sdc?"] self.takes = ["eblif", "place", "sdc?"]
self.produces = ["route"] self.produces = ["route"]
self.values = ["device", "vpr_options?"] + vpr_specific_values() self.values = ["device", "vpr_options?"] + vpr_specific_values
ModuleClass = RouteModule ModuleClass = RouteModule