read_spef block stitching support, round 1

Signed-off-by: James Cherry <[email protected]>
htfab · Oct 3, 2022 · 25323c0 · 25323c0
1 parent c40e6ef
commit 25323c0
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/parasitics/SpefReader.cc b/parasitics/SpefReader.cc
@@ -447,14 +447,27 @@ SpefReader::dspfBegin(Net *net,
 		      SpefTriple *total_cap)
 {
   if (net) {
+    Net *parasitic_owner = net;
+    if (!network_->isTopInstance(instance_)) {
+      NetTermIterator *term_iter = network_->termIterator(net);
+      if (term_iter->hasNext()) {
+        Term *term = term_iter->next();
+        Pin *hpin = network_->pin(term);
+        parasitic_owner = network_->net(hpin);
+      }
+      delete term_iter;
+    }
     // Incremental parasitics do not overwrite existing parasitics.
-    if (increment_
-	&& parasitics_->findParasiticNetwork(net, ap_))
-      parasitic_ = nullptr;
+    if (increment_) {
+      parasitic_ = parasitics_->findParasiticNetwork(parasitic_owner, ap_);
+      if( parasitic_ == nullptr)
+        parasitic_ = parasitics_->makeParasiticNetwork(parasitic_owner,
+                                                       pin_cap_included_, ap_);
+    }
     else {
-      parasitics_->deleteReducedParasitics(net, ap_);
-      parasitic_ = parasitics_->makeParasiticNetwork(net, pin_cap_included_,
-                                                     ap_);
+      parasitics_->deleteReducedParasitics(parasitic_owner, ap_);
+      parasitic_ = parasitics_->makeParasiticNetwork(parasitic_owner,
+                                                     pin_cap_included_, ap_);
     }
     net_ = net;
   }
@@ -469,7 +482,6 @@ void
 SpefReader::dspfFinish()
 {
   if (parasitic_) {
-    // Checking "should" be done by report_annotated_parasitics.
     if (!quiet_)
       parasitics_->check(parasitic_);
     if (reduce_to_ != ReducedParasiticType::none) {

diff --git a/search/Sta.cc b/search/Sta.cc
@@ -3872,6 +3872,7 @@ Sta::reportParasiticAnnotation(bool report_unannotated,
                                const Corner *corner)
 {
   ensureGraph();
+  findDelays();
   sta::reportParasiticAnnotation(report_unannotated, corner, this);
 }