Merge remote-tracking branch 'origin/master' into HEAD

Author: oharboe

flow/scripts/final_report.tcl

@@ -19,12 +19,6 @@ write_verilog $::env(RESULTS_DIR)/6_final.v
 
 # Run extraction and STA
 if { [env_var_exists_and_non_empty RCX_RULES] } {
-  # Set RC corner for RCX
-  # Set in config.mk
-  if { [env_var_exists_and_non_empty RCX_RC_CORNER] } {
-    set rc_corner $::env(RCX_RC_CORNER)
-  }
-
   # RCX section
   define_process_corner -ext_model_index 0 X
   extract_parasitics -ext_model_file $::env(RCX_RULES)

flow/scripts/generate_abstract.tcl

@@ -26,11 +26,9 @@ if { $design_stage >= 4 } {
 set_clock_latency -source 0 [all_clocks]
 puts "Generating abstract views"
 if { [env_var_exists_and_non_empty CORNERS] } {
-  # corners
   foreach corner $::env(CORNERS) {
     log_cmd write_timing_model -corner $corner $::env(RESULTS_DIR)/$::env(DESIGN_NAME)_$corner.lib
   }
-  unset corner
 } else {
   log_cmd write_timing_model $::env(RESULTS_DIR)/$::env(DESIGN_NAME)_typ.lib
 }

flow/scripts/global_place.tcl

@@ -18,7 +18,14 @@ if { ![env_var_exists_and_non_empty FOOTPRINT] } {
   }
 }
 
-fast_route
+if { [env_var_exists_and_non_empty FASTROUTE_TCL] } {
+  log_cmd source $::env(FASTROUTE_TCL)
+} else {
+  log_cmd \
+    set_global_routing_layer_adjustment \
+    $::env(MIN_ROUTING_LAYER)-$::env(MAX_ROUTING_LAYER) $::env(ROUTING_LAYER_ADJUSTMENT)
+  log_cmd set_routing_layers -signal $::env(MIN_ROUTING_LAYER)-$::env(MAX_ROUTING_LAYER)
+}
 
 set global_placement_args {}
 

flow/scripts/util.tcl

@@ -13,17 +13,6 @@ proc log_cmd { cmd args } {
   return $result
 }
 
-proc fast_route { } {
-  if { [env_var_exists_and_non_empty FASTROUTE_TCL] } {
-    log_cmd source $::env(FASTROUTE_TCL)
-  } else {
-    log_cmd \
-      set_global_routing_layer_adjustment \
-      $::env(MIN_ROUTING_LAYER)-$::env(MAX_ROUTING_LAYER) $::env(ROUTING_LAYER_ADJUSTMENT)
-    log_cmd set_routing_layers -signal $::env(MIN_ROUTING_LAYER)-$::env(MAX_ROUTING_LAYER)
-  }
-}
-
 proc repair_timing_helper { args } {
   set additional_args "$args -verbose"
   append_env_var additional_args SETUP_SLACK_MARGIN -setup_margin 1