Modified DbInstanceChildIterator to iterate through logical cells (exclude physical-only cells).

- This makes STA not traverse physical-only cells.
- In the output .v, there will be no physical-only cells.

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

Author: jhkim-pii

src/dbSta/src/dbNetwork.cc

@@ -253,7 +253,7 @@ DbInstanceChildIterator::DbInstanceChildIterator(const Instance* instance,
   // original code for non hierarchy
   if (!network->hasHierarchy()) {
     if (instance == network->topInstance() && block) {
-      dbSet<dbInst> insts = block->getInsts();
+      dbSet<dbInst> insts = block->getLogicalInsts();
       top_ = true;
       dbinst_iter_ = insts.begin();
       dbinst_end_ = insts.end();

src/odb/include/odb/db.h

@@ -695,6 +695,11 @@ class dbBlock : public dbObject
   ///
   dbSet<dbInst> getInsts();
 
+  ///
+  /// Get the logical (non-physical-only) instances of this block.
+  ///
+  dbSet<dbInst> getLogicalInsts();
+
   ///
   /// Get the modules of this block.
   ///

src/odb/src/db/dbBlock.cpp

@@ -135,6 +135,63 @@
 
 namespace odb {
 
+class dbLogicalInstItr : public dbIterator
+{
+ public:
+  dbLogicalInstItr(dbTable<_dbInst>* inst_tbl) : _inst_tbl(inst_tbl) {}
+
+  bool reversible() override { return false; }
+  bool orderReversed() override { return false; }
+  void reverse(dbObject* /*parent*/) override {}
+  uint sequential() override { return 0; }
+
+  uint size(dbObject* parent) override
+  {
+    uint count = 0;
+    for (uint id = begin(parent); id != end(parent); id = next(id)) {
+      count++;
+    }
+    return count;
+  }
+
+  uint begin(dbObject* parent) override
+  {
+    return findNext(_inst_tbl->begin(parent));
+  }
+
+  uint end(dbObject* parent) override { return _inst_tbl->end(parent); }
+
+  uint next(uint id, ...) override { return findNext(_inst_tbl->next(id)); }
+
+  dbObject* getObject(uint id, ...) override
+  {
+    return _inst_tbl->getObject(id);
+  }
+
+ private:
+  uint findNext(uint start_id)
+  {
+    uint cur_id = start_id;
+    const uint end_id = _inst_tbl->end(nullptr);
+
+    while (cur_id != end_id) {
+      if (_inst_tbl->validId(cur_id)) {
+        _dbInst* inst_impl = (_dbInst*) _inst_tbl->getPtr(cur_id);
+        dbInst* inst = reinterpret_cast<dbInst*>(inst_impl);
+        if (inst->isPhysicalOnly() == false) {
+          return cur_id;
+        }
+      }
+      cur_id = _inst_tbl->next(cur_id);
+    }
+
+    return end_id;
+  }
+
+ private:
+  dbTable<_dbInst>* _inst_tbl;
+};
+
 struct OldTransform
 {
   int _orient;
@@ -415,6 +472,9 @@ _dbBlock::_dbBlock(_dbDatabase* db)
 
   _prop_itr = new dbPropertyItr(_prop_tbl);
 
+  _logical_inst_itr
+      = new dbLogicalInstItr((dbTable<_dbInst>*) getObjectTable(dbInstObj));
+
   _num_ext_dbs = 1;
   _searchDb = nullptr;
   _extmi = nullptr;
@@ -506,6 +566,7 @@ _dbBlock::~_dbBlock()
   delete _group_ground_net_itr;
   delete _bpin_itr;
   delete _prop_itr;
+  delete _logical_inst_itr;
   delete _dft_tbl;
   delete _marker_categories_tbl;
 
@@ -1797,6 +1858,12 @@ dbSet<dbInst> dbBlock::getInsts()
   return dbSet<dbInst>(block, block->_inst_tbl);
 }
 
+dbSet<dbInst> dbBlock::getLogicalInsts()
+{
+  _dbBlock* block = (_dbBlock*) this;
+  return dbSet<dbInst>(block, block->_logical_inst_itr);
+}
+
 dbSet<dbModule> dbBlock::getModules()
 {
   _dbBlock* block = (_dbBlock*) this;

src/odb/src/db/dbBlock.h

@@ -116,6 +116,7 @@ class dbBlockCallBackObj;
 class dbGuideItr;
 class dbNetTrackItr;
 class _dbDft;
+class dbLogicalInstItr;
 
 struct _dbBlockFlags
 {
@@ -289,6 +290,7 @@ class _dbBlock : public _dbObject
   dbBPinItr* _bpin_itr;
   dbPropertyItr* _prop_itr;
   dbBlockSearch* _searchDb;
+  dbLogicalInstItr* _logical_inst_itr;
 
   std::unordered_map<std::string, int> _module_name_id_map;
   std::unordered_map<std::string, int> _inst_name_id_map;

src/tap/test/gcd_asap7.ok

@@ -5,3 +5,4 @@
 [INFO TAP-0004] Inserted 104 endcaps.
 [INFO TAP-0005] Inserted 0 tapcells.
 No differences found.
+No differences found.

src/tap/test/gcd_asap7.tcl

@@ -3,13 +3,15 @@ read_lef asap7/asap7_tech_1x_201209.lef
 read_lef asap7/asap7sc7p5t_28_R_1x_220121a.lef
 read_def asap7_data/gcd.def
 
-set def_file [make_result_file gcd_asap7.def]
-
 tapcell \
   -distance 25 \
   -tapcell_master TAPCELL_ASAP7_75t_R \
   -endcap_master TAPCELL_ASAP7_75t_R
 
+set def_file [make_result_file gcd_asap7.def]
 write_def $def_file
-
 diff_file gcd_asap7.defok $def_file
+
+set verilog_file [make_result_file gcd_asap7.v]
+write_verilog $verilog_file
+diff_file gcd_asap7.vok $verilog_file

src/tap/test/gcd_asap7.vok

@@ -0,0 +1,19 @@
+module gcd (clk,
+    req_rdy,
+    req_val,
+    reset,
+    resp_rdy,
+    resp_val,
+    req_msg,
+    resp_msg);
+ input clk;
+ output req_rdy;
+ input req_val;
+ input reset;
+ input resp_rdy;
+ output resp_val;
+ input [31:0] req_msg;
+ output [15:0] resp_msg;
+
+
+endmodule