Merge branch 'master' into grt_delete_FrNet

fgaray · Dec 7, 2023 · abd7faa · abd7faa
2 parents f1ccd52 + aae7fc8
commit abd7faa
Show file tree

Hide file tree

Showing 27 changed files with 184 additions and 227 deletions.
diff --git a/src/dpl/src/Opendp.cpp b/src/dpl/src/Opendp.cpp
@@ -744,18 +744,18 @@ int Opendp::gridEndX(const Cell* cell) const
 
 int Opendp::gridEndY(const Cell* cell) const
 {
-  return gridEndY(cell->y_, cell);
+  return gridEndY(cell->y_ + cell->height_, cell);
 }
 
 int Opendp::gridEndY(int y, const Cell* cell) const
 {
   if (cell->isHybrid()) {
     auto grid_info = getGridInfo(cell);
     const auto& grid_sites = grid_info.getSites();
-    return gridY(y + cell->height_, grid_sites).first;
+    return gridY(y, grid_sites).first;
   }
   int row_height = getRowHeight(cell);
-  return divCeil(y + cell->height_, row_height);
+  return divCeil(y, row_height);
 }
 
 double Opendp::dbuToMicrons(int64_t dbu) const

diff --git a/src/drt/src/io/io.cpp b/src/drt/src/io/io.cpp
@@ -3204,6 +3204,7 @@ void io::Writer::updateDbConn(odb::dbBlock* block,
         }
       }
       _wire_encoder.end();
+      net->setWireOrdered(false);
     }
   }
 }

diff --git a/src/gpl/src/replace.cpp b/src/gpl/src/replace.cpp
@@ -482,8 +482,10 @@ void Replace::setUniformTargetDensityMode(bool mode)
 float Replace::getUniformTargetDensity()
 {
   // TODO: update to be compatible with multiple target densities
-  initNesterovPlace();
-  return nbVec_[0]->uniformTargetDensity();
+  if (initNesterovPlace()) {
+    return nbVec_[0]->uniformTargetDensity();
+  }
+  return 1;
 }
 
 void Replace::setInitDensityPenalityFactor(float penaltyFactor)

diff --git a/src/ppl/include/ppl/IOPlacer.h b/src/ppl/include/ppl/IOPlacer.h
@@ -35,6 +35,7 @@
 
 #pragma once
 
+#include <map>
 #include <memory>
 #include <set>
 #include <unordered_map>
@@ -268,6 +269,7 @@ class IOPlacer
   double dbuToMicrons(int64_t dbu);
   int micronsToDbu(double microns);
   Edge getMirroredEdge(const Edge& edge);
+  int computeRegionIncrease(const Interval& interval, int num_pins);
 
   // db functions
   void populateIOPlacer(const std::set<int>& hor_layer_idx,
@@ -293,6 +295,7 @@ class IOPlacer
   // router
   const int num_tracks_offset_ = 15;
   const int pins_per_report_ = 5;
+  const int default_min_dist_ = 2;
 
   std::vector<Interval> excluded_intervals_;
   std::vector<Constraint> constraints_;

diff --git a/src/ppl/src/Core.h b/src/ppl/src/Core.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <map>
+
 #include "odb/geom.h"
 
 namespace ppl {
@@ -47,16 +49,16 @@ class Core
  public:
   Core();
   Core(const Rect& boundary,
-       const std::vector<int>& min_dst_pins_x,
-       const std::vector<int>& min_dst_pins_y,
-       const std::vector<int>& init_tracks_x,
-       const std::vector<int>& init_tracks_y,
-       const std::vector<int>& num_tracks_x,
-       const std::vector<int>& num_tracks_y,
-       const std::vector<int>& min_area_x,
-       const std::vector<int>& min_area_y,
-       const std::vector<int>& min_width_x,
-       const std::vector<int>& min_width_y,
+       const std::map<int, int>& min_dst_pins_x,
+       const std::map<int, int>& min_dst_pins_y,
+       const std::map<int, int>& init_tracks_x,
+       const std::map<int, int>& init_tracks_y,
+       const std::map<int, int>& num_tracks_x,
+       const std::map<int, int>& num_tracks_y,
+       const std::map<int, int>& min_area_x,
+       const std::map<int, int>& min_area_y,
+       const std::map<int, int>& min_width_x,
+       const std::map<int, int>& min_width_y,
        const int& database_unit)
       : boundary_(boundary),
         min_dst_pins_x_(min_dst_pins_x),
@@ -74,32 +76,32 @@ class Core
   }
 
   Rect getBoundary() const { return boundary_; }
-  std::vector<int> getMinDstPinsX() const { return min_dst_pins_x_; }
-  std::vector<int> getMinDstPinsY() const { return min_dst_pins_y_; }
-  std::vector<int> getInitTracksX() const { return init_tracks_x_; }
-  std::vector<int> getInitTracksY() const { return init_tracks_y_; }
-  std::vector<int> getNumTracksX() const { return num_tracks_x_; }
-  std::vector<int> getNumTracksY() const { return num_tracks_y_; }
-  std::vector<int> getMinAreaX() const { return min_area_x_; }
-  std::vector<int> getMinAreaY() const { return min_area_y_; }
-  std::vector<int> getMinWidthX() const { return min_width_x_; }
-  std::vector<int> getMinWidthY() const { return min_width_y_; }
+  std::map<int, int> getMinDstPinsX() const { return min_dst_pins_x_; }
+  std::map<int, int> getMinDstPinsY() const { return min_dst_pins_y_; }
+  std::map<int, int> getInitTracksX() const { return init_tracks_x_; }
+  std::map<int, int> getInitTracksY() const { return init_tracks_y_; }
+  std::map<int, int> getNumTracksX() const { return num_tracks_x_; }
+  std::map<int, int> getNumTracksY() const { return num_tracks_y_; }
+  std::map<int, int> getMinAreaX() const { return min_area_x_; }
+  std::map<int, int> getMinAreaY() const { return min_area_y_; }
+  std::map<int, int> getMinWidthX() const { return min_width_x_; }
+  std::map<int, int> getMinWidthY() const { return min_width_y_; }
   int getDatabaseUnit() const { return database_unit_; }
   int getPerimeter() const;
   odb::Point getMirroredPosition(const odb::Point& position) const;
 
  private:
   Rect boundary_;
-  std::vector<int> min_dst_pins_x_;
-  std::vector<int> min_dst_pins_y_;
-  std::vector<int> init_tracks_x_;
-  std::vector<int> init_tracks_y_;
-  std::vector<int> num_tracks_x_;
-  std::vector<int> num_tracks_y_;
-  std::vector<int> min_area_x_;
-  std::vector<int> min_area_y_;
-  std::vector<int> min_width_x_;
-  std::vector<int> min_width_y_;
+  std::map<int, int> min_dst_pins_x_;
+  std::map<int, int> min_dst_pins_y_;
+  std::map<int, int> init_tracks_x_;
+  std::map<int, int> init_tracks_y_;
+  std::map<int, int> num_tracks_x_;
+  std::map<int, int> num_tracks_y_;
+  std::map<int, int> min_area_x_;
+  std::map<int, int> min_area_y_;
+  std::map<int, int> min_width_x_;
+  std::map<int, int> min_width_y_;
   int database_unit_;
 };