Merge branch 'master' into mpl-perturbations

Author: AcKoucher

etc/DependencyInstaller.sh

@@ -322,6 +322,8 @@ _installOrTools() {
     os=$1
     osVersion=$2
     arch=$3
+    local skipSystemOrTools=$4
+
     orToolsVersionBig=9.11
     orToolsVersionSmall=${orToolsVersionBig}.4210
 
@@ -331,18 +333,20 @@ _installOrTools() {
     cd "${baseDir}"
 
     # Disable exit on error for 'find' command, as it might return non zero
-    set +euo pipefail
-    LIST=($(find /local* /opt* /lib* /usr* /bin* -type f -name "libortools.so*" 2>/dev/null))
-    # Bring back exit on error
-    set -euo pipefail
-    # Return if right version of or-tools is installed
-    for lib in ${LIST[@]}; do
-        if [[ "$lib" =~ .*"/libortools.so.${orToolsVersionSmall}" ]]; then
-            echo "OR-Tools is already installed"
-            CMAKE_PACKAGE_ROOT_ARGS+=" -D ortools_ROOT=$(realpath $(dirname $lib)/..) "
-            return
-        fi
-    done
+    if [[ "${skipSystemOrTools}" == "false" ]]; then
+      set +euo pipefail
+      LIST=($(find /local* /opt* /lib* /usr* /bin* -type f -name "libortools.so*" 2>/dev/null))
+      # Bring back exit on error
+      set -euo pipefail
+      # Return if right version of or-tools is installed
+      for lib in ${LIST[@]}; do
+          if [[ "$lib" =~ .*"/libortools.so.${orToolsVersionSmall}" ]]; then
+              echo "OR-Tools is already installed"
+              CMAKE_PACKAGE_ROOT_ARGS+=" -D ortools_ROOT=$(realpath $(dirname $lib)/..) "
+              return
+          fi
+      done
+    fi
 
     orToolsPath=${PREFIX:-"/opt/or-tools"}
     if [ "$(uname -m)" == "aarch64" ]; then
@@ -791,6 +795,11 @@ Usage: $0 -all
                                 #    like working around a firewall. This opens
                                 #    vulnerability to man-in-the-middle (MITM)
                                 #    attacks.
+       $0 -skip-system-or-tools
+                                # If true, does not perform a search of system
+                                # paths for a pre-installed or-tools library.
+                                # Instead, will install a separate version 
+                                # of or-tools
        $0 -save-deps-prefixes=FILE
                                 # Dumps OpenROAD build arguments and variables
                                 # to FILE
@@ -813,6 +822,7 @@ equivalenceDeps="no"
 CI="no"
 saveDepsPrefixes=""
 numThreads=$(nproc)
+skipSystemOrTools="false"
 # temp dir to download and compile
 baseDir=$(mktemp -d /tmp/DependencyInstaller-XXXXXX)
 
@@ -886,6 +896,9 @@ while [ "$#" -gt 0 ]; do
             alias wget="wget --no-check-certificate"
             export GIT_SSL_NO_VERIFY=true
             ;;
+        -skip-system-or-tools)
+            skipSystemOrTools="true"
+            ;;
         -save-deps-prefixes=*)
             saveDepsPrefixes=$(realpath ${1#*=})
             ;;
@@ -956,7 +969,7 @@ case "${os}" in
             else
                 ubuntuVersion=20.04
             fi
-            _installOrTools "ubuntu" "${ubuntuVersion}" "amd64"
+            _installOrTools "ubuntu" "${ubuntuVersion}" "amd64" ${skipSystemOrTools}
         fi
         ;;
     "Red Hat Enterprise Linux" | "Rocky Linux" | "AlmaLinux")
@@ -982,10 +995,10 @@ case "${os}" in
         if [[ "${option}" == "common" || "${option}" == "all" ]]; then
             _installCommonDev
             if [[ "${rhelVersion}" == "8" ]]; then
-                    _installOrTools "AlmaLinux" "8.10" "x86_64"
+                    _installOrTools "AlmaLinux" "8.10" "x86_64" ${skipSystemOrTools}
             fi
             if [[ "${rhelVersion}" == "9" ]]; then
-                    _installOrTools "rockylinux" "9" "amd64"
+                    _installOrTools "rockylinux" "9" "amd64" ${skipSystemOrTools}
             fi
         fi
         ;;
@@ -1012,7 +1025,7 @@ EOF
         fi
         if [[ "${option}" == "common" || "${option}" == "all" ]]; then
             _installCommonDev
-            _installOrTools "opensuse" "leap" "amd64"
+            _installOrTools "opensuse" "leap" "amd64" ${skipSystemOrTools}
         fi
         cat <<EOF
 To enable GCC-11 you need to run:
@@ -1035,7 +1048,7 @@ EOF
         fi
         if [[ "${option}" == "common" || "${option}" == "all" ]]; then
             _installCommonDev
-            _installOrTools "debian" "${debianVersion}" "amd64"
+            _installOrTools "debian" "${debianVersion}" "amd64" ${skipSystemOrTools}
         fi
         ;;
     *)

src/cts/test/BUILD

@@ -18,6 +18,7 @@ COMPULSORY_TESTS = [
     "check_charBuf",
     "check_max_fanout1",
     "check_max_fanout2",
+    "check_max_fanout3",
     "check_wire_rc_cts",
     "dummy_load",
     "find_clock",

src/dbSta/include/db_sta/dbNetwork.hh

@@ -72,16 +72,17 @@ class dbNetwork : public ConcreteNetwork
   CellPortIterator* portIterator(const Cell* cell) const override;
 
   // sanity checkers
-  void checkAxioms();
-  void checkSanityModBTerms();
-  void checkSanityModITerms();
-  void checkSanityModuleInsts();
-  void checkSanityModInstTerms();
-  void checkSanityUnusedModules();
-  void checkSanityTermConnectivity();
-  void checkSanityNetConnectivity();
-  void checkSanityInstNames();
-  void checkSanityNetNames();
+  void checkAxioms() const;
+  void checkSanityModBTerms() const;
+  void checkSanityModITerms() const;
+  void checkSanityModuleInsts() const;
+  void checkSanityModInstTerms() const;
+  void checkSanityUnusedModules() const;
+  void checkSanityTermConnectivity() const;
+  void checkSanityNetConnectivity() const;
+  void checkSanityInstNames() const;
+  void checkSanityNetNames() const;
+  void checkSanityModNetNamesInModule(odb::dbModule* module) const;
 
   void readLefAfter(dbLib* lib);
   void readDefAfter(dbBlock* block);