Merge branch 'The-OpenROAD-Project:master' into fill-tap-cell-optional

Author: jeffng-or

etc/DependencyInstaller.sh

@@ -126,7 +126,7 @@ _installUbuntuPackages() {
         zlib1g-dev
 
     # install KLayout
-    if _versionCompare $1 -ge 23.04; then
+    if  [[ $1 == "rodete" || $(_versionCompare "$1") -ge 23.04 ]]; then
         apt-get -y install --no-install-recommends klayout python3-pandas
     else
         arch=$(uname -m)
@@ -180,11 +180,13 @@ _installUbuntuPackages() {
         tee /etc/apt/sources.list.d/docker.list > /dev/null
 
     apt-get -y update
-    apt-get -y install --no-install-recommends \
-        docker-ce \
-        docker-ce-cli \
-        containerd.io \
-        docker-buildx-plugin
+    if [[ $1 != "rodete" ]]; then
+        apt-get -y install --no-install-recommends \
+            docker-ce \
+            docker-ce-cli \
+            containerd.io \
+            docker-buildx-plugin
+    fi
 }
 
 _installDarwinPackages() {
@@ -323,8 +325,11 @@ case "${os}" in
             _installCommon
         fi
         ;;
-    "Ubuntu" )
+    "Ubuntu" | "Debian GNU/Linux rodete" )
         version=$(awk -F= '/^VERSION_ID/{print $2}' /etc/os-release | sed 's/"//g')
+        if [[ -z ${version} ]]; then
+            version=$(awk -F= '/^VERSION_CODENAME/{print $2}' /etc/os-release | sed 's/"//g')
+        fi
         if [[ ${CI} == "yes" ]]; then
             echo "Installing CI Tools"
             _installCI
@@ -335,7 +340,9 @@ case "${os}" in
             _installUbuntuCleanUp
         fi
         if [[ "${option}" == "common" || "${option}" == "all" ]]; then
-            if _versionCompare ${version} -lt 23.04 ; then
+            if [[ $version == "rodete" ]]; then
+                echo "Skip common for rodete"
+            elif _versionCompare ${version} -lt 23.04 ; then
                 _installCommon
             fi
         fi

flow/Makefile

@@ -134,6 +134,9 @@ export GENERATE_ARTIFACTS_ON_FAILURE ?= 0
 # Try fixing all violating endpoints by default (reduce to 5% for runtime)
 export TNS_END_PERCENT ?=100
 
+# Default routing layer adjustment
+export ROUTING_LAYER_ADJUSTMENT ?= 0.5
+
 # If we are running headless use offscreen rendering for save_image
 ifndef DISPLAY
 export QT_QPA_PLATFORM ?= offscreen

flow/designs/asap7/mock-alu/config.mk

@@ -6,4 +6,4 @@ export PLACE_DENSITY          = 0.75
 export CORE_UTILIZATION       = 50
 export CORNER            = BC
 
-export FASTROUTE_TCL = ./designs/$(PLATFORM)/mock-alu/fastroute.tcl
+export ROUTING_LAYER_ADJUSTMENT = 0.45

flow/designs/asap7/mock-alu/fastroute.tcl

@@ -61,14 +61,12 @@ power:
 # violations.
 export DETAILED_ROUTE_ARGS   = -bottom_routing_layer M2 -top_routing_layer M7 -save_guide_updates -verbose 1 -droute_end_iter 15
 
-# since we are specifying DETAILED_ROUTE_ARGS, we need to communicate the
-# same information to other stages in the flow.
 export MIN_ROUTING_LAYER = M2
 export MAX_ROUTING_LAYER = M7
+export ROUTING_LAYER_ADJUSTMENT = 0.45
 
 # works with 28 or more iterations as of writing, so give it a few more.
 export GLOBAL_ROUTE_ARGS=-congestion_iterations 40 -verbose
-export FASTROUTE_TCL = ./designs/$(PLATFORM)/mock-array/fastroute.tcl
 
 # ensure we have some rows, so we don't get a bad clock skew.
 export MACRO_HALO_X            = 0.5

flow/designs/asap7/mock-array/config.mk

@@ -24,4 +24,4 @@ export CORE_AREA   = 5 5 545 595
 export PLACE_PINS_ARGS = -exclude left:* -exclude right:* 
 export PLACE_DENSITY_LB_ADDON = 0.20
 
-export FASTROUTE_TCL = ./designs/$(PLATFORM)/swerv_wrapper/fastroute.tcl
+export ROUTING_LAYER_ADJUSTMENT = 0.2

flow/designs/asap7/mock-array/fastroute.tcl

@@ -4,16 +4,7 @@ load_design 3_2_place_iop.odb 2_floorplan.sdc
 
 set_dont_use $::env(DONT_USE_CELLS)
 
-# set fastroute layer reduction
-if {[info exist env(FASTROUTE_TCL)]} {
-  source $env(FASTROUTE_TCL)
-} else {
-  set_global_routing_layer_adjustment $env(MIN_ROUTING_LAYER)-$env(MAX_ROUTING_LAYER) 0.5
-  set_routing_layers -signal $env(MIN_ROUTING_LAYER)-$env(MAX_ROUTING_LAYER)
-  if {[info exist env(MACRO_EXTENSION)]} {
-    set_macro_extension $env(MACRO_EXTENSION)
-  }
-}
+fast_route
 
 source $::env(SCRIPTS_DIR)/set_place_density.tcl
 

flow/designs/asap7/swerv_wrapper/config.mk

@@ -10,15 +10,7 @@ proc global_route_helper {} {
     source $::env(PRE_GLOBAL_ROUTE)
   }
 
-  if {[info exist ::env(FASTROUTE_TCL)]} {
-    source $::env(FASTROUTE_TCL)
-  } else {
-    set_global_routing_layer_adjustment $::env(MIN_ROUTING_LAYER)-$::env(MAX_ROUTING_LAYER) 0.5
-    set_routing_layers -signal $::env(MIN_ROUTING_LAYER)-$::env(MAX_ROUTING_LAYER)
-    if {[info exist ::env(MACRO_EXTENSION)]} {
-      set_macro_extension $::env(MACRO_EXTENSION)
-    }
-  }
+  fast_route
 
   # The default behavior if the user didn't specify GLOBAL_ROUTE_ARGS is to
   # produce a drc report every 5 iterations.