Merge pull request #8623 from hzeller/feature-20251012-using-dbblock

Don't use `using odb::dbBlock;` in header files to not pollute namespace

Author: maliberty

src/dpl/include/dpl/Opendp.h

@@ -29,7 +29,6 @@ namespace dpl {
 
 using utl::Logger;
 
-using odb::dbBlock;
 using odb::dbDatabase;
 using odb::dbMaster;
 using odb::dbMasterType;
@@ -311,7 +310,7 @@ class Opendp
 
   Logger* logger_ = nullptr;
   dbDatabase* db_ = nullptr;
-  dbBlock* block_ = nullptr;
+  odb::dbBlock* block_ = nullptr;
   odb::Rect core_;
 
   std::unique_ptr<Architecture> arch_;  // Information about rows, etc.

src/dpl/src/dbToOpendp.cpp

@@ -101,7 +101,7 @@ Rect Opendp::getBbox(odb::dbInst* inst)
 }
 void Opendp::createNetwork()
 {
-  dbBlock* block = db_->getChip()->getBlock();
+  odb::dbBlock* block = db_->getChip()->getBlock();
   network_->setCore(core_);
   ///////////////////////////////////
   auto min_row_height = std::numeric_limits<int>::max();
@@ -165,7 +165,7 @@ void Opendp::createNetwork()
 ////////////////////////////////////////////////////////////////
 void Opendp::createArchitecture()
 {
-  dbBlock* block = db_->getChip()->getBlock();
+  odb::dbBlock* block = db_->getChip()->getBlock();
 
   auto min_row_height = std::numeric_limits<int>::max();
   for (odb::dbRow* row : block->getRows()) {
@@ -268,7 +268,7 @@ void Opendp::createArchitecture()
 void Opendp::setUpPlacementGroups()
 {
   regions_rtree_.clear();
-  dbBlock* block = db_->getChip()->getBlock();
+  odb::dbBlock* block = db_->getChip()->getBlock();
   int count = 0;
   auto db_groups = block->getGroups();
   for (auto db_group : db_groups) {

src/dpl/src/graphics/Graphics.cpp

@@ -8,6 +8,7 @@
 #include "infrastructure/Grid.h"
 #include "infrastructure/Objects.h"
 #include "infrastructure/network.h"
+#include "odb/db.h"
 #include "odb/geom.h"
 
 namespace dpl {
@@ -24,7 +25,7 @@ Graphics::Graphics(Opendp* dp,
   gui::Gui::get()->registerRenderer(this);
 }
 
-void Graphics::startPlacement(dbBlock* block)
+void Graphics::startPlacement(odb::dbBlock* block)
 {
   block_ = block;
 }

src/dpl/src/graphics/Graphics.h

@@ -12,8 +12,6 @@
 
 namespace dpl {
 
-using odb::dbBlock;
-
 class Opendp;
 class Node;
 
@@ -24,7 +22,7 @@ class Graphics : public gui::Renderer, public DplObserver
            float min_displacement,
            const odb::dbInst* debug_instance);
   ~Graphics() override = default;
-  void startPlacement(dbBlock* block) override;
+  void startPlacement(odb::dbBlock* block) override;
   void placeInstance(odb::dbInst* instance) override;
   void binSearch(const Node* cell,
                  GridX xl,
@@ -41,7 +39,7 @@ class Graphics : public gui::Renderer, public DplObserver
  private:
   Opendp* dp_;
   const odb::dbInst* debug_instance_;
-  dbBlock* block_ = nullptr;
+  odb::dbBlock* block_ = nullptr;
   float min_displacement_;  // in row height
   std::vector<odb::Rect> searched_;
 };

src/dpl/src/infrastructure/Grid.cpp

@@ -51,7 +51,7 @@ void Grid::clear()
   row_index_to_y_dbu_.clear();
 }
 
-void Grid::visitDbRows(dbBlock* block,
+void Grid::visitDbRows(odb::dbBlock* block,
                        const std::function<void(dbRow*)>& func) const
 {
   for (auto row : block->getRows()) {
@@ -88,7 +88,7 @@ void Grid::allocateGrid()
   row_sites_.resize(row_count_.v);
 }
 
-void Grid::markHopeless(dbBlock* block,
+void Grid::markHopeless(odb::dbBlock* block,
                         const int max_displacement_x,
                         const int max_displacement_y)
 {
@@ -137,7 +137,7 @@ void Grid::markHopeless(dbBlock* block,
   }
 }
 
-void Grid::markBlocked(dbBlock* block)
+void Grid::markBlocked(odb::dbBlock* block)
 {
   const odb::Rect core = getCore();
   auto addBlockedLayers
@@ -214,7 +214,7 @@ void Grid::markBlocked(dbBlock* block)
 }
 
 void Grid::initGrid(dbDatabase* db,
-                    dbBlock* block,
+                    odb::dbBlock* block,
                     std::shared_ptr<Padding> padding,
                     int max_displacement_x,
                     int max_displacement_y)
@@ -685,7 +685,7 @@ bool Grid::cellFitsInCore(Node* cell) const
          && cell->getHeight().v <= core_.dy();
 }
 
-void Grid::examineRows(dbBlock* block)
+void Grid::examineRows(odb::dbBlock* block)
 {
   block_ = block;
   has_hybrid_rows_ = false;

src/dpl/src/infrastructure/Grid.h

@@ -70,12 +70,12 @@ class Grid
   void init(Logger* logger) { logger_ = logger; }
   void setCore(const odb::Rect& core) { core_ = core; }
   void initGrid(dbDatabase* db,
-                dbBlock* block,
+                odb::dbBlock* block,
                 std::shared_ptr<Padding> padding,
                 int max_displacement_x,
                 int max_displacement_y);
   void allocateGrid();
-  void examineRows(dbBlock* block);
+  void examineRows(odb::dbBlock* block);
   std::unordered_set<int> getRowCoordinates() const;
 
   GridX gridX(DbuX x) const;
@@ -185,15 +185,15 @@ class Grid
 
   using Pixels = std::vector<std::vector<Pixel>>;
 
-  void markHopeless(dbBlock* block,
+  void markHopeless(odb::dbBlock* block,
                     int max_displacement_x,
                     int max_displacement_y);
-  void markBlocked(dbBlock* block);
-  void visitDbRows(dbBlock* block,
+  void markBlocked(odb::dbBlock* block);
+  void visitDbRows(odb::dbBlock* block,
                    const std::function<void(odb::dbRow*)>& func) const;
 
   Logger* logger_ = nullptr;
-  dbBlock* block_ = nullptr;
+  odb::dbBlock* block_ = nullptr;
   std::shared_ptr<Padding> padding_;
   Pixels pixels_;
   // Contains all the rows' yLo plus the yHi of the last row.  The extra

src/dpl/src/infrastructure/Objects.cpp

@@ -9,6 +9,7 @@
 #include <vector>
 
 #include "dpl/Opendp.h"
+#include "odb/db.h"
 #include "odb/dbTypes.h"
 #include "odb/geom.h"
 

src/dpl/src/infrastructure/Objects.h

@@ -9,6 +9,7 @@
 
 #include "Coordinates.h"
 #include "dpl/Opendp.h"
+#include "odb/db.h"
 #include "odb/dbTypes.h"
 #include "odb/geom.h"
 

src/dpl/src/infrastructure/Padding.cpp

@@ -5,6 +5,7 @@
 
 #include "Objects.h"
 #include "dpl/Opendp.h"
+#include "odb/db.h"
 
 namespace dpl {
 

src/est/include/est/EstimateParasitics.h

@@ -43,7 +43,6 @@ namespace est {
 
 using utl::Logger;
 
-using odb::dbBlock;
 using odb::dbDatabase;
 using odb::dbNet;
 using odb::dbTechLayer;
@@ -228,14 +227,14 @@ class EstimateParasitics : public dbStaState
   void highlightSteiner(const Pin* drvr);
 
   dbNetwork* getDbNetwork() { return db_network_; }
-  dbBlock* getBlock() { return block_; }
+  odb::dbBlock* getBlock() { return block_; }
   GlobalRouter* getGlobalRouter() { return global_router_; }
   IncrementalGRoute* getIncrementalGRT() { return incr_groute_; }
   void setIncrementalGRT(IncrementalGRoute* incr_groute)
   {
     incr_groute_ = incr_groute;
   }
-  void setDbCbkOwner(dbBlock* block);
+  void setDbCbkOwner(odb::dbBlock* block);
   void removeDbCbkOwner();
 
   void initBlock();
@@ -276,7 +275,7 @@ class EstimateParasitics : public dbStaState
   IncrementalGRoute* incr_groute_ = nullptr;
   dbNetwork* db_network_ = nullptr;
   dbDatabase* db_ = nullptr;
-  dbBlock* block_ = nullptr;
+  odb::dbBlock* block_ = nullptr;
   std::unique_ptr<OdbCallBack> db_cbk_;
 
   std::vector<odb::dbTechLayer*> signal_layers_;