Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Settings for Cadence tools to add command line arguments #787

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions hammer/formal/conformal/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,10 @@ def env_vars(self) -> Dict[str, str]:
@property
def start_cmd(self) -> List[str]:
""" Generate required startup command based on the requested check and license level """
lec_bin = self.get_setting("formal.conformal.conformal_lec_bin")
ccd_bin = self.get_setting("formal.conformal.conformal_ccd_bin")
lec_bin = self.get_setting("formal.conformal.conformal_lec_bin") + \
self.get_setting("formal.conformal.conformal_lec_bin_args")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't match the key in the defaults.yml below.

I think for the rest of them I'd prefer doing <tool>_extra_args for clarity instead of <tool>_bin_args or <tool>_args

ccd_bin = self.get_setting("formal.conformal.conformal_ccd_bin") + \
self.get_setting("formal.conformal.conformal_ccd_bin_args")
license = self.get_setting("formal.conformal.license")
cmd = ["", ""]
if not license in ["L", "XL", "GXL"]:
Expand Down
2 changes: 2 additions & 0 deletions hammer/formal/conformal/defaults.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ formal.conformal:
# Location of the binary
conformal_lec_bin: "${cadence.cadence_home}/CONFRML/CONFRML${formal.conformal.version}/bin/lec"
conformal_lec_bin_meta: lazysubst # we want later overrides to be able to affect this
conformal_lec_args: [] # Additional command line arguments passed to Conformal
conformal_ccd_bin: "${cadence.cadence_home}/CONFRML/CONFRML${formal.conformal.version}/bin/ccd"
conformal_ccd_bin_meta: lazysubst # we want later overrides to be able to affect this
conformal_ccd_args: [] # Additional command line arguments passed to Conformal

# Conformal version to use
# Used to locate the binary - e.g. the '212' in ${cadence.cadence_home}/CONFRML/CONFRML212/bin/lec
Expand Down
2 changes: 1 addition & 1 deletion hammer/par/innovus/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -837,7 +837,7 @@ def run_innovus(self) -> bool:
"-nowin", # Prevent the GUI popping up.
"-common_ui",
"-files", par_tcl_filename
]
] + self.get_setting("par.innovus.innovus_bin_args")

# Temporarily disable colours/tag to make run output more readable.
# TODO: think of a more elegant way to do this?
Expand Down
3 changes: 3 additions & 0 deletions hammer/par/innovus/defaults.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ par.innovus:
innovus_bin: "${cadence.cadence_home}/INNOVUS/INNOVUS${par.innovus.version}/bin/innovus"
innovus_bin_meta: lazysubst # we want later overrides to be able to affect this

# Additional command line arguments passed to Innovus
innovus_bin_args: []

# Innovus version to use.
# Used to locate the binary - e.g. the '171' in ${cadence.cadence_home}/INNOVUS/INNOVUS171/bin/innovus
# 171_ISR3 supports ILMs properly in contrast to 171.
Expand Down
2 changes: 1 addition & 1 deletion hammer/power/joules/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ def run_joules(self) -> bool:
self.get_setting("power.joules.joules_bin"),
"-files", joules_tcl_filename,
"-common_ui"
]
] + self.get_setting("power.joules.joules_bin_args")

HammerVLSILogging.enable_colour = False
HammerVLSILogging.enable_tag = False
Expand Down
3 changes: 3 additions & 0 deletions hammer/power/joules/defaults.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ power.joules:
joules_bin: "${cadence.cadence_home}/JLS/JLS${power.joules.version}/bin/joules"
joules_bin_meta: lazysubst # we want later overrides to be able to affect this

# Additional command line arguments passed to Joules
joules_bin_args: []

# Joules version to use.
# Used to locate the binary - e.g. the '201' in ${cadence.cadence_home}/JLS/JLS201/bin/joules
version: "201"
3 changes: 2 additions & 1 deletion hammer/power/voltus/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -730,8 +730,9 @@ def run_voltus(self) -> bool:
self.get_setting("power.voltus.voltus_bin"),
"-no_gui",
"-common_ui",
"-init"
]
base_args.extend(self.get_setting("power.voltus.voltus_bin_args"))
base_args.append("-init")

HammerVLSILogging.enable_colour = False
HammerVLSILogging.enable_tag = False
Expand Down
3 changes: 3 additions & 0 deletions hammer/power/voltus/defaults.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ power.voltus:
voltus_bin: "${cadence.cadence_home}/SSV/SSV${power.voltus.version}/bin/voltus"
voltus_bin_meta: lazysubst # we want later overrides to be able to affect this

# Additional command line arguments passed to Voltus
voltus_bin_args: []

# Voltus version to use.
# Used to locate the binary - e.g. the '181' in ${cadence.cadence_home}/VOLTUS/VOLTUS181/bin/voltus
version: "211"
Expand Down
2 changes: 1 addition & 1 deletion hammer/synthesis/genus/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ def run_genus(self) -> bool:
self.get_setting("synthesis.genus.genus_bin"),
"-f", syn_tcl_filename,
"-no_gui"
]
] + self.get_setting("synthesis.genus.genus_bin_args")

if bool(self.get_setting("synthesis.genus.generate_only")):
self.logger.info("Generate-only mode: command-line is " + " ".join(args))
Expand Down
3 changes: 3 additions & 0 deletions hammer/synthesis/genus/defaults.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ synthesis.genus:
genus_bin: "${cadence.cadence_home}/GENUS/GENUS${synthesis.genus.version}/bin/genus"
genus_bin_meta: lazysubst # we want later overrides to be able to affect this

# Additional command line arguments passed to Genus
genus_bin_args: []

# Genus version to use.
# Used to locate the binary - e.g. the '171' in ${cadence.cadence_home}/GENUS/GENUS171/bin/genus
version: "171"
Expand Down
2 changes: 1 addition & 1 deletion hammer/timing/tempus/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ def run_tempus(self) -> bool:
"-no_gui", # no GUI
"-stylus", # common UI
"-files", timing_script
]
] + self.get_setting("timing.tempus.tempus_bin_args")

# Temporarily disable colours/tag to make run output more readable.
# TODO: think of a more elegant way to do this?
Expand Down
3 changes: 3 additions & 0 deletions hammer/timing/tempus/defaults.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ timing.tempus:
tempus_bin: "${cadence.cadence_home}/SSV/SSV${timing.tempus.version}/bin/tempus"
tempus_bin_meta: lazysubst # we want later overrides to be able to affect this

# Additional command line arguments passed to Tempus
tempus_bin_args: []

# Tempus version to use
# Used to locate the binary - e.g. the '211_ISR3' in ${cadence.cadence_home}/SSV/SSV211_ISR3/bin/tempus
version: "211_ISR3"
Expand Down