Merge branch 'master' into routing

Author: maliberty

src/OpenRoad.i

@@ -417,6 +417,9 @@ set_debug_level(const char* tool_name,
   if (id == utl::UKN) {
     logger->error(utl::ORD, 15, "Unknown tool name {}", tool_name);
   }
+  if (id == utl::STA) {
+    getSta()->setDebugLevel(group, level);
+  }
   logger->setDebugLevel(id, group, level);
 }
 

src/ant/src/AntennaChecker.cc

@@ -1007,35 +1007,15 @@ void AntennaChecker::buildLayerMaps(odb::dbNet* db_net,
         upper_index = findNodesWithIntersection(
             node_by_layer_map[layer_it.first->getUpperLayer()], via_it);
 
-        if (upper_index.size() <= 2) {
-          // connect upper -> via
-          for (int& up_index : upper_index) {
-            node_by_layer_map[layer_it.first->getUpperLayer()][up_index]
-                ->low_adj.push_back(via_index);
-          }
-        } else if (upper_index.size() > 2) {
-          std::string log_error = fmt::format(
-              "ERROR: net {} has via on {} conect with multiple wires on layer "
-              "{} \n",
-              db_net->getConstName(),
-              layer_it.first->getName(),
-              layer_it.first->getUpperLayer()->getName());
-          logger_->report("{}", log_error);
+        // connect upper -> via
+        for (int& up_index : upper_index) {
+          node_by_layer_map[layer_it.first->getUpperLayer()][up_index]
+              ->low_adj.push_back(via_index);
         }
-        if (lower_index.size() == 1) {
-          // connect via -> lower
-          for (int& low_index : lower_index) {
-            node_by_layer_map[layer_it.first][via_index]->low_adj.push_back(
-                low_index);
-          }
-        } else if (lower_index.size() > 2) {
-          std::string log_error = fmt::format(
-              "ERROR: net {} has via on {} conect with multiple wires on layer "
-              "{} \n",
-              db_net->getConstName(),
-              layer_it.first->getName(),
-              layer_it.first->getLowerLayer()->getName());
-          logger_->report("{}", log_error);
+        // connect via -> lower
+        for (int& low_index : lower_index) {
+          node_by_layer_map[layer_it.first][via_index]->low_adj.push_back(
+              low_index);
         }
         via_index++;
       }

src/dbSta/include/db_sta/dbSta.hh

@@ -208,6 +208,13 @@ class dbSta : public Sta, public odb::dbDatabaseObserver
                        bool verbose,
                        const char* file_name,
                        const char* stage_name);
+  void countInstancesByType(odb::dbModule* module,
+                            InstTypeMap& inst_type_stats,
+                            std::vector<dbInst*>& insts);
+  void countPhysicalOnlyInstancesByType(InstTypeMap& inst_type_stats,
+                                        std::vector<dbInst*>& insts);
+  void addInstanceByTypeInstance(odb::dbInst* inst,
+                                 InstTypeMap& inst_type_stats);
 
   void reportTimingHistogram(int num_bins, const MinMax* min_max) const;
 
@@ -230,14 +237,6 @@ class dbSta : public Sta, public odb::dbDatabaseObserver
                    Cell* to_cell,
                    LibertyCell* to_lib_cell) override;
 
-  void countInstancesByType(odb::dbModule* module,
-                            InstTypeMap& inst_type_stats,
-                            std::vector<dbInst*>& insts);
-  void countPhysicalOnlyInstancesByType(InstTypeMap& inst_type_stats,
-                                        std::vector<dbInst*>& insts);
-  void addInstanceByTypeInstance(odb::dbInst* inst,
-                                 InstTypeMap& inst_type_stats);
-
   dbDatabase* db_ = nullptr;
   Logger* logger_ = nullptr;
 

src/gpl/src/mbff.cpp

@@ -2483,6 +2483,7 @@ void MBFF::ReadPaths()
                                                    20,
                                                    num_paths_,
                                                    true,
+                                                   true,
                                                    -sta::INF,
                                                    sta::INF,
                                                    true,

src/gui/src/staGuiInterface.cpp

@@ -969,6 +969,7 @@ void STAGuiInterface::updatePathGroups()
   search->makePathGroups(1,         /* group count */
                          1,         /* endpoint count*/
                          false,     /* unique pins */
+                         false,     /* unique edges */
                          -sta::INF, /* min slack */
                          sta::INF,  /* max slack*/
                          nullptr,   /* group names */
@@ -1135,7 +1136,8 @@ TimingPathList STAGuiInterface::getTimingPaths(
           // group_count, endpoint_count, unique_pins
           max_path_count_,
           one_path_per_endpoint_ ? 1 : max_path_count_,
-          true,
+          true,  // unique pins
+          true,  // unique edges
           -sta::INF,
           sta::INF,  // slack_min, slack_max,
           true,      // sort_by_slack

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;