Merge pull request #878 from os-fpga/checker_handle_wire_nodes_E3235

checker: handle wire nodes EDA-3235

Author: serge-dsa

planning/src/file_io/pln_blif_file.cpp

@@ -187,6 +187,14 @@ void BLIF_file::BNode::place_output_at_back(vector<string>& dat) noexcept {
   }
 }
 
+CStr BLIF_file::BNode::cPrimType() const noexcept {
+  if (is_wire_)
+    return "WIRE";
+  if (is_const_)
+    return "CONST";
+  return ptype_ == prim::A_ZERO ? "{e}" : pr_enum2str(ptype_);
+}
+
 bool BLIF_file::readBlif() noexcept {
   inputs_.clear();
   outputs_.clear();
@@ -558,7 +566,9 @@ uint BLIF_file::printNodes(std::ostream& os) const noexcept {
   os << "       #fabricNodes_= " << fabricNodes_.size() << '\n';
   os << "   #fabricRealNodes_= " << fabricRealNodes_.size() << '\n';
   os << "           #latches_= " << latches_.size() << '\n';
-  os << "     #constantNodes_= " << constantNodes_.size() << '\n';
+  os << "     #constantNodes_= " << constantNodes_.size()
+     << "  cnt " << countConstNodes() << '\n';
+  os << "         #wireNodes_= " << countWireNodes() << '\n';
   os << endl;
 
   if (trace_ < 4) {
@@ -817,6 +827,36 @@ uint BLIF_file::countCarryNodes() const noexcept {
   return cnt;
 }
 
+uint BLIF_file::countWireNodes() const noexcept {
+  uint nn = numNodes();
+  if (nn == 0)
+    return 0;
+
+  uint cnt = 0;
+  for (uint i = 1; i <= nn; i++) {
+    const BNode& nd = nodePool_[i];
+    if (nd.is_wire_)
+      cnt++;
+  }
+
+  return cnt;
+}
+
+uint BLIF_file::countConstNodes() const noexcept {
+  uint nn = numNodes();
+  if (nn == 0)
+    return 0;
+
+  uint cnt = 0;
+  for (uint i = 1; i <= nn; i++) {
+    const BNode& nd = nodePool_[i];
+    if (nd.is_const_)
+      cnt++;
+  }
+
+  return cnt;
+}
+
 uint BLIF_file::printCarryNodes(std::ostream& os) const noexcept {
   uint nn = numNodes();
   if (!nn) {
@@ -1120,9 +1160,18 @@ bool BLIF_file::createNodes() noexcept {
     if (starts_w_names(cs + 1, len - 1)) {
       Fio::split_spa(lines_[L], V);
       if (V.size() > 1 and V.front() == ".names") {
+        //lputs9();
         nodePool_.emplace_back(".names", L);
         BNode& nd = nodePool_.back();
         nd.data_.assign(V.begin() + 1, V.end());
+        nd.out_ = nd.data_.back();
+        if (V.size() == 2) {
+          nd.is_const_ = true;
+        } else if (V.size() == 3) {
+          nd.is_wire_ = true;
+          nd.inSigs_.push_back(V[1]);
+          nd.inPins_.push_back("wire_in");
+        }
       }
       continue;
     }

planning/src/file_io/pln_blif_file.h

@@ -46,6 +46,8 @@ struct BLIF_file : public fio::MMapReader
     bool is_mog_ = false;
     bool isClockLess_ = false;
 
+    bool is_wire_ = false, is_const_ = false;  // .names
+
   public:
     BNode() noexcept = default;
     BNode(CStr keyword, uint L) noexcept : lnum_(L) {
@@ -188,9 +190,7 @@ struct BLIF_file : public fio::MMapReader
 
     CStr cOut() const noexcept { return out_.empty() ? "{e}" : out_.c_str(); }
 
-    CStr cPrimType() const noexcept {
-      return ptype_ == prim::A_ZERO ? "{e}" : pr_enum2str(ptype_);
-    }
+    CStr cPrimType() const noexcept;
 
     struct CmpOut {
       bool operator()(const BNode* a, const BNode* b) const noexcept {
@@ -284,12 +284,15 @@ struct BLIF_file : public fio::MMapReader
   void collectClockedNodes(vector<BNode*>& V) noexcept;
   std::array<uint, prim::Prim_MAX_ID> countTypes() const noexcept;
 
+  uint countCarryNodes() const noexcept;
+  uint countWireNodes() const noexcept;
+  uint countConstNodes() const noexcept;
+
   uint printInputs(std::ostream& os, CStr spacer = nullptr) const noexcept;
   uint printOutputs(std::ostream& os, CStr spacer = nullptr) const noexcept;
   uint printNodes(std::ostream& os) const noexcept;
   uint printPrimitives(std::ostream& os, bool instCounts) const noexcept;
 
-  uint countCarryNodes() const noexcept;
   uint printCarryNodes(std::ostream& os) const noexcept;
 
 private:

planning/src/main.cpp

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