Merge remote-tracking branch 'private/master' into secure-gpl-less-inflation

Author: gudeh

docs/user/FlowVariables.md

@@ -169,6 +169,7 @@ configuration file.
 | <a name="MATCH_CELL_FOOTPRINT"></a>MATCH_CELL_FOOTPRINT| Enforce sizing operations to only swap cells that have the same layout boundary.| 0|
 | <a name="MAX_REPAIR_ANTENNAS_ITER_DRT"></a>MAX_REPAIR_ANTENNAS_ITER_DRT| Defines the maximum number of iterations post-detailed routing repair antennas will run.| 5|
 | <a name="MAX_REPAIR_ANTENNAS_ITER_GRT"></a>MAX_REPAIR_ANTENNAS_ITER_GRT| Defines the maximum number of iterations post global routing repair antennas will run.| 5|
+| <a name="MAX_REPAIR_TIMING_ITER"></a>MAX_REPAIR_TIMING_ITER| Maximum number of iterations for repair setup and repair hold.| |
 | <a name="MAX_ROUTING_LAYER"></a>MAX_ROUTING_LAYER| The highest metal layer name to be used in routing.| |
 | <a name="MIN_BUF_CELL_AND_PORTS"></a>MIN_BUF_CELL_AND_PORTS| Used to insert a buffer cell to pass through wires. Used in synthesis.| |
 | <a name="MIN_ROUTING_LAYER"></a>MIN_ROUTING_LAYER| The lowest metal layer name to be used in routing.| |
@@ -208,7 +209,6 @@ configuration file.
 | <a name="RTLMP_NOTCH_WT"></a>RTLMP_NOTCH_WT| Weight for the notch, or the existence of dead space that cannot be used for placement and routing.| 10.0|
 | <a name="RTLMP_OUTLINE_WT"></a>RTLMP_OUTLINE_WT| Weight for violating the fixed outline constraint, meaning that all clusters should be placed within the shape of their parent cluster.| 100.0|
 | <a name="RTLMP_RPT_DIR"></a>RTLMP_RPT_DIR| Path to the directory where reports are saved.| |
-| <a name="RTLMP_SIGNATURE_NET_THRESHOLD"></a>RTLMP_SIGNATURE_NET_THRESHOLD| Minimum number of connections between two clusters to be identified as connected.| 50|
 | <a name="RTLMP_WIRELENGTH_WT"></a>RTLMP_WIRELENGTH_WT| Weight for half-perimiter wirelength.| 100.0|
 | <a name="RULES_JSON"></a>RULES_JSON| json files with the metrics baseline regression rules. In the ORFS Makefile, this defaults to $DESIGN_DIR/rules-base.json, but ORFS does not mandate the users source directory layout and this can be placed elsewhere when the user sets up an ORFS config.mk or from bazel-orfs.| |
 | <a name="RUN_LOG_NAME_STEM"></a>RUN_LOG_NAME_STEM| Stem of the log file name, the log file will be named `$(LOG_DIR)/$(RUN_LOG_NAME_STEM).log`.| run|
@@ -318,6 +318,7 @@ configuration file.
 - [MACRO_WRAPPERS](#MACRO_WRAPPERS)
 - [MAKE_TRACKS](#MAKE_TRACKS)
 - [MATCH_CELL_FOOTPRINT](#MATCH_CELL_FOOTPRINT)
+- [MAX_REPAIR_TIMING_ITER](#MAX_REPAIR_TIMING_ITER)
 - [MAX_ROUTING_LAYER](#MAX_ROUTING_LAYER)
 - [MIN_ROUTING_LAYER](#MIN_ROUTING_LAYER)
 - [PDN_TCL](#PDN_TCL)
@@ -343,7 +344,6 @@ configuration file.
 - [RTLMP_NOTCH_WT](#RTLMP_NOTCH_WT)
 - [RTLMP_OUTLINE_WT](#RTLMP_OUTLINE_WT)
 - [RTLMP_RPT_DIR](#RTLMP_RPT_DIR)
-- [RTLMP_SIGNATURE_NET_THRESHOLD](#RTLMP_SIGNATURE_NET_THRESHOLD)
 - [RTLMP_WIRELENGTH_WT](#RTLMP_WIRELENGTH_WT)
 - [SETUP_REPAIR_SEQUENCE](#SETUP_REPAIR_SEQUENCE)
 - [SETUP_SLACK_MARGIN](#SETUP_SLACK_MARGIN)
@@ -374,6 +374,7 @@ configuration file.
 - [IO_PLACER_H](#IO_PLACER_H)
 - [IO_PLACER_V](#IO_PLACER_V)
 - [MATCH_CELL_FOOTPRINT](#MATCH_CELL_FOOTPRINT)
+- [MAX_REPAIR_TIMING_ITER](#MAX_REPAIR_TIMING_ITER)
 - [MAX_ROUTING_LAYER](#MAX_ROUTING_LAYER)
 - [MIN_ROUTING_LAYER](#MIN_ROUTING_LAYER)
 - [PLACE_DENSITY](#PLACE_DENSITY)
@@ -398,6 +399,7 @@ configuration file.
 - [EQUIVALENCE_CHECK](#EQUIVALENCE_CHECK)
 - [HOLD_SLACK_MARGIN](#HOLD_SLACK_MARGIN)
 - [MATCH_CELL_FOOTPRINT](#MATCH_CELL_FOOTPRINT)
+- [MAX_REPAIR_TIMING_ITER](#MAX_REPAIR_TIMING_ITER)
 - [POST_CTS_TCL](#POST_CTS_TCL)
 - [REMOVE_CELLS_FOR_EQY](#REMOVE_CELLS_FOR_EQY)
 - [REPORT_CLOCK_SKEW](#REPORT_CLOCK_SKEW)
@@ -419,6 +421,7 @@ configuration file.
 - [GLOBAL_ROUTE_ARGS](#GLOBAL_ROUTE_ARGS)
 - [HOLD_SLACK_MARGIN](#HOLD_SLACK_MARGIN)
 - [MAX_REPAIR_ANTENNAS_ITER_GRT](#MAX_REPAIR_ANTENNAS_ITER_GRT)
+- [MAX_REPAIR_TIMING_ITER](#MAX_REPAIR_TIMING_ITER)
 - [MAX_ROUTING_LAYER](#MAX_ROUTING_LAYER)
 - [MIN_ROUTING_LAYER](#MIN_ROUTING_LAYER)
 - [PRE_GLOBAL_ROUTE_TCL](#PRE_GLOBAL_ROUTE_TCL)

flow/scripts/floorplan_to_place.tcl

@@ -142,7 +142,9 @@ if { [env_var_equals REMOVE_ABC_BUFFERS 1] } {
   # Skip clone & split
   set ::env(SETUP_MOVE_SEQUENCE) "unbuffer,sizeup,swap,buffer,vt_swap"
   set ::env(SKIP_LAST_GASP) 1
-  repair_timing_helper -setup
+  set additional_args_repair_timing ""
+  append_env_var additional_args_repair_timing MAX_REPAIR_TIMING_ITER -max_iterations 1
+  repair_timing_helper -setup {*}$additional_args_repair_timing
 }
 
 puts "Default units for flow"
@@ -365,7 +367,12 @@ set_placement_padding -global \
 
 puts "Repair setup and hold violations"
 estimate_parasitics -placement
-log_cmd repair_timing -repair_tns $::env(TNS_END_PERCENT)
+
+set additional_args_repair_timing ""
+append_env_var additional_args_repair_timing MAX_REPAIR_TIMING_ITER -max_iterations 1
+
+log_cmd repair_timing -repair_tns $::env(TNS_END_PERCENT) \
+  {*}$additional_args_repair_timing
 
 # Legalize placement after timing repair
 detailed_placement

flow/scripts/macro_place_util.tcl

@@ -47,7 +47,6 @@ if { [find_macros] != "" } {
   append additional_rtlmp_args " -halo_width $halo_x"
   append additional_rtlmp_args " -halo_height $halo_y"
   append_env_var additional_rtlmp_args RTLMP_MIN_AR -min_ar 1
-  append_env_var additional_rtlmp_args RTLMP_SIGNATURE_NET_THRESHOLD -signature_net_threshold 1
   append_env_var additional_rtlmp_args RTLMP_AREA_WT -area_weight 1
   append_env_var additional_rtlmp_args RTLMP_WIRELENGTH_WT -wirelength_weight 1
   append_env_var additional_rtlmp_args RTLMP_OUTLINE_WT -outline_weight 1

flow/scripts/variables.yaml

@@ -962,13 +962,6 @@ RTLMP_MIN_AR:
   default: 0.33
   stages:
     - floorplan
-RTLMP_SIGNATURE_NET_THRESHOLD:
-  description: >
-    Minimum number of connections between two clusters to be identified as
-    connected.
-  default: 50
-  stages:
-    - floorplan
 RTLMP_AREA_WT:
   description: >
     Weight for the area of the current floorplan.
@@ -1137,3 +1130,11 @@ OPENROAD_HIERARCHICAL:
   default: 0
   stages:
     - All stages
+MAX_REPAIR_TIMING_ITER:
+  description: >
+    Maximum number of iterations for repair setup and repair hold.
+  stages:
+    - cts
+    - floorplan
+    - grt
+    - place