[#82535] rename PathsContainer to PathsStitch

magancarz · magancarz · commit 8994565934fc · 2025-08-29T12:10:27.000+02:00
diff --git a/include/sta/Search.hh b/include/sta/Search.hh
@@ -420,10 +420,10 @@ public:
                                           PathGroupNameSet *groups,
                                           unsigned int path_count);
 
-  PathsContainer mergePaths(const PathEndSeq *path_ends,
-                            const InternalPathSeq *timing_paths,
-                            bool sort_by_slack,
-                            unsigned int path_count);
+  PathsStitch mergePaths(const PathEndSeq *path_ends,
+                         const InternalPathSeq *timing_paths,
+                         bool sort_by_slack,
+                         unsigned int path_count);
 
 protected:
   void init(StaState *sta);
diff --git a/include/sta/SearchClass.hh b/include/sta/SearchClass.hh
@@ -139,12 +139,12 @@ enum class ReportDeduplicationMode { none,
 			      keep_different
 };
 
-class PathsContainer
+class PathsStitch
 {
 public:
-  PathsContainer() = default;
+  PathsStitch() = default;
 
-  PathsContainer(
+  PathsStitch(
       PathEndSeq path_ends,
       InternalPathSeq internal_timing_paths,
       bool sorted_by_slack)
@@ -153,14 +153,14 @@ public:
     sorted_by_slack_{sorted_by_slack},
     num_of_paths_{static_cast<unsigned int>(path_ends_.size() + internal_timing_paths_.size())} {}
 
-  PathsContainer(
+  PathsStitch(
       PathEndSeq path_ends,
       bool sorted_by_slack)
     : path_ends_{std::move(path_ends)},
     sorted_by_slack_{sorted_by_slack},
     num_of_paths_{static_cast<unsigned int>(path_ends_.size())} {}
 
-  PathsContainer(
+  PathsStitch(
       InternalPathSeq internal_timing_paths,
       bool sorted_by_slack)
     : internal_timing_paths_{std::move(internal_timing_paths)},
diff --git a/include/sta/Sta.hh b/include/sta/Sta.hh
@@ -843,10 +843,10 @@ public:
                                           bool sort_by_slack,
                                           PathGroupNameSet *groups,
                                           int path_count);
-  PathsContainer mergePaths(const PathEndSeq *path_ends,
-                            const InternalPathSeq *timing_paths,
-                            bool sort_by_slack,
-                            unsigned int path_count);
+  PathsStitch mergePaths(const PathEndSeq *path_ends,
+                         const InternalPathSeq *timing_paths,
+                         bool sort_by_slack,
+                         unsigned int path_count);
   void setReportPathFormat(ReportPathFormat format);
   void setReportPathFieldOrder(StringSeq *field_names);
   void setReportPathFields(bool report_input_pin,
@@ -873,7 +873,7 @@ public:
 		     PathEnd *prev_end);
   void reportPathEnd(PathEnd *end);
   void reportPathEnds(PathEndSeq *ends);
-  void reportPaths(const PathsContainer *paths_container);
+  void reportPaths(const PathsStitch *paths_stitch);
   ReportPath *reportPath() { return report_path_; }
   void reportPath(const Path *path);
   void reportPath(const InputRegisterTimingPath *internal_path);
diff --git a/search/ReportPath.cc b/search/ReportPath.cc
@@ -2807,44 +2807,44 @@ ReportPath::reportPathFull(const Path *path) const
 }
 
 void
-ReportPath::reportPaths(const PathsContainer *paths_container) const
+ReportPath::reportPaths(const PathsStitch *paths_stitch) const
 {
-  if (!paths_container->hasInternalPaths()) {
-    reportPathEnds(&paths_container->pathEnds());
+  if (!paths_stitch->hasInternalPaths()) {
+    reportPathEnds(&paths_stitch->pathEnds());
     return;
   }
 
-  if (!paths_container->hasPathEnds()) {
-    reportPaths(&paths_container->internalPaths());
+  if (!paths_stitch->hasPathEnds()) {
+    reportPaths(&paths_stitch->internalPaths());
     return;
   }
 
-  if (!paths_container->sortedBySlack()) {
+  if (!paths_stitch->sortedBySlack()) {
     reportPathEndHeader();
     static constexpr bool NO_PATHS_MESSAGE = false;
-    reportPathEnds(&paths_container->pathEnds(), NO_PATHS_MESSAGE);
+    reportPathEnds(&paths_stitch->pathEnds(), NO_PATHS_MESSAGE);
     
-    const bool prev_path = paths_container->hasPathEnds();
-    reportPaths(&paths_container->internalPaths(), prev_path);
+    const bool prev_path = paths_stitch->hasPathEnds();
+    reportPaths(&paths_stitch->internalPaths(), prev_path);
     reportPathEndFooter();
     return;
   }
 
   reportPathEndHeader();
   
-  const PathEndSeq &path_ends = paths_container->pathEnds();
+  const PathEndSeq &path_ends = paths_stitch->pathEnds();
   Set<PathEnd *> qualified_ends;
   if (dedup_by_word_) {
     qualified_ends = dedupByWord(&path_ends);
   }
-  const InternalPathSeq &internal_paths = paths_container->internalPaths();
+  const InternalPathSeq &internal_paths = paths_stitch->internalPaths();
 
   unsigned int first_index = 0;
   unsigned int second_index = 0;
 
   const PathEnd *prev_path_end = nullptr;
   unsigned int current_index = 0;
-  while (current_index < paths_container->size()) {
+  while (current_index < paths_stitch->size()) {
     current_index += 1;
 
     if (first_index >= path_ends.size()) {
diff --git a/search/ReportPath.hh b/search/ReportPath.hh
@@ -77,8 +77,8 @@ public:
   void reportPath(const Path *path) const;
   void reportPaths(const InternalPathSeq *timing_paths) const;
   void reportPath(const InputRegisterTimingPath *timing_path, bool prev_path) const;
-  void reportPaths(const PathsContainer *paths_container) const;
-  void reportPathsSorted(const PathsContainer *paths_container) const;
+  void reportPaths(const PathsStitch *paths_stitch) const;
+  void reportPathsSorted(const PathsStitch *paths_stitch) const;
 
   void reportShort(const PathEndUnconstrained *end) const;
   void reportShort(const PathEndCheck *end) const;
diff --git a/search/Search.cc b/search/Search.cc
@@ -770,23 +770,23 @@ Search::isMatchingSearchedPathGroups(const char *path_group, PathGroupNameSet *g
 
 ////////////////////////////////////////////////////////////////
 
-PathsContainer Search::mergePaths(const PathEndSeq *path_ends,
-                                  const InternalPathSeq *timing_paths,
-                                  bool sort_by_slack,
-                                  unsigned int path_count)
+PathsStitch Search::mergePaths(const PathEndSeq *path_ends,
+                               const InternalPathSeq *timing_paths,
+                               bool sort_by_slack,
+                               unsigned int path_count)
 {
   bool has_timing_paths = timing_paths && !timing_paths->empty();
   bool has_path_ends = path_ends && !path_ends->empty();
   if (!has_timing_paths && !has_path_ends) {
-    return PathsContainer{};
+    return PathsStitch{};
   }
 
   if (!has_timing_paths) {
-    return PathsContainer{*path_ends, sort_by_slack};
+    return PathsStitch{*path_ends, sort_by_slack};
   }
 
   if (!has_path_ends) {
-    return PathsContainer{*timing_paths, sort_by_slack};
+    return PathsStitch{*timing_paths, sort_by_slack};
   }
 
   std::unordered_map<PathGroup*, PathEndSeq> grouped_path_ends;
@@ -824,7 +824,7 @@ PathsContainer Search::mergePaths(const PathEndSeq *path_ends,
     sort(filtered_internal_paths, std::less<const InputRegisterTimingPath*>{});
   }
 
-  return PathsContainer{std::move(filtered_path_ends), std::move(filtered_internal_paths), sort_by_slack};
+  return PathsStitch{std::move(filtered_path_ends), std::move(filtered_internal_paths), sort_by_slack};
 }
 
 PathGroup *
diff --git a/search/Search.i b/search/Search.i
@@ -398,7 +398,7 @@ find_internal_timing_paths(const MinMaxAll *delay_min_max,
 
 ////////////////////////////////////////////////////////////////
 
-PathsContainer
+PathsStitch
 merge_paths(PathEndSeq *path_ends,
             InternalPathSeq *timing_paths,
             bool sort_by_slack,
@@ -533,10 +533,10 @@ report_path_ends(PathEndSeq *ends)
 }
 
 void
-report_paths_combined(PathsContainer *paths_container)
+report_paths_combined(PathsStitch *paths_stitch)
 {
-  Sta::sta()->reportPaths(paths_container);
-  delete paths_container;
+  Sta::sta()->reportPaths(paths_stitch);
+  delete paths_stitch;
 }
 
 void
diff --git a/search/Sta.cc b/search/Sta.cc
@@ -2542,7 +2542,7 @@ Sta::findInternalTimingPaths(
 
 ////////////////////////////////////////////////////////////////
 
-PathsContainer
+PathsStitch
 Sta::mergePaths(const PathEndSeq *path_ends,
                 const InternalPathSeq *timing_paths,
                 bool sort_by_slack,
@@ -2663,9 +2663,9 @@ Sta::reportPathEnds(PathEndSeq *ends)
 }
 
 void
-Sta::reportPaths(const PathsContainer *paths_container)
+Sta::reportPaths(const PathsStitch *paths_stitch)
 {
-  report_path_->reportPaths(paths_container);
+  report_path_->reportPaths(paths_stitch);
 }
 
 void

Original file line number	Diff line number	Diff line change
`@@ -770,23 +770,23 @@ Search::isMatchingSearchedPathGroups(const char path_group, PathGroupNameSet g`
`770`	`770`
`771`	`771`	`////////////////////////////////////////////////////////////////`
`772`	`772`
`773`		`-PathsContainer Search::mergePaths(const PathEndSeq *path_ends,`
`774`		`- const InternalPathSeq *timing_paths,`
`775`		`- bool sort_by_slack,`
`776`		`- unsigned int path_count)`
	`773`	`+PathsStitch Search::mergePaths(const PathEndSeq *path_ends,`
	`774`	`+ const InternalPathSeq *timing_paths,`
	`775`	`+ bool sort_by_slack,`
	`776`	`+ unsigned int path_count)`
`777`	`777`	`{`
`778`	`778`	`bool has_timing_paths = timing_paths && !timing_paths->empty();`
`779`	`779`	`bool has_path_ends = path_ends && !path_ends->empty();`
`780`	`780`	`if (!has_timing_paths && !has_path_ends) {`
`781`		`- return PathsContainer{};`
	`781`	`+ return PathsStitch{};`
`782`	`782`	`}`
`783`	`783`
`784`	`784`	`if (!has_timing_paths) {`
`785`		`- return PathsContainer{*path_ends, sort_by_slack};`
	`785`	`+ return PathsStitch{*path_ends, sort_by_slack};`
`786`	`786`	`}`
`787`	`787`
`788`	`788`	`if (!has_path_ends) {`
`789`		`- return PathsContainer{*timing_paths, sort_by_slack};`
	`789`	`+ return PathsStitch{*timing_paths, sort_by_slack};`
`790`	`790`	`}`
`791`	`791`
`792`	`792`	`std::unordered_map<PathGroup*, PathEndSeq> grouped_path_ends;`
`@@ -824,7 +824,7 @@ PathsContainer Search::mergePaths(const PathEndSeq *path_ends,`
`824`	`824`	`sort(filtered_internal_paths, std::less<const InputRegisterTimingPath*>{});`
`825`	`825`	`}`
`826`	`826`
`827`		`- return PathsContainer{std::move(filtered_path_ends), std::move(filtered_internal_paths), sort_by_slack};`
	`827`	`+ return PathsStitch{std::move(filtered_path_ends), std::move(filtered_internal_paths), sort_by_slack};`
`828`	`828`	`}`
`829`	`829`
`830`	`830`	`PathGroup *`
Original file line number	Diff line number	Diff line change
`@@ -398,7 +398,7 @@ find_internal_timing_paths(const MinMaxAll *delay_min_max,`
`398`	`398`
`399`	`399`	`////////////////////////////////////////////////////////////////`
`400`	`400`
`401`		`-PathsContainer`
	`401`	`+PathsStitch`
`402`	`402`	`merge_paths(PathEndSeq *path_ends,`
`403`	`403`	`InternalPathSeq *timing_paths,`
`404`	`404`	`bool sort_by_slack,`
`@@ -533,10 +533,10 @@ report_path_ends(PathEndSeq *ends)`
`533`	`533`	`}`
`534`	`534`
`535`	`535`	`void`
`536`		`-report_paths_combined(PathsContainer *paths_container)`
	`536`	`+report_paths_combined(PathsStitch *paths_stitch)`
`537`	`537`	`{`
`538`		`- Sta::sta()->reportPaths(paths_container);`
`539`		`- delete paths_container;`
	`538`	`+ Sta::sta()->reportPaths(paths_stitch);`
	`539`	`+ delete paths_stitch;`
`540`	`540`	`}`
`541`	`541`
`542`	`542`	`void`
Original file line number	Diff line number	Diff line change
`@@ -2542,7 +2542,7 @@ Sta::findInternalTimingPaths(`
`2542`	`2542`
`2543`	`2543`	`////////////////////////////////////////////////////////////////`
`2544`	`2544`
`2545`		`-PathsContainer`
	`2545`	`+PathsStitch`
`2546`	`2546`	`Sta::mergePaths(const PathEndSeq *path_ends,`
`2547`	`2547`	`const InternalPathSeq *timing_paths,`
`2548`	`2548`	`bool sort_by_slack,`
`@@ -2663,9 +2663,9 @@ Sta::reportPathEnds(PathEndSeq *ends)`
`2663`	`2663`	`}`
`2664`	`2664`
`2665`	`2665`	`void`
`2666`		`-Sta::reportPaths(const PathsContainer *paths_container)`
	`2666`	`+Sta::reportPaths(const PathsStitch *paths_stitch)`
`2667`	`2667`	`{`
`2668`		`- report_path_->reportPaths(paths_container);`
	`2668`	`+ report_path_->reportPaths(paths_stitch);`
`2669`	`2669`	`}`
`2670`	`2670`
`2671`	`2671`	`void`