Merge branch 'master' into mpl-remove-flips

Author: joaomai

etc/DependencyInstaller.sh

@@ -91,7 +91,7 @@ _installCommonDev() {
     cmakeBin=${cmakePrefix}/bin/cmake
     if [[ ! -f ${cmakeBin} || -z $(${cmakeBin} --version | grep ${cmakeVersionBig}) ]]; then
         cd "${baseDir}"
-        eval wget https://cmake.org/files/v${cmakeVersionBig}/cmake-${cmakeVersionSmall}-${osName}-${arch}.sh
+        eval wget https://github.com/Kitware/CMake/releases/download/v${cmakeVersionSmall}/cmake-${cmakeVersionSmall}-linux-${arch}.sh
         md5sum -c <(echo "${cmakeChecksum} cmake-${cmakeVersionSmall}-${osName}-${arch}.sh") || exit 1
         chmod +x cmake-${cmakeVersionSmall}-${osName}-${arch}.sh
         ./cmake-${cmakeVersionSmall}-${osName}-${arch}.sh --skip-license --prefix=${cmakePrefix}
@@ -861,10 +861,10 @@ while [ "$#" -gt 0 ]; do
             export GIT_SSL_NO_VERIFY=true
             ;;
         -save-deps-prefixes=*)
-            saveDepsPrefixes=$(realpath ${1#-save-deps-prefixes=})
+            saveDepsPrefixes=$(realpath ${1#*=})
             ;;
         -threads=*)
-            numThreads=${1}
+            numThreads=${1#*=}
             ;;
         *)
             echo "unknown option: ${1}" >&2
@@ -933,11 +933,13 @@ case "${os}" in
             _installOrTools "ubuntu" "${ubuntuVersion}" "amd64"
         fi
         ;;
-    "Red Hat Enterprise Linux" | "Rocky Linux")
+    "Red Hat Enterprise Linux" | "Rocky Linux" | "AlmaLinux")
     if [[ "${os}" == "Red Hat Enterprise Linux" ]]; then
         rhelVersion=$(rpm -q --queryformat '%{VERSION}' redhat-release | cut -d. -f1)
     elif  [[ "${os}" == "Rocky Linux" ]]; then
         rhelVersion=$(rpm -q --queryformat '%{VERSION}' rocky-release | cut -d. -f1)
+    elif [[ "${os}" == "AlmaLinux" ]]; then
+        rhelVersion=$(rpm -q --queryformat '%{VERSION}' almalinux-release | cut -d. -f1)
     fi
         if [[ "${rhelVersion}" != "8" ]] && [[ "${rhelVersion}" != "9" ]]; then
             echo "ERROR: Unsupported ${rhelVersion} version. Versions '8' and '9' are supported."
@@ -1018,4 +1020,8 @@ esac
 if [[ ! -z ${saveDepsPrefixes} ]]; then
     mkdir -p "$(dirname $saveDepsPrefixes)"
     echo "$CMAKE_PACKAGE_ROOT_ARGS" > $saveDepsPrefixes
+    # Fix permissions if running as root to allow user access
+    if [[ $(id -u) == 0 && ! -z "${SUDO_USER+x}" ]]; then
+        chown "$SUDO_USER:$(id -gn "$SUDO_USER")" "$saveDepsPrefixes" 2>/dev/null || true
+    fi
 fi

src/cts/test/balance_levels.defok

@@ -1,5 +1,5 @@
 VERSION 5.8 ;
-DIVIDERCHAR "|" ;
+DIVIDERCHAR "/" ;
 BUSBITCHARS "[]" ;
 DESIGN multi_sink ;
 UNITS DISTANCE MICRONS 2000 ;

src/dbSta/include/db_sta/dbNetwork.hh

@@ -298,11 +298,26 @@ class dbNetwork : public ConcreteNetwork
   NetTermIterator* termIterator(const Net* net) const override;
   const Net* highestConnectedNet(Net* net) const override;
   bool isSpecial(Net* net);
+
+  // Get the flat net (dbNet) with the Net*.
+  // If the net is a hierarchical net (dbModNet), return nullptr
   dbNet* flatNet(const Net* net) const;
-  Net* getOrFindFlatNet(const Net* net) const;
-  dbNet* getOrFindFlatDbNet(const Net* net) const;
-  Net* getOrFindFlatNet(const Pin* pin) const;
-  dbNet* getOrFindFlatDbNet(const Pin* pin) const;
+
+  // Given a net or pin that may be hierarchical, find the corresponding flat
+  // dbNet by traversing the netlist.
+  // If the net is already a flat net (dbNet), it is returned as is.
+  // If the net is a hierarchical net (dbModNet), find the associated dbNet.
+  dbNet* findFlatDbNet(const Net* net) const;
+  dbNet* findFlatDbNet(const Pin* pin) const;
+
+  // Given a net that may be hierarchical, find the corresponding flat dbNet by
+  // traversing the netlist and return it as Net*.
+  // If the net is already a flat net, it is returned as is.
+  // If the net is a hierarchical net (dbModNet), find the associated dbNet and
+  // return it as Net*.
+  Net* findFlatNet(const Net* net) const;
+  Net* findFlatNet(const Pin* pin) const;
+
   bool hasPort(const Net* net) const;
 
   ////////////////////////////////////////////////////////////////

src/dbSta/src/dbNetwork.cc

@@ -2655,7 +2655,7 @@ Net* dbNetwork::mergedInto(Net*)
 
 bool dbNetwork::isSpecial(Net* net)
 {
-  dbNet* db_net = getOrFindFlatDbNet(net);
+  dbNet* db_net = findFlatDbNet(net);
   return (db_net && db_net->isSpecial());
 }
 
@@ -3977,15 +3977,15 @@ void dbNetwork::checkAxioms()
 // If the net is already a flat net, it is returned as is.
 // If the net is a hierarchical net (dbModNet), find the associated dbNet and
 // return it as Net*.
-Net* dbNetwork::getOrFindFlatNet(const Net* net) const
+Net* dbNetwork::findFlatNet(const Net* net) const
 {
-  return dbToSta(getOrFindFlatDbNet(net));
+  return dbToSta(findFlatDbNet(net));
 }
 
 // Given a net that may be hierarchical, find the corresponding flat dbNet.
 // If the net is already a flat net (dbNet), it is returned as is.
 // If the net is a hierarchical net (dbModNet), find the associated dbNet.
-dbNet* dbNetwork::getOrFindFlatDbNet(const Net* net) const
+dbNet* dbNetwork::findFlatDbNet(const Net* net) const
 {
   if (!net) {
     return nullptr;
@@ -4010,14 +4010,14 @@ dbNet* dbNetwork::getOrFindFlatDbNet(const Net* net) const
 
 // Find the flat net connected to the pin.
 // This function handles both internal instance pins and top-level port pins.
-Net* dbNetwork::getOrFindFlatNet(const Pin* pin) const
+Net* dbNetwork::findFlatNet(const Pin* pin) const
 {
-  return dbToSta(getOrFindFlatDbNet(pin));
+  return dbToSta(findFlatDbNet(pin));
 }
 
 // Find the flat net (dbNet) connected to the pin in the OpenDB database.
 // This function handles both internal instance pins and top-level port pins.
-dbNet* dbNetwork::getOrFindFlatDbNet(const Pin* pin) const
+dbNet* dbNetwork::findFlatDbNet(const Pin* pin) const
 {
   dbNet* db_net = nullptr;
   if (isTopLevelPort(pin)) {

src/est/src/EstimateParasitics.cpp

@@ -993,7 +993,7 @@ SteinerTree* EstimateParasitics::makeSteinerTree(const Pin* drvr_pin)
   /*
     Handle hierarchy. Make sure all traversal on dbNets.
    */
-  odb::dbNet* db_net = db_network_->getOrFindFlatDbNet(drvr_pin);
+  odb::dbNet* db_net = db_network_->findFlatDbNet(drvr_pin);
   Net* net = db_network_->dbToSta(db_net);
 
   debugPrint(logger_, EST, "steiner", 1, "Net {}", sdc_network->pathName(net));

src/gpl/test/clust02.defok

@@ -1,5 +1,5 @@
 VERSION 5.8 ;
-DIVIDERCHAR "|" ;
+DIVIDERCHAR "/" ;
 BUSBITCHARS "[]" ;
 DESIGN top ;
 UNITS DISTANCE MICRONS 1000 ;

src/gpl/test/convergence01.defok

@@ -160,71 +160,71 @@ COMPONENTS 145 ;
     - PHY_79 TAPCELL_ASAP7_75t_R + SOURCE DIST + FIXED ( 11394 11070 ) S ;
     - PHY_8 TAPCELL_ASAP7_75t_R + SOURCE DIST + FIXED ( 486 1620 ) N ;
     - PHY_9 TAPCELL_ASAP7_75t_R + SOURCE DIST + FIXED ( 11394 1620 ) FN ;
-    - _33_ INVx3_ASAP7_75t_R + PLACED ( 4870 10251 ) N ;
-    - _34_ INVxp33_ASAP7_75t_R + PLACED ( 5543 6083 ) N ;
-    - _35_ INVxp33_ASAP7_75t_R + PLACED ( 5330 5831 ) N ;
-    - _36_ INVxp33_ASAP7_75t_R + PLACED ( 4357 10251 ) N ;
-    - _37_ INVxp33_ASAP7_75t_R + PLACED ( 4865 5426 ) N ;
-    - _38_ INVxp33_ASAP7_75t_R + PLACED ( 4382 10251 ) N ;
-    - _39_ INVxp33_ASAP7_75t_R + PLACED ( 6412 5022 ) N ;
-    - _40_ INVxp33_ASAP7_75t_R + PLACED ( 6235 4738 ) N ;
-    - _41_ INVxp33_ASAP7_75t_R + PLACED ( 6065 4500 ) N ;
-    - _42_ INVxp33_ASAP7_75t_R + PLACED ( 5930 4297 ) N ;
-    - _43_ INVxp33_ASAP7_75t_R + PLACED ( 5829 4144 ) N ;
-    - _44_ INVxp33_ASAP7_75t_R + PLACED ( 10448 3774 ) N ;
-    - _45_ INVxp33_ASAP7_75t_R + PLACED ( 5624 3933 ) N ;
-    - _46_ INVxp33_ASAP7_75t_R + PLACED ( 5525 3868 ) N ;
-    - _47_ INVxp33_ASAP7_75t_R + PLACED ( 3036 1359 ) N ;
-    - _48_ INVxp33_ASAP7_75t_R + PLACED ( 2950 1359 ) N ;
-    - _49_ INVxp33_ASAP7_75t_R + PLACED ( 2868 1359 ) N ;
-    - _50_ INVxp33_ASAP7_75t_R + PLACED ( 2785 1359 ) N ;
-    - _51_ INVxp33_ASAP7_75t_R + PLACED ( 2734 1359 ) N ;
-    - _52_ INVxp33_ASAP7_75t_R + PLACED ( 2688 1359 ) N ;
-    - _53_ INVxp33_ASAP7_75t_R + PLACED ( 2642 1359 ) N ;
-    - _54_ INVxp33_ASAP7_75t_R + PLACED ( 2596 1359 ) N ;
-    - _55_ INVxp33_ASAP7_75t_R + PLACED ( 3719 3973 ) N ;
-    - _56_ INVxp33_ASAP7_75t_R + PLACED ( 3827 3819 ) N ;
-    - _57_ INVxp33_ASAP7_75t_R + PLACED ( 3935 3599 ) N ;
-    - _58_ INVxp33_ASAP7_75t_R + PLACED ( 3969 3361 ) N ;
-    - _59_ INVxp33_ASAP7_75t_R + PLACED ( 4103 3141 ) N ;
-    - _60_ INVxp33_ASAP7_75t_R + PLACED ( 3707 3033 ) N ;
-    - _61_ INVxp33_ASAP7_75t_R + PLACED ( 3147 2948 ) N ;
-    - _62_ INVxp33_ASAP7_75t_R + PLACED ( 2272 2859 ) N ;
-    - _63_ INVxp33_ASAP7_75t_R + PLACED ( 6012 6516 ) N ;
-    - _64_ INVxp33_ASAP7_75t_R + PLACED ( 4848 10251 ) N ;
-    - _65_ INVxp33_ASAP7_75t_R + PLACED ( 5762 6248 ) N ;
-    - _66_ DFFLQNx1_ASAP7_75t_R + PLACED ( 5943 5411 ) N ;
-    - _67_ DFFLQNx1_ASAP7_75t_R + PLACED ( 4053 9970 ) N ;
-    - _68_ DFFLQNx1_ASAP7_75t_R + PLACED ( 6217 5688 ) N ;
-    - _69_ DFFLQNx1_ASAP7_75t_R + PLACED ( 2085 1416 ) N ;
-    - _70_ DFFLQNx1_ASAP7_75t_R + PLACED ( 2954 1501 ) N ;
-    - _71_ DFFLQNx1_ASAP7_75t_R + PLACED ( 3387 1607 ) N ;
-    - _72_ DFFLQNx1_ASAP7_75t_R + PLACED ( 3598 1913 ) N ;
-    - _73_ DFFLQNx1_ASAP7_75t_R + PLACED ( 3625 2363 ) N ;
-    - _74_ DFFLQNx1_ASAP7_75t_R + PLACED ( 3664 2736 ) N ;
-    - _75_ DFFLQNx1_ASAP7_75t_R + PLACED ( 3624 3033 ) N ;
-    - _76_ DFFLQNx1_ASAP7_75t_R + PLACED ( 3539 3239 ) N ;
-    - _77_ DFFLQNx1_ASAP7_75t_R + PLACED ( 919 2038 ) N ;
-    - _78_ DFFLQNx1_ASAP7_75t_R + PLACED ( 919 2063 ) N ;
-    - _79_ DFFLQNx1_ASAP7_75t_R + PLACED ( 920 2088 ) N ;
-    - _80_ DFFLQNx1_ASAP7_75t_R + PLACED ( 931 2112 ) N ;
-    - _81_ DFFLQNx1_ASAP7_75t_R + PLACED ( 958 2143 ) N ;
-    - _82_ DFFLQNx1_ASAP7_75t_R + PLACED ( 1019 2227 ) N ;
-    - _83_ DFFLQNx1_ASAP7_75t_R + PLACED ( 1092 2502 ) N ;
-    - _84_ DFFLQNx1_ASAP7_75t_R + PLACED ( 1165 2884 ) N ;
-    - _85_ DFFLQNx1_ASAP7_75t_R + PLACED ( 3668 4579 ) N ;
-    - _86_ DFFLQNx1_ASAP7_75t_R + PLACED ( 3773 4610 ) N ;
-    - _87_ DFFLQNx1_ASAP7_75t_R + PLACED ( 9181 3625 ) N ;
-    - _88_ DFFLQNx1_ASAP7_75t_R + PLACED ( 3972 4833 ) N ;
-    - _89_ DFFLQNx1_ASAP7_75t_R + PLACED ( 4072 5042 ) N ;
-    - _90_ DFFLQNx1_ASAP7_75t_R + PLACED ( 4183 5364 ) N ;
-    - _91_ DFFLQNx1_ASAP7_75t_R + PLACED ( 4339 5785 ) N ;
-    - _92_ DFFLQNx1_ASAP7_75t_R + PLACED ( 4508 6365 ) N ;
-    - _93_ DFFLQNx1_ASAP7_75t_R + PLACED ( 3695 9864 ) N ;
-    - _94_ DFFLQNx1_ASAP7_75t_R + PLACED ( 4607 4684 ) N ;
-    - _95_ DFFLQNx1_ASAP7_75t_R + PLACED ( 3457 10069 ) N ;
-    - _96_ DFFLQNx1_ASAP7_75t_R + PLACED ( 5294 5015 ) N ;
-    - _97_ DFFLQNx1_ASAP7_75t_R + PLACED ( 5596 5239 ) N ;
+    - _33_ INVx3_ASAP7_75t_R + PLACED ( 4853 10251 ) N ;
+    - _34_ INVx3_ASAP7_75t_R + PLACED ( 5470 6128 ) N ;
+    - _35_ INVx3_ASAP7_75t_R + PLACED ( 5187 5905 ) N ;
+    - _36_ INVx3_ASAP7_75t_R + PLACED ( 4334 10251 ) N ;
+    - _37_ INVx3_ASAP7_75t_R + PLACED ( 4723 5498 ) N ;
+    - _38_ INVx3_ASAP7_75t_R + PLACED ( 4572 5473 ) N ;
+    - _39_ INVx3_ASAP7_75t_R + PLACED ( 10394 4190 ) N ;
+    - _40_ INVx3_ASAP7_75t_R + PLACED ( 6086 4729 ) N ;
+    - _41_ INVx3_ASAP7_75t_R + PLACED ( 10394 4333 ) N ;
+    - _42_ INVx3_ASAP7_75t_R + PLACED ( 5878 4327 ) N ;
+    - _43_ INVx3_ASAP7_75t_R + PLACED ( 5825 4162 ) N ;
+    - _44_ INVx3_ASAP7_75t_R + PLACED ( 10394 3754 ) N ;
+    - _45_ INVx3_ASAP7_75t_R + PLACED ( 5702 3927 ) N ;
+    - _46_ INVx3_ASAP7_75t_R + PLACED ( 5636 3851 ) N ;
+    - _47_ INVx3_ASAP7_75t_R + PLACED ( 3022 1359 ) N ;
+    - _48_ INVx3_ASAP7_75t_R + PLACED ( 2935 1359 ) N ;
+    - _49_ INVx3_ASAP7_75t_R + PLACED ( 2845 1359 ) N ;
+    - _50_ INVx3_ASAP7_75t_R + PLACED ( 2753 1359 ) N ;
+    - _51_ INVx3_ASAP7_75t_R + PLACED ( 2687 1359 ) N ;
+    - _52_ INVx3_ASAP7_75t_R + PLACED ( 2638 1359 ) N ;
+    - _53_ INVx3_ASAP7_75t_R + PLACED ( 2590 1359 ) N ;
+    - _54_ INVx3_ASAP7_75t_R + PLACED ( 2542 1359 ) N ;
+    - _55_ INVx3_ASAP7_75t_R + PLACED ( 4005 3943 ) N ;
+    - _56_ INVx3_ASAP7_75t_R + PLACED ( 3888 3810 ) N ;
+    - _57_ INVx3_ASAP7_75t_R + PLACED ( 3848 3616 ) N ;
+    - _58_ INVx3_ASAP7_75t_R + PLACED ( 3861 3350 ) N ;
+    - _59_ INVx3_ASAP7_75t_R + PLACED ( 3973 3056 ) N ;
+    - _60_ INVx3_ASAP7_75t_R + PLACED ( 3974 2936 ) N ;
+    - _61_ INVx3_ASAP7_75t_R + PLACED ( 3379 2963 ) N ;
+    - _62_ INVx3_ASAP7_75t_R + PLACED ( 2088 2990 ) N ;
+    - _63_ INVx3_ASAP7_75t_R + PLACED ( 5935 6432 ) N ;
+    - _64_ INVx3_ASAP7_75t_R + PLACED ( 5904 6297 ) N ;
+    - _65_ INVx3_ASAP7_75t_R + PLACED ( 5760 6211 ) N ;
+    - _66_ DFFLQNx1_ASAP7_75t_R + PLACED ( 6017 5374 ) N ;
+    - _67_ DFFLQNx1_ASAP7_75t_R + PLACED ( 6140 5474 ) N ;
+    - _68_ DFFLQNx1_ASAP7_75t_R + PLACED ( 6134 5619 ) N ;
+    - _69_ DFFLQNx1_ASAP7_75t_R + PLACED ( 1898 1453 ) N ;
+    - _70_ DFFLQNx1_ASAP7_75t_R + PLACED ( 3199 1470 ) N ;
+    - _71_ DFFLQNx1_ASAP7_75t_R + PLACED ( 3561 1582 ) N ;
+    - _72_ DFFLQNx1_ASAP7_75t_R + PLACED ( 3635 1901 ) N ;
+    - _73_ DFFLQNx1_ASAP7_75t_R + PLACED ( 3626 2323 ) N ;
+    - _74_ DFFLQNx1_ASAP7_75t_R + PLACED ( 3666 2727 ) N ;
+    - _75_ DFFLQNx1_ASAP7_75t_R + PLACED ( 3712 2997 ) N ;
+    - _76_ DFFLQNx1_ASAP7_75t_R + PLACED ( 3824 3171 ) N ;
+    - _77_ DFFLQNx1_ASAP7_75t_R + PLACED ( 919 2063 ) N ;
+    - _78_ DFFLQNx1_ASAP7_75t_R + PLACED ( 919 2083 ) N ;
+    - _79_ DFFLQNx1_ASAP7_75t_R + PLACED ( 919 2096 ) N ;
+    - _80_ DFFLQNx1_ASAP7_75t_R + PLACED ( 934 2098 ) N ;
+    - _81_ DFFLQNx1_ASAP7_75t_R + PLACED ( 976 2099 ) N ;
+    - _82_ DFFLQNx1_ASAP7_75t_R + PLACED ( 1044 2162 ) N ;
+    - _83_ DFFLQNx1_ASAP7_75t_R + PLACED ( 1132 2550 ) N ;
+    - _84_ DFFLQNx1_ASAP7_75t_R + PLACED ( 1201 3048 ) N ;
+    - _85_ DFFLQNx1_ASAP7_75t_R + PLACED ( 3710 4616 ) N ;
+    - _86_ DFFLQNx1_ASAP7_75t_R + PLACED ( 3803 4668 ) N ;
+    - _87_ DFFLQNx1_ASAP7_75t_R + PLACED ( 9222 3637 ) N ;
+    - _88_ DFFLQNx1_ASAP7_75t_R + PLACED ( 3966 4958 ) N ;
+    - _89_ DFFLQNx1_ASAP7_75t_R + PLACED ( 4040 5206 ) N ;
+    - _90_ DFFLQNx1_ASAP7_75t_R + PLACED ( 8796 4930 ) N ;
+    - _91_ DFFLQNx1_ASAP7_75t_R + PLACED ( 4274 6002 ) N ;
+    - _92_ DFFLQNx1_ASAP7_75t_R + PLACED ( 9034 4466 ) N ;
+    - _93_ DFFLQNx1_ASAP7_75t_R + PLACED ( 4253 4691 ) N ;
+    - _94_ DFFLQNx1_ASAP7_75t_R + PLACED ( 4453 4741 ) N ;
+    - _95_ DFFLQNx1_ASAP7_75t_R + PLACED ( 3522 10007 ) N ;
+    - _96_ DFFLQNx1_ASAP7_75t_R + PLACED ( 5154 5065 ) N ;
+    - _97_ DFFLQNx1_ASAP7_75t_R + PLACED ( 5557 5274 ) N ;
 END COMPONENTS
 PINS 65 ;
     - clock + NET clock + DIRECTION INPUT + USE SIGNAL