clang-tidy across many modules and remove Ath__ prefix

Signed-off-by: Matt Liberty <[email protected]>
The-OpenROAD-Project · Nov 6, 2024 · bbd0f35 · bbd0f35
1 parent 1531ad9
commit bbd0f35
Show file tree

Hide file tree

Showing 77 changed files with 1,516 additions and 1,651 deletions.
diff --git a/src/OpenRoad.cc b/src/OpenRoad.cc
@@ -109,7 +109,6 @@ using odb::dbChip;
 using odb::dbDatabase;
 using odb::dbLib;
 using odb::dbTech;
-using odb::Rect;
 
 using sta::evalTclInit;
 

diff --git a/src/dpl/src/CheckPlacement.cpp b/src/dpl/src/CheckPlacement.cpp
@@ -48,8 +48,6 @@ using std::vector;
 
 using utl::DPL;
 
-using utl::format_as;
-
 void Opendp::checkPlacement(const bool verbose,
                             const bool disallow_one_site_gaps,
                             const string& report_file_name)

diff --git a/src/dpl/src/FillerPlacement.cpp b/src/dpl/src/FillerPlacement.cpp
@@ -48,8 +48,6 @@ using utl::DPL;
 using odb::dbMaster;
 using odb::dbPlacementStatus;
 
-using utl::format_as;
-
 static dbTechLayer* getImplant(dbMaster* master)
 {
   if (!master) {

diff --git a/src/dpl/src/Grid.cpp b/src/dpl/src/Grid.cpp
@@ -59,8 +59,6 @@ using utl::DPL;
 using odb::dbBox;
 using odb::dbRow;
 
-using utl::format_as;
-
 PixelPt::PixelPt(Pixel* pixel1, GridX grid_x, GridY grid_y)
     : pixel(pixel1), x(grid_x), y(grid_y)
 {

diff --git a/src/dpl/src/Opendp.cpp b/src/dpl/src/Opendp.cpp
@@ -62,11 +62,8 @@ using std::string;
 
 using utl::DPL;
 
-using odb::dbMasterType;
 using odb::Rect;
 
-using utl::format_as;
-
 ////////////////////////////////////////////////////////////////
 
 bool Opendp::isMultiRow(const Cell* cell) const

diff --git a/src/dpl/src/Place.cpp b/src/dpl/src/Place.cpp
@@ -63,8 +63,6 @@ using std::vector;
 
 using utl::DPL;
 
-using utl::format_as;
-
 std::string Opendp::printBgBox(
     const boost::geometry::model::box<bgPoint>& queryBox)
 {

diff --git a/src/dpl/src/dbToOpendp.cpp b/src/dpl/src/dbToOpendp.cpp
@@ -48,8 +48,6 @@ namespace dpl {
 using std::string;
 using std::vector;
 
-using utl::DPL;
-
 using odb::dbBox;
 using odb::dbMaster;
 using odb::dbOrientType;

diff --git a/src/drt/src/io/io_parser_helper.cpp b/src/drt/src/io/io_parser_helper.cpp
@@ -257,7 +257,7 @@ std::pair<frCoord, frCoord> getBloatingDist(frTechObject* tech,
     }
     return bloats;
   }
-  return std::make_pair(0, 0);
+  return {0, 0};
 }
 
 }  // namespace

diff --git a/src/fin/src/DensityFill.cpp b/src/fin/src/DensityFill.cpp
@@ -317,7 +317,7 @@ static std::pair<int, int> getSpacing(dbTechLayer* layer,
     space_y = std::max(space_y, cfg.space_line_end);
   }
 
-  return std::make_pair(space_x, space_y);
+  return {space_x, space_y};
 }
 
 // Two different polygons might be less than min space apart and this

diff --git a/src/gpl/src/fft.cpp b/src/gpl/src/fft.cpp
@@ -118,7 +118,7 @@ void FFT::updateDensity(int x, int y, float density)
 
 std::pair<float, float> FFT::getElectroForce(int x, int y) const
 {
-  return std::make_pair(electroForceX_[x][y], electroForceY_[x][y]);
+  return {electroForceX_[x][y], electroForceY_[x][y]};
 }
 
 float FFT::getElectroPhi(int x, int y) const

diff --git a/src/gpl/src/nesterovBase.cpp b/src/gpl/src/nesterovBase.cpp
@@ -828,7 +828,7 @@ std::pair<int, int> BinGrid::getDensityMinMaxIdxX(const GCell* gcell) const
 
   lowerIdx = std::max(lowerIdx, 0);
   upperIdx = std::min(upperIdx, binCntX_);
-  return std::make_pair(lowerIdx, upperIdx);
+  return {lowerIdx, upperIdx};
 }
 
 std::pair<int, int> BinGrid::getDensityMinMaxIdxY(const GCell* gcell) const
@@ -840,7 +840,7 @@ std::pair<int, int> BinGrid::getDensityMinMaxIdxY(const GCell* gcell) const
 
   lowerIdx = std::max(lowerIdx, 0);
   upperIdx = std::min(upperIdx, binCntY_);
-  return std::make_pair(lowerIdx, upperIdx);
+  return {lowerIdx, upperIdx};
 }
 
 std::pair<int, int> BinGrid::getMinMaxIdxX(const Instance* inst) const
@@ -850,7 +850,7 @@ std::pair<int, int> BinGrid::getMinMaxIdxX(const Instance* inst) const
                      ? (inst->ux() - lx()) / binSizeX_
                      : (inst->ux() - lx()) / binSizeX_ + 1;
 
-  return std::make_pair(std::max(lowerIdx, 0), std::min(upperIdx, binCntX_));
+  return {std::max(lowerIdx, 0), std::min(upperIdx, binCntX_)};
 }
 
 std::pair<int, int> BinGrid::getMinMaxIdxY(const Instance* inst) const
@@ -860,7 +860,7 @@ std::pair<int, int> BinGrid::getMinMaxIdxY(const Instance* inst) const
                      ? (inst->uy() - ly()) / binSizeY_
                      : (inst->uy() - ly()) / binSizeY_ + 1;
 
-  return std::make_pair(std::max(lowerIdx, 0), std::min(upperIdx, binCntY_));
+  return {std::max(lowerIdx, 0), std::min(upperIdx, binCntY_)};
 }
 
 ////////////////////////////////////////////////

diff --git a/src/gpl/src/placerBase.cpp b/src/gpl/src/placerBase.cpp
@@ -1363,7 +1363,7 @@ static std::pair<int, int> getMinMaxIdx(int ll,
   int upperIdx = (fastModulo((uu - coreLL), siteSize) == 0)
                      ? (uu - coreLL) / siteSize
                      : (uu - coreLL) / siteSize + 1;
-  return std::make_pair(std::max(minIdx, lowerIdx), std::min(maxIdx, upperIdx));
+  return {std::max(minIdx, lowerIdx), std::min(maxIdx, upperIdx)};
 }
 
 static bool isCoreAreaOverlap(Die& die, Instance& inst)

diff --git a/src/gpl/src/routeBase.cpp b/src/gpl/src/routeBase.cpp
@@ -585,7 +585,7 @@ std::pair<bool, bool> RouteBase::routability()
                "FinalRC lower than targetRC({}), routability not needed.",
                rbVars_.targetRC);
     resetRoutabilityResources();
-    return std::make_pair(false, false);
+    return {false, false};
   }
 
   //
@@ -724,7 +724,7 @@ std::pair<bool, bool> RouteBase::routability()
     nbVec_[0]->updateDensitySize();
     resetRoutabilityResources();
 
-    return std::make_pair(false, true);
+    return {false, true};
   }
 
   log_->info(GPL,
@@ -807,7 +807,7 @@ std::pair<bool, bool> RouteBase::routability()
   // reset
   resetRoutabilityResources();
 
-  return std::make_pair(true, true);
+  return {true, true};
 }
 
 void RouteBase::revertGCellSizeToMinRc()

diff --git a/src/gui/include/gui/gui.h b/src/gui/include/gui/gui.h
@@ -329,12 +329,12 @@ class Descriptor
 
   virtual bool lessThan(std::any l, std::any r) const = 0;
 
-  static const Editor makeEditor(const EditorCallback& func,
-                                 const std::vector<EditorOption>& options)
+  static Editor makeEditor(const EditorCallback& func,
+                           const std::vector<EditorOption>& options)
   {
     return {func, options};
   }
-  static const Editor makeEditor(const EditorCallback& func)
+  static Editor makeEditor(const EditorCallback& func)
   {
     return makeEditor(func, {});
   }
@@ -357,7 +357,7 @@ class Selected
 {
  public:
   // Null case
-  Selected() : object_({}), descriptor_(nullptr) {}
+  Selected() = default;
 
   Selected(std::any object, const Descriptor* descriptor)
       : object_(std::move(object)), descriptor_(descriptor)
@@ -429,7 +429,7 @@ class Selected
 
  private:
   std::any object_;
-  const Descriptor* descriptor_;
+  const Descriptor* descriptor_ = nullptr;
 };
 
 // This is an interface for classes that wish to be called to render

diff --git a/src/mpl/src/ParquetFP/src/skyline.cxx b/src/mpl/src/ParquetFP/src/skyline.cxx
@@ -347,7 +347,7 @@ float SkylineContour::GetHeight(float left, float right)
 std::pair<float, int> SkylineContour::GetHeightWithIdx(float left, float right)
 {
   if (!skyline_) {
-    return std::make_pair(0, -1);
+    return {0, -1};
   }
 
   float height = 0;
@@ -367,7 +367,7 @@ std::pair<float, int> SkylineContour::GetHeightWithIdx(float left, float right)
   }
 
   cout << "return height: " << height << endl;
-  return std::make_pair(height, idx);
+  return {height, idx};
 }
 
 // extract ContourArea

diff --git a/src/mpl2/include/mpl2/rtl_mp.h b/src/mpl2/include/mpl2/rtl_mp.h
@@ -65,7 +65,6 @@ class MacroPlacer2
 
   void init(sta::dbNetwork* network,
             odb::dbDatabase* db,
-            sta::dbSta* sta,
             utl::Logger* logger,
             par::PartitionMgr* tritonpart);
 
@@ -99,7 +98,7 @@ class MacroPlacer2
              float target_dead_space,
              float min_ar,
              int snap_layer,
-             bool bus_planning_flag,
+             bool bus_planning_on,
              const char* report_directory);
 
   void placeMacro(odb::dbInst* inst,

diff --git a/src/mpl2/src/MakeMacroPlacer.cpp b/src/mpl2/src/MakeMacroPlacer.cpp
@@ -61,7 +61,6 @@ void initMacroPlacer2(OpenRoad* openroad)
   sta::evalTclInit(tcl_interp, sta::mpl2_tcl_inits);
   openroad->getMacroPlacer2()->init(openroad->getDbNetwork(),
                                     openroad->getDb(),
-                                    openroad->getSta(),
                                     openroad->getLogger(),
                                     openroad->getPartitionMgr());
 }

diff --git a/src/mpl2/src/SimulatedAnnealingCore.cpp b/src/mpl2/src/SimulatedAnnealingCore.cpp
@@ -389,9 +389,7 @@ void SimulatedAnnealingCore<T>::packFloorplan()
   }
 
   std::vector<float> accumulated_length(pos_seq_.size(), 0.0);
-  for (int i = 0; i < pos_seq_.size(); i++) {
-    const int macro_id = pos_seq_[i];
-
+  for (const int macro_id : pos_seq_) {
     // There may exist pin access macros with zero area in our sequence pair
     // when bus planning is on. This check is a temporary approach.
     if (macros_[macro_id].getWidth() <= 0

diff --git a/src/mpl2/src/clusterEngine.cpp b/src/mpl2/src/clusterEngine.cpp
@@ -1337,8 +1337,7 @@ void ClusteringEngine::updateSubTree(Cluster* parent)
   // When breaking large flat clusters, the children will
   // be modified, so, we need to iterate them using indexes.
   const UniqueClusterVector& new_children = parent->getChildren();
-  for (int i = 0; i < new_children.size(); ++i) {
-    auto& child = new_children[i];
+  for (auto& child : new_children) {
     child->setParent(parent);
     if (child->getNumStdCell() > max_std_cell_) {
       breakLargeFlatCluster(child.get());
@@ -2152,4 +2151,4 @@ void ClusteringEngine::clearTempMacroClusterMapping(
   }
 }
 
-}  // namespace mpl2
+}  // namespace mpl2
diff --git a/src/mpl2/src/graphics.cpp b/src/mpl2/src/graphics.cpp
@@ -45,10 +45,6 @@ Graphics::Graphics(bool coarse,
                    utl::Logger* logger)
     : coarse_(coarse),
       fine_(fine),
-      show_bundled_nets_(false),
-      skip_steps_(false),
-      is_skipping_(false),
-      only_final_result_(false),
       block_(block),
       logger_(logger)
 {

diff --git a/src/mpl2/src/graphics.h b/src/mpl2/src/graphics.h
@@ -115,13 +115,13 @@ class Graphics : public gui::Renderer, public Mpl2Observer
   odb::Rect outline_;
   std::vector<std::vector<odb::Rect>> outlines_;
 
-  bool active_ = true;
+  bool active_{true};
   bool coarse_;
   bool fine_;
-  bool show_bundled_nets_;
-  bool skip_steps_;
-  bool is_skipping_;
-  bool only_final_result_;
+  bool show_bundled_nets_{false};
+  bool skip_steps_{false};
+  bool is_skipping_{false};
+  bool only_final_result_{false};
   odb::dbBlock* block_;
   utl::Logger* logger_;
 

diff --git a/src/mpl2/src/hier_rtlmp.cpp b/src/mpl2/src/hier_rtlmp.cpp
@@ -69,12 +69,10 @@ HierRTLMP::~HierRTLMP() = default;
 // Constructors
 HierRTLMP::HierRTLMP(sta::dbNetwork* network,
                      odb::dbDatabase* db,
-                     sta::dbSta* sta,
                      utl::Logger* logger,
                      par::PartitionMgr* tritonpart)
     : network_(network),
       db_(db),
-      sta_(sta),
       logger_(logger),
       tritonpart_(tritonpart),
       tree_(std::make_unique<PhysicalHierarchy>())

diff --git a/src/mpl2/src/hier_rtlmp.h b/src/mpl2/src/hier_rtlmp.h
@@ -99,7 +99,6 @@ class HierRTLMP
  public:
   HierRTLMP(sta::dbNetwork* network,
             odb::dbDatabase* db,
-            sta::dbSta* sta,
             utl::Logger* logger,
             par::PartitionMgr* tritonpart);
   ~HierRTLMP();
@@ -249,7 +248,6 @@ class HierRTLMP
   sta::dbNetwork* network_ = nullptr;
   odb::dbDatabase* db_ = nullptr;
   odb::dbBlock* block_ = nullptr;
-  sta::dbSta* sta_ = nullptr;
   utl::Logger* logger_ = nullptr;
   par::PartitionMgr* tritonpart_ = nullptr;
   std::unique_ptr<PhysicalHierarchy> tree_;