Merge remote-tracking branch 'origin' into ant_prints_issue

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

Author: luis201420

BUILD.bazel

@@ -104,7 +104,7 @@ OPENROAD_LIBRARY_DEPS = [
     "//src/upf:ui",
     "//src/utl",
     "//src/utl:ui",
-    "@edu_berkeley_abc//:abc-lib",
+    "//third-party/abc:abc-lib",
     ":ord",
 ] + select(
     {

WORKSPACE

@@ -25,7 +25,6 @@ http_archive(
 # This essentially reads as a TODO list of what needs to be upstreamed to BCR
 load("@rules_hdl//dependency_support/com_github_quantamhd_lemon:com_github_quantamhd_lemon.bzl", "com_github_quantamhd_lemon")
 load("@rules_hdl//dependency_support/com_github_westes_flex:com_github_westes_flex.bzl", "com_github_westes_flex")
-load("@rules_hdl//dependency_support/edu_berkeley_abc:edu_berkeley_abc.bzl", "edu_berkeley_abc")
 load("@rules_hdl//dependency_support/net_invisible_island_ncurses:net_invisible_island_ncurses.bzl", "net_invisible_island_ncurses")
 load("@rules_hdl//dependency_support/net_zlib:net_zlib.bzl", "net_zlib")
 load("@rules_hdl//dependency_support/org_gnu_bison:org_gnu_bison.bzl", "org_gnu_bison")
@@ -37,8 +36,6 @@ load("@rules_hdl//dependency_support/tk_tcl:tk_tcl.bzl", "tk_tcl")
 # Direct dependencies needed in Openroad
 com_github_quantamhd_lemon()
 
-edu_berkeley_abc()
-
 tk_tcl()
 
 # Swig exists in BCR, but in a newer version where we need to test how to make

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/cgt/BUILD

@@ -40,8 +40,8 @@ cc_library(
         "//src/odb",
         "//src/sta:opensta_lib",
         "//src/utl",
+        "//third-party/abc:abc-lib",
         "@boost.stacktrace",
-        "@edu_berkeley_abc//:abc-lib",
         "@tk_tcl//:tcl",
     ],
 )

src/cut/BUILD

@@ -37,13 +37,13 @@ cc_library(
         "//src/rsz",
         "//src/sta:opensta_lib",
         "//src/utl",
+        "//third-party/abc:abc-lib",
         "@boost.bind",
         "@boost.config",
         "@boost.fusion",
         "@boost.lambda",
         "@boost.optional",
         "@boost.phoenix",
         "@boost.spirit",
-        "@edu_berkeley_abc//:abc-lib",
     ],
 )

src/cut/test/BUILD

@@ -37,7 +37,7 @@ cc_test(
         "//src/sta:opensta_lib",
         "//src/tst",
         "//src/utl",
-        "@edu_berkeley_abc//:abc-lib",
+        "//third-party/abc:abc-lib",
         "@googletest//:gtest",
         "@googletest//:gtest_main",
     ],

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/ifp/include/ifp/InitFloorplan.hh

@@ -126,6 +126,7 @@ class InitFloorplan
                             int y_offset,
                             int y_pitch,
                             int first_last_pitch);
+  void resetTracks() const;
 
   odb::dbSite* findSite(const char* site_name);