Skip to content

Commit eda33d9

Browse files
author
osamahammad21
committed
odb: rename unfolded_bump_inst_tbl_ -> unfolded_chip_bump_inst_tbl_
Signed-off-by: osamahammad21 <osama@precisioninno.com>
1 parent e6e6b86 commit eda33d9

7 files changed

Lines changed: 24 additions & 21 deletions

File tree

src/odb/src/codeGenerator/schema.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@
222222
{
223223
"name": "dbUnfoldedChipBumpInstItr",
224224
"parentObject": "dbUnfoldedChipBumpInst",
225-
"tableName": "unfolded_bump_inst_tbl",
225+
"tableName": "unfolded_chip_bump_inst_tbl",
226226
"reversible": "true",
227227
"orderReversed": "true",
228228
"sequential": 0,
@@ -581,7 +581,7 @@
581581
"parent":"dbDatabase",
582582
"child":"dbUnfoldedChipBumpInst",
583583
"type":"1_n",
584-
"tbl_name":"unfolded_bump_inst_tbl_",
584+
"tbl_name":"unfolded_chip_bump_inst_tbl_",
585585
"flags": ["no-serial"]
586586
},
587587
{

src/odb/src/db/dbDatabase.cpp

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ bool _dbDatabase::operator==(const _dbDatabase& rhs) const
135135
if (*unfolded_chip_region_inst_tbl_ != *rhs.unfolded_chip_region_inst_tbl_) {
136136
return false;
137137
}
138-
if (*unfolded_bump_inst_tbl_ != *rhs.unfolded_bump_inst_tbl_) {
138+
if (*unfolded_chip_bump_inst_tbl_ != *rhs.unfolded_chip_bump_inst_tbl_) {
139139
return false;
140140
}
141141
if (*unfolded_conn_tbl_ != *rhs.unfolded_conn_tbl_) {
@@ -223,7 +223,7 @@ _dbDatabase::_dbDatabase(_dbDatabase* db)
223223
this,
224224
(GetObjTbl_t) &_dbDatabase::getObjectTable,
225225
dbUnfoldedChipRegionInstObj);
226-
unfolded_bump_inst_tbl_ = new dbTable<_dbUnfoldedChipBumpInst>(
226+
unfolded_chip_bump_inst_tbl_ = new dbTable<_dbUnfoldedChipBumpInst>(
227227
this,
228228
this,
229229
(GetObjTbl_t) &_dbDatabase::getObjectTable,
@@ -275,7 +275,8 @@ _dbDatabase::_dbDatabase(_dbDatabase* db)
275275
unfolded_region_itr_
276276
= new dbUnfoldedChipRegionInstItr(unfolded_chip_region_inst_tbl_);
277277

278-
unfolded_bump_itr_ = new dbUnfoldedChipBumpInstItr(unfolded_bump_inst_tbl_);
278+
unfolded_bump_itr_
279+
= new dbUnfoldedChipBumpInstItr(unfolded_chip_bump_inst_tbl_);
279280
// User Code End Constructor
280281
}
281282

@@ -511,7 +512,7 @@ dbObjectTable* _dbDatabase::getObjectTable(dbObjectType type)
511512
case dbUnfoldedChipRegionInstObj:
512513
return unfolded_chip_region_inst_tbl_;
513514
case dbUnfoldedChipBumpInstObj:
514-
return unfolded_bump_inst_tbl_;
515+
return unfolded_chip_bump_inst_tbl_;
515516
case dbUnfoldedConnObj:
516517
return unfolded_conn_tbl_;
517518
case dbUnfoldedChipNetObj:
@@ -550,8 +551,8 @@ void _dbDatabase::collectMemInfo(MemInfo& info)
550551
info.children["unfolded_chip_inst_tbl_"]);
551552
unfolded_chip_region_inst_tbl_->collectMemInfo(
552553
info.children["unfolded_chip_region_inst_tbl_"]);
553-
unfolded_bump_inst_tbl_->collectMemInfo(
554-
info.children["unfolded_bump_inst_tbl_"]);
554+
unfolded_chip_bump_inst_tbl_->collectMemInfo(
555+
info.children["unfolded_chip_bump_inst_tbl_"]);
555556
unfolded_conn_tbl_->collectMemInfo(info.children["unfolded_conn_tbl_"]);
556557
unfolded_chip_net_tbl_->collectMemInfo(
557558
info.children["unfolded_chip_net_tbl_"]);
@@ -576,7 +577,7 @@ _dbDatabase::~_dbDatabase()
576577
delete chip_net_tbl_;
577578
delete unfolded_chip_inst_tbl_;
578579
delete unfolded_chip_region_inst_tbl_;
579-
delete unfolded_bump_inst_tbl_;
580+
delete unfolded_chip_bump_inst_tbl_;
580581
delete unfolded_conn_tbl_;
581582
delete unfolded_chip_net_tbl_;
582583
// User Code Begin Destructor
@@ -645,7 +646,8 @@ _dbDatabase::_dbDatabase(_dbDatabase* /* unused: db */, int id)
645646
unfolded_region_itr_
646647
= new dbUnfoldedChipRegionInstItr(unfolded_chip_region_inst_tbl_);
647648

648-
unfolded_bump_itr_ = new dbUnfoldedChipBumpInstItr(unfolded_bump_inst_tbl_);
649+
unfolded_bump_itr_
650+
= new dbUnfoldedChipBumpInstItr(unfolded_chip_bump_inst_tbl_);
649651
}
650652

651653
utl::Logger* _dbDatabase::getLogger() const
@@ -753,7 +755,7 @@ dbSet<dbUnfoldedChipRegionInst> dbDatabase::getUnfoldedChipRegionInsts() const
753755
dbSet<dbUnfoldedChipBumpInst> dbDatabase::getUnfoldedChipBumpInsts() const
754756
{
755757
_dbDatabase* obj = (_dbDatabase*) this;
756-
return dbSet<dbUnfoldedChipBumpInst>(obj, obj->unfolded_bump_inst_tbl_);
758+
return dbSet<dbUnfoldedChipBumpInst>(obj, obj->unfolded_chip_bump_inst_tbl_);
757759
}
758760

759761
dbSet<dbUnfoldedConn> dbDatabase::getUnfoldedConns() const

src/odb/src/db/dbDatabase.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ class _dbDatabase : public _dbObject
347347
dbTable<_dbChipNet>* chip_net_tbl_;
348348
dbTable<_dbUnfoldedChipInst>* unfolded_chip_inst_tbl_;
349349
dbTable<_dbUnfoldedChipRegionInst>* unfolded_chip_region_inst_tbl_;
350-
dbTable<_dbUnfoldedChipBumpInst>* unfolded_bump_inst_tbl_;
350+
dbTable<_dbUnfoldedChipBumpInst>* unfolded_chip_bump_inst_tbl_;
351351
dbTable<_dbUnfoldedConn>* unfolded_conn_tbl_;
352352
dbTable<_dbUnfoldedChipNet>* unfolded_chip_net_tbl_;
353353

src/odb/src/db/dbUnfoldedBuilder.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ void dbUnfoldedBuilder::build()
7373
{
7474
db_->unfolded_chip_inst_tbl_->clear();
7575
db_->unfolded_chip_region_inst_tbl_->clear();
76-
db_->unfolded_bump_inst_tbl_->clear();
76+
db_->unfolded_chip_bump_inst_tbl_->clear();
7777
db_->unfolded_conn_tbl_->clear();
7878
db_->unfolded_chip_net_tbl_->clear();
7979
chip_by_path_.clear();
@@ -182,7 +182,8 @@ void dbUnfoldedBuilder::unfoldBumps(_dbUnfoldedChipRegionInst* uf_region,
182182
if (bump->getInst() == nullptr) {
183183
continue;
184184
}
185-
_dbUnfoldedChipBumpInst* uf_bump = db_->unfolded_bump_inst_tbl_->create();
185+
_dbUnfoldedChipBumpInst* uf_bump
186+
= db_->unfolded_chip_bump_inst_tbl_->create();
186187
uf_bump->chip_bump_inst_ = bump_inst->getImpl()->getOID();
187188
uf_bump->parent_region_ = uf_region->getOID();
188189
uf_bump->region_next_ = uf_region->bump_;

src/odb/src/db/dbUnfoldedChipBumpInstItr.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ void dbUnfoldedChipBumpInstItr::reverse(dbObject* parent)
3535
uint32_t id = region->bump_;
3636
uint32_t list = 0;
3737
while (id != 0) {
38-
_dbUnfoldedChipBumpInst* bump = unfolded_bump_inst_tbl_->getPtr(id);
38+
_dbUnfoldedChipBumpInst* bump = unfolded_chip_bump_inst_tbl_->getPtr(id);
3939
uint32_t n = bump->region_next_;
4040
bump->region_next_ = list;
4141
list = id;
@@ -79,13 +79,13 @@ uint32_t dbUnfoldedChipBumpInstItr::end(dbObject* /* unused: parent */) const
7979
uint32_t dbUnfoldedChipBumpInstItr::next(uint32_t id, ...) const
8080
{
8181
// User Code Begin next
82-
return unfolded_bump_inst_tbl_->getPtr(id)->region_next_;
82+
return unfolded_chip_bump_inst_tbl_->getPtr(id)->region_next_;
8383
// User Code End next
8484
}
8585

8686
dbObject* dbUnfoldedChipBumpInstItr::getObject(uint32_t id, ...)
8787
{
88-
return unfolded_bump_inst_tbl_->getPtr(id);
88+
return unfolded_chip_bump_inst_tbl_->getPtr(id);
8989
}
9090
} // namespace odb
9191
// Generator Code End Cpp

src/odb/src/db/dbUnfoldedChipBumpInstItr.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ class dbUnfoldedChipBumpInstItr : public dbIterator
1616
{
1717
public:
1818
dbUnfoldedChipBumpInstItr(
19-
dbTable<_dbUnfoldedChipBumpInst>* unfolded_bump_inst_tbl)
19+
dbTable<_dbUnfoldedChipBumpInst>* unfolded_chip_bump_inst_tbl)
2020
{
21-
unfolded_bump_inst_tbl_ = unfolded_bump_inst_tbl;
21+
unfolded_chip_bump_inst_tbl_ = unfolded_chip_bump_inst_tbl;
2222
}
2323

2424
bool reversible() const override;
@@ -32,7 +32,7 @@ class dbUnfoldedChipBumpInstItr : public dbIterator
3232
dbObject* getObject(uint32_t id, ...) override;
3333

3434
private:
35-
dbTable<_dbUnfoldedChipBumpInst>* unfolded_bump_inst_tbl_;
35+
dbTable<_dbUnfoldedChipBumpInst>* unfolded_chip_bump_inst_tbl_;
3636
};
3737

3838
} // namespace odb

src/odb/src/db/dbUnfoldedChipNet.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ std::vector<dbUnfoldedChipBumpInst*> dbUnfoldedChipNet::getConnectedBumps()
8181
bumps.reserve(obj->connected_bumps_.size());
8282
for (const auto& id : obj->connected_bumps_) {
8383
bumps.push_back(
84-
(dbUnfoldedChipBumpInst*) db->unfolded_bump_inst_tbl_->getPtr(id));
84+
(dbUnfoldedChipBumpInst*) db->unfolded_chip_bump_inst_tbl_->getPtr(id));
8585
}
8686
return bumps;
8787
}

0 commit comments

Comments
 (0)