Merge pull request #703 from os-fpga/pln_checker_support_escaping_NL

pln blif-checker: support escaping NL (line continuation)

Author: serge-dsa

stars/src/file_readers/pinc_Fio.cpp

@@ -867,6 +867,108 @@ bool MMapReader::makeLines(bool cutComments, bool cutNL) noexcept {
   return true;
 }
 
+vector<char*> MMapReader::get_backslashed_block(size_t fromLine) noexcept {
+  if (!sz_ || !fsz_) return {};
+  if (!buf_) return {};
+  if (!hasLines()) return {};
+
+  size_t numLines = lines_.size();
+  if (numLines <= 3)
+    return {};
+  if (fromLine >= numLines - 3)
+    return {};
+
+  vector<char*> V;
+  size_t li = 0;
+
+  for (li = fromLine; li < numLines - 3; li++) {
+    char* line = lines_[li];
+    if (!line)
+      break;
+    size_t len = ::strlen(line);
+    if (len <= 2)
+      break;
+    if (line[len - 1] != '\\')
+      break;
+
+    line[len - 1] = ' '; // erase backslash
+    V.push_back(line);
+  }
+
+  // add non-backslashed line at the end of block:
+  if (li < numLines - 1) {
+    char* line = lines_[li];
+    if (line and line[0])
+      V.push_back(line);
+  }
+
+  return V;
+}
+
+// '\' screens new-line '\n' like in tcl and cpp.
+// returns number of processed '\' symbols.
+size_t MMapReader::escapeNL() noexcept {
+  if (!sz_ || !fsz_) return 0;
+  if (!buf_) return 0;
+  if (!hasLines()) return 0;
+
+  size_t numLines = lines_.size();
+  if (numLines <= 3)
+    return 0;
+
+  size_t cnt = 0;
+  vector<char*> bs_block;
+
+  for (size_t li = 1; li < numLines - 1; li++) {
+    char* line = lines_[li];
+    if (!line)
+      continue;
+    size_t len = ::strlen(line);
+    if (len <= 2)
+      continue;
+    if (line[len - 1] != '\\')
+      continue;
+    line[len - 1] = ' '; // erase backslash
+
+    char* nextLine = lines_[li + 1];
+    if (!nextLine)
+      continue;
+    size_t nextLen = ::strlen(nextLine);
+    if (nextLen <= 1)
+      continue;
+
+    bs_block = get_backslashed_block(li + 1);
+    if (bs_block.empty())
+      continue;
+
+    // lprintf("\t    ............. bs_block.size()= %zu\n", bs_block.size());
+
+    // replace 'line' by allocated and contatenated string:
+    size_t newSize = len;
+    for (char* s : bs_block) {
+      assert(s);
+      newSize += ::strlen(s);
+    }
+    char* replacement = (char*) ::calloc(newSize + 2, 1);
+
+    void* next = ::mempcpy(replacement, line, len);
+    for (char* s : bs_block) {
+      size_t slen = ::strlen(s);
+      next = ::mempcpy(next, s, slen);
+      cnt++;
+    }
+
+    // blank bs_block lines:
+    for (char* s : bs_block) {
+      s[0] = 0;
+    }
+
+    lines_[li] = replacement;
+  }
+
+  return cnt;
+}
+
 char* MMapReader::skipLine(char* curL) noexcept {
   assert(sz_);
   assert(buf_);

stars/src/file_readers/pinc_Fio.h

@@ -232,6 +232,8 @@ class MMapReader : public Fio
 
   virtual bool makeLines(bool cutComments, bool cutNL) noexcept override;
 
+  size_t escapeNL() noexcept; // by '\'
+
   int64_t countLines() const noexcept;
 
   size_t setNumLines() noexcept {
@@ -261,6 +263,8 @@ class MMapReader : public Fio
 private:
   bool is_text_file(string& label) const noexcept;
 
+  vector<char*> get_backslashed_block(size_t fromLine) noexcept;
+
 }; // MMapReader
 
 

stars/src/file_readers/pln_blif_file.cpp

@@ -146,11 +146,11 @@ bool BLIF_file::readBlif() noexcept {
     return false;
   }
 
-  ok = ::memmem(buf_, sz_, ".end", 4);
-  if (!ok) {
-    err_msg_ = ".end not found";
-    return false;
-  }
+  //ok = ::memmem(buf_, sz_, ".end", 4);
+  //if (!ok) {
+  //  err_msg_ = ".end not found";
+  //  return false;
+  //}
 
   ok = MMapReader::makeLines(true, true);
   if (!ok) {
@@ -164,6 +164,11 @@ bool BLIF_file::readBlif() noexcept {
     return false;
   }
 
+  size_t num_escaped = escapeNL();
+  if (trace_ >= 4) {
+    lprintf(" ....\\ ...  num_escaped= %zu\n", num_escaped);
+  }
+
   inputs_lnum_ = outputs_lnum_ = 0;
   err_lnum_ = 0;
   for (size_t i = 1; i < lsz; i++) {
@@ -189,7 +194,7 @@ bool BLIF_file::readBlif() noexcept {
     return false;
   }
 
-  if (trace() >= 3) {
+  if (trace_ >= 3) {
     lprintf("\t ....  inputs_lnum_= %zu  outputs_lnum_= %zu\n", inputs_lnum_, outputs_lnum_);
   }
 
@@ -636,7 +641,14 @@ bool BLIF_file::linkNodes() noexcept {
   for (Node* fab_nd : fabricNodes_) {
     assert(fab_nd);
     Node& nd = *fab_nd;
-    assert(!nd.out_.empty());
+    if (nd.out_.empty()) {
+      err_msg_ = str::concat("incomplete fabric cell:  ", nd.kw_);
+      if (!nd.data_.empty()) {
+        err_msg_ += str::concat("  ", nd.data_.front());
+      }
+      err_lnum_ = nd.lnum_;
+      return false;
+    }
     Node* port = findOutputPort(nd.out_);
     if (port) {
       link(*port, nd);

stars/src/main.cpp

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