ifp: Check -gap value is positive.

Signed-off-by: Christian COSTA <christian.costa@st.com>

Author: titan73

src/ifp/include/ifp/InitFloorplan.hh

@@ -3,6 +3,8 @@
 
 #pragma once
 
+#include <cstdint>
+#include <limits>
 #include <set>
 #include <string>
 #include <vector>
@@ -51,7 +53,7 @@ class InitFloorplan
                      const std::vector<odb::dbSite*>& additional_sites = {},
                      RowParity row_parity = RowParity::NONE,
                      const std::set<odb::dbSite*>& flipped_sites = {},
-                     int gap = -1);
+                     int gap = std::numeric_limits<std::int32_t>::min());
 
   // The base_site determines the single-height rows.  For hybrid rows it is
   // a site containing a row pattern.
@@ -61,7 +63,7 @@ class InitFloorplan
                      const std::vector<odb::dbSite*>& additional_sites = {},
                      RowParity row_parity = RowParity::NONE,
                      const std::set<odb::dbSite*>& flipped_sites = {},
-                     int gap = -1);
+                     int gap = std::numeric_limits<std::int32_t>::min());
 
   void insertTiecells(odb::dbMTerm* tie_term,
                       const std::string& prefix = "TIEOFF_");
@@ -92,7 +94,7 @@ class InitFloorplan
                            = {},
                            RowParity row_parity = RowParity::NONE,
                            const std::set<odb::dbSite*>& flipped_sites = {},
-                           int gap = -1);
+                           int gap = std::numeric_limits<std::int32_t>::min());
 
   // The base_site determines the single-height rows.  For hybrid rows it is
   // a site containing a row pattern.
@@ -101,15 +103,15 @@ class InitFloorplan
                 const std::vector<odb::dbSite*>& additional_sites = {},
                 RowParity row_parity = RowParity::NONE,
                 const std::set<odb::dbSite*>& flipped_sites = {},
-                int gap = -1);
+                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,
                        const std::set<odb::dbSite*>& flipped_sites = {},
-                       int gap = -1);
+                       int gap = std::numeric_limits<std::int32_t>::min());
 
   void makeTracks();
   void makeTracks(odb::dbTechLayer* layer,
@@ -178,6 +180,8 @@ class InitFloorplan
   // this is a set of sets of all constructed site ids.
   std::set<std::set<int>> constructed_patterns_;
   std::vector<std::vector<odb::dbSite*>> repeating_row_patterns_;
+
+  void checkGap(int gap);
 };
 
 }  // namespace ifp

src/ifp/src/InitFloorplan.cc

@@ -6,6 +6,7 @@
 #include <algorithm>
 #include <cmath>
 #include <cstddef>
+#include <cstdint>
 #include <limits>
 #include <map>
 #include <set>
@@ -88,6 +89,13 @@ InitFloorplan::InitFloorplan(dbBlock* block,
 {
 }
 
+void InitFloorplan::checkGap(const int gap)
+{
+  if (gap != std::numeric_limits<int32_t>::min() && gap <= 0) {
+    logger_->error(IFP, 36, "Gap must be positive ({})", gap);
+  }
+}
+
 void InitFloorplan::initFloorplan(
     double utilization,
     double aspect_ratio,
@@ -101,6 +109,8 @@ void InitFloorplan::initFloorplan(
     const std::set<odb::dbSite*>& flipped_sites,
     const int gap)
 {
+  checkGap(gap);
+
   makeDieUtilization(utilization,
                      aspect_ratio,
                      core_space_bottom,
@@ -129,6 +139,8 @@ void InitFloorplan::initFloorplan(
     const std::set<odb::dbSite*>& flipped_sites,
     const int gap)
 {
+  checkGap(gap);
+
   makeDie(die);
   makeRows(core, base_site, additional_sites, row_parity, flipped_sites, gap);
 }
@@ -212,6 +224,8 @@ void InitFloorplan::makePolygonRows(
     const std::set<odb::dbSite*>& flipped_sites,
     const int gap)
 {
+  checkGap(gap);
+
   auto points = core_polygon.getPoints();
 
   if (points.empty()) {
@@ -344,6 +358,8 @@ void InitFloorplan::makeRowsWithSpacing(
     const std::set<odb::dbSite*>& flipped_sites,
     const int gap)
 {
+  checkGap(gap);
+
   odb::Rect block_die_area = block_->getDieArea();
   if (block_die_area.area() == 0) {
     logger_->error(IFP, 64, "Floorplan die area is 0. Cannot build rows.");
@@ -381,6 +397,8 @@ void InitFloorplan::makeRows(const odb::Rect& core,
                              const std::set<odb::dbSite*>& flipped_sites,
                              const int gap)
 {
+  checkGap(gap);
+
   odb::Rect block_die_area = block_->getDieArea();
   if (block_die_area.area() == 0) {
     logger_->error(IFP, 63, "Floorplan die area is 0. Cannot build rows.");
@@ -522,7 +540,9 @@ void InitFloorplan::updateVoltageDomain(const int core_lx,
         }
       }
       // Default space is 6 times the minimum site height
-      const int power_domain_y_space = (gap == -1) ? 6 * min_site_dy : gap;
+      const int power_domain_y_space
+          = (gap == std::numeric_limits<int32_t>::min()) ? 6 * min_site_dy
+                                                         : gap;
 
       row_itr = rows.begin();
       for (int row_processed = 0; row_processed < total_row_count;

src/ifp/src/InitFloorplan.tcl

@@ -111,7 +111,7 @@ proc make_rows_helper { key_array } {
   }
 
   # Get gap space
-  set gap -1
+  set gap [expr -(2 ** 31)]
   if { [info exists keys(-gap)] } {
     set gap [ord::microns_to_dbu $keys(-gap)]
   }
@@ -450,7 +450,7 @@ proc make_polygon_rows_helper { key_array } {
   }
 
   # Get gap space
-  set gap -1
+  set gap [expr -(2 ** 31)]
   if { [info exists keys(-gap)] } {
     set gap [ord::microns_to_dbu $keys(-gap)]
   }