rsz: Share latch data path helper

Move latchDataPath to OptimizerTypes so setup policies and target collection use one helper for latch-through path expansion.

Remove the duplicate RepairTargetCollector member and SetupLegacyBase local helper while preserving the same latch D-side path handling.

Signed-off-by: Jaehyun Kim <jhkim@precisioninno.com>

Author: jhkim-pii

src/rsz/src/OptimizerTypes.cc

@@ -195,6 +195,16 @@ const sta::TimingArc* findMatchingTimingArc(const sta::TimingArc* reference,
       reference, candidate, ArcMatchMode::kExact, nullptr);
 }
 
+const sta::Path* latchDataPath(const sta::PathExpanded& expanded,
+                               const sta::StaState*)
+{
+  const sta::Path* d_path = nullptr;
+  const sta::Path* q_path = nullptr;
+  sta::Edge* d_q_edge = nullptr;
+  expanded.latchPaths(d_path, q_path, d_q_edge);
+  return d_path;
+}
+
 bool Target::canBePathDriver() const
 {
   return (views & kPathDriverView) != 0 && driver_pin != nullptr

src/rsz/src/OptimizerTypes.hh

@@ -27,6 +27,7 @@ class Pin;
 class Pvt;
 class RiseFall;
 class Scene;
+class StaState;
 class TimingArc;
 class TimingArcSet;
 class Vertex;
@@ -132,6 +133,10 @@ struct SelectedArc
 const sta::TimingArc* findMatchingTimingArc(const sta::TimingArc* reference,
                                             const sta::TimingArcSet* candidate);
 
+// Return the latch D-side path attached to an expanded latch-through path.
+const sta::Path* latchDataPath(const sta::PathExpanded& expanded,
+                               const sta::StaState* sta);
+
 // One timing arc that can contribute to the driver's output slew merge for the
 // selected output transition.  STA merges output slew across all such arcs
 // before the next stage consumes it.

src/rsz/src/RepairTargetCollector.cc

@@ -878,16 +878,6 @@ sta::Path* RepairTargetCollector::findWorstSlackPath(
   return sta_->vertexWorstSlackPath(endpoint, max_);
 }
 
-const sta::Path* RepairTargetCollector::latchDataPath(
-    const sta::PathExpanded& expanded) const
-{
-  const sta::Path* d_path = nullptr;
-  const sta::Path* q_path = nullptr;
-  sta::Edge* d_q_edge = nullptr;
-  expanded.latchPaths(d_path, q_path, d_q_edge);
-  return d_path;
-}
-
 void RepairTargetCollector::collectExpandedPathDriverTargets(
     const sta::Path* endpoint_path,
     const sta::PathExpanded& expanded,
@@ -945,7 +935,7 @@ std::vector<Target> RepairTargetCollector::collectPathDriverTargets(
   // A latch-through path starts at latch Q in OpenSTA, with the latch D path
   // stored as side context.  Expand that D path separately so repair_timing can
   // optimize the logic that consumed the borrowed time.
-  const sta::Path* d_path = latchDataPath(expanded);
+  const sta::Path* d_path = latchDataPath(expanded, sta_);
   if (d_path != nullptr) {
     sta::PathExpanded d_expanded(d_path, sta_);
     collectExpandedPathDriverTargets(d_path, d_expanded, path_slack, targets);
@@ -1269,7 +1259,7 @@ set<const sta::Pin*> RepairTargetCollector::collectPinsByPathEndpoint(
       }
     }
 
-    const sta::Path* d_path = latchDataPath(expanded);
+    const sta::Path* d_path = latchDataPath(expanded, sta_);
     if (d_path != nullptr) {
       sta::PathExpanded d_expanded(d_path, sta_);
       const size_t old_size = viol_pins.size();

src/rsz/src/RepairTargetCollector.hh

@@ -286,7 +286,6 @@ class RepairTargetCollector
   void sortByHeuristic(float load_delay_threshold = 0.0);
   std::map<const sta::Pin*, sta::Delay> getLocalTns() const;
   sta::Delay getLocalPinTns(const sta::Pin* pin) const;
-  const sta::Path* latchDataPath(const sta::PathExpanded& expanded) const;
   void collectExpandedPathDriverTargets(const sta::Path* endpoint_path,
                                         const sta::PathExpanded& expanded,
                                         sta::Slack path_slack,

src/rsz/src/policy/SetupLegacyBase.cc

@@ -53,19 +53,6 @@ using std::vector;
 
 using utl::RSZ;
 
-namespace {
-
-const sta::Path* latchDataPath(const sta::PathExpanded& expanded)
-{
-  const sta::Path* d_path = nullptr;
-  const sta::Path* q_path = nullptr;
-  sta::Edge* d_q_edge = nullptr;
-  expanded.latchPaths(d_path, q_path, d_q_edge);
-  return d_path;
-}
-
-}  // namespace
-
 SetupLegacyBase::SetupLegacyBase(Resizer& resizer,
                                  MoveCommitter& committer,
                                  RepairSetupContext& setup_context,
@@ -470,7 +457,7 @@ bool SetupLegacyBase::makePinTargetOnPath(const sta::Pin* pin,
     return true;
   }
 
-  const sta::Path* d_path = latchDataPath(expanded);
+  const sta::Path* d_path = latchDataPath(expanded, sta_);
   if (d_path == nullptr) {
     return false;
   }
@@ -797,7 +784,7 @@ bool SetupLegacyBase::repairPath(sta::Path* path,
     ranked_targets.emplace_back(std::move(target), load_delay.second);
   }
 
-  const sta::Path* d_path = latchDataPath(expanded);
+  const sta::Path* d_path = latchDataPath(expanded, sta_);
   if (d_path != nullptr) {
     sta::PathExpanded d_expanded(d_path, sta_);
     const sta::Scene* d_corner = d_path->scene(sta_);