Merge pull request #1555 from eder-matheus/test-repair_antennas

enable repair_antennas after global route

Author: maliberty

flow/Makefile

@@ -683,18 +683,14 @@ cts: $(RESULTS_DIR)/4_cts.odb \
 # ------------------------------------------------------------------------------
 $(eval $(call do-step,4_1_cts,$(RESULTS_DIR)/3_place.odb $(RESULTS_DIR)/3_place.sdc,cts))
 
-# Filler cell insertion
-# ------------------------------------------------------------------------------
-$(eval $(call do-step,4_2_cts_fillcell,$(RESULTS_DIR)/4_1_cts.odb,fillcell))
-
 $(RESULTS_DIR)/4_cts.sdc: $(RESULTS_DIR)/4_cts.odb
 
-$(eval $(call do-copy,4_cts,4_2_cts_fillcell.odb))
+$(eval $(call do-copy,4_cts,4_1_cts.odb))
 
 .PHONY: do-cts
 do-cts:
 	mkdir -p $(LOG_DIR) $(REPORTS_DIR)
-	$(UNSET_AND_MAKE) do-4_1_cts do-4_2_cts_fillcell do-4_cts
+	$(UNSET_AND_MAKE) do-4_1_cts do-4_cts
 
 .PHONY: clean_cts
 clean_cts:
@@ -720,22 +716,26 @@ route: $(RESULTS_DIR)/5_route.odb \
 #-------------------------------------------------------------------------------
 $(eval $(call do-step,5_1_grt,$(RESULTS_DIR)/4_cts.odb $(FASTROUTE_TCL) $(PRE_GLOBAL_ROUTE),global_route))
 
-# STEP 2: Run detailed route
+# SEP 2: Filler cell insertion
+# ------------------------------------------------------------------------------
+$(eval $(call do-step,5_2_fillcell,$(RESULTS_DIR)/5_1_grt.odb,fillcell))
+
+# STEP 3: Run detailed route
 #-------------------------------------------------------------------------------
 ifeq ($(USE_WXL),)
-$(eval $(call do-step,5_2_route,$(RESULTS_DIR)/5_1_grt.odb,detail_route))
+$(eval $(call do-step,5_3_route,$(RESULTS_DIR)/5_2_fillcell.odb,detail_route))
 else
-$(eval $(call do-step,5_2_route,$(RESULTS_DIR)/4_cts.odb,detail_route))
+$(eval $(call do-step,5_3_route,$(RESULTS_DIR)/4_cts.odb,detail_route))
 endif
 
-$(eval $(call do-copy,5_route,5_2_route.odb))
+$(eval $(call do-copy,5_route,5_3_route.odb))
 
 $(eval $(call do-copy,5_route,4_cts.sdc,,.sdc))
 
 .PHONY: do-route
 do-route:
-	mkdir -p $(LOG_DIR) $(REPORTS_DIR)
-	$(UNSET_AND_MAKE) do-5_1_grt do-5_2_route do-5_route do-5_route.sdc
+	mkdir -p $(RESULTS_DIR) $(LOG_DIR) $(REPORTS_DIR)
+	$(UNSET_AND_MAKE) do-5_1_grt do-5_2_fillcell do-5_3_route do-5_route do-5_route.sdc
 
 $(RESULTS_DIR)/5_route.v:
 	@export OR_DB=5_route ;\

flow/scripts/detail_route.tcl

@@ -3,7 +3,7 @@ source $::env(SCRIPTS_DIR)/load.tcl
 if { [info exists ::env(USE_WXL)]} {
   set db_file 4_cts.odb
 } else {
-  set db_file 5_1_grt.odb
+  set db_file 5_2_fillcell.odb
 }
 load_design $db_file 4_cts.sdc "Starting detailed routing"
 set_propagated_clock [all_clocks]
@@ -74,5 +74,5 @@ if { [info exists ::env(POST_DETAIL_ROUTE_TCL)] } {
 }
 
 if {![info exists save_checkpoint] || $save_checkpoint} {
-  write_db $::env(RESULTS_DIR)/5_2_route.odb
+  write_db $::env(RESULTS_DIR)/5_3_route.odb
 }

flow/scripts/fillcell.tcl

@@ -1,12 +1,12 @@
-utl::set_metrics_stage "cts__{}"
+utl::set_metrics_stage "globalroute__{}"
 source $::env(SCRIPTS_DIR)/load.tcl
-load_design 4_1_cts.odb 3_place.sdc "Starting fill cell"
+load_design 5_1_grt.odb 4_cts.sdc "Starting fill cell"
 
 set_propagated_clock [all_clocks]
 
 filler_placement $::env(FILL_CELLS)
 check_placement
 
 if {![info exists save_checkpoint] || $save_checkpoint} {
-  write_db $::env(RESULTS_DIR)/4_2_cts_fillcell.odb
+  write_db $::env(RESULTS_DIR)/5_2_fillcell.odb
 }

flow/scripts/global_route.tcl

@@ -27,6 +27,12 @@ global_route -guide_file $env(RESULTS_DIR)/route.guide \
                {-congestion_iterations 30 -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
 

flow/util/genMetrics.py

@@ -315,9 +315,9 @@ def extract_metrics(cwd, platform, design, flow_variant, output, hier_json):
     extractGnuTime('placeopt', metrics_dict, logPath + '/3_4_place_resized.log')
     extractGnuTime('detailedplace', metrics_dict, logPath + '/3_5_place_dp.log')
     extractGnuTime('cts', metrics_dict, logPath + '/4_1_cts.log')
-    extractGnuTime('cts_fill', metrics_dict, logPath + '/4_2_cts_fillcell.log')
     extractGnuTime('globalroute', metrics_dict, logPath + '/5_1_grt.log')
-    extractGnuTime('detailedroute', metrics_dict, logPath + '/5_2_route.log')
+    extractGnuTime('fillcell', metrics_dict, logPath + '/5_2_fillcell.log')
+    extractGnuTime('detailedroute', metrics_dict, logPath + '/5_3_route.log')
     extractGnuTime('finish_merge', metrics_dict, logPath + '/6_1_merge.log')
     extractGnuTime('finish', metrics_dict, logPath + '/6_report.log')