Merge pull request #776 from os-fpga/checker_method_createPinGraph

checker: added method createPinGraph() for clock-data

Author: serge-dsa

planning/src/file_readers/pln_blif_file.cpp

@@ -23,6 +23,7 @@ void BLIF_file::reset(CStr nm, uint16_t tr) noexcept {
   inputs_lnum_ = outputs_lnum_ = 0;
   err_lnum_ = 0;
   err_msg_.clear();
+  pg_.clear();
 }
 
 // "model "
@@ -1149,7 +1150,7 @@ BLIF_file::Node* BLIF_file::findFabricDriver(uint of, const string& contact) noe
   return nullptr;
 }
 
-void BLIF_file::link(Node& from, Node& to) noexcept {
+void BLIF_file::link2(Node& from, Node& to) noexcept {
   assert(from.id_);
   assert(to.id_);
   assert(!to.parent_);
@@ -1178,7 +1179,7 @@ bool BLIF_file::linkNodes() noexcept {
     }
     Node* port = findOutputPort(nd.out_);
     if (port) {
-      link(*port, nd);
+      link2(*port, nd);
     }
   }
 
@@ -1248,7 +1249,7 @@ bool BLIF_file::linkNodes() noexcept {
       err_lnum_ = nd.lnum_;
       return false;
     }
-    link(*par, nd);
+    link2(*par, nd);
   }
 
   // 3. link input ports
@@ -1268,11 +1269,20 @@ bool BLIF_file::linkNodes() noexcept {
         err_lnum_ = nd.lnum_;
         return false;
       }
-      link(*par, nd);
+      link2(*par, nd);
     }
   }
 
-  // 4. every node except topInputs_ should be driven
+  // 4. set hashes
+  uint nn = numNodes();
+  for (uint i = 1; i <= nn; i++) {
+    Node& nd = nodePool_[i];
+    assert(nd.id_ == i);
+    nd.setCellHash();
+    nd.setOutHash();
+  }
+
+  // 5. every node except topInputs_ should be driven
   string inp1;
   for (Node* fab_nd : fabricNodes_) {
     Node& nd = *fab_nd;
@@ -1301,10 +1311,18 @@ bool BLIF_file::linkNodes() noexcept {
   return true;
 }
 
-bool BLIF_file::checkClockSepar(vector<const Node*>& clocked) const noexcept {
+bool BLIF_file::checkClockSepar(vector<const Node*>& clocked) noexcept {
   if (1|| clocked.empty())
     return true;
 
+  bool ok = createPinGraph();
+  if (!ok) {
+    flush_out(true); err_puts();
+    lprintf2("[Error] NOT createPinGraph()\n");
+    err_puts(); flush_out(true);
+  }
+
+#if 0
   NW g;
   auto& ls = lout();
   char nm_buf[512] = {};
@@ -1355,9 +1373,72 @@ bool BLIF_file::checkClockSepar(vector<const Node*>& clocked) const noexcept {
     lputs("\n\t***** break; // TMP");
     break; // TMP
   }
+#endif //////////0000000000
 
   return true;
 }
 
+bool BLIF_file::createPinGraph() noexcept {
+  auto& ls = lout();
+  pg_.clear();
+  if (!rd_ok_) return false;
+  if (topInputs_.empty() and topOutputs_.empty()) return false;
+  if (fabricNodes_.empty()) return false;
+
+  err_msg_.clear();
+  uint64_t key = 0;
+  uint nid = 0, kid = 0, eid = 0;
+
+  // -- create pg-nodes for topInputs_
+  for (const Node* p : topInputs_) {
+    const Node& port = *p;
+    assert(!port.out_.empty());
+    nid = pg_.insK(port.id_);
+    assert(nid);
+    pg_.setNodeName(nid, port.out_);
+  }
+
+  // -- create pg-nodes for topOutputs_
+  for (const Node* p : topOutputs_) {
+    const Node& port = *p;
+    assert(!port.out_.empty());
+    nid = pg_.insK(port.id_);
+    assert(nid);
+    pg_.setNodeName(nid, port.out_);
+  }
+
+  // -- link from input ports to fabric
+  for (Node* p : topInputs_) {
+    Node& port = *p;
+    assert(!port.out_.empty());
+    int pinIndex = -1;
+    Node* par = findFabricParent(port.id_, port.out_, pinIndex);
+    if (!par) {
+      continue;
+    }
+    assert(par->cell_hc_);
+    key = hashComb(par->cell_hc_, pinIndex);
+    assert(key);
+    kid = pg_.insK(key);
+    assert(kid);
+
+    eid = pg_.linK(port.id_, kid);
+    assert(eid);
+  }
+
+  if (1) {
+
+    pg_.dump("\t *** pg_ separ ***");
+    lprintf("\t  pg_. numN()= %u   numE()= %u\n", pg_.numN(), pg_.numE());
+    lputs();
+    pg_.printSum(ls, 0);
+    lputs();
+    pg_.dumpEdges("|edges|");
+
+  }
+
+  return false;
+}
+
 }
 

planning/src/file_readers/pln_blif_file.h

@@ -5,6 +5,7 @@
 #include "file_readers/pln_Fio.h"
 #include "file_readers/pln_primitives.h"
 #include "util/geo/xyz.h"
+#include "util/nw/Nw.h"
 
 namespace pln {
 
@@ -32,6 +33,8 @@ struct BLIF_file : public fio::MMapReader
 
     prim::Prim_t  ptype_ = prim::A_ZERO;
 
+    uint64_t cell_hc_ = 0, out_hc_ = 0;
+
     int16_t is_top_ = 0;     // -1:top input  1:top output
     bool is_mog_ = false;
 
@@ -41,10 +44,19 @@ struct BLIF_file : public fio::MMapReader
       if (keyword) kw_ = keyword;
     }
 
-    uint64_t outHash() const noexcept { return str::hashf(out_.c_str()); }
+    void setOutHash() noexcept {
+      out_hc_ = str::hashf(out_.c_str());
+    }
+    uint64_t outHash() const noexcept {
+      return out_hc_ ? out_hc_ : str::hashf(out_.c_str());
+    }
 
-    uint64_t hashCode() const noexcept {
-      return hashComb(id_, is_top_, outHash());
+    void setCellHash() noexcept {
+      cell_hc_ = hashComb(id_, is_top_, str::hashf(out_.c_str()));
+    }
+    uint64_t cellHash() const noexcept {
+      if (cell_hc_) return cell_hc_;
+      return hashComb(id_, is_top_, str::hashf(out_.c_str()));
     }
 
     bool isTopPort() const noexcept { return is_top_ != 0; }
@@ -202,9 +214,12 @@ struct BLIF_file : public fio::MMapReader
 private:
   bool createNodes() noexcept;
   bool linkNodes() noexcept;
-  void link(Node& from, Node& to) noexcept;
+  void link2(Node& from, Node& to) noexcept;
+
+  bool createPinGraph() noexcept;
+  bool linkPinGraph() noexcept;
 
-  bool checkClockSepar(vector<const Node*>& clocked) const noexcept;
+  bool checkClockSepar(vector<const Node*>& clocked) noexcept;
 
   Node* findOutputPort(const string& contact) noexcept;
   Node* findInputPort(const string& contact) noexcept;
@@ -218,6 +233,8 @@ struct BLIF_file : public fio::MMapReader
   std::vector<Node*> fabricNodes_, constantNodes_;
 
   std::vector<Node*> latches_; // latches are not checked for now
+
+  NW pg_; // Pin Graph
 };
 
 }

planning/src/main.cpp

@@ -1,4 +1,4 @@
-static const char* _pln_VERSION_STR = "pln0286";
+static const char* _pln_VERSION_STR = "pln0289";
 
 #include "RS/rsEnv.h"
 #include "util/pln_log.h"

planning/src/util/nw/Nw.cpp

@@ -14,6 +14,7 @@
 namespace pln {
 
 uint NW::insK(uint64_t k) noexcept {
+  assert(k);
   if (empty()) return addNode(k);
 
   uint newNid = 0;
@@ -359,6 +360,22 @@ uint NW::printNodes(ostream& os, CStr msg, uint16_t forDot) const noexcept {
 }
 uint NW::dumpNodes(CStr msg) const noexcept { return printNodes(lout(), msg, 0); }
 
+uint NW::printEdges(ostream& os, CStr msg) const noexcept {
+  using std::endl;
+  if (msg) os << msg << endl;
+
+  uint esz = numE();
+  os_printf(os, "  esz= %u\n", esz);
+  if (esz) {
+    for (cEI I(*this); I.valid(); ++I) {
+      I->print(os);
+      os << endl;
+    }
+  }
+  return esz;
+}
+uint NW::dumpEdges(CStr msg) const noexcept { return printEdges(lout(), msg); }
+
 uint NW::printSum(ostream& os, uint16_t forDot) const noexcept {
   dot_comment(os, forDot);
   if (empty()) {

planning/src/util/nw/Nw.h

@@ -360,6 +360,7 @@ struct NW {
   }
 
   uint linkNodes(uint i1, uint i2, bool in_cel = false) noexcept;
+  inline uint linK(uint64_t k1, uint64_t k2) noexcept;
 
   uint insK(uint64_t k) noexcept;
 
@@ -370,8 +371,6 @@ struct NW {
     return id;
   }
 
-  uint linK(uint64_t k1, uint64_t k2) noexcept;
-
   inline uint findEdge(uint a, uint b) const noexcept;
 
   uint findNode(uint64_t k) const noexcept {
@@ -413,6 +412,8 @@ struct NW {
   uint dump(CStr msg = nullptr) const noexcept;
   uint printNodes(ostream& os, CStr msg, uint16_t forDot) const noexcept;
   uint dumpNodes(CStr msg = nullptr) const noexcept;
+  uint printEdges(ostream& os, CStr msg = nullptr) const noexcept;
+  uint dumpEdges(CStr msg = nullptr) const noexcept;
 
   uint printSum(ostream& os, uint16_t forDot) const noexcept;
 
@@ -499,24 +500,7 @@ struct NW {
   uint16_t trace_ = 0;
 };
 
-inline void NW::clear() noexcept {
-  nids_.clear();
-  rids_.clear();
-  ndStor_.clear();
-  edStor_.clear();
-  ndStor_.emplace_back();
-  edStor_.emplace_back();
-}
-
-inline uint NW::addNode(const XY& p, uint64_t k) noexcept {
-  if (ndStor_.empty()) ndStor_.emplace_back();
-
-  uint id = ndStor_.size();
-  ndStor_.emplace_back(p, k, id, 0, false);
-  nids_.push_back(id);
-  return id;
-}
-
+// ==== Outgoing Edge Iterator
 struct NW::OutgEI {
   OutgEI(const NW& g, uint nid) noexcept : g_(g), nid_(nid) { reset(); }
   OutgEI(const NW& g, const Node& nd) noexcept : g_(g), nid_(nd.id_) { reset(); }
@@ -560,6 +544,7 @@ struct NW::OutgEI {
   uint esz_ = 0;
 };
 
+// ==== Incoming Edge Iterator
 struct NW::IncoEI {
   IncoEI(const NW& g, uint nid) noexcept : g_(g), nid_(nid) { reset(); }
   IncoEI(const NW& g, const Node& nd) noexcept : g_(g), nid_(nd.id_) { reset(); }
@@ -604,6 +589,7 @@ struct NW::IncoEI {
   uint esz_ = 0;
 };
 
+// ==== Edge Iterator
 struct NW::EI {
   EI(NW& g) noexcept : stor_(g.edStor_), cur_(1) {
     while (valid() and !stor_[cur_].valid()) cur_++;
@@ -628,6 +614,7 @@ struct NW::EI {
   uint cur_ = 0;
 };
 
+// ==== const Edge Iterator
 struct NW::cEI {
   cEI(const NW& g) noexcept : stor_(g.edStor_), cur_(1) {
     while (valid() and !stor_[cur_].valid()) cur_++;
@@ -653,6 +640,7 @@ struct NW::cEI {
   uint cur_ = 0;
 };
 
+// ==== Child Node Iterator
 struct NW::ChldNI : public NW::OutgEI {
   ChldNI(const NW& g, uint nid) noexcept : OutgEI(g, nid) {}
   ChldNI& operator++() noexcept {
@@ -673,6 +661,24 @@ struct NW::ChldNI : public NW::OutgEI {
   }
 };
 
+inline void NW::clear() noexcept {
+  nids_.clear();
+  rids_.clear();
+  ndStor_.clear();
+  edStor_.clear();
+  ndStor_.emplace_back();
+  edStor_.emplace_back();
+}
+
+inline uint NW::addNode(const XY& p, uint64_t k) noexcept {
+  if (ndStor_.empty()) ndStor_.emplace_back();
+
+  uint id = ndStor_.size();
+  ndStor_.emplace_back(p, k, id, 0, false);
+  nids_.push_back(id);
+  return id;
+}
+
 inline uint NW::Node::outDeg(const NW& g) const noexcept {
   if (edges_.empty()) return 0;
 
@@ -783,6 +789,36 @@ inline uint NW::findEdge(uint a, uint b) const noexcept {
   return 0;
 }
 
+inline uint NW::linK(uint64_t k1, uint64_t k2) noexcept {
+  assert(k1 != k2);
+  uint n1 = 0, n2 = 0;
+
+  if (empty()) {
+    uint e = 0;
+    if (k1 < k2) {
+      addNode(k1);
+      addNode(k2);
+      e = linkNodes(1, 2);
+    } else {
+      addNode(k2);
+      addNode(k1);
+      e = linkNodes(2, 1);
+    }
+    return e;
+  }
+
+  if (k1 < k2) {
+    n1 = insK(k1);
+    n2 = insK(k2);
+  } else {
+    n2 = insK(k2);
+    n1 = insK(k1);
+  }
+
+  assert(n1 and n2);
+  return linkNodes(n1, n2);
+}
+
 inline upair NW::countRoots() const noexcept {
   uint cnt = 0, mark_cnt = 0;
   if (empty()) return {cnt, mark_cnt};