Merge branch 'master' into secure-fix_missing_para_dbmodnet

Signed-off-by: Matt Liberty <mliberty@precisioninno.com>

Author: maliberty

docker/Dockerfile.dev

@@ -21,7 +21,8 @@ RUN sh /tmp/setup_compiler_wrappers.sh && rm /tmp/setup_compiler_wrappers.sh
 
 ENV PATH="/usr/local/bin/wrapped-cc:$PATH"
 
-RUN ./DependencyInstaller.sh -all $options $constantBuildDir -save-deps-prefixes=/etc/openroad_deps_prefixes.txt \
+RUN ./DependencyInstaller.sh -base $options $constantBuildDir -save-deps-prefixes=/etc/openroad_deps_prefixes.txt \
+    && ./DependencyInstaller.sh -common $options $constantBuildDir -save-deps-prefixes=/etc/openroad_deps_prefixes.txt \
     && rm -rf /tmp/installer /tmp/* /var/tmp/* /var/lib/apt/lists/*
 
 ARG fromImage

etc/DependencyInstaller.sh

@@ -73,7 +73,9 @@ _install_EL7_Packages() {
         time \
         readline \
         ruby \
-        ruby-devel
+        ruby-devel \
+        tcl-tclreadline \
+        tcl-tclreadline-devel
 
     if ! [ -x "$(command -v klayout)" ]; then
       yum -y install https://www.klayout.org/downloads/CentOS_7/klayout-${klayoutVersion}-0.x86_64.rpm
@@ -113,6 +115,17 @@ _install_EL8_EL9_Packages() {
         ruby \
         ruby-devel
 
+    if [[ "${elVersion}" == "8" ]]; then
+        dnf -y install \
+            tcl-tclreadline \
+            tcl-tclreadline-devel
+    fi
+
+    if [[ "${elVersion}" == "9" ]]; then
+        dnf -y install \
+            https://mirror.stream.centos.org/9-stream/AppStream/x86_64/os/Packages/readline-devel-8.1-4.el9.x86_64.rpm
+    fi
+
     # Install KLayout based on EL version, note the different URLs
     case "${elVersion}" in
         "8")
@@ -199,6 +212,7 @@ _installUbuntuPackages() {
         qttools5-dev \
         ruby \
         ruby-dev \
+        tcl-tclreadline \
         time \
         zlib1g \
         zlib1g-dev

flow/scripts/load.tcl

@@ -46,6 +46,6 @@ proc load_design { design_file sdc_file } {
 
   if { [env_var_equals LIB_MODEL CCS] } {
     puts "Using CCS delay calculation"
-    set_delay_calculator prima
+    log_cmd set_delay_calculator prima
   }
 }

flow/scripts/open.tcl

@@ -78,6 +78,11 @@ if { [ord::openroad_gui_compiled] } {
     "OpenROAD - $::env(PLATFORM)/$::env(DESIGN_NICKNAME)/$::env(FLOW_VARIANT) - ${db_basename}"
 }
 
+if { [env_var_equals LIB_MODEL CCS] } {
+  puts "Using CCS delay calculation"
+  log_cmd set_delay_calculator prima
+}
+
 if { $::env(GUI_TIMING) } {
   puts "GUI_TIMING=1 reading timing, takes a little while for large designs..."
   read_timing $input_file