Minor refactoring.

Signed-off-by: Jaehyun Kim <[email protected]>

Author: jhkim-pii

src/dbSta/src/dbEditHierarchy.cc

@@ -562,7 +562,7 @@ void dbEditHierarchy::hierarchicalConnect(dbITerm* source_pin,
   db_network_->reassociatePinConnection(sta_source_pin);
   db_network_->reassociatePinConnection(sta_dest_pin);
 
-  // 3.8. Rename flat net name if needed
+  // 3.7. Rename flat net name if needed
   new_flat_net->renameWithModNetInHighestHier();
 
   // 3.8. During the addition of new ports and new wiring we may

src/dbSta/src/dbNetwork.cc

@@ -4605,18 +4605,22 @@ void dbNetwork::checkSanityNetNames() const
           break;
         }
       }
-      if (name_match == false) {
+
+      if (name_match) {
+        continue;
+      }
+
+      // Found name mismatch b/w flat net and hierarchical nets
+      logger_->warn(ORD,
+                    2050,
+                    "SanityCheck: Flat net name '{}' does not match any of "
+                    "its hierarchical net names.",
+                    net->getName());
+      for (odb::dbModNet* mod_net : mod_nets) {
         logger_->warn(ORD,
-                      2050,
-                      "SanityCheck: Flat net name '{}' does not match any of "
-                      "its hierarchical net names.",
-                      net->getName());
-        for (odb::dbModNet* mod_net : mod_nets) {
-          logger_->warn(ORD,
-                        2055,
-                        "  hierarchical net: {}",
-                        mod_net->getHierarchicalName());
-        }
+                      2055,
+                      "  hierarchical net: {}",
+                      mod_net->getHierarchicalName());
       }
     }
   }

src/odb/include/odb/db.h

@@ -2475,12 +2475,7 @@ class dbNet : public dbObject
   ///
   /// Find the modnet in the highest hierarchy related to this net.
   ///
-  dbModNet* findHighestModNet() const;
-
-  ///
-  /// Find the modnet on the driver iterm of this net.
-  ///
-  dbModNet* findModNetOfDriver() const;
+  dbModNet* findModNetInHighestHier() const;
 
   ///
   /// Rename this net with the name of the modnet in the highest hierarchy

src/odb/src/db/dbNet.cpp

@@ -2413,7 +2413,7 @@ bool dbNet::isDeeperThan(const dbNet* net) const
   return (other_depth < this_depth);
 }
 
-dbModNet* dbNet::findHighestModNet() const
+dbModNet* dbNet::findModNetInHighestHier() const
 {
   std::set<dbModNet*> modnets;
   if (findRelatedModNets(modnets) == false) {
@@ -2436,28 +2436,9 @@ dbModNet* dbNet::findHighestModNet() const
   return highest;
 }
 
-dbModNet* dbNet::findModNetOfDriver() const
-{
-  for (dbITerm* iterm : getITerms()) {
-    if (iterm->getIoType() == dbIoType::OUTPUT
-        || iterm->getIoType() == dbIoType::INOUT) {
-      return iterm->getModNet();
-    }
-  }
-
-  for (dbBTerm* bterm : getBTerms()) {
-    if (bterm->getIoType() == dbIoType::INPUT
-        || bterm->getIoType() == dbIoType::INOUT) {
-      return bterm->getModNet();
-    }
-  }
-
-  return nullptr;
-}
-
 void dbNet::renameWithModNetInHighestHier()
 {
-  dbModNet* highest_mod_net = findHighestModNet();
+  dbModNet* highest_mod_net = findModNetInHighestHier();
   if (highest_mod_net) {
     rename(highest_mod_net->getHierarchicalName().c_str());
   }

src/rcx/test/net_name_consistency.tcl

@@ -1,6 +1,4 @@
-# Tests the handling of hierarchical and escaped names in read/write spef
-# This test starts with read_verilog to make sure that the names generated
-# in odb are what are generated during verilog parsing and not from DEF.
+# Tests a net name consistency b/w Verilog and SPEF.
 source helpers.tcl
 source Nangate45/Nangate45.vars