Merge remote-tracking branch 'origin' into ant_prints_issue

Signed-off-by: luis201420 <luisemv@precisioninno.com>

Author: luis201420

src/pad/BUILD

@@ -15,6 +15,8 @@ cc_library(
     srcs = [
         "src/ICeWall.cpp",
         "src/MakeICeWall.cpp",
+        "src/PadPlacer.cpp",
+        "src/PadPlacer.h",
         "src/RDLGui.cpp",
         "src/RDLGui.h",
         "src/RDLRoute.cpp",

src/pad/CMakeLists.txt

@@ -16,6 +16,7 @@ target_sources(pad
   PRIVATE
     src/MakeICeWall.cpp
     src/ICeWall.cpp
+    src/PadPlacer.cpp
     src/RDLRouter.cpp
     src/RDLRoute.cpp
     src/RDLGui.cpp

src/pad/README.md

@@ -228,7 +228,7 @@ place_pads
 | Switch Name | Description |
 | ----- | ----- |
 | `-row` | Name of the row to place the pad into, examples include: `IO_NORTH`, `IO_SOUTH`, `IO_WEST`, `IO_EAST`, `IO_NORTH_0`, `IO_NORTH_1`. |
-| `-mode` | Select the mode to use during pad placement, choices are `bump_aligned` and `uniform`. Default will select `bump_aligned` if possible, otherwise fallback to `uniform`. |
+| `-mode` | Select the mode to use during pad placement, choices are `bump_aligned`, `linear`, and `uniform`. Default will select `bump_aligned` if possible, otherwise fallback to `uniform`. |
 | `pads` | Name of the instances in the order they should be placed (left to right for `IO_SOUTH` and `IO_NORTH` and bottom to top for `IO_WEST` and `IO_EAST`). |
 
 #### Modes
@@ -241,6 +241,10 @@ In `bump_aligned` mode, the pads will be clustered near their assigned bumps to
 
 <img src="./doc/image/mode_bump_aligned.png" width=450px>
 
+In `linear` mode, the pads will be place starting from the bottom or left of the row next to eachother.
+
+<img src="./doc/image/mode_linear.png" width=450px>
+
 ### Placing Pads Manually
 
 To place a pad into the pad ring.

src/pad/doc/image/mode_linear.png

@@ -30,7 +30,8 @@ enum class PlacementStrategy
 {
   DEFAULT,
   BUMP_ALIGNED,
-  UNIFORM
+  UNIFORM,
+  LINEAR
 };
 
 class ICeWall
@@ -110,19 +111,11 @@ class ICeWall
 
  private:
   odb::dbBlock* getBlock() const;
-  int snapToRowSite(odb::dbRow* row, int location) const;
 
   std::vector<odb::dbRow*> getRows() const;
   std::vector<odb::dbInst*> getPadInstsInRow(odb::dbRow* row) const;
   std::vector<odb::dbInst*> getPadInsts() const;
 
-  int placeInstance(odb::dbRow* row,
-                    int index,
-                    odb::dbInst* inst,
-                    const odb::dbOrientType& base_orient,
-                    bool allow_overlap = false,
-                    bool allow_shift = false) const;
-
   void makeBTerm(odb::dbNet* net,
                  odb::dbTechLayer* layer,
                  const odb::Rect& shape) const;
@@ -138,43 +131,6 @@ class ICeWall
   std::string getRowName(const std::string& name, int ring_index) const;
   odb::Direction2D::Value getRowEdge(odb::dbRow* row) const;
 
-  int64_t estimateWirelengths(odb::dbInst* inst,
-                              const std::set<odb::dbITerm*>& iterms) const;
-  int64_t computePadBumpDistance(odb::dbInst* inst,
-                                 int inst_width,
-                                 odb::dbITerm* bump,
-                                 odb::dbRow* row,
-                                 int center_pos) const;
-  void placePadsUniform(const std::vector<odb::dbInst*>& insts,
-                        odb::dbRow* row,
-                        const std::map<odb::dbInst*, int>& inst_widths,
-                        int pads_width,
-                        int row_width,
-                        int row_start) const;
-  void placePadsBumpAligned(
-      const std::vector<odb::dbInst*>& insts,
-      odb::dbRow* row,
-      const std::map<odb::dbInst*, int>& inst_widths,
-      int pads_width,
-      int row_width,
-      int row_start,
-      const std::map<odb::dbInst*, std::set<odb::dbITerm*>>& iterm_connections)
-      const;
-  std::map<odb::dbInst*, odb::dbITerm*> getBumpAlignmentGroup(
-      odb::dbRow* row,
-      int offset,
-      const std::map<odb::dbInst*, int>& inst_widths,
-      const std::map<odb::dbInst*, std::set<odb::dbITerm*>>& iterm_connections,
-      const std::vector<odb::dbInst*>::const_iterator& itr,
-      const std::vector<odb::dbInst*>::const_iterator& inst_end) const;
-  void performPadFlip(odb::dbRow* row,
-                      odb::dbInst* inst,
-                      const std::map<odb::dbInst*, std::set<odb::dbITerm*>>&
-                          iterm_connections) const;
-  std::optional<std::pair<odb::dbInst*, odb::Rect>> checkInstancePlacement(
-      odb::dbInst* inst,
-      odb::dbRow* row) const;
-
   // Data members
   odb::dbDatabase* db_ = nullptr;
   utl::Logger* logger_ = nullptr;