Merge pull request #1597 from eder-matheus/secure-incr_repair

maliberty · web-flow · commit 28ba199ab6b7 · 2023-11-07T09:41:46.000-08:00
enable incremental repair during global routing
diff --git a/flow/designs/gf12/aes/config.mk b/flow/designs/gf12/aes/config.mk
@@ -18,3 +18,4 @@ else
 export DESIGN_TYPE = CELL_NODEN
 endif
 
+export SKIP_INCREMENTAL_REPAIR = 1
diff --git a/flow/designs/gf12/ariane/config.mk b/flow/designs/gf12/ariane/config.mk
@@ -34,3 +34,5 @@ export DESIGN_TYPE = CELL
 else
 export DESIGN_TYPE = CELL_NODEN
 endif
+
+export SKIP_INCREMENTAL_REPAIR = 1
diff --git a/flow/designs/gf12/ariane/constraint.sdc b/flow/designs/gf12/ariane/constraint.sdc
diff --git a/flow/designs/gf12/ariane/constraint_hier.sdc b/flow/designs/gf12/ariane/constraint_hier.sdc
diff --git a/flow/designs/gf12/ca53/config.mk b/flow/designs/gf12/ca53/config.mk
@@ -58,3 +58,4 @@ export DESIGN_TYPE = CELL_NODEN
 endif
 
 export SKIP_PIN_SWAP          = 1
+export SKIP_INCREMENTAL_REPAIR = 1
diff --git a/flow/designs/gf12/ca53/config_mpl2.mk b/flow/designs/gf12/ca53/config_mpl2.mk
@@ -67,3 +67,5 @@ export DESIGN_TYPE = CELL
 else
 export DESIGN_TYPE = CELL_NODEN
 endif
+
+export SKIP_INCREMENTAL_REPAIR = 1
diff --git a/flow/designs/gf55/aes/metadata-base-ok.json b/flow/designs/gf55/aes/metadata-base-ok.json
diff --git a/flow/designs/gf55/aes/rules-base.json b/flow/designs/gf55/aes/rules-base.json
@@ -40,7 +40,7 @@
         "compare": ">="
     },
     "finish__design__instance__area": {
-        "value": 154782,
+        "value": 178042,
         "compare": "<="
     },
     "finish__timing__drv__setup_violation_count": {
diff --git a/flow/designs/intel16/gcd/metadata-base-ok.json b/flow/designs/intel16/gcd/metadata-base-ok.json
diff --git a/flow/designs/intel16/gcd/rules-base.json b/flow/designs/intel16/gcd/rules-base.json
@@ -36,11 +36,11 @@
         "compare": "<="
     },
     "finish__timing__setup__ws": {
-        "value": -352.01,
+        "value": -9.79,
         "compare": ">="
     },
     "finish__design__instance__area": {
-        "value": 179,
+        "value": 227,
         "compare": "<="
     },
     "finish__timing__drv__setup_violation_count": {
@@ -52,7 +52,7 @@
         "compare": "<="
     },
     "finish__timing__wns_percent_delay": {
-        "value": -37.98,
+        "value": -10.0,
         "compare": ">="
     }
 }
diff --git a/flow/designs/nangate45/swerv_wrapper/config.mk b/flow/designs/nangate45/swerv_wrapper/config.mk
@@ -32,3 +32,5 @@ export MACRO_PLACE_CHANNEL = 20 20
 
 export PLACE_DENSITY_LB_ADDON = 0.10
 export TNS_END_PERCENT        = 100
+
+export SKIP_INCREMENTAL_REPAIR = 1
diff --git a/flow/designs/sky130hs/riscv32i/config.mk b/flow/designs/sky130hs/riscv32i/config.mk
@@ -10,3 +10,5 @@ export PLACE_DENSITY_LB_ADDON = 0.2
 # many east pins cause global routing congestion
 export PLACE_PINS_ARGS=-min_distance 6 -min_distance_in_tracks
 export TNS_END_PERCENT = 100
+
+export FASTROUTE_TCL = ./designs/$(PLATFORM)/$(DESIGN_NICKNAME)/fastroute.tcl
diff --git a/flow/designs/sky130hs/riscv32i/fastroute.tcl b/flow/designs/sky130hs/riscv32i/fastroute.tcl
@@ -0,0 +1,3 @@
+set_global_routing_layer_adjustment $::env(MIN_ROUTING_LAYER)-$::env(MAX_ROUTING_LAYER) 0.15
+
+set_routing_layers -signal $::env(MIN_ROUTING_LAYER)-$::env(MAX_ROUTING_LAYER)
diff --git a/flow/platforms/sky130hd/fastroute.tcl b/flow/platforms/sky130hd/fastroute.tcl
@@ -1,4 +1,4 @@
-set_global_routing_layer_adjustment $::env(MIN_ROUTING_LAYER)-$::env(MAX_ROUTING_LAYER) 0.3
+set_global_routing_layer_adjustment $::env(MIN_ROUTING_LAYER)-$::env(MAX_ROUTING_LAYER) 0.2
 
 set_routing_layers -clock $::env(MIN_CLK_ROUTING_LAYER)-$::env(MAX_ROUTING_LAYER)
 set_routing_layers -signal $::env(MIN_ROUTING_LAYER)-$::env(MAX_ROUTING_LAYER)
diff --git a/flow/platforms/sky130hs/fastroute.tcl b/flow/platforms/sky130hs/fastroute.tcl
@@ -1,3 +1,3 @@
-set_global_routing_layer_adjustment $::env(MIN_ROUTING_LAYER)-$::env(MAX_ROUTING_LAYER) 0.3
+set_global_routing_layer_adjustment $::env(MIN_ROUTING_LAYER)-$::env(MAX_ROUTING_LAYER) 0.2
 
 set_routing_layers -signal $::env(MIN_ROUTING_LAYER)-$::env(MAX_ROUTING_LAYER)
diff --git a/flow/scripts/global_route.tcl b/flow/scripts/global_route.tcl
@@ -24,18 +24,51 @@ if {[info exist env(FASTROUTE_TCL)]} {
 global_route -guide_file $env(RESULTS_DIR)/route.guide \
                -congestion_report_file $env(REPORTS_DIR)/congestion.rpt \
                {*}[expr {[info exists ::env(GLOBAL_ROUTE_ARGS)] ? $::env(GLOBAL_ROUTE_ARGS) : \
-               {-congestion_iterations 30 -congestion_report_iter_step 5 -verbose}}]
+               {-congestion_iterations 50 -congestion_report_iter_step 5 -verbose}}]
 
 
 set_placement_padding -global \
     -left $::env(CELL_PAD_IN_SITES_DETAIL_PLACEMENT) \
     -right $::env(CELL_PAD_IN_SITES_DETAIL_PLACEMENT)
-repair_antennas -iterations 5
-check_placement -verbose
 
 set_propagated_clock [all_clocks]
 estimate_parasitics -global_routing
 
+if {[info exist env(DONT_USE_CELLS)]} {
+  set_dont_use $::env(DONT_USE_CELLS)
+}
+
+source $env(SCRIPTS_DIR)/report_metrics.tcl
+
+if { ![info exists ::env(SKIP_INCREMENTAL_REPAIR)] } {
+  report_metrics "global route pre repair design"
+
+  # Repair design using global route parasitics
+  puts "Perform buffer insertion..."
+  repair_design
+  report_metrics "global route post repair design"
+
+  # Running DPL to fix overlapped instances
+  # Run to get modified net by DPL
+  global_route -start_incremental
+  detailed_placement
+  # Route only the modified net by DPL
+  global_route -end_incremental -congestion_report_file $env(REPORTS_DIR)/congestion_post_repair_design.rpt
+
+  # Repair timing using global route parasitics
+  puts "Repair setup and hold violations..."
+  estimate_parasitics -global_routing
+  repair_timing
+  report_metrics "global route post repair timing"
+
+  # Running DPL to fix overlapped instances
+  # Run to get modified net by DPL
+  global_route -start_incremental
+  detailed_placement
+  # Route only the modified net by DPL
+  global_route -end_incremental -congestion_report_file $env(REPORTS_DIR)/congestion_post_repair_timing.rpt
+}
+
 if { [info exists ::env(RECOVER_POWER)] } {
   puts "Downsizing/switching to higher Vt  for non critical gates for power recovery"
   puts "Percent of paths optimized $::env(RECOVER_POWER)"  
@@ -48,14 +81,17 @@ if { [info exists ::env(RECOVER_POWER)] } {
   report_power
 }
 
-source $env(SCRIPTS_DIR)/report_metrics.tcl
-report_metrics "global route"
-
 puts "\n=========================================================================="
 puts "check_antennas"
 puts "--------------------------------------------------------------------------"
+
+repair_antennas -iterations 5
+check_placement -verbose
 check_antennas -report_file $env(REPORTS_DIR)/antenna.log -report_violating_nets
 
+estimate_parasitics -global_routing
+report_metrics "global route"
+
 # Write SDC to results with updated clock periods that are just failing.
 # Use make target update_sdc_clock to install the updated sdc.
 source [file join $env(SCRIPTS_DIR) "write_ref_sdc.tcl"]
diff --git a/tools/OpenROAD b/tools/OpenROAD
@@ -1 +1 @@
-Subproject commit 6719c92e6ea92f0dc889c1f6806efd967c0c665e
+Subproject commit b7c9b7e1c31cc164fc0656049281dfc3d3926af0

Original file line number	Diff line number	Diff line change
`@@ -18,3 +18,4 @@ else`
`18`	`18`	`export DESIGN_TYPE = CELL_NODEN`
`19`	`19`	`endif`
`20`	`20`
	`21`	`+export SKIP_INCREMENTAL_REPAIR = 1`
Original file line number	Diff line number	Diff line change
`@@ -58,3 +58,4 @@ export DESIGN_TYPE = CELL_NODEN`
`58`	`58`	`endif`
`59`	`59`
`60`	`60`	`export SKIP_PIN_SWAP = 1`
	`61`	`+export SKIP_INCREMENTAL_REPAIR = 1`