Merge pull request #9154 from The-OpenROAD-Project-staging/tidy

Fix many categories of clang-tidy

Author: maliberty

src/OpenRoad.cc

@@ -102,10 +102,8 @@ extern int Ord_Init(Tcl_Interp* interp);
 
 namespace ord {
 
-using odb::dbBlock;
 using odb::dbChip;
 using odb::dbDatabase;
-using odb::dbLib;
 using odb::dbTech;
 
 using utl::ORD;

src/cts/src/HTreeBuilder.h

@@ -32,7 +32,7 @@ class SegmentBuilder
                  Clock& clock,
                  ClockSubNet& drivingSubNet,
                  const TechChar& techChar,
-                 const unsigned techCharDistUnit,
+                 unsigned techCharDistUnit,
                  TreeBuilder* tree);
 
   void build(const std::string& forceBuffer = "");

src/cts/src/SinkClustering.cpp

@@ -212,7 +212,7 @@ bool SinkClustering::findBestMatching(const unsigned groupSize)
                "Stree",
                1,
                "Clustering with max cap limit of {:.3e}",
-               options_->getSinkBufferInputCap() * max_cap__factor_);
+               options_->getSinkBufferInputCap() * kMaxCapFactor);
   }
   // Iterates over the theta vector.
   for (unsigned i = 0; i < thetaIndexVector_.size(); ++i) {
@@ -416,7 +416,7 @@ bool SinkClustering::isLimitExceeded(const unsigned size,
                                      const unsigned sizeLimit)
 {
   if (useMaxCapLimit_) {
-    return (capCost > options_->getSinkBufferInputCap() * max_cap__factor_);
+    return (capCost > options_->getSinkBufferInputCap() * kMaxCapFactor);
   }
 
   return (size >= sizeLimit || cost > maxInternalDiameter_);

src/cts/src/SinkClustering.h

@@ -92,7 +92,7 @@ class SinkClustering
   float capPerUnit_;
   bool useMaxCapLimit_;
   int scaleFactor_;
-  static constexpr double max_cap__factor_ = 10;
+  static constexpr double kMaxCapFactor = 10;
   HTreeBuilder* HTree_;
   bool firstRun_ = true;
   double xSpan_ = 0.0;

src/cts/src/TritonCTS.cpp

@@ -249,7 +249,7 @@ void TritonCTS::checkCharacterization()
   techChar_->forEachWireSegment([&](unsigned idx, const WireSegment& wireSeg) {
     for (int buf = 0; buf < wireSeg.getNumBuffers(); ++buf) {
       const std::string& master = wireSeg.getBufferMaster(buf);
-      if (visitedMasters.count(master) == 0) {
+      if (!visitedMasters.contains(master)) {
         if (masterExists(master)) {
           visitedMasters.insert(master);
         } else {

src/cut/include/cut/blif.h

@@ -41,8 +41,8 @@ class Blif
   bool inspectBlif(const char* file_name, int& num_instances);
   float getRequiredTime(sta::Pin* term, bool is_rise);
   float getArrivalTime(sta::Pin* term, bool is_rise);
-  void addArrival(sta::Pin* pin, std::string netName);
-  void addRequired(sta::Pin* pin, std::string netName);
+  void addArrival(sta::Pin* pin, const std::string& netName);
+  void addRequired(sta::Pin* pin, const std::string& netName);
 
  private:
   std::set<odb::dbInst*> instances_to_optimize_;

src/cut/src/blif.cpp

@@ -172,13 +172,13 @@ bool Blif::writeBlif(const char* file_name, bool write_arrival_requireds)
                     && (expr->op() == sta::FuncExpr::op_zero
                         || expr->op() == sta::FuncExpr::op_one)) {
                   if (expr->op() == sta::FuncExpr::op_zero) {
-                    if (!const0.size()) {
+                    if (const0.empty()) {
                       const0_cell_ = port_->libertyCell()->name();
                       const0_cell_port_ = port_->name();
                     }
                     const0.insert(netName);
                   } else {
-                    if (!const1.size()) {
+                    if (const1.empty()) {
                       const1_cell_ = port_->libertyCell()->name();
                       const1_cell_port_ = port_->name();
                     }
@@ -291,7 +291,7 @@ bool Blif::writeBlif(const char* file_name, bool write_arrival_requireds)
   }
   f << "\n";
 
-  if (clocks.size() > 0) {
+  if (!clocks.empty()) {
     f << ".clock";
     for (auto& clock : clocks) {
       f << " " << clock;
@@ -420,7 +420,7 @@ bool Blif::readBlif(const char* file_name, odb::dbBlock* block)
     for (auto iterm : iterms) {
       auto net = iterm->getNet();
       iterm->disconnect();
-      if (net && net->getITerms().size() == 0 && net->getBTerms().size() == 0) {
+      if (net && net->getITerms().empty() && net->getBTerms().empty()) {
         odb::dbNet::destroy(net);
       }
     }
@@ -447,7 +447,7 @@ bool Blif::readBlif(const char* file_name, odb::dbBlock* block)
 
     if (master == nullptr
         && (masterName == "_const0_" || masterName == "_const1_")) {
-      if (connections.size() < 1) {
+      if (connections.empty()) {
         logger_->info(CUT,
                       9,
                       "Const driver {} doesn't have any connected nets.",
@@ -566,7 +566,7 @@ bool Blif::readBlif(const char* file_name, odb::dbBlock* block)
         }
       }
 
-      if (mtermName == "") {
+      if (mtermName.empty()) {
         logger_->info(CUT,
                       13,
                       "Could not connect instance of cell type {} to {} net "
@@ -613,15 +613,15 @@ float Blif::getArrivalTime(sta::Pin* term, bool is_rise)
   return arr;
 }
 
-void Blif::addArrival(sta::Pin* pin, std::string netName)
+void Blif::addArrival(sta::Pin* pin, const std::string& netName)
 {
   if (arrivals_.find(netName) == arrivals_.end()) {
     arrivals_[netName] = std::pair<float, float>(
         getArrivalTime(pin, true) * 1e12, getArrivalTime(pin, false) * 1e12);
   }
 }
 
-void Blif::addRequired(sta::Pin* pin, std::string netName)
+void Blif::addRequired(sta::Pin* pin, const std::string& netName)
 {
   if (requireds_.find(netName) == requireds_.end()) {
     requireds_[netName] = std::pair<float, float>(

src/cut/src/blifParser.cpp

@@ -28,7 +28,7 @@ namespace blif_parser {
 namespace qi = boost::spirit::qi;
 namespace ascii = boost::spirit::ascii;
 
-using namespace boost::placeholders;
+using boost::placeholders::_1;
 
 using boost::spirit::ascii::space_type;
 using boost::spirit::ascii::string;
@@ -38,43 +38,43 @@ using qi::lexeme;
 using ascii::char_;
 using ascii::space;
 
-void setNewInput(std::string input, cut::BlifParser* parser)
+void setNewInput(const std::string& input, cut::BlifParser* parser)
 {
   if (input != "\\") {
     parser->addInput(input);
   }
 }
 
-void setNewOutput(std::string output, cut::BlifParser* parser)
+void setNewOutput(const std::string& output, cut::BlifParser* parser)
 {
   if (output != "\\") {
     parser->addOutput(output);
   }
 }
 
-void setNewClock(std::string clock, cut::BlifParser* parser)
+void setNewClock(const std::string& clock, cut::BlifParser* parser)
 {
   if (clock != "\\") {
     parser->addClock(clock);
   }
 }
 
-void setNewInstanceType(std::string type, cut::BlifParser* parser)
+void setNewInstanceType(const std::string& type, cut::BlifParser* parser)
 {
   parser->addNewInstanceType(type);
 }
 
-void setNewGate(std::string gate, cut::BlifParser* parser)
+void setNewGate(const std::string& gate, cut::BlifParser* parser)
 {
   parser->addNewGate(gate);
 }
 
-void setGateNets(std::string net, cut::BlifParser* parser)
+void setGateNets(const std::string& net, cut::BlifParser* parser)
 {
   parser->addConnection(net);
 }
 
-void endParser(std::string end, cut::BlifParser* parser)
+void endParser(const std::string& end, cut::BlifParser* parser)
 {
   parser->endParser();
 }

src/dbSta/src/dbNetwork.cc

@@ -4215,7 +4215,7 @@ dbModNet* dbNetwork::findModNetForPin(const Pin* drvr_pin)
 
 bool dbNetwork::hasHierarchicalElements() const
 {
-  if (block()->getModNets().size() != 0) {
+  if (!block()->getModNets().empty()) {
     return true;
   }
   return false;

src/dbSta/src/dbSta.cc

@@ -146,7 +146,7 @@ class dbStaReport : public sta::ReportTcl
 class dbStaCbk : public dbBlockCallBackObj
 {
  public:
-  dbStaCbk(dbSta* sta, Logger* logger);
+  dbStaCbk(dbSta* sta);
   void setNetwork(dbNetwork* network);
   void inDbInstCreate(dbInst* inst) override;
   void inDbInstDestroy(dbInst* inst) override;
@@ -175,7 +175,6 @@ class dbStaCbk : public dbBlockCallBackObj
 
   dbSta* sta_;
   dbNetwork* network_ = nullptr;
-  Logger* logger_;
 };
 
 ////////////////////////////////////////////////////////////////
@@ -229,7 +228,7 @@ void dbSta::initVars(Tcl_Interp* tcl_interp,
   }
   db_report_->setLogger(logger);
   db_network_->init(db, logger);
-  db_cbk_ = std::make_unique<dbStaCbk>(this, logger);
+  db_cbk_ = std::make_unique<dbStaCbk>(this);
   buffer_use_analyser_ = std::make_unique<BufferUseAnalyser>();
 }
 
@@ -930,7 +929,7 @@ const char* dbStaReport::redirectStringEnd()
 //
 ////////////////////////////////////////////////////////////////
 
-dbStaCbk::dbStaCbk(dbSta* sta, Logger* logger) : sta_(sta), logger_(logger)
+dbStaCbk::dbStaCbk(dbSta* sta) : sta_(sta)
 {
 }