Skip to content

Commit

Permalink
Revert "Logging for file paths use [link]"
Browse files Browse the repository at this point in the history
This reverts commit f3fc073.
  • Loading branch information
kareefardi committed Jan 22, 2024
1 parent d744e7f commit fac7d4d
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 22 deletions.
5 changes: 5 additions & 0 deletions openlane/scripts/openroad/grt.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ set_propagated_clock [all_clocks]

source $::env(SCRIPTS_DIR)/openroad/common/grt.tcl

# Check Antennas (Pre-Repair)
puts "%OL_CREATE_REPORT antenna.rpt"
check_antennas -verbose
puts "%OL_END_REPORT"

source $::env(SCRIPTS_DIR)/openroad/common/set_rc.tcl
estimate_parasitics -global_routing

Expand Down
26 changes: 9 additions & 17 deletions openlane/steps/openroad.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
import rich
import rich.table

from .step import ViewsUpdate, MetricsUpdate, Step, StepException, CompositeStep
from .step import ViewsUpdate, MetricsUpdate, Step, StepException
from .tclstep import TclStep
from .common_variables import (
io_layer_variables,
Expand Down Expand Up @@ -1200,7 +1200,7 @@ def run(self, state_in: State, **kwargs) -> Tuple[ViewsUpdate, MetricsUpdate]:
report_dir = os.path.join(self.step_dir, "reports")
report_path = os.path.join(report_dir, "antenna.rpt")
report_summary_path = os.path.join(report_dir, "antenna_summary.rpt")
_, env = self.extract_env(kwargs)
kwargs, env = self.extract_env(kwargs)
env["_ANTENNA_REPORT"] = report_path

mkdirp(os.path.join(self.step_dir, "reports"))
Expand All @@ -1214,21 +1214,8 @@ def run(self, state_in: State, **kwargs) -> Tuple[ViewsUpdate, MetricsUpdate]:
return views_updates, metrics_updates


class GlobalRoutingOnly(OpenROADStep):
id = "OpenROAD.GlobalRoutingOnly"
name = "Global Routing Only"
long_name = "Global Routing Only without Antenna Check"

outputs = [DesignFormat.ODB, DesignFormat.DEF]

config_vars = OpenROADStep.config_vars + grt_variables + dpl_variables

def get_script_path(self):
return os.path.join(get_script_dir(), "openroad", "grt.tcl")


@Step.factory.register()
class GlobalRouting(CompositeStep):
class GlobalRouting(OpenROADStep):
"""
The initial phase of routing. Given a detailed-placed ODB file, this
phase starts assigning coarse-grained routing "regions" for each net so they
Expand All @@ -1247,7 +1234,12 @@ class GlobalRouting(CompositeStep):
id = "OpenROAD.GlobalRouting"
name = "Global Routing"

Steps = [GlobalRoutingOnly, CheckAntennas]
outputs = [DesignFormat.ODB, DesignFormat.DEF]

config_vars = OpenROADStep.config_vars + grt_variables + dpl_variables

def get_script_path(self):
return os.path.join(get_script_dir(), "openroad", "grt.tcl")


@Step.factory.register()
Expand Down
6 changes: 1 addition & 5 deletions openlane/steps/step.py
Original file line number Diff line number Diff line change
Expand Up @@ -871,12 +871,8 @@ def start(

if not logging.options.get_condensed_mode():
rule(f"{self.long_name}")
log_path = Path(self.get_log_path()).rel_if_child(
relative_prefix=f".{os.path.sep}"
)

verbose(
f"Running '{self.id}'… (Log: [link=file://{os.path.abspath(log_path)}]{log_path}[/link])"
f"Running '{self.id}'… (Log: {Path(self.get_log_path()).rel_if_child(relative_prefix=f'.{os.path.sep}')})"
)

mkdirp(self.step_dir)
Expand Down

0 comments on commit fac7d4d

Please sign in to comment.