Merge pull request #8956 from osamahammad21/3dblox-update

ODB: fix multiple 3dblox issues

Author: osamahammad21

src/OpenRoad.cc

@@ -495,6 +495,7 @@ void OpenRoad::read3Dbx(const std::string& filename)
 {
   odb::ThreeDBlox parser(logger_, db_, sta_);
   parser.readDbx(filename);
+  parser.check();
 }
 
 void OpenRoad::read3DBloxBMap(const std::string& filename)

src/odb/include/odb/db.h

@@ -7247,12 +7247,6 @@ class dbChipInst : public dbObject
  public:
   std::string getName() const;
 
-  void setLoc(const Point3D& loc);
-
-  Point3D getLoc() const;
-
-  void setOrient(dbOrientType3D orient);
-
   dbOrientType3D getOrient() const;
 
   dbChip* getMasterChip() const;
@@ -7263,6 +7257,12 @@ class dbChipInst : public dbObject
 
   dbTransform getTransform() const;
 
+  void setOrient(dbOrientType3D orient);
+
+  void setLoc(const Point3D& loc);
+
+  Point3D getLoc() const;
+
   Rect getBBox() const;
 
   Cuboid getCuboid() const;

src/odb/include/odb/dbTransform.h

@@ -18,44 +18,75 @@ class dbIStream;
 class dbTransform
 {
  public:
-  // T = <R0, (0,0)>
+  // T = <R0, (0,0,0), false>
   dbTransform() = default;
 
-  //  T = <R0, offset>
-  dbTransform(const Point offset) : offset_(offset) {}
+  //  T = <R0, (offset,0), false>
+  dbTransform(const Point offset) : offset_(offset, 0) {}
 
-  //  T = <orient, (0,0)>
+  //  T = <R0, offset, false>
+  dbTransform(const Point3D& offset) : offset_(offset) {}
+
+  //  T = <orient, (0,0,0), false>
   dbTransform(const dbOrientType orient) : orient_(orient) {}
 
-  //  T = <orient, offset>
+  //  T = <orient, (0,0,0), orient.mirror_z_>
+  dbTransform(const dbOrientType3D& orient)
+      : orient_(orient.getOrientType2D()), mirror_z_(orient.isMirrorZ())
+  {
+  }
+
+  //  T = <orient, (offset,0), false>
   dbTransform(const dbOrientType orient, const Point& offset)
-      : orient_(orient), offset_(offset)
+      : orient_(orient), offset_(offset, 0)
+  {
+  }
+
+  dbTransform(const dbOrientType3D orient, const Point3D& offset)
+      : orient_(orient.getOrientType2D()),
+        offset_(offset),
+        mirror_z_(orient.isMirrorZ())
   {
   }
 
   bool operator==(const dbTransform& t) const
   {
-    return (orient_ == t.orient_) && (offset_ == t.offset_);
+    return (orient_ == t.orient_) && (offset_ == t.offset_)
+           && (mirror_z_ == t.mirror_z_);
   }
 
   bool operator!=(const dbTransform& t) const { return !operator==(t); }
 
   void setOrient(const dbOrientType orient) { orient_ = orient; }
 
-  void setOffset(const Point offset) { offset_ = offset; }
+  void setOrient(const dbOrientType3D& orient)
+  {
+    orient_ = orient.getOrientType2D();
+    mirror_z_ = orient.isMirrorZ();
+  }
+
+  void setOffset(const Point offset) { offset_ = Point3D(offset, 0); }
+
+  void setOffset(const Point3D& offset) { offset_ = offset; }
 
   void setTransform(const dbOrientType orient, const Point& offset)
   {
     orient_ = orient;
-    offset_ = offset;
+    offset_ = Point3D(offset, 0);
   }
 
   // Apply transform to this point
   void apply(Point& p) const;
 
+  // Apply transform to this point3D
+  void apply(Point3D& p) const;
+
   // Apply transform to this Rect
   void apply(Rect& r) const;
 
+  // Apply transform to this Cuboid
+  void apply(Cuboid& c) const;
+
   // Apply transform to this polygon
   void apply(Polygon& p) const;
 
@@ -72,16 +103,16 @@ class dbTransform
   void invert();
 
   dbOrientType getOrient() const { return orient_; }
-  Point getOffset() const { return offset_; }
+  Point getOffset() const { return Point(offset_.x(), offset_.y()); }
 
   friend dbOStream& operator<<(dbOStream& stream, const dbTransform& t);
   friend dbIStream& operator>>(dbIStream& stream, dbTransform& t);
 
  private:
   friend class _dbBlock;
-
   dbOrientType::Value orient_ = dbOrientType::R0;
-  Point offset_;
+  Point3D offset_;
+  bool mirror_z_ = false;
 };
 
 dbOStream& operator<<(dbOStream& stream, const dbTransform& t);

src/odb/include/odb/geom.h

@@ -217,6 +217,7 @@ class Cuboid
   int yhi_ = 0;
   int zhi_ = 0;
 };
+std::ostream& operator<<(std::ostream& os, const Cuboid& cIn);
 
 /*
 an Oct represents a 45-degree routing segment as 2 connected octagons

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

@@ -89,7 +89,6 @@ void ThreeDBlox::readDbx(const std::string& dbx_file)
   }
   calculateSize(db_->getChip());
   db_->triggerPostRead3Dbx(chip);
-  check();
 }
 
 void ThreeDBlox::check()
@@ -192,13 +191,14 @@ void ThreeDBlox::writeDbx(const std::string& dbx_file, odb::dbChip* chip)
 
 void ThreeDBlox::calculateSize(dbChip* chip)
 {
-  Rect box;
-  box.mergeInit();
+  Cuboid cuboid;
+  cuboid.mergeInit();
   for (auto inst : chip->getChipInsts()) {
-    box.merge(inst->getBBox());
+    cuboid.merge(inst->getCuboid());
   }
-  chip->setWidth(box.dx());
-  chip->setHeight(box.dy());
+  chip->setWidth(cuboid.dx());
+  chip->setHeight(cuboid.dy());
+  chip->setThickness(cuboid.dz());
 }
 
 void ThreeDBlox::readHeaderIncludes(const std::vector<std::string>& includes)
@@ -302,30 +302,46 @@ void ThreeDBlox::createChiplet(const ChipletDef& chiplet)
                         chip,
                         /*issue_callback*/ false);
   }
-  chip->setWidth(chiplet.design_width * db_->getDbuPerMicron());
-  chip->setHeight(chiplet.design_height * db_->getDbuPerMicron());
-  chip->setThickness(chiplet.thickness * db_->getDbuPerMicron());
-  chip->setShrink(chiplet.shrink);
+  if (chiplet.design_width != -1.0) {
+    chip->setWidth(chiplet.design_width * db_->getDbuPerMicron());
+  }
+  if (chiplet.design_height != -1.0) {
+    chip->setHeight(chiplet.design_height * db_->getDbuPerMicron());
+  }
+  if (chiplet.thickness != -1.0) {
+    chip->setThickness(chiplet.thickness * db_->getDbuPerMicron());
+  }
+  if (chiplet.shrink != -1.0) {
+    chip->setShrink(chiplet.shrink);
+  }
   chip->setTsv(chiplet.tsv);
 
-  chip->setScribeLineEast(chiplet.scribe_line_right * db_->getDbuPerMicron());
-  chip->setScribeLineWest(chiplet.scribe_line_left * db_->getDbuPerMicron());
-  chip->setScribeLineNorth(chiplet.scribe_line_top * db_->getDbuPerMicron());
-  chip->setScribeLineSouth(chiplet.scribe_line_bottom * db_->getDbuPerMicron());
-
-  chip->setSealRingEast(chiplet.seal_ring_right * db_->getDbuPerMicron());
-  chip->setSealRingWest(chiplet.seal_ring_left * db_->getDbuPerMicron());
-  chip->setSealRingNorth(chiplet.seal_ring_top * db_->getDbuPerMicron());
-  chip->setSealRingSouth(chiplet.seal_ring_bottom * db_->getDbuPerMicron());
+  if (chiplet.scribe_line_right != -1.0) {
+    chip->setScribeLineEast(chiplet.scribe_line_right * db_->getDbuPerMicron());
+    chip->setScribeLineWest(chiplet.scribe_line_left * db_->getDbuPerMicron());
+    chip->setScribeLineNorth(chiplet.scribe_line_top * db_->getDbuPerMicron());
+    chip->setScribeLineSouth(chiplet.scribe_line_bottom
+                             * db_->getDbuPerMicron());
+  }
+  if (chiplet.seal_ring_right != -1.0) {
+    chip->setSealRingEast(chiplet.seal_ring_right * db_->getDbuPerMicron());
+    chip->setSealRingWest(chiplet.seal_ring_left * db_->getDbuPerMicron());
+    chip->setSealRingNorth(chiplet.seal_ring_top * db_->getDbuPerMicron());
+    chip->setSealRingSouth(chiplet.seal_ring_bottom * db_->getDbuPerMicron());
+  }
 
   chip->setOffset(Point(chiplet.offset.x * db_->getDbuPerMicron(),
                         chiplet.offset.y * db_->getDbuPerMicron()));
   if (chip->getChipType() != dbChip::ChipType::HIER
       && chip->getBlock() == nullptr) {
     // blackbox stage, create block
     auto block = odb::dbBlock::create(chip, chiplet.name.c_str());
-    block->setDieArea(Rect(0, 0, chip->getWidth(), chip->getHeight()));
-    block->setCoreArea(Rect(0, 0, chip->getWidth(), chip->getHeight()));
+    const int x_min = chip->getScribeLineWest() + chip->getSealRingWest();
+    const int y_min = chip->getScribeLineSouth() + chip->getSealRingSouth();
+    const int x_max = x_min + chip->getWidth();
+    const int y_max = y_min + chip->getHeight();
+    block->setDieArea(Rect(x_min, y_min, x_max, y_max));
+    block->setCoreArea(Rect(x_min, y_min, x_max, y_max));
   }
   for (const auto& [_, region] : chiplet.regions) {
     createRegion(region, chip);
@@ -405,8 +421,11 @@ void ThreeDBlox::createBump(const BumpMapEntry& entry,
   auto bump = dbChipBump::create(chip_region, inst);
   Rect bbox;
   inst->getMaster()->getPlacementBoundary(bbox);
-  inst->setOrigin((entry.x * db_->getDbuPerMicron()) - bbox.xCenter(),
-                  (entry.y * db_->getDbuPerMicron()) - bbox.yCenter());
+  int x = (entry.x * db_->getDbuPerMicron()) - bbox.xCenter()
+          + chip->getOffset().x();
+  int y = (entry.y * db_->getDbuPerMicron()) - bbox.yCenter()
+          + chip->getOffset().y();
+  inst->setOrigin(x, y);
   inst->setPlacementStatus(dbPlacementStatus::FIRM);
   if (entry.net_name != "-") {
     auto net = block->findNet(entry.net_name.c_str());
@@ -454,9 +473,6 @@ void ThreeDBlox::createChipInst(const ChipletInst& chip_inst)
                    chip_inst.name);
   }
   dbChipInst* inst = dbChipInst::create(db_->getChip(), chip, chip_inst.name);
-  inst->setLoc(Point3D(chip_inst.loc.x * db_->getDbuPerMicron(),
-                       chip_inst.loc.y * db_->getDbuPerMicron(),
-                       chip_inst.z * db_->getDbuPerMicron()));
   auto orient_str = chip_inst.orient;
   if (dup_orient_map.find(orient_str) != dup_orient_map.end()) {
     orient_str = dup_orient_map[orient_str];
@@ -470,6 +486,9 @@ void ThreeDBlox::createChipInst(const ChipletInst& chip_inst)
                    chip_inst.name);
   }
   inst->setOrient(orient.value());
+  inst->setLoc(Point3D(chip_inst.loc.x * db_->getDbuPerMicron(),
+                       chip_inst.loc.y * db_->getDbuPerMicron(),
+                       chip_inst.z * db_->getDbuPerMicron()));
 }
 std::vector<std::string> splitPath(const std::string& path)
 {