Merge pull request #899 from os-fpga/checker_add_writeBlif_method

checker: add writeBlif() method

Author: serge-dsa

planning/src/RS/rsCheck.cpp

@@ -66,7 +66,7 @@ bool do_check_blif(CStr cfn,
   bool chk_ok = bfile.checkBlif(badInputs, badOutputs);
   assert(chk_ok == bfile.chk_ok_);
 
-  lprintf("=====   passed: %s\n", chk_ok ? "YES" : "NO");
+  lprintf("=====  passed: %s\n", chk_ok ? "YES" : "NO");
 
   ls << "-----    topModel: " << bfile.topModel_ << endl;
   ls << "-----        file: " << bfile.fnm_ << endl;
@@ -116,8 +116,16 @@ bool do_check_blif(CStr cfn,
     if (numWarn)
       lprintf("  # WARNINGS= %u", numWarn);
     lputs();
+    if (::getenv("pln_always_write_blif")) {
+      string outFn = str::concat("PLN_", cfn);
+      string wr_ok = bfile.writeBlif(outFn, false);
+      if (wr_ok.empty())
+        lprintf("---!!  FAILED writeBlif to '%s'\n", outFn.c_str());
+      else
+        lprintf("+++++  WRITTEN '%s'\n", wr_ok.c_str());
+    }
   }
-  lprintf("=====    passed: %s\n", chk_ok ? "YES" : "NO");
+  lprintf("=====  passed: %s\n", chk_ok ? "YES" : "NO");
 
   flush_out(true);
   if (chk_ok) {

planning/src/file_io/pln_Fio.cpp

@@ -703,7 +703,7 @@ int64_t MMapReader::writeFile(const string& nm) noexcept {
   if (nm == fnm_)
     return -1;
 
-  auto tr = trace();
+  uint16_t tr = trace();
   CStr cnm = nm.c_str();
   FILE* f = ::fopen(cnm, "w");
   if (!f) {

planning/src/file_io/pln_blif_file.cpp

@@ -1747,9 +1747,8 @@ bool BLIF_file::linkNodes() noexcept {
     if (!par) {
       if (nd.is_RAM() or nd.is_DSP()) {
         const string& net = nd.out_;
-        bool is_ram = nd.is_RAM();
         uint rid = nd.realId(*this);
-        const BNode& realNd = bnodeRef(rid);
+        BNode& realNd = bnodeRef(rid);
         const vector<string>& realData = realNd.realData_;
         assert(not realData.empty());
         int dataTerm = findTermByNet(realData, net);
@@ -1760,12 +1759,13 @@ bool BLIF_file::linkNodes() noexcept {
         // RAM or DSP output bits may be unused
         if (trace_ >= 4) {
           lprintf("skipping dangling cell output issue for %s at line %u\n",
-                  is_ram ? "RAM" : "DSP", realNd.lnum_);
+                  realNd.cPrimType(), realNd.lnum_);
           lprintf("  dangling net: %s  term# %i %s\n",
                   net.c_str(), dataTerm, realData[dataTerm].c_str());
           lputs();
         }
-        if (is_ram)
+        realNd.dangTerms_.push_back(dataTerm);
+        if (nd.is_RAM())
           dang_RAM_outputs_.emplace_back(realNd.id_, dataTerm);
         else
           dang_DSP_outputs_.emplace_back(realNd.id_, dataTerm);
@@ -2482,5 +2482,54 @@ string BLIF_file::writePinGraph(CStr fn0) const noexcept {
   return {};
 }
 
+string BLIF_file::writeBlif(const string& toFn, bool cleanUp) noexcept {
+  if (toFn.empty())
+    return {};
+  if (!fsz_ || !sz_ || !buf_ || fnm_.empty())
+    return {};
+  if (not hasLines())
+    return {};
+
+  string fn2 = (toFn == fnm_ ? str::concat("2_", toFn) : toFn);
+
+  CStr cnm = fn2.c_str();
+  FILE* f = ::fopen(cnm, "w");
+  if (!f) {
+    if (trace_ >= 3) {
+      flush_out(true);
+      lprintf("ERROR writeBlif() could not open file for writing: %s\n", cnm);
+      flush_out(true);
+    }
+    return {};
+  }
+
+  size_t cnt = 0, n = lines_.size();
+  for (size_t i = 0; i < n; i++) {
+    CStr cs = lines_[i];
+    if (!cs || !cs[0]) continue;
+    ::fputs(cs, f);
+    ::fputc('\n', f);
+    if (::ferror(f)) {
+      if (trace_ >= 3) {
+        flush_out(true);
+        lprintf("ERROR writeBlif() error during writing: %s\n", cnm);
+        flush_out(true);
+      }
+      break;
+    }
+    cnt++;
+  }
+
+  ::fclose(f);
+
+  if (trace_ >= 4) {
+    flush_out(trace_ >= 5);
+    lprintf("  writeBlif OK written #lines= %zu\n", cnt);
+  }
+  flush_out(trace_ >= 5);
+
+  return fn2;
+}
+
 }
 

planning/src/file_io/pln_blif_file.h

@@ -35,6 +35,8 @@ struct BLIF_file : public fio::MMapReader
 
     vector<string> data_;     // like realData_, but has only 1 output term (virtual SOG)
 
+    vector<uint> dangTerms_;  // realData_ indexes of dangling bits
+
     vector<string> inPins_;   // input pins from Prim-DB
     vector<string> inSigs_;   // input signals from blif-file
 
@@ -270,6 +272,9 @@ struct BLIF_file : public fio::MMapReader
   virtual void reset(CStr nm, uint16_t tr = 0) noexcept override;
 
   bool readBlif() noexcept;
+
+  string writeBlif(const string& toFn, bool cleanUp) noexcept;
+
   bool checkBlif(vector<string>& badInputs, vector<string>& badOutputs) noexcept;
 
   uint numInputs() const noexcept { return inputs_.size(); }

planning/src/main.cpp

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