Merge pull request #1668 from Pinata-Consulting/more-consistent-output

global and detailed route: consistent implementation cts output of arguments

Author: maliberty

flow/scripts/detail_route.tcl

@@ -63,11 +63,14 @@ append additional_args " -save_guide_updates -verbose 1"
 set arguments [expr {[info exists ::env(DETAILED_ROUTE_ARGS)] ? $::env(DETAILED_ROUTE_ARGS) : \
  [concat $additional_args {-drc_report_iter_step 5}]}]
 
-puts "detailed_route arguments: $arguments"
+set all_args [concat [list \
+  -output_drc $::env(REPORTS_DIR)/5_route_drc.rpt \
+  -output_maze $::env(RESULTS_DIR)/maze.log] \
+  $arguments]
 
-detailed_route -output_drc $::env(REPORTS_DIR)/5_route_drc.rpt \
-               -output_maze $::env(RESULTS_DIR)/maze.log \
-               {*}$arguments
+puts "detailed_route [join $all_args " "]"
+
+detailed_route {*}$all_args
 
 if { [info exists ::env(POST_DETAIL_ROUTE_TCL)] } {
   source $::env(POST_DETAIL_ROUTE_TCL)

flow/scripts/global_place.tcl

@@ -28,27 +28,27 @@ if {[info exist ::env(PLACE_DENSITY_LB_ADDON)]} {
   set place_density $::env(PLACE_DENSITY)
 }
 
-set global_placement_args ""
+set global_placement_args {}
 if {$::env(GPL_ROUTABILITY_DRIVEN)} {
-    append global_placement_args " -routability_driven"
+  lappend global_placement_args {-routability_driven}
 }
 if {$::env(GPL_TIMING_DRIVEN)} {
-    append global_placement_args " -timing_driven"
+  lappend global_placement_args {-timing_driven}
 }
 
 proc do_placement {place_density global_placement_args} {
+  set all_args [concat [list -density $place_density \
+    -pad_left $::env(CELL_PAD_IN_SITES_GLOBAL_PLACEMENT) \
+    -pad_right $::env(CELL_PAD_IN_SITES_GLOBAL_PLACEMENT)] \
+    $global_placement_args]
+
   if { 0 != [llength [array get ::env GLOBAL_PLACEMENT_ARGS]] } {
-  global_placement -density $place_density \
-      -pad_left $::env(CELL_PAD_IN_SITES_GLOBAL_PLACEMENT) \
-      -pad_right $::env(CELL_PAD_IN_SITES_GLOBAL_PLACEMENT) \
-      {*}$global_placement_args \
-      {*}$::env(GLOBAL_PLACEMENT_ARGS)
-  } else {
-  global_placement -density $place_density \
-      -pad_left $::env(CELL_PAD_IN_SITES_GLOBAL_PLACEMENT) \
-      -pad_right $::env(CELL_PAD_IN_SITES_GLOBAL_PLACEMENT) \
-      {*}$global_placement_args
+    lappend all_args {*}$::env(GLOBAL_PLACEMENT_ARGS)
   }
+
+  puts "global_placement [join $all_args " "]"
+
+  global_placement {*}$all_args
 }
 
 set result [catch {do_placement $place_density $global_placement_args} errMsg]

flow/scripts/global_route.tcl

@@ -22,10 +22,14 @@ if {[info exist env(FASTROUTE_TCL)]} {
 # If GLOBAL_ROUTE_ARGS is specified, then we do only what the
 # GLOBAL_ROUTE_ARGS specifies.
 proc do_global_route {} {
-  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}}]
+  set all_args [concat [list -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}}]]
+
+  puts "global_route [join $all_args " "]"
+
+  global_route {*}$all_args
 }
 
 set result [catch {do_global_route} errMsg]