Merge pull request #9196 from The-OpenROAD-Project-staging/tidy3

Tidy3

Author: maliberty

src/ant/src/AntennaChecker.cc

@@ -1212,8 +1212,7 @@ int AntennaChecker::Impl::checkAntennas(odb::dbNet* net,
     }
     omp_set_num_threads(num_threads);
 #pragma omp parallel for schedule(dynamic)
-    for (int i = 0; i < nets_.size(); i++) {
-      odb::dbNet* net = nets_[i];
+    for (auto net : nets_) {
       Violations antenna_violations;
       int pin_viol_count
           = checkNet(net, verbose, true, nullptr, 0, antenna_violations);

src/ant/src/Polygon.cc

@@ -15,10 +15,6 @@
 
 namespace ant {
 
-using gtl::operators::operator+=;
-using gtl::operators::operator-=;
-using gtl::operators::operator&;
-
 Polygon rectToPolygon(const odb::Rect& rect)
 {
   std::vector<Point> points{{gtl::construct<Point>(rect.xMin(), rect.yMin()),
@@ -34,6 +30,9 @@ Polygon rectToPolygon(const odb::Rect& rect)
 std::vector<int> findNodesWithIntersection(const GraphNodes& graph_nodes,
                                            const Polygon& pol)
 {
+  using gtl::operators::operator+=;
+  using gtl::operators::operator&;
+
   // expand object by 1
   PolygonSet obj;
   obj += pol;
@@ -53,6 +52,8 @@ std::vector<int> findNodesWithIntersection(const GraphNodes& graph_nodes,
 void wiresToPolygonSetMap(odb::dbWire* wires,
                           std::map<odb::dbTechLayer*, PolygonSet>& set_by_layer)
 {
+  using gtl::operators::operator+=;
+
   odb::dbShape shape;
   odb::dbWireShapeItr shapes_it;
   std::vector<odb::dbShape> via_boxes;
@@ -85,6 +86,8 @@ void wiresToPolygonSetMap(odb::dbWire* wires,
 void avoidPinIntersection(odb::dbNet* db_net,
                           std::map<odb::dbTechLayer*, PolygonSet>& set_by_layer)
 {
+  using gtl::operators::operator-=;
+
   // iterate all instance pin
   for (odb::dbITerm* iterm : db_net->getITerms()) {
     odb::dbMTerm* mterm = iterm->getMTerm();

src/cts/src/HTreeBuilder.cpp

@@ -323,7 +323,9 @@ void HTreeBuilder::initSinkRegion()
   logger_->info(CTS, 26, "    Height: {:.4f}.", sinkRegion_.getHeight());
 }
 
-void plotBlockage(std::ofstream& file, odb::dbDatabase* db_, int scalingFactor)
+static void plotBlockage(std::ofstream& file,
+                         odb::dbDatabase* db_,
+                         int scalingFactor)
 {
   unsigned i = 0;
   for (odb::dbBlockage* blockage : db_->getChip()->getBlock()->getBlockages()) {
@@ -351,7 +353,8 @@ double HTreeBuilder::weightedDistance(const Point<double>& newLoc,
   return dist;
 }
 
-void plotSinks(std::ofstream& file, const std::vector<Point<double>>& sinks)
+static void plotSinks(std::ofstream& file,
+                      const std::vector<Point<double>>& sinks)
 {
   unsigned cnt = 0;
   for (const Point<double>& pt : sinks) {
@@ -407,9 +410,9 @@ void HTreeBuilder::scalePosition(Point<double>& loc,
   loc.setY(y);
 }
 
-void setSiblingPosition(const Point<double>& a,
-                        Point<double>& b,
-                        const Point<double>& parLoc)
+static void setSiblingPosition(const Point<double>& a,
+                               Point<double>& b,
+                               const Point<double>& parLoc)
 {
   double px = parLoc.getX();
   double py = parLoc.getY();

src/cts/src/TritonCTS.cpp

@@ -685,13 +685,6 @@ void TritonCTS::setBufferList(const char* buffers)
   options_->setBufferList(bufferList);
 }
 
-std::string toLowerCase(std::string str)
-{
-  std::ranges::transform(
-      str, str.begin(), [](unsigned char c) { return std::tolower(c); });
-  return str;
-}
-
 std::string TritonCTS::getRootBufferToString()
 {
   std::ostringstream buffer_names;
@@ -2235,7 +2228,7 @@ double TritonCTS::computeInsertionDelay(const std::string& name,
   return insDelayPerMicron;
 }
 
-float getInputCap(const sta::LibertyCell* cell)
+static float getInputCap(const sta::LibertyCell* cell)
 {
   sta::LibertyPort *in, *out;
   cell->bufferPorts(in, out);
@@ -2245,7 +2238,7 @@ float getInputCap(const sta::LibertyCell* cell)
   return 0.0;
 }
 
-sta::LibertyCell* findBestDummyCell(
+static sta::LibertyCell* findBestDummyCell(
     const std::vector<sta::LibertyCell*>& dummyCandidates,
     float deltaCap)
 {

src/dbSta/src/SpefWriter.cc

@@ -38,7 +38,7 @@ SpefWriter::SpefWriter(Logger* logger,
   writePorts();
 }
 
-std::string escapeSpecial(const std::string& name)
+static std::string escapeSpecial(const std::string& name)
 {
   std::string result = name;
   size_t pos = 0;
@@ -49,7 +49,7 @@ std::string escapeSpecial(const std::string& name)
   return result;
 }
 
-std::string escapeSpecial(const char* name)
+static std::string escapeSpecial(const char* name)
 {
   if (!name) {
     return "";
@@ -60,7 +60,7 @@ std::string escapeSpecial(const char* name)
 // Quick fix for wrong pin delimiter.
 // TODO: save the parasitics data to odb and use the existing write_spef
 // mechanism to produce the spef files from estimate_parasitics.
-std::string fixPinDelimiter(const std::string& name)
+static std::string fixPinDelimiter(const std::string& name)
 {
   const char delimiter = '/';
   std::string result = name;
@@ -104,7 +104,7 @@ void SpefWriter::writeHeader()
   }
 }
 
-char getIoDirectionText(const odb::dbIoType& io_type)
+static char getIoDirectionText(const odb::dbIoType& io_type)
 {
   if (io_type == odb::dbIoType::INPUT) {
     return 'I';

src/dbSta/src/dbSta.cc

@@ -571,7 +571,7 @@ void dbSta::countPhysicalOnlyInstancesByType(InstTypeMap& inst_type_stats,
   }
 }
 
-std::string toLowerCase(std::string str)
+static std::string toLowerCase(std::string str)
 {
   std::ranges::transform(
       str, str.begin(), [](unsigned char c) { return std::tolower(c); });

src/dbSta/test/cpp/TestHconn.cpp

@@ -34,13 +34,14 @@
 namespace odb {
 
 static const std::string prefix("_main/src/dbSta/test/");
+static constexpr bool kDebugMsgs = false;
 
 /*
   Extract the hierarchical information in human readable format.
   Shows the dbNet and dbModNet view of the database.
 */
 
-void DbStrDebugHierarchy(dbBlock* block, std::stringstream& str_db)
+static void DbStrDebugHierarchy(dbBlock* block, std::stringstream& str_db)
 {
   str_db << fmt::format("Debug: Data base tables for block at {}:\n",
                         block->getName());
@@ -527,9 +528,11 @@ class TestHconn : public ::tst::Fixture
     inv4_3_op_->connect(op2_net_);
     inv4_4_op_->connect(op3_net_);
 
-    // std::stringstream str_str;
-    //    DbStrDebugHierarchy(block_, str_str);
-    //    printf("The Flat design created %s\n", str_str.str().c_str());
+    if (kDebugMsgs) {
+      std::stringstream str_str;
+      DbStrDebugHierarchy(block_, str_str);
+      printf("The Flat design created %s\n", str_str.str().c_str());
+    }
 
     // Now build the hierarchical "overlay"
     // What we are doing here is adding the modnets which hook up
@@ -645,11 +648,12 @@ class TestHconn : public ::tst::Fixture
     inv4_mod_level2_inst_o3_miterm_->connect(inv4_mod_level2_inst_o3_mnet_);
     inv4_mod_level1_master_o3_port_->connect(inv4_mod_level2_inst_o3_mnet_);
 
-    // Uncomment this to see the full design
-    //    std::stringstream full_design;
-    //    DbStrDebugHierarchy(block_, full_design);
-    //    printf("The  design created (flat and hierarchical) %s\n",
-    //	   full_design.str().c_str());
+    if (kDebugMsgs) {
+      std::stringstream full_design;
+      DbStrDebugHierarchy(block_, full_design);
+      printf("The  design created (flat and hierarchical) %s\n",
+             full_design.str().c_str());
+    }
   }
 
   sta::LibertyLibrary* library_;
@@ -788,9 +792,11 @@ class TestHconn : public ::tst::Fixture
 
 TEST_F(TestHconn, ConnectionMade)
 {
-  //  std::stringstream str_str_initial;
-  //  DbStrDebugHierarchy(block_, str_str_initial);
-  //  printf("The initial design: %s\n", str_str_initial.str().c_str());
+  if (kDebugMsgs) {
+    std::stringstream str_str_initial;
+    DbStrDebugHierarchy(block_, str_str_initial);
+    printf("The initial design: %s\n", str_str_initial.str().c_str());
+  }
 
   // ECO test: get initial state before we start modifying
   // the design. Then at end we undo everything and
@@ -896,10 +902,11 @@ TEST_F(TestHconn, ConnectionMade)
   db_network_->hierarchicalConnect(
       inv1_2_inst_op0, inv4_4_ip_, hier_net_name.c_str());
 
-  // Uncomment this to see the final design
-  //  std::stringstream str_str_final;
-  //  DbStrDebugHierarchy(block_, str_str_final);
-  //  printf("The final design: %s\n", str_str_final.str().c_str());
+  if (kDebugMsgs) {
+    std::stringstream str_str_final;
+    DbStrDebugHierarchy(block_, str_str_final);
+    printf("The final design: %s\n", str_str_final.str().c_str());
+  }
 
   // Example of how to turn on the call backs for all the bterms/iterms
   // used by the sta

src/dpl/src/CheckPlacement.cpp

@@ -22,7 +22,7 @@ using std::vector;
 
 using utl::DPL;
 
-using utl::format_as;
+using utl::format_as;  // NOLINT(misc-unused-using-decls)
 
 void Opendp::checkPlacement(const bool verbose,
                             const std::string& report_file_name)

src/dpl/src/FillerPlacement.cpp

@@ -22,7 +22,7 @@ using utl::DPL;
 using odb::dbMaster;
 using odb::dbPlacementStatus;
 
-using utl::format_as;
+using utl::format_as;  // NOLINT(misc-unused-using-decls)
 
 static odb::dbTechLayer* getImplant(dbMaster* master)
 {

src/dpl/src/OptMirror.cpp

@@ -19,7 +19,6 @@ namespace dpl {
 
 using utl::DPL;
 
-using std::sort;
 using std::unordered_set;
 
 using odb::dbITerm;