Merge branch 'The-OpenROAD-Project:master' into ng_arian136

andyfox-rushc · Oct 14, 2024 · 0be2610 · 0be2610
2 parents 7603832 + 7a67188
commit 0be2610
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/src/gui/src/chartsWidget.cpp b/src/gui/src/chartsWidget.cpp
@@ -274,7 +274,7 @@ SlackHistogramData ChartsWidget::fetchSlackHistogramData()
   StaPins end_points = stagui_->getEndPoints();
   removeUnconstrainedPinsAndSetLimits(end_points);
 
-  data.constrained_pins = end_points;
+  data.constrained_pins = std::move(end_points);
 
   for (sta::Clock* clock : *stagui_->getClocks()) {
     data.clocks.insert(clock);

diff --git a/src/gui/src/staDescriptors.cpp b/src/gui/src/staDescriptors.cpp
@@ -206,7 +206,7 @@ Descriptor::Properties LibertyLibraryDescriptor::getProperties(
   for (auto* corner : *sta_->corners()) {
     for (const sta::MinMax* min_max :
          {sta::MinMax::min(), sta::MinMax::max()}) {
-      const auto libs = corner->libertyLibraries(min_max);
+      const auto& libs = corner->libertyLibraries(min_max);
       if (std::find(libs.begin(), libs.end(), library) != libs.end()) {
         corners.insert(gui->makeSelected(corner));
       }

diff --git a/src/gui/src/staGuiInterface.cpp b/src/gui/src/staGuiInterface.cpp
@@ -1036,8 +1036,13 @@ TimingPathList STAGuiInterface::getTimingPaths(
                                  sta::RiseFallBoth::riseFall());
   }
 
-  sta::Search* search = sta_->search();
+  std::unique_ptr<sta::PathGroupNameSet> group_names;
+  if (!path_group_name.empty()) {
+    group_names = std::make_unique<sta::PathGroupNameSet>();
+    group_names->insert(path_group_name.c_str());
+  }
 
+  sta::Search* search = sta_->search();
   sta::PathEndSeq path_ends
       = search->findPathEnds(  // from, thrus, to, unconstrained
           e_from,
@@ -1054,7 +1059,7 @@ TimingPathList STAGuiInterface::getTimingPaths(
           -sta::INF,
           sta::INF,  // slack_min, slack_max,
           true,      // sort_by_slack
-          nullptr,   // group_names
+          group_names.get(),
           // setup, hold, recovery, removal,
           use_max_,
           !use_max_,
@@ -1064,13 +1069,7 @@ TimingPathList STAGuiInterface::getTimingPaths(
           false,
           false);
 
-  sta::PathGroup* path_group
-      = search->findPathGroup(path_group_name.c_str(), sta::MinMax::max());
   for (auto& path_end : path_ends) {
-    if (path_group && path_group != search->pathGroup(path_end)) {
-      continue;
-    }
-
     TimingPath* timing_path = new TimingPath();
     sta::Path* path = path_end->path();