odb: fix bmap reader to use bterm instead of net since net can have multiple bterms, but bterm can only have one net

Signed-off-by: Peter Gadfort <[email protected]>

Author: gadfort

src/odb/include/odb/3dblox.h

@@ -26,6 +26,7 @@ class dbChipInst;
 class BumpMapEntry;
 class dbChipRegion;
 class dbBlock;
+class dbBTerm;
 class dbInst;
 class dbTech;
 class dbLib;
@@ -49,7 +50,8 @@ class ThreeDBlox
   void createChipInst(const ChipletInst& chip_inst);
   void createConnection(const Connection& connection);
   void createBump(const BumpMapEntry& entry, dbChipRegion* chip_region);
-  dbInst* createBump(const BumpMapEntry& entry, dbBlock* block);
+  std::pair<dbInst*, dbBTerm*> createBump(const BumpMapEntry& entry,
+                                          dbBlock* block);
   dbChipRegionInst* resolvePath(const std::string& path,
                                 std::vector<dbChipInst*>& path_insts);
   void readHeaderIncludes(const std::vector<std::string>& includes);

src/odb/src/3dblox/3dblox.cpp

@@ -581,7 +581,7 @@ void ThreeDBlox::readBMap(const std::string& bmap_file)
 
   BmapParser parser(logger_);
   BumpMapData data = parser.parseFile(bmap_file);
-  std::vector<odb::dbInst*> bumps;
+  std::vector<std::pair<odb::dbInst*, odb::dbBTerm*>> bumps;
   bumps.reserve(data.entries.size());
   for (const auto& entry : data.entries) {
     bumps.push_back(createBump(entry, block));
@@ -595,7 +595,7 @@ void ThreeDBlox::readBMap(const std::string& bmap_file)
 
   // Populate where the bpins should be made
   std::map<odb::dbMaster*, BPinInfo> bpininfo;
-  for (dbInst* inst : bumps) {
+  for (const auto& [inst, bterm] : bumps) {
     dbMaster* master = inst->getMaster();
     if (bpininfo.find(master) != bpininfo.end()) {
       continue;
@@ -645,7 +645,11 @@ void ThreeDBlox::readBMap(const std::string& bmap_file)
   }
 
   // create bpins
-  for (dbInst* inst : bumps) {
+  for (const auto& [inst, bterm] : bumps) {
+    if (bterm == nullptr) {
+      continue;
+    }
+
     auto masterbpin = bpininfo.find(inst->getMaster());
     if (masterbpin == bpininfo.end()) {
       continue;
@@ -654,28 +658,22 @@ void ThreeDBlox::readBMap(const std::string& bmap_file)
     const BPinInfo& pin_info = masterbpin->second;
 
     const dbTransform xform = inst->getTransform();
-    for (dbITerm* iterm : inst->getITerms()) {
-      dbNet* net = iterm->getNet();
-      if (net == nullptr) {
-        continue;
-      }
-      dbBTerm* bterm = net->get1stBTerm();
-      dbBPin* pin = dbBPin::create(bterm);
-      Rect shape = pin_info.rect;
-      xform.apply(shape);
-      dbBox::create(pin,
-                    pin_info.layer,
-                    shape.xMin(),
-                    shape.yMin(),
-                    shape.xMax(),
-                    shape.yMax());
-      pin->setPlacementStatus(odb::dbPlacementStatus::FIRM);
-      break;
-    }
+    dbBPin* pin = dbBPin::create(bterm);
+    Rect shape = pin_info.rect;
+    xform.apply(shape);
+    dbBox::create(pin,
+                  pin_info.layer,
+                  shape.xMin(),
+                  shape.yMin(),
+                  shape.xMax(),
+                  shape.yMax());
+    pin->setPlacementStatus(odb::dbPlacementStatus::FIRM);
   }
 }
 
-dbInst* ThreeDBlox::createBump(const BumpMapEntry& entry, dbBlock* block)
+std::pair<dbInst*, odb::dbBTerm*> ThreeDBlox::createBump(
+    const BumpMapEntry& entry,
+    dbBlock* block)
 {
   const int dbus = db_->getDbuPerMicron();
   dbInst* inst = block->findInst(entry.bump_inst_name.c_str());
@@ -693,22 +691,28 @@ dbInst* ThreeDBlox::createBump(const BumpMapEntry& entry, dbBlock* block)
   inst->setOrigin(entry.x * dbus, entry.y * dbus);
   inst->setPlacementStatus(dbPlacementStatus::FIRM);
 
-  // Net entry doesn't make sense
-  if (entry.net_name != "-") {
-    dbNet* net = block->findNet(entry.net_name.c_str());
-    if (net == nullptr) {
+  dbNet* net = nullptr;
+  dbBTerm* term = nullptr;
+
+  // Find bterm
+  if (entry.port_name != "-") {
+    term = block->findBTerm(entry.port_name.c_str());
+    if (term == nullptr) {
       logger_->error(utl::ODB,
                      539,
-                     "3DBV Parser Error: Bump net {} not found",
-                     entry.net_name);
+                     "3DBV Parser Error: Bump port {} not found",
+                     entry.port_name);
     }
+    net = term->getNet();
+  }
+
+  if (net != nullptr) {
     for (odb::dbITerm* iterm : inst->getITerms()) {
       iterm->connect(net);
     }
   }
-  // Port already on the net, so skip
 
-  return inst;
+  return {inst, term};
 }
 
 }  // namespace odb