Merge pull request #10190 from The-OpenROAD-Project-staging/ifp-tidy-naming

ifp: adjust naming to Google-style (excluding method names)

Author: maliberty

src/ifp/include/ifp/InitFloorplan.hh

@@ -24,9 +24,9 @@ namespace ifp {
 
 enum class RowParity
 {
-  NONE,
-  EVEN,
-  ODD
+  kNone,
+  kEven,
+  kOdd
 };
 
 class InitFloorplan
@@ -50,7 +50,7 @@ class InitFloorplan
                      int core_space_right,
                      odb::dbSite* base_site,
                      const std::vector<odb::dbSite*>& additional_sites = {},
-                     RowParity row_parity = RowParity::NONE,
+                     RowParity row_parity = RowParity::kNone,
                      const std::set<odb::dbSite*>& flipped_sites = {},
                      int gap = std::numeric_limits<std::int32_t>::min());
 
@@ -60,7 +60,7 @@ class InitFloorplan
                      const odb::Rect& core,
                      odb::dbSite* base_site,
                      const std::vector<odb::dbSite*>& additional_sites = {},
-                     RowParity row_parity = RowParity::NONE,
+                     RowParity row_parity = RowParity::kNone,
                      const std::set<odb::dbSite*>& flipped_sites = {},
                      int gap = std::numeric_limits<std::int32_t>::min());
 
@@ -91,7 +91,7 @@ class InitFloorplan
                            odb::dbSite* base_site,
                            const std::vector<odb::dbSite*>& additional_sites
                            = {},
-                           RowParity row_parity = RowParity::NONE,
+                           RowParity row_parity = RowParity::kNone,
                            const std::set<odb::dbSite*>& flipped_sites = {},
                            int gap = std::numeric_limits<std::int32_t>::min());
 
@@ -100,15 +100,15 @@ class InitFloorplan
   void makeRows(const odb::Rect& core,
                 odb::dbSite* base_site,
                 const std::vector<odb::dbSite*>& additional_sites = {},
-                RowParity row_parity = RowParity::NONE,
+                RowParity row_parity = RowParity::kNone,
                 const std::set<odb::dbSite*>& flipped_sites = {},
                 int gap = std::numeric_limits<std::int32_t>::min());
 
   // Create rows for a polygon core area using true polygon-aware generation
   void makePolygonRows(const odb::Polygon& core_polygon,
                        odb::dbSite* base_site,
                        const std::vector<odb::dbSite*>& additional_sites = {},
-                       RowParity row_parity = RowParity::NONE,
+                       RowParity row_parity = RowParity::kNone,
                        const std::set<odb::dbSite*>& flipped_sites = {},
                        int gap = std::numeric_limits<std::int32_t>::min());
 

src/ifp/src/InitFloorplan-py.i

@@ -26,13 +26,13 @@
   const char *str = PyUnicode_AsUTF8AndSize($input, &size);
 
   if (strcasecmp(str, "NONE") == 0) {
-    $1 = ifp::RowParity::NONE;
+    $1 = ifp::RowParity::kNone;
   } else if (strcasecmp(str, "EVEN") == 0) {
-    $1 = ifp::RowParity::EVEN;
+    $1 = ifp::RowParity::kEven;
   } else if (strcasecmp(str, "ODD") == 0) {
-    $1 = ifp::RowParity::ODD;
+    $1 = ifp::RowParity::kOdd;
   } else {
-    $1 = ifp::RowParity::NONE;
+    $1 = ifp::RowParity::kNone;
   }
 }
 

src/ifp/src/InitFloorplan.cc

@@ -382,12 +382,12 @@ static int divCeil(int dividend, int divisor)
 static int applyRowParity(int rows_y, const RowParity row_parity)
 {
   switch (row_parity) {
-    case RowParity::NONE:
+    case RowParity::kNone:
       break;
-    case RowParity::EVEN:
+    case RowParity::kEven:
       rows_y = (rows_y / 2) * 2;
       break;
-    case RowParity::ODD:
+    case RowParity::kOdd:
       if (rows_y > 0 && rows_y % 2 == 0) {
         rows_y--;
       }
@@ -498,7 +498,7 @@ void InitFloorplan::makeRows(const odb::Rect& core,
     }
 
     if (base_site->hasRowPattern()) {
-      if (row_parity != RowParity::NONE) {
+      if (row_parity != RowParity::kNone) {
         logger_->error(
             IFP,
             51,

src/ifp/src/InitFloorplan.i

@@ -48,13 +48,13 @@ static utl::Logger* getLogger() {
 %typemap(in) ifp::RowParity {
   char *str = Tcl_GetStringFromObj($input, 0);
   if (strcasecmp(str, "NONE") == 0) {
-    $1 = ifp::RowParity::NONE;
+    $1 = ifp::RowParity::kNone;
   } else if (strcasecmp(str, "EVEN") == 0) {
-    $1 = ifp::RowParity::EVEN;
+    $1 = ifp::RowParity::kEven;
   } else if (strcasecmp(str, "ODD") == 0) {
-    $1 = ifp::RowParity::ODD;
+    $1 = ifp::RowParity::kOdd;
   } else {
-    $1 = ifp::RowParity::NONE;
+    $1 = ifp::RowParity::kNone;
   }
 }