ccs ceff delay calc

commit 87130be63ddbf1a7fb65986b02839eb4c0b13168 Author: James Cherry <[email protected]> Date: Tue Feb 27 09:49:02 2024 -0700 ccs ceff delay calc Signed-off-by: James Cherry <[email protected]> commit de0dd38dabda2f7ef51b49c196c2787a0d3c5784 Author: James Cherry <[email protected]> Date: Tue Feb 27 07:40:11 2024 -0700 dcalc public funcs Signed-off-by: James Cherry <[email protected]> commit dd7fcb12f929b9b0a391653cad42e617f9cbdd3b Author: James Cherry <[email protected]> Date: Mon Feb 26 09:08:37 2024 -0700 mv CircuitSim.hh to include Signed-off-by: James Cherry <[email protected]> commit 9663e46d28ece544ee1453f229990c9db9e0efec Author: James Cherry <[email protected]> Date: Sun Feb 25 17:58:57 2024 -0700 ArcDcalcArg Signed-off-by: James Cherry <[email protected]> commit 76b0588034faaefd2302c865c441975f76386d3f Author: James Cherry <[email protected]> Date: Sun Feb 25 15:36:46 2024 -0700 ensureVoltageWaveforms Signed-off-by: James Cherry <[email protected]> commit f88e67b861c56752e5b36efe2b552ba0077a7180 Author: James Cherry <[email protected]> Date: Sun Feb 25 15:00:02 2024 -0700 const Signed-off-by: James Cherry <[email protected]> commit 8f32cc571dcadee0185b08f951a1f79d46e7984d Author: James Cherry <[email protected]> Date: Sun Feb 25 14:57:51 2024 -0700 Graph::gateEdgeArc Signed-off-by: James Cherry <[email protected]> commit ac3cb35cb6732d7ecbf0532d7351a3ff2a917fc9 Author: James Cherry <[email protected]> Date: Sun Feb 25 14:31:30 2024 -0700 ConcreteParasiticSubNodeMap, ConcreteParasiticPinNodeMap use id cmp Signed-off-by: James Cherry <[email protected]> commit cbfe4eac463036c26a64701239d7651d91a09778 Author: James Cherry <[email protected]> Date: Sun Feb 25 14:08:41 2024 -0700 WriteSpice Signed-off-by: James Cherry <[email protected]> commit 8b5d30f1a8b1ccb8c9cbd9d7ba93418907c41b2a Author: James Cherry <[email protected]> Date: Sat Feb 24 09:45:46 2024 -0700 emplace_push Signed-off-by: James Cherry <[email protected]> commit 5335a2eaaf737ed7c7a8cff30654a68c4ac4c8e4 Author: James Cherry <[email protected]> Date: Fri Feb 23 16:19:30 2024 -0700 Parasitics::findParasiticNode Signed-off-by: James Cherry <[email protected]> commit ce92f3caf28afb0e0384799f08166cfb0aecfea0 Author: James Cherry <[email protected]> Date: Fri Feb 23 15:53:28 2024 -0700 Parasitics::findParasiticNode Signed-off-by: James Cherry <[email protected]> commit 0c591430c725a3ebd50d2892673dca76e023dc32 Author: James Cherry <[email protected]> Date: Fri Feb 23 09:03:18 2024 -0700 Parsitics::name(node) const Signed-off-by: James Cherry <[email protected]> commit 499c297e64d1487388f549843ff9ea05e8555cfc Author: James Cherry <[email protected]> Date: Fri Feb 23 09:03:07 2024 -0700 write_spice umr Signed-off-by: James Cherry <[email protected]> commit 6984c398dbce9e6266fab8377a844bc518481d9d Author: James Cherry <[email protected]> Date: Thu Feb 22 18:42:34 2024 -0700 gcc warning Signed-off-by: James Cherry <[email protected]> commit edec16519806013623194d8201e804dec81a51dd Author: James Cherry <[email protected]> Date: Thu Feb 22 17:54:11 2024 -0700 no cuddification Signed-off-by: James Cherry <[email protected]> commit 4a0e1070c179b2f8615b604c362359ce4b3a0e2e Author: James Cherry <[email protected]> Date: Thu Feb 22 17:29:46 2024 -0700 sim const Signed-off-by: James Cherry <[email protected]> commit 2e941fafa631f6b9bc0f82784b9146de2449e9c5 Author: James Cherry <[email protected]> Date: Thu Feb 22 17:29:39 2024 -0700 sdc comment Signed-off-by: James Cherry <[email protected]> commit 1c12f56aee7115fcb06807b5b6c626d1a419ccdc Author: James Cherry <[email protected]> Date: Wed Feb 21 13:13:29 2024 -0700 Sim use Bdd class Signed-off-by: James Cherry <[email protected]> commit b70c41d5caec56c3001b834141b6dab89bb933ed Author: James Cherry <[email protected]> Date: Tue Feb 20 12:18:27 2024 -0700 write_spice coupling caps Signed-off-by: James Cherry <[email protected]> commit 614d2cd41a1a9cf850dbe480954a5f58ee0dc21e Author: James Cherry <[email protected]> Date: Mon Feb 19 14:37:30 2024 -0700 write_spice time offset Signed-off-by: James Cherry <[email protected]> commit f0ba1fca0dfca384e6fb0be302bba9ced71ee41c Author: James Cherry <[email protected]> Date: Mon Feb 19 10:59:18 2024 -0700 class Bdd for cudd Signed-off-by: James Cherry <[email protected]> commit 24c94756334fce5e70e97ce0ee31375ae4e59b84 Author: James Cherry <[email protected]> Date: Sun Feb 18 08:58:30 2024 -0700 WriteSpice Signed-off-by: James Cherry <[email protected]> commit 47a4505d88bdfe4a85056895f8b7d842e07dce8d Author: James Cherry <[email protected]> Date: Fri Feb 16 21:34:23 2024 -0700 default sim ngspice Signed-off-by: James Cherry <[email protected]> commit 06e279555a076e218f0a9c308e8937a6fc8fdea4 Author: James Cherry <[email protected]> Date: Fri Feb 16 21:34:01 2024 -0700 WriteSpice refactor Signed-off-by: James Cherry <[email protected]> commit 06e3f0734edbbbd69ad063e97d1d8cca92a83aea Author: James Cherry <[email protected]> Date: Thu Feb 15 15:18:35 2024 -0700 mv report_dcalc to DelayCalc.tcl Signed-off-by: James Cherry <[email protected]> commit 922056471a6d380699bbd0623f95637401d23eff Author: James Cherry <[email protected]> Date: Thu Feb 15 14:27:31 2024 -0700 WriteSpice::cell_spice_port_names_ Signed-off-by: James Cherry <[email protected]> commit 732922ead68097e3f7da268ecc5ae2ca2daa4492 Author: James Cherry <[email protected]> Date: Thu Feb 15 13:35:13 2024 -0700 WritePathSpice.hh Signed-off-by: James Cherry <[email protected]> commit 8cd6e2ffc6ad66e831630273b5eacd192259191e Author: James Cherry <[email protected]> Date: Thu Feb 15 10:11:39 2024 -0700 small Signed-off-by: James Cherry <[email protected]> commit f7f6bfb49f43ddc3e45c294f89c8814d60df5220 Author: James Cherry <[email protected]> Date: Thu Feb 15 09:48:09 2024 -0700 refactor WritePathSpice Signed-off-by: James Cherry <[email protected]> commit f74db730c3e8c67a24d531266510e4376db463d3 Author: James Cherry <[email protected]> Date: Wed Feb 14 09:22:01 2024 -0700 Sta.hh Signed-off-by: James Cherry <[email protected]> commit 051532deef203cae97e32e8af7a2348bfd8912cc Author: James Cherry <[email protected]> Date: Wed Feb 14 08:14:44 2024 -0700 PowerClass.hh Signed-off-by: James Cherry <[email protected]> commit bfb8357d1093e5d3da14e708acd21fc21ba3b0dd Author: James Cherry <[email protected]> Date: Wed Feb 14 08:08:56 2024 -0700 doc Signed-off-by: James Cherry <[email protected]> commit 8fe28ec91b234d9d8210019aa46a2e8107aa497a Author: James Cherry <[email protected]> Date: Wed Feb 14 07:32:34 2024 -0700 ClkSkew use seq instead of set Signed-off-by: James Cherry <[email protected]> commit c4e3a3a0315ab4f6160a707e838423bb734f5363 Author: James Cherry <[email protected]> Date: Tue Feb 13 19:26:45 2024 -0700 report_clock_latency Signed-off-by: James Cherry <[email protected]> commit 51fb6657d9706c7443e1c269cfe63cf080b05d50 Author: James Cherry <[email protected]> Date: Tue Feb 13 11:10:11 2024 -0700 report_clock_latency Signed-off-by: James Cherry <[email protected]> commit e639ee129d13e1c11b34bca0762b8136b18563f3 Author: James Cherry <[email protected]> Date: Mon Feb 12 11:19:06 2024 -0700 ClkSkew use map Signed-off-by: James Cherry <[email protected]> commit e91d3ea8142a73b7b607dfdf53b3fce8e2f16984 Author: James Cherry <[email protected]> Date: Mon Feb 12 10:18:27 2024 -0700 report_clock_skew report format Signed-off-by: James Cherry <[email protected]> commit c650b7ec63b83382ba9cec7d187ffee8a031c2ce Author: James Cherry <[email protected]> Date: Mon Feb 12 09:22:29 2024 -0700 report_clock_skew include macro clock_tree_path_delay Signed-off-by: James Cherry <[email protected]> commit cf14b230a9944b95ba43ef7c09e553d9014990eb Author: James Cherry <[email protected]> Date: Sun Feb 11 11:03:29 2024 -0700 clk skew range iter Signed-off-by: James Cherry <[email protected]> commit e7e0342e063ac876d00d03fd1ff0eab1715cfde4 Author: James Cherry <[email protected]> Date: Sun Feb 11 08:11:29 2024 -0700 write_spice sensitize and3 Signed-off-by: James Cherry <[email protected]> commit 743ceb676c763ac5bcbf05e630a4da1b507c537d Author: James Cherry <[email protected]> Date: Sat Feb 10 18:07:04 2024 -0700 write spice Signed-off-by: James Cherry <[email protected]> Signed-off-by: James Cherry <[email protected]>
2026-09-02 02:38:22 +02:00 · 2024-02-27 10:00:48 -07:00
parent c3ecde1105
commit f6253af8a9
58 changed files with 3967 additions and 1906 deletions
@@ -487,8 +487,11 @@ ConcreteParasiticCapacitor::ConcreteParasiticCapacitor(size_t id,
 ////////////////////////////////////////////////////////////////

 ConcreteParasiticNetwork::ConcreteParasiticNetwork(const Net *net,
-                                                   bool includes_pin_caps) :
+                                                   bool includes_pin_caps,
+                                                   const Network *network) :
  net_(net),
+  sub_nodes_(network),
+  pin_nodes_(network),
  max_node_id_(0),
  includes_pin_caps_(includes_pin_caps)
 {
@@ -580,6 +583,29 @@ ConcreteParasiticNetwork::capacitance() const
  return cap;
 }

+ConcreteParasiticNode *
+ConcreteParasiticNetwork::findParasiticNode(const Net *net,
+                                            int id,
+                                            const Network *) const
+{
+  NetIdPair net_id(net, id);
+  auto id_node = sub_nodes_.find(net_id);
+  if (id_node == sub_nodes_.end()) 
+    return nullptr;
+  else
+    return id_node->second;
+}
+
+ConcreteParasiticNode *
+ConcreteParasiticNetwork::findParasiticNode(const Pin *pin) const
+{
+  auto pin_node = pin_nodes_.find(pin);
+  if (pin_node == pin_nodes_.end())
+    return nullptr;
+  else
+    return pin_node->second;
+}
+
 ConcreteParasiticNode *
 ConcreteParasiticNetwork::ensureParasiticNode(const Net *net,
 					      int id,
@@ -623,22 +649,12 @@ ConcreteParasiticNetwork::ensureParasiticNode(const Pin *pin,
  return node;
 }

-ConcreteParasiticNode *
-ConcreteParasiticNetwork::findNode(const Pin *pin) const
-{
-  auto pin_node = pin_nodes_.find(pin);
-  if (pin_node == pin_nodes_.end())
-    return nullptr;
-  else
-    return pin_node->second;
-}
-
 PinSet
 ConcreteParasiticNetwork::unannotatedLoads(const Pin *drvr_pin,
                                           const Parasitics *parasitics) const
 {
  PinSet loads = parasitics->loads(drvr_pin);
-  ParasiticNode *drvr_node = findNode(drvr_pin);
+  ParasiticNode *drvr_node = findParasiticNode(drvr_pin);
  if (drvr_node) {
    ParasiticNodeResistorMap resistor_map =
      parasitics->parasiticNodeResistorMap(this);
@@ -713,6 +729,11 @@ ConcreteParasiticNetwork::disconnectPin(const Pin *pin,
  }
 }

+NetIdPairLess::NetIdPairLess(const Network *network) :
+  net_less_(network)
+{
+}
+
 bool
 NetIdPairLess::operator()(const NetIdPair &net_id1,
                          const NetIdPair &net_id2) const
@@ -721,7 +742,7 @@ NetIdPairLess::operator()(const NetIdPair &net_id1,
  const Net *net2 = net_id2.first;
  int id1 = net_id1.second;
  int id2 = net_id2.second;
-  return net1 < net2
+  return net_less_(net1, net2)
    || (net1 == net2
 	&& id1 < id2);
 }
@@ -1229,7 +1250,7 @@ ConcreteParasitics::makeParasiticNetwork(const Net *net,
    for (const Pin *drvr_pin : *network_->drivers(net))
      deleteParasitics(drvr_pin, ap);
  }
-  parasitic = new ConcreteParasiticNetwork(net, includes_pin_caps);
+  parasitic = new ConcreteParasiticNetwork(net, includes_pin_caps, network_);
  parasitics[ap_index] = parasitic;
  return parasitic;
 }
@@ -1286,6 +1307,17 @@ ConcreteParasitics::includesPinCaps(const Parasitic *parasitic) const
  return cparasitic->includesPinCaps();
 }

+ParasiticNode *
+ConcreteParasitics::findParasiticNode(Parasitic *parasitic,
+                                      const Net *net,
+                                      int id,
+                                      const Network *network) const
+{
+  const ConcreteParasiticNetwork *cparasitic =
+    static_cast<const ConcreteParasiticNetwork*>(parasitic);
+  return cparasitic->findParasiticNode(net, id, network);
+}
+
 ParasiticNode *
 ConcreteParasitics::ensureParasiticNode(Parasitic *parasitic,
 					const Net *net,
@@ -1297,6 +1329,15 @@ ConcreteParasitics::ensureParasiticNode(Parasitic *parasitic,
  return cparasitic->ensureParasiticNode(net, id, network);
 }

+ParasiticNode *
+ConcreteParasitics::findParasiticNode(const Parasitic *parasitic,
+                                      const Pin *pin) const
+{
+  const ConcreteParasiticNetwork *cparasitic =
+    static_cast<const ConcreteParasiticNetwork*>(parasitic);
+  return cparasitic->findParasiticNode(pin);
+}
+
 ParasiticNode *
 ConcreteParasitics::ensureParasiticNode(Parasitic *parasitic,
 					const Pin *pin,
@@ -1373,7 +1414,7 @@ ConcreteParasitics::capacitors(const Parasitic *parasitic) const


 const char *
-ConcreteParasitics::name(const ParasiticNode *node)
+ConcreteParasitics::name(const ParasiticNode *node) const
 {
  const ConcreteParasiticNode *cnode =
    static_cast<const ConcreteParasiticNode*>(node);
@@ -1413,15 +1454,6 @@ ConcreteParasitics::isExternal(const ParasiticNode *node) const
  return cnode->isExternal();
 }

-ParasiticNode *
-ConcreteParasitics::findNode(const Parasitic *parasitic,
-			     const Pin *pin) const
-{
-  const ConcreteParasiticNetwork *cparasitic =
-    static_cast<const ConcreteParasiticNetwork*>(parasitic);
-  return cparasitic->findNode(pin);
-}
-
 ////////////////////////////////////////////////////////////////

 size_t
@@ -113,19 +113,23 @@ public:
                              const ParasiticAnalysisPt *ap) override;
  void deleteParasiticNetworks(const Net *net) override;
  bool includesPinCaps(const Parasitic *parasitic) const override;
+  ParasiticNode *findParasiticNode(Parasitic *parasitic,
+                                   const Net *net,
+                                   int id,
+                                   const Network *network) const override;
  ParasiticNode *ensureParasiticNode(Parasitic *parasitic,
                                     const Net *net,
                                     int id,
                                     const Network *network) override;
+  ParasiticNode *findParasiticNode(const Parasitic *parasitic,
+                                   const Pin *pin) const override;
  ParasiticNode *ensureParasiticNode(Parasitic *parasitic,
                                     const Pin *pin,
                                     const Network *network) override;
  ParasiticNodeSeq nodes(const Parasitic *parasitic) const override;
  void incrCap(ParasiticNode *node,
               float cap) override;
-  const char *name(const ParasiticNode *node) override;
-  ParasiticNode *findNode(const Parasitic *parasitic,
-                          const Pin *pin) const override;
+  const char *name(const ParasiticNode *node) const override;
  const Pin *pin(const ParasiticNode *node) const override;
  const Net *net(const ParasiticNode *node,
                 const Network *network) const override;
@@ -27,17 +27,23 @@ class ConcretePoleResidue;
 class ConcreteParasiticDevice;
 class ConcreteParasiticNode;

-typedef std::map<const Pin*, float> ConcreteElmoreLoadMap;
-typedef std::map<const Pin*, ConcretePoleResidue> ConcretePoleResidueMap;
 typedef std::pair<const Net*, int> NetIdPair;
-struct NetIdPairLess
+class NetIdPairLess
 {
+public:
+  NetIdPairLess(const Network *network);
  bool operator()(const NetIdPair &net_id1,
 		  const NetIdPair &net_id2) const;
+
+private:
+  const NetIdLess net_less_;
 };
+
+typedef std::map<const Pin*, float> ConcreteElmoreLoadMap;
+typedef std::map<const Pin*, ConcretePoleResidue> ConcretePoleResidueMap;
 typedef std::map<NetIdPair,ConcreteParasiticNode*,
                 NetIdPairLess> ConcreteParasiticSubNodeMap;
-typedef std::map<const Pin*, ConcreteParasiticNode*> ConcreteParasiticPinNodeMap;
+typedef std::map<const Pin*, ConcreteParasiticNode*, PinIdLess> ConcreteParasiticPinNodeMap;
 typedef std::set<ParasiticNode*> ParasiticNodeSet;
 typedef std::set<ParasiticResistor*> ParasiticResistorSet;
 typedef std::vector<ParasiticResistor*> ParasiticResistorSeq;
@@ -197,17 +203,21 @@ class ConcreteParasiticNetwork : public ParasiticNetwork,
 {
 public:
  ConcreteParasiticNetwork(const Net *net,
-                           bool includes_pin_caps);
+                           bool includes_pin_caps,
+                           const Network *network);
  virtual ~ConcreteParasiticNetwork();
  virtual bool isParasiticNetwork() const { return true; }
  const Net *net() { return net_; }
  bool includesPinCaps() const { return includes_pin_caps_; }
+  ConcreteParasiticNode *findParasiticNode(const Net *net,
+                                           int id,
+                                           const Network *network) const;
  ConcreteParasiticNode *ensureParasiticNode(const Net *net,
 					     int id,
                                             const Network *network);
+  ConcreteParasiticNode *findParasiticNode(const Pin *pin) const;
  ConcreteParasiticNode *ensureParasiticNode(const Pin *pin,
                                             const Network *network);
-  ConcreteParasiticNode *findNode(const Pin *pin) const;
  virtual float capacitance() const;
  ParasiticNodeSeq nodes() const;
  void disconnectPin(const Pin *pin,
@@ -53,6 +53,13 @@ Parasitics::findParasiticNet(const Pin *pin) const
    return nullptr;
 }

+ParasiticNode *
+Parasitics::findNode(const Parasitic *parasitic,
+                     const Pin *pin) const
+{
+  return findParasiticNode(parasitic, pin);
+}
+
 PinSet
 Parasitics::loads(const Pin *drvr_pin) const
 {
@@ -306,7 +306,8 @@ reduceToPiElmore(const Parasitic *parasitic_network,
 		 StaState *sta)
 {
  Parasitics *parasitics = sta->parasitics();
-  ParasiticNode *drvr_node = parasitics->findNode(parasitic_network, drvr_pin);
+  ParasiticNode *drvr_node =
+    parasitics->findParasiticNode(parasitic_network, drvr_pin);
  if (drvr_node) {
    debugPrint(sta->debug(), "parasitic_reduce", 1, "Reduce driver %s %s %s",
               sta->network()->pathName(drvr_pin),
@@ -456,7 +457,8 @@ reduceToPiPoleResidue2(const Parasitic *parasitic_network,
 		       StaState *sta)
 {
  Parasitics *parasitics = sta->parasitics();
-  ParasiticNode *drvr_node = parasitics->findNode(parasitic_network, drvr_pin);
+  ParasiticNode *drvr_node =
+    parasitics->findParasiticNode(parasitic_network, drvr_pin);
  if (drvr_node) {
    debugPrint(sta->debug(), "parasitic_reduce", 1, "Reduce driver %s",
               sta->network()->pathName(drvr_pin));
@@ -508,7 +510,8 @@ ReduceToPiPoleResidue2::findPolesResidues(const Parasitic *parasitic_network,
  while (pin_iter->hasNext()) {
    const Pin *pin = pin_iter->next();
    if (network_->isLoad(pin)) {
-      ParasiticNode *load_node = parasitics_->findNode(parasitic_network, pin);
+      ParasiticNode *load_node =
+        parasitics_->findParasiticNode(parasitic_network, pin);
      if (load_node) {
 	findPolesResidues(pi_pole_residue, drvr_pin, pin, load_node);
      }
@@ -468,38 +468,40 @@ SpefReader::findParasiticNode(char *name,
      *delim = '\0';
      char *name2 = delim + 1;
      name = nameMapLookup(name);
-      Instance *inst = findInstanceRelative(name);
-      if (inst) {
-        // <instance>:<port>
-        Pin *pin = network_->findPin(inst, name2);
-        if (pin) {
-          if (local_only
-              && !network_->isConnected(net_, pin))
-            warn(1651, "%s not connected to net %s.", name, network_->pathName(net_));
-          return parasitics_->ensureParasiticNode(parasitic_, pin, network_);
+      if (name) {
+        Instance *inst = findInstanceRelative(name);
+        if (inst) {
+          // <instance>:<port>
+          Pin *pin = network_->findPin(inst, name2);
+          if (pin) {
+            if (local_only
+                && !network_->isConnected(net_, pin))
+              warn(1651, "%s not connected to net %s.", name, network_->pathName(net_));
+            return parasitics_->ensureParasiticNode(parasitic_, pin, network_);
+          }
+          else {
+            // Replace delimiter for error message.
+            *delim = delimiter_;
+            warn(1652, "pin %s not found.", name);
+          }
        }
        else {
-          // Replace delimiter for error message.
+          Net *net = findNet(name);
+          // Replace delimiter for error messages.
          *delim = delimiter_;
-          warn(1652, "pin %s not found.", name);
-        }
-      }
-      else {
-        Net *net = findNet(name);
-        // Replace delimiter for error messages.
-        *delim = delimiter_;
-        if (net) {
-          // <net>:<subnode_id>
-          const char *id_str = delim + 1;
-          if (isDigits(id_str)) {
-            int id = atoi(id_str);
-            if (local_only
-                && !network_->isConnected(net, net_))
-              warn(1653, "%s not connected to net %s.", name, network_->pathName(net_));
-            return parasitics_->ensureParasiticNode(parasitic_, net, id, network_);
+          if (net) {
+            // <net>:<subnode_id>
+            const char *id_str = delim + 1;
+            if (isDigits(id_str)) {
+              int id = atoi(id_str);
+              if (local_only
+                  && !network_->isConnected(net, net_))
+                warn(1653, "%s not connected to net %s.", name, network_->pathName(net_));
+              return parasitics_->ensureParasiticNode(parasitic_, net, id, network_);
+            }
+            else
+              warn(1654, "node %s not a pin or net:number", name);
          }
-          else
-            warn(1654, "node %s not a pin or net:number", name);
        }
      }
    }