Merge remote-tracking branch 'private/master' into gpl-less-inflation

Author: gudeh

src/dbSta/test/cpp/TestHconn.cpp

@@ -945,7 +945,6 @@ TEST_F(TestHconn, ConnectionMade)
   // Journalling test.
   // Undo everything and check initial state preserved
   //
-  odb::dbDatabase::endEco(block_);
   odb::dbDatabase::undoEco(block_);
 
   size_t restored_db_net_count = block_->getNets().size();

src/odb/include/odb/db.h

@@ -1756,12 +1756,12 @@ class dbNet : public dbObject
 {
  public:
   ///
-  /// Get the net name.
+  /// Get the hierarchical net name (not a base name).
   ///
   std::string getName() const;
 
   ///
-  /// Get the net name.
+  /// Need a version that does not do strdup every time
   ///
   const char* getConstName() const;
 
@@ -2520,6 +2520,8 @@ class dbNet : public dbObject
   /// Dump dbNet info for debugging
   ///
   void dump() const;
+
+  void checkSanityModNetConsistency() const;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -2532,14 +2534,14 @@ class dbInst : public dbObject
 {
  public:
   ///
-  /// Get the instance name.
+  /// Get the hierarchical instance name (not a base name).
   ///
-  std::string getName();
+  std::string getName() const;
 
   ///
   /// Need a version that does not do strdup every time
   ///
-  const char* getConstName();
+  const char* getConstName() const;
 
   ///
   /// Compare, like !strcmp
@@ -2828,7 +2830,7 @@ class dbInst : public dbObject
   ///
   /// Get the block of this instance.
   ///
-  dbBlock* getBlock();
+  dbBlock* getBlock() const;
 
   ///
   /// Get the Master of this instance.
@@ -7407,46 +7409,46 @@ class dbDatabase : public dbObject
   ///
 
   ///
-  /// Begin collecting netlist changes on specified block.
-  ///
-  /// NOTE: Eco changes can not be nested at this time.
+  /// Start collecting ECO changes on the specified block.
   ///
   static void beginEco(dbBlock* block);
 
   ///
-  /// End collecting netlist changes on specified block.
+  /// Stop collecting ECO changes on the specified block.
   ///
   static void endEco(dbBlock* block);
 
   ///
-  /// Returns true of the pending eco is empty
+  /// Commit the last ECO changes on the specified block.
   ///
-  static bool ecoEmpty(dbBlock* block);
+  static void commitEco(dbBlock* block);
 
   ///
-  /// Read the eco changes from the specified stream to be applied to the
-  /// specified block.
+  /// Undo the last ECO changes on the specified block.
   ///
-  static void readEco(dbBlock* block, const char* filename);
+  static void undoEco(dbBlock* block);
 
   ///
-  /// Write the eco netlist changes to the specified stream.
+  /// Returns true if the current ECO is empty
   ///
-  static void writeEco(dbBlock* block, const char* filename);
-  static int checkEco(dbBlock* block);
+  static bool ecoEmpty(dbBlock* block);
 
   ///
-  /// Commit any pending netlist changes.
+  /// Return true if the ECO stack is empty. The ECO stack holds
+  /// the nested uncommitted ECOs that can still be undone.
   ///
-  static void commitEco(dbBlock* block);
+  static bool ecoStackEmpty(dbBlock* block);
+
+  ///
+  /// Read the ECO changes from the specified file to be applied to the
+  /// specified block.
+  ///
+  static void readEco(dbBlock* block, const char* filename);
 
   ///
-  /// Undo any pending netlist changes.  Only supports:
-  ///   create and destroy of dbInst and dbNet
-  ///   dbInst::swapMaster
-  ///   connect and disconnect of dbBTerm and dbITerm
+  /// Write the ECO changes to the specified file.
   ///
-  static void undoEco(dbBlock* block);
+  static void writeEco(dbBlock* block, const char* filename);
 
   ///
   /// links to utl::Logger

src/odb/src/db/dbBTerm.cpp

@@ -619,7 +619,11 @@ dbBTerm* dbBTerm::create(dbNet* net_, const char* name)
                utl::ODB,
                "DB_ECO",
                1,
-               "ECO: dbBTerm:create");
+               "ECO: create dbBTerm '{}' on dbNet({}, {:p}) '{}'",
+               name,
+               net->getId(),
+               static_cast<void*>(net),
+               name);
     block->_journal->beginAction(dbJournal::CREATE_OBJECT);
     block->_journal->pushParam(dbBTermObj);
     block->_journal->pushParam(net->getId());
@@ -680,10 +684,13 @@ void _dbBTerm::connectModNet(_dbModNet* mod_net, _dbBlock* block)
                utl::ODB,
                "DB_ECO",
                1,
-               "ECO: connect Bterm {} to modnet {}",
+               "ECO: connect dbBTerm({} {:p}) '{}' to dbModNet({} {:p}) '{}'",
                bterm->getId(),
-               mod_net->getId());
-
+               static_cast<void*>(bterm),
+               bterm->_name,
+               mod_net->getId(),
+               static_cast<void*>(mod_net),
+               ((dbModNet*) mod_net)->getHierarchicalName());
     block->_journal->beginAction(dbJournal::CONNECT_OBJECT);
     block->_journal->pushParam(dbBTermObj);
     block->_journal->pushParam(bterm->getId());
@@ -714,9 +721,13 @@ void _dbBTerm::connectNet(_dbNet* net, _dbBlock* block)
                utl::ODB,
                "DB_ECO",
                1,
-               "ECO: connect Bterm {} to net {}",
+               "ECO: connect dbBTerm({} {:p}) '{}' to dbNet({} {:p}) '{}'",
                bterm->getId(),
-               net->getId());
+               static_cast<void*>(bterm),
+               bterm->_name,
+               net->getId(),
+               static_cast<void*>(net),
+               ((dbNet*) net)->getName());
     block->_journal->beginAction(dbJournal::CONNECT_OBJECT);
     block->_journal->pushParam(dbBTermObj);
     block->_journal->pushParam(bterm->getId());
@@ -778,7 +789,10 @@ void dbBTerm::destroy(dbBTerm* bterm_)
                utl::ODB,
                "DB_ECO",
                1,
-               "ECO: dbBTerm:destroy");
+               "ECO: delete dbBTerm({}, {:p}) '{}'",
+               bterm->getId(),
+               static_cast<void*>(bterm),
+               bterm->_name);
     block->_journal->beginAction(dbJournal::DELETE_OBJECT);
     block->_journal->pushParam(dbBTermObj);
     block->_journal->pushParam(bterm_->getId());
@@ -797,12 +811,18 @@ void _dbBTerm::disconnectNet(_dbBTerm* bterm, _dbBlock* block)
 
     // Journal
     if (block->_journal) {
-      debugPrint(block->getImpl()->getLogger(),
-                 utl::ODB,
-                 "DB_ECO",
-                 1,
-                 "ECO: disconnect bterm {}",
-                 bterm->getId());
+      debugPrint(
+          block->getImpl()->getLogger(),
+          utl::ODB,
+          "DB_ECO",
+          1,
+          "ECO: disconnect dbBTerm({} {:p}) '{}' from dbNet({} {:p}) '{}'",
+          bterm->getId(),
+          static_cast<void*>(bterm),
+          bterm->_name,
+          net->getId(),
+          static_cast<void*>(net),
+          net->_name);
       block->_journal->beginAction(dbJournal::DISCONNECT_OBJECT);
       block->_journal->pushParam(dbBTermObj);
       block->_journal->pushParam(bterm->getId());
@@ -849,12 +869,18 @@ void _dbBTerm::disconnectModNet(_dbBTerm* bterm, _dbBlock* block)
     _dbModNet* mod_net = block->_modnet_tbl->getPtr(bterm->_mnet);
 
     if (block->_journal) {
-      debugPrint(block->getImpl()->getLogger(),
-                 utl::ODB,
-                 "DB_ECO",
-                 1,
-                 "ECO: disconnect bterm {}",
-                 bterm->getId());
+      debugPrint(
+          block->getImpl()->getLogger(),
+          utl::ODB,
+          "DB_ECO",
+          1,
+          "ECO: disconnect dbBTerm({} {:p}) '{}' from dbModNet({} {:p}) '{}'",
+          bterm->getId(),
+          static_cast<void*>(bterm),
+          bterm->_name,
+          mod_net->getId(),
+          static_cast<void*>(mod_net),
+          ((dbModNet*) mod_net)->getHierarchicalName());
       block->_journal->beginAction(dbJournal::DISCONNECT_OBJECT);
       block->_journal->pushParam(dbBTermObj);
       block->_journal->pushParam(bterm->getId());

src/odb/src/db/dbBlock.cpp

@@ -422,7 +422,6 @@ _dbBlock::_dbBlock(_dbDatabase* db)
   _searchDb = nullptr;
   _extmi = nullptr;
   _journal = nullptr;
-  _journal_pending = nullptr;
 }
 
 _dbBlock::~_dbBlock()
@@ -517,7 +516,6 @@ _dbBlock::~_dbBlock()
     (*_cbitr)->removeOwner();
   }
   delete _journal;
-  delete _journal_pending;
 }
 
 void dbBlock::clear()
@@ -561,11 +559,6 @@ void dbBlock::clear()
     delete block->_journal;
     block->_journal = nullptr;
   }
-
-  if (block->_journal_pending) {
-    delete block->_journal_pending;
-    block->_journal_pending = nullptr;
-  }
 }
 
 void _dbBlock::initialize(_dbChip* chip,

src/odb/src/db/dbBlock.h

@@ -6,6 +6,7 @@
 #include <functional>
 #include <list>
 #include <map>
+#include <stack>
 #include <string>
 #include <unordered_map>
 #include <vector>
@@ -301,7 +302,7 @@ class _dbBlock : public _dbObject
   void* _extmi;
 
   dbJournal* _journal;
-  dbJournal* _journal_pending;
+  std::stack<dbJournal*> _journal_stack;
 
   _dbBlock(_dbDatabase* db);
   ~_dbBlock();