Merge pull request #706 from os-fpga/checker_pin_dir_development

blif_checker: pin direction related development

Author: serge-dsa

stars/src/file_readers/pln_blif_file.cpp

@@ -409,9 +409,11 @@ uint BLIF_file::printNodes(std::ostream& os) const noexcept {
   os << "--- nodes (" << n << ") :" << endl;
   for (uint i = 1; i <= n; i++) {
     const Node& nd = nodePool_[i];
+    CStr pts = nd.cPrimType();
+    assert(pts);
     os_printf(os,
-              "  |%u| L:%u  %s  inDeg=%u outDeg=%u  par=%u  out:%s  mog:%i/%i  ",
-              i, nd.lnum_, nd.kw_.c_str(),
+              "  |%u| L:%u  %s  ptype:%s  inDeg=%u outDeg=%u  par=%u  out:%s  mog:%i/%i  ",
+              i, nd.lnum_, nd.kw_.c_str(), pts,
               nd.inDeg(), nd.outDeg(), nd.parent_,
               nd.cOut(), nd.isMog(), nd.isVirtualMog());
     if (nd.data_.empty()) {
@@ -550,6 +552,7 @@ bool BLIF_file::createNodes() noexcept {
         nodePool_.emplace_back(".subckt", L);
         Node& nd = nodePool_.back();
         nd.data_.assign(V.begin() + 1, V.end());
+        nd.ptype_ = primt_id(nd.data_front());
         place_output_at_back(nd.data_);
       }
       continue;
@@ -562,6 +565,7 @@ bool BLIF_file::createNodes() noexcept {
         nodePool_.emplace_back(".gate", L);
         Node& nd = nodePool_.back();
         nd.data_.assign(V.begin() + 1, V.end());
+        nd.ptype_ = primt_id(nd.data_front());
         place_output_at_back(nd.data_);
       }
       continue;
@@ -598,7 +602,7 @@ bool BLIF_file::createNodes() noexcept {
     bool is_mog = V.size() > 1;
     if (is_mog) {
       if (trace_ >= 5) {
-        lprintf("\t\t .... MOG-type: %s\n", nd.cType());
+        lprintf("\t\t .... MOG-type: %s\n", nd.cPrimType());
         lprintf("\t\t .... [terms] V.size()= %zu\n", V.size());
         logVec(V, "  [V-terms] ");
         lputs();

stars/src/file_readers/pln_blif_file.h

@@ -66,21 +66,32 @@ struct BLIF_file : public fio::MMapReader
     // returns pin index in chld_ or -1
     int in_contact(const string& x) const noexcept;
 
-    bool is_IBUF() const noexcept {
+    CStr data_front() const noexcept {
+      return data_.size() > 1 ? data_.front().c_str() : nullptr;
+    }
+
+    bool is_str_IBUF() const noexcept {
       return data_.size() > 1 and data_.front() == "I_BUF";
     }
-    bool is_OBUF() const noexcept {
+    bool is_str_OBUF() const noexcept {
       return data_.size() > 1 and data_.front() == "O_BUF";
     }
 
+    bool is_IBUF() const noexcept {
+      return ptype_ == I_BUF or ptype_ == I_BUF_DS;
+    }
+    bool is_OBUF() const noexcept {
+      return ptype_ == O_BUF or ptype_ == O_BUF_DS or
+             ptype_ == O_BUFT or ptype_ == O_BUFT_DS;
+    }
+
     string firstInputPin() const noexcept;
 
     CStr cOut() const noexcept { return out_.empty() ? "{e}" : out_.c_str(); }
 
-    CStr cType() const noexcept { return data_.empty() ? "{e}" : data_.front().c_str(); }
+    // CStr cType() const noexcept { return data_.empty() ? "{e}" : data_.front().c_str(); }
 
-    // cPrimType() will replace cType()
-    CStr cPrimType() const noexcept { return primt_name(ptype_); }
+    CStr cPrimType() const noexcept { return ptype_ == A_ZERO ? "{e}" : primt_name(ptype_); }
 
     struct CmpOut {
       bool operator()(const Node* a, const Node* b) const noexcept {

stars/src/file_readers/pln_primitives.cpp

@@ -2,8 +2,7 @@
 
 namespace pln {
 
-
-CStr primt_name(Prim_t enu) noexcept {
+namespace {
   // enumNames are sorted and Prim_t is sorted, it ensures
   // correct ID -> name mapping. Always keep them in sorted order.
   static const char* enumNames[] = {
@@ -43,14 +42,67 @@ CStr primt_name(Prim_t enu) noexcept {
     "X_UNKNOWN",
     "Y_UPPER_GUARD"
   };
-  static_assert(sizeof(enumNames) / sizeof(enumNames[0]) == Y_UPPER_GUARD + 1);
+}
 
+CStr primt_name(Prim_t enu) noexcept {
+  static_assert(sizeof(enumNames) / sizeof(enumNames[0]) == Y_UPPER_GUARD + 1);
   uint i = enu;
   assert(i <= Prim_MAX_ID);
-
   return enumNames[i];
 }
 
+// "A_"
+static inline bool starts_w_A(CStr z) noexcept {
+  assert(z);
+  if (::strnlen(z, 4) < 2)
+    return false;
+  return z[0] == 'A' and z[1] == '_';
+}
+
+// "X_"
+static inline bool starts_w_X(CStr z) noexcept {
+  assert(z);
+  if (::strnlen(z, 4) < 2)
+    return false;
+  return z[0] == 'X' and z[1] == '_';
+}
+
+// "Y_"
+static inline bool starts_w_Y(CStr z) noexcept {
+  assert(z);
+  if (::strnlen(z, 4) < 2)
+    return false;
+  return z[0] == 'Y' and z[1] == '_';
+}
+
+static inline bool starts_w_CAR(CStr z) noexcept {
+  assert(z);
+  if (::strnlen(z, 8) < 4)
+    return false;
+  return z[0] == 'C' and z[1] == 'A' and z[2] == 'R';
+}
+
+// string -> enum, returns A_ZERO on error
+Prim_t primt_id(CStr name) noexcept {
+  if (!name or !name[0])
+    return A_ZERO;
+  if (starts_w_X(name))
+    return X_UNKNOWN;
+  if (starts_w_Y(name))
+    return Y_UPPER_GUARD;
+  if (starts_w_A(name))
+    return A_ZERO;
+  if (starts_w_CAR(name))
+    return CARRY_CHAIN;
+
+  uint X = X_UNKNOWN;
+  for (uint i = 1; i < X; i++) {
+    if (::strcmp(enumNames[i], name) == 0)
+      return (Prim_t)i;
+  }
+
+  return A_ZERO;
+}
 
 }
 

stars/src/file_readers/pln_primitives.h

@@ -56,6 +56,11 @@ constexpr uint Prim_MAX_ID = X_UNKNOWN;
 // enum -> string
 CStr primt_name(Prim_t enu) noexcept;
 
+
+// string -> enum, returns A_ZERO on error
+Prim_t primt_id(CStr name) noexcept;
+
+
 }
 
 #endif

stars/src/main.cpp

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