Merge pull request #765 from os-fpga/pinc_new_blif_reader

pin_c: new blif reader based on pln::BLIF_file

Author: serge-dsa

planning/src/file_readers/blif_reader.cpp

@@ -1,10 +1,5 @@
-#include "read_blif.h"
-#include "vtr_path.h"
-
-#include "blifparse.hpp"
-
 #include "file_readers/blif_reader.h"
-#include "file_readers/pln_Fio.h"
+#include "file_readers/pln_blif_file.h"
 
 namespace pln {
 
@@ -13,7 +8,78 @@ using std::string;
 using std::cerr;
 using std::endl;
 
-// blif parser callback
+bool BlifReader::read_blif(const string& blif_fn) {
+  using namespace fio;
+  flush_out(true);
+  inputs_.clear();
+  outputs_.clear();
+
+  CStr cfn = blif_fn.c_str();
+  uint16_t tr = ltrace();
+  auto& ls = lout();
+
+  BLIF_file bfile(blif_fn);
+
+  if (tr >= 4)
+    bfile.setTrace(3);
+
+  bool exi = false;
+  exi = bfile.fileExists();
+  if (tr >= 8)
+    ls << int(exi) << endl;
+  if (not exi) {
+    flush_out(true); err_puts();
+    lprintf2("[Error] BLIF file '%s' does not exist\n", cfn); 
+    err_puts(); flush_out(true);
+    return false;
+  }
+
+  exi = bfile.fileAccessible();
+  if (tr >= 8)
+    ls << int(exi) << endl;
+  if (not exi) {
+    flush_out(true); err_puts();
+    lprintf2("[Error] BLIF file '%s' is not accessible\n", cfn); 
+    err_puts(); flush_out(true);
+    return false;
+  }
+
+  bool rd_ok = bfile.readBlif();
+  if (tr >= 8)
+    ls << int(rd_ok) << endl;
+  if (not rd_ok) {
+    flush_out(true); err_puts();
+    lprintf2("[Error] failed reading BLIF file '%s'\n", cfn); 
+    err_puts(); flush_out(true);
+    return false;
+  }
+
+  lprintf("  (blif_file)   #inputs= %u  #outputs= %u  topModel= %s\n",
+          bfile.numInputs(), bfile.numOutputs(), bfile.topModel_.c_str());
+
+  if (tr >= 5) {
+    flush_out(true);
+    bfile.printInputs(ls);
+    flush_out(true);
+    bfile.printOutputs(ls);
+  }
+
+  std::swap(inputs_, bfile.inputs_);
+  std::swap(outputs_, bfile.outputs_);
+  if (tr >= 3) {
+    flush_out(true);
+    lprintf("pin_c: finished read_blif().  #inputs= %zu  #outputs= %zu\n",
+             inputs_.size(), outputs_.size());
+  }
+
+  flush_out(true);
+
+  return true;
+}
+
+// ========================= OLD ONE:
+#ifdef _PLN_OLD_BLIF_READER_MODE
+
 using namespace blifparse;
 
 struct PlnBlifParserCB : public blifparse::Callback {
@@ -136,4 +202,7 @@ bool BlifReader::read_blif(const string& blif_fn) {
   return true;
 }
 
-}  // namespace pln
+#endif // _PLN_OLD_BLIF_READER_MODE
+
+}
+

planning/src/file_readers/blif_reader.h

@@ -9,15 +9,6 @@ namespace pln {
 using std::string;
 using std::vector;
 
-/*
-Supported PCF commands:
-
-* set_io  <net> <pad> - constrain a given <net> to a given physical <pad> in eFPGA pinout.
-* set_clk <pin> <net> - constrain a given global clock <pin> to a given <net>
-
-  Every tile where <net> is present will be constrained to use a given global clock.
-*/
-
 class BlifReader {
   vector<string> inputs_;
   vector<string> outputs_;

planning/src/main.cpp

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

planning/src/pin_loc/pcf_place.cpp

@@ -316,11 +316,10 @@ void PinPlacer::print_summary(const string& csv_name) const {
   const vector<Pin>& inputs = user_design_inputs_;
   const vector<Pin>& outputs = user_design_outputs_;
 
-  flush_out((tr >= 7));
-
-  ls << "======== pin_c summary:" << endl;
-
-  ls << "    Pin Table csv :  " << csv_name << endl;
+  flush_out((tr >= 5));
+  lputs("======== pin_c summary:");
+  lprintf("   Pin Table csv :  %s\n", csv_name.c_str());
+  lprintf("       BLIF file :  %s\n", blif_fn_.c_str());
 
   if (num_warnings_) {
     lprintf("\t pin_c: NOTE ERRORs: %u\n", num_warnings_);

planning/src/pin_loc/pin_placer.cpp

@@ -165,6 +165,7 @@ void PinPlacer::resetState() noexcept {
   num_warnings_ = 0;
   num_critical_warnings_ = 0;
   user_pcf_.clear();
+  blif_fn_.clear();
   has_edits_.clear();
   clk_map_file_.clear();
   clear_err_code();

planning/src/pin_loc/pin_placer.h

@@ -124,6 +124,7 @@ struct PinPlacer {
 
   bool auto_pcf_created_ = false;
   string user_pcf_;
+  string blif_fn_;
   string has_edits_;
   string clk_map_file_;
 

planning/src/pin_loc/read_ports.cpp

@@ -51,6 +51,7 @@ bool PinPlacer::read_design_ports() {
     flush_out(true);
   }
 
+  blif_fn_.clear();
   user_design_inputs_.clear();
   user_design_outputs_.clear();
 
@@ -91,24 +92,24 @@ bool PinPlacer::read_design_ports() {
     }
     json_ifs.close();
   } else {
-    string blif_fn = cl_.get_param("--blif");
-    if (tr >= 2) lprintf("... reading %s\n", blif_fn.c_str());
-    str_path = blif_fn;
+    blif_fn_ = cl_.get_param("--blif");
+    if (tr >= 2) lprintf("... reading %s\n", blif_fn_.c_str());
+    str_path = blif_fn_;
     if (not Fio::regularFileExists(str_path)) {
       lprintf("\npin_c WARNING: blif file %s does not exist\n", str_path.c_str());
       std::filesystem::path fs_path{str_path}, eblif_ext{"eblif"};
       fs_path.replace_extension(eblif_ext);
       string eblif_fn = fs_path.string();
       if (Fio::regularFileExists(fs_path)) {
-        blif_fn = eblif_fn;
-        str_path = blif_fn;
+        blif_fn_ = eblif_fn;
+        str_path = blif_fn_;
         lprintf("\npin_c INFO: using eblif file %s\n", eblif_fn.c_str());
       } else {
         lprintf("pin_c WARNING: eblif file %s does not exist\n", eblif_fn.c_str());
       }
     }
     BlifReader rd_blif;
-    if (!rd_blif.read_blif(blif_fn)) {
+    if (!rd_blif.read_blif(blif_fn_)) {
       flush_out(true);
       err_puts();
       CERROR << err_lookup("PORT_INFO_PARSE_ERROR") << endl;
@@ -129,7 +130,7 @@ bool PinPlacer::read_design_ports() {
       return false;
     }
 
-    is_fabric_eblif_ = s_is_fabric_eblif(blif_fn);
+    is_fabric_eblif_ = s_is_fabric_eblif(blif_fn_);
   }
 
   size_t sz = raw_design_inputs_.size();
@@ -638,12 +639,17 @@ void PinPlacer::dump_edits(const string& memo) noexcept {
 
   if (tr >= 5) {
     vector<uint> undefs;
+    char nmA[128 + 2] = {};
     lprintf("  ==== [%s] ==== dumping all_edits ====\n", memo.c_str());
     for (uint i = 0; i < esz; i++) {
       const EditItem& ed = all_edits_[i];
+      if (ed.name_.length() <= 20)
+        ::sprintf(nmA, "%s", ed.name_.c_str());
+      else
+        ::sprintf(nmA, "%zu", ed.nameHash());
       lprintf(
-          "   |%u|  %zu   module: %s  js_dir:%s  dir:%i    old: %s  new: %s",
-          i+1, ed.nameHash(), ed.c_mod(), ed.c_jsdir(), ed.dir_, ed.c_old(), ed.c_new());
+          "  |%u|  %s   mod: %s  jsd:%s  dir:%i   old: %s  n: %s",
+          i+1, nmA, ed.c_mod(), ed.c_jsdir(), ed.dir_, ed.c_old(), ed.c_new());
       if (ed.isQBus())
         lprintf("  QBUS-%u", ed.qbusSize());
       lputs();