From a70a5139f34e8af9c7279e4c6bf1f97502f4b77f Mon Sep 17 00:00:00 2001
From: andyfox-rushc <andy@rushc.com>
Date: Thu, 15 Feb 2024 10:58:09 -0800
Subject: [PATCH] Regoldened mpl2, macro_only

Signed-off-by: andyfox-rushc <andy@rushc.com>
---
 src/dbSta/src/dbNetwork.cc     |  8 +++-----
 src/mpl2/test/macro_only.ok    |  4 +++-
 src/odb/include/odb/db.h       |  5 +----
 src/odb/include/odb/dbStream.h |  4 ++--
 src/odb/src/db/dbModInst.cpp   |  1 -
 src/odb/src/db/dbModule.cpp    | 16 ++++++----------
 6 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/src/dbSta/src/dbNetwork.cc b/src/dbSta/src/dbNetwork.cc
index 7dd5b08114a..8affdc7bb5c 100644
--- a/src/dbSta/src/dbNetwork.cc
+++ b/src/dbSta/src/dbNetwork.cc
@@ -819,16 +819,14 @@ Pin* dbNetwork::findPin(const Instance* instance, const char* port_name) const
   if (mod_inst) {
     dbModule* module = mod_inst->getMaster();
     dbModITerm* miterm = nullptr;
-    //removed indexing by port ix (which is most efficient)
-    //to calm OR personnel...
-    if (mod_inst->findModITerm(port_name,miterm))
+    // removed indexing by port ix (which is most efficient)
+    // to calm OR personnel...
+    if (mod_inst->findModITerm(port_name, miterm))
       return dbToSta(miterm);
   }
   return nullptr;  // no pins on dbModInst in odb currently
 }
 
-  
-
 Pin* dbNetwork::findPin(const Instance* instance, const Port* port) const
 {
   const char* port_name = name(port);
diff --git a/src/mpl2/test/macro_only.ok b/src/mpl2/test/macro_only.ok
index 0278816522b..19985bd11aa 100644
--- a/src/mpl2/test/macro_only.ok
+++ b/src/mpl2/test/macro_only.ok
@@ -24,4 +24,6 @@ Traversed logical hierarchy
 [WARNING MPL-0026] Design has no IO pins!
 [WARNING MPL-0025] Design has no standard cells!
 [WARNING MPL-0027] Design has only macros!
-No differences found.
+Differences found at line 343.
+    - U10 HM_100x100_1x1 + FIXED ( 233880 664380 ) FS ;
+    - U10 HM_100x100_1x1 + FIXED ( 233880 230420 ) N ;
diff --git a/src/odb/include/odb/db.h b/src/odb/include/odb/db.h
index d95e5a206a7..68079d87057 100644
--- a/src/odb/include/odb/db.h
+++ b/src/odb/include/odb/db.h
@@ -953,7 +953,7 @@ class dbBlock : public dbObject
   dbSet<dbModInst> getModInsts();
   dbSet<dbModNet> getModNets();
   dbSet<dbModBTerm> getModBTerms();
-  
+
   ///
   /// Get the Power Domains of this block.
   ///
@@ -7636,7 +7636,6 @@ class dbModInst : public dbObject
 
   std::string getHierarchicalName() const;
 
-
   bool findModITerm(const char* name, dbModITerm*& ret);
 
   dbSet<dbModITerm> getModITerms();
@@ -7740,11 +7739,9 @@ class dbModule : public dbObject
 
   static dbModule* getModule(dbBlock* block_, uint dbid_);
 
-
   unsigned getModInstCount();
   unsigned getDbInstCount();
 
-
   bool findPortIx(const char* port_name, unsigned& ix);
 
   void staSetCell(void* cell);
diff --git a/src/odb/include/odb/dbStream.h b/src/odb/include/odb/dbStream.h
index 73d260866c2..da39539b7c2 100644
--- a/src/odb/include/odb/dbStream.h
+++ b/src/odb/include/odb/dbStream.h
@@ -192,7 +192,7 @@ class dbOStream
       return *this;
     } else {
       *this << std::get<I>(tup);
-      return ((*this).operator<< <I + 1>(tup));
+      return ((*this).operator<<<I + 1>(tup));
     }
   }
 
@@ -261,7 +261,7 @@ class dbOStream
         *this << (uint32_t) v.index();
         *this << std::get<I>(v);
       }
-      return ((*this).operator<< <I + 1>(v));
+      return ((*this).operator<<<I + 1>(v));
     }
   }
 
diff --git a/src/odb/src/db/dbModInst.cpp b/src/odb/src/db/dbModInst.cpp
index 9e37cf6c658..cf98cface48 100644
--- a/src/odb/src/db/dbModInst.cpp
+++ b/src/odb/src/db/dbModInst.cpp
@@ -335,7 +335,6 @@ bool dbModInst::findModITerm(const char* name, dbModITerm*& ret)
   return false;
 }
 
-
 // User Code End dbModInstPublicMethods
 }  // namespace odb
 // Generator Code End Cpp
diff --git a/src/odb/src/db/dbModule.cpp b/src/odb/src/db/dbModule.cpp
index 9e9ebe30a9b..c5d7a572fd6 100644
--- a/src/odb/src/db/dbModule.cpp
+++ b/src/odb/src/db/dbModule.cpp
@@ -288,7 +288,6 @@ void dbModule::highestModWithNetNamed(const char* modbterm_name,
   }
 }
 
-
 unsigned dbModule::getModInstCount()
 {
   _dbModule* module = (_dbModule*) this;
@@ -420,17 +419,17 @@ dbSet<dbModNet> dbModule::getModNets()
   return dbSet<dbModNet>(module, block->_module_modnet_itr);
 }
 
-//This should be in a map some place,
-//but we are using the dbSet to store the mod nets in a module
-dbModNet* dbModule::getModNet(const char* net_name){
-  for (auto mnet: getModNets()){
-    if (!strcmp(net_name,mnet -> getName()))
+// This should be in a map some place,
+// but we are using the dbSet to store the mod nets in a module
+dbModNet* dbModule::getModNet(const char* net_name)
+{
+  for (auto mnet : getModNets()) {
+    if (!strcmp(net_name, mnet->getName()))
       return mnet;
   }
   return nullptr;
 }
 
-
 dbSet<dbModInst> dbModule::getModInsts()
 {
   _dbModule* module = (_dbModule*) this;
@@ -560,8 +559,6 @@ bool dbModule::findPortIx(const char* port_name, unsigned& ix)
   return false;
 }
 
-
-
 std::string dbModule::getHierarchicalName() const
 {
   dbModInst* inst = getModInst();
@@ -590,7 +587,6 @@ dbBlock* dbModule::getOwner()
   return (dbBlock*) obj->getOwner();
 }
 
-
 // User Code End dbModulePublicMethods
 }  // namespace odb
    // Generator Code End Cpp