Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion src/odb/src/db/dbChipNet.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,21 @@ void dbChipNet::addBumpInst(dbChipBumpInst* bump_inst,
const std::vector<dbChipInst*>& path)
{
_dbChipNet* obj = (_dbChipNet*) this;

if (bump_inst == nullptr) {
obj->getLogger()->error(utl::ODB,
479,
"Cannot add nullptr bump inst to chip {} net {}",
obj->name_);
}
std::vector<dbId<_dbChipInst>> path_ids;
path_ids.reserve(path.size());
for (const auto& inst : path) {
if (inst == nullptr) {
obj->getLogger()->error(utl::ODB,
480,
"Invalid inst in path for bump inst in net {}",
obj->name_);
}
path_ids.emplace_back(inst->getImpl()->getOID());
}

Expand Down
21 changes: 14 additions & 7 deletions src/odb/test/cpp/TestChips.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ struct F_CHIP_HIERARCHY
= createMaster1X1(lib2, "io_master", 100, 100, "in", "out");
dbInst* io_cell = dbInst::create(io_chip->getBlock(), io_master, "io_bump");
io_bump = dbChipBump::create(io_chip_region_r1, io_cell);
io_master = createMaster1X1(lib1, "io_master", 100, 100, "in", "out");
io_cell = dbInst::create(memory_chip->getBlock(), io_master, "io_bump");
dbChipBump::create(memory_chip_region_r1, io_cell);
}
void createChipInsts()
{
Expand Down Expand Up @@ -333,7 +336,7 @@ BOOST_FIXTURE_TEST_CASE(test_chip_bumps, F_CHIP_HIERARCHY)
BOOST_TEST(io_chip_region_r1->getChipBumps().size() == 1);
BOOST_TEST(*io_chip_region_r1->getChipBumps().begin() == io_bump);

BOOST_TEST(db->getChipBumpInsts().size() == 1);
BOOST_TEST(db->getChipBumpInsts().size() == 2);

BOOST_TEST(io_inst->getRegions().size() == 1);
auto io_inst_region_r1 = *io_inst->getRegions().begin();
Expand All @@ -351,19 +354,23 @@ BOOST_FIXTURE_TEST_CASE(test_chip_bumps, F_CHIP_HIERARCHY)
BOOST_TEST(system_chip->getChipNets().size() == 1);
BOOST_TEST(db->getChipNets().size() == 1);
chip_net->addBumpInst(io_inst_region_r1_bump_inst, {io_inst});
dbChipRegionInst* memory_inst_region_r1 = nullptr;
for (auto region : memory_inst->getRegions()) {
if (region->getChipRegion() == memory_chip_region_r1) {
memory_inst_region_r1 = region;
break;
}
}
BOOST_TEST(memory_inst_region_r1->getChipBumpInsts().size() == 1);
auto memory_inst_region_r1_bump_inst
= (*(*memory_inst->getRegions().begin())->getChipBumpInsts().begin());
= (*memory_inst_region_r1->getChipBumpInsts().begin());
chip_net->addBumpInst(memory_inst_region_r1_bump_inst, {memory_inst});
BOOST_TEST(chip_net->getNumBumpInsts() == 2);
std::vector<dbChipInst*> path;
BOOST_TEST(chip_net->getBumpInst(0, path) == io_inst_region_r1_bump_inst);
BOOST_TEST(path.size() == 1);
BOOST_TEST(path[0] == io_inst);

dbMaster* io_master
= createMaster1X1(lib1, "io_master", 100, 100, "in", "out");
dbInst* io_cell
= dbInst::create(memory_chip->getBlock(), io_master, "io_bump");
dbInst* io_cell = memory_chip->getBlock()->findInst("io_bump");
try {
dbChipBump::create(io_chip_region_r1, io_cell);
BOOST_TEST(false);
Expand Down