Merge pull request #841 from os-fpga/checker_fix_EDA3230

blif checker fix EDA-3230

Author: serge-dsa

planning/src/RS/rsCheck.cpp

@@ -68,6 +68,9 @@ bool do_check_blif(CStr cfn) {
   ls << "-----    #inputs= " << numInp << endl;
   ls << "-----   #outputs= " << numOut << endl;
   ls << "-----      #LUTs= " << bfile.countLUTs() << endl;
+  ls << "-----      #LUT1= " << bfile.typeHist(prim::LUT1) << endl;
+  ls << "-----      #LUT5= " << bfile.typeHist(prim::LUT5) << endl;
+  ls << "-----      #LUT6= " << bfile.typeHist(prim::LUT6) << endl;
   ls << "-----       #FFs= " << bfile.countFFs() << endl;
   {
   uint nIBUF = 0, nOBUF = 0, nCBUF = 0;

planning/src/file_io/pln_Fio.cpp

@@ -18,7 +18,7 @@ namespace fio {
 using namespace pln;
 using namespace std;
 
-static constexpr uint32_t fio_MAX_STACK_USE = 1048576;  // 1 MiB
+static constexpr uint32_t fio_MAX_STACK_USE = 2097152;  // 2 MiB
 
 Info::Info(CStr nm) noexcept {
   if (!nm) return;
@@ -1211,7 +1211,7 @@ bool LineReader::makeLines(bool cutComments, bool cutNL) noexcept {
   return false;
 }
 
-static constexpr size_t MAX_BUF_sz = 67108860;  // 64 MB
+static constexpr size_t MAX_BUF_sz = 134217720;  // 128 MB
 
 static inline CStr trim_left(CStr p) noexcept {
   if (p && *p)

planning/src/file_io/pln_blif_file.cpp

@@ -390,6 +390,12 @@ bool BLIF_file::checkBlif() noexcept {
     flush_out(true);
   }
 
+  // confirm that all fab node have output:
+  // for (const BNode* fab_nd : fabricNodes_) {
+  //   assert(fab_nd);
+  //   assert(not fab_nd->out_.empty());
+  // }
+
   bool link_ok = linkNodes();
   if (not link_ok) {
     string tmp = err_msg_;
@@ -1017,10 +1023,10 @@ bool BLIF_file::createNodes() noexcept {
   if (not hasLines() or lsz < 3) return false;
   if (lsz >= UINT_MAX) return false;
 
-  nodePool_.reserve(2 * lsz + 8);
+  nodePool_.reserve(4 * lsz + 8);
   nodePool_.emplace_back();  // put a fake node
 
-  char buf[2048] = {};
+  char buf[4096] = {};
   vector<string> V;
   V.reserve(16);
   inputs_lnum_ = outputs_lnum_ = 0;
@@ -1111,9 +1117,9 @@ bool BLIF_file::createNodes() noexcept {
     BNode& nd = nodePool_[i];
     if (nd.kw_ != ".subckt" and nd.kw_ != ".gate")
       continue;
-    if (nd.data_.size() < 4)
+    if (nd.data_.size() < 3)
       continue;
-    if (nd.is_IBUF() or nd.is_OBUF())
+    if (nd.is_IBUF() or nd.is_OBUF() or nd.is_LUT())
       continue;
     assert(!nd.is_mog_);
 
@@ -1150,7 +1156,7 @@ bool BLIF_file::createNodes() noexcept {
   nn = numNodes();
   assert(nn);
 
-  fabricNodes_.reserve(nn);
+  fabricNodes_.reserve(nn + 4);
 
   // -- finish and index nodes:
   for (uint i = 1; i <= nn; i++) {
@@ -1172,9 +1178,11 @@ bool BLIF_file::createNodes() noexcept {
     }
     if (nd.kw_ == ".subckt" or nd.kw_ == ".gate") {
       if (nd.data_.size() > 1) {
+        if (nd.lnum_ == 47)
+          lputs8();
         const string& last = nd.data_.back();
         size_t llen = last.length();
-        if (!last.empty() and llen < 2047) {
+        if (!last.empty() and llen < 4095) {
           // replace '=' by 'space' and tokenize:
           ::strcpy(buf, last.c_str());
           for (uint k = 0; k < llen; k++) {
@@ -1453,6 +1461,7 @@ bool BLIF_file::linkNodes() noexcept {
     assert(fab_nd);
     BNode& nd = *fab_nd;
     if (nd.out_.empty()) {
+      //lputs8();
       err_msg_ = str::concat("incomplete fabric cell:  ", nd.kw_);
       if (!nd.data_.empty()) {
         err_msg_ += str::concat("  ", nd.data_.front());

planning/src/main.cpp

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

planning/src/pin_loc/read_ports.cpp

@@ -1122,6 +1122,7 @@ bool PinPlacer::BlifReader::read_blif(const string& blif_fn, bool& checked_ok) n
             checked_ok ? "PASS" : "FAIL");
     lprintf("------ END pinc_check_blif:  %s\n", cfn);
     flush_out(true);
+    //assert(checked_ok);
   }
 
   bool rd_ok = bfile.readBlif();