Merge pull request #834 from os-fpga/prepare_blif_check_in_pin_c

prepare blif check in pin_c

Author: serge-dsa

planning/src/file_io/pln_Fio.cpp

@@ -824,7 +824,7 @@ bool MMapReader::makeLines(bool cutComments, bool cutNL) noexcept {
       if (buf_[i] == '\n') num_lines_++;
     }
     if (!num_lines_) {
-      if (trace() >= 4) {
+      if (trace() >= 5) {
         lputs("MReader::makeLines-1 not_OK: num_lines_ == 0");
       }
       return false;
@@ -835,7 +835,7 @@ bool MMapReader::makeLines(bool cutComments, bool cutNL) noexcept {
     }
   } else {
     if (!num_lines_) {
-      if (trace() >= 4) {
+      if (trace() >= 5) {
         lputs("MReader::makeLines-2 not_OK: num_lines_ == 0");
       }
       return false;
@@ -872,7 +872,7 @@ bool MMapReader::makeLines(bool cutComments, bool cutNL) noexcept {
     }
   }
 
-  if (trace() >= 4) {
+  if (trace() >= 6) {
     lprintf("MReader::makeLines() OK:  lines_.size()= %zu  num_lines_= %zu\n", lines_.size(), num_lines_);
   }
 

planning/src/main.cpp

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

planning/src/pin_loc/pcf_place.cpp

@@ -356,6 +356,13 @@ void PinPlacer::print_summary(const string& csv_name) const {
   CStr cmapVal = clk_map_file_.empty() ? "(NONE)" : clk_map_file_.c_str();
   lprintf("                clk_map_file : %s\n", cmapVal);
 
+  if (::getenv("pinc_dont_check_blif")) {
+    lprintf("           check BLIF status : (NOT DONE)\n");
+  } else {
+    lprintf("           check BLIF status : %s\n",
+            check_blif_ok_ ? "PASS" : "FAIL");
+  }
+
   lprintf("  pinc_trace verbosity= %u\n", tr);
 
   if (num_critical_warnings_) {

planning/src/pin_loc/pin_placer.cpp

@@ -154,6 +154,7 @@ PinPlacer::~PinPlacer() {
 
 void PinPlacer::resetState() noexcept {
   auto_pcf_created_ = false;
+  check_blif_ok_ = false;
   min_pt_row_ = UINT_MAX;
   max_pt_row_ = 0;
   no_more_inp_bumps_ = false;

planning/src/pin_loc/pin_placer.h

@@ -92,8 +92,8 @@ struct PinPlacer {
     vector<string> outputs_;
 
     BlifReader() noexcept = default;
-    BlifReader(const string& f) { read_blif(f); }
-    bool read_blif(const string& f);
+
+    bool read_blif(const string& f, bool& checked_ok) noexcept;
 
     const vector<string>& get_inputs() const noexcept { return inputs_; }
     const vector<string>& get_outputs() const noexcept { return outputs_; }
@@ -137,6 +137,7 @@ struct PinPlacer {
   bool pin_assign_def_order_ = true;
 
   bool auto_pcf_created_ = false;
+  bool check_blif_ok_ = false;
   string user_pcf_;
   string blif_fn_;
   string has_edits_;

planning/src/pin_loc/read_ports.cpp

@@ -108,7 +108,8 @@ bool PinPlacer::read_design_ports() {
       }
     }
     BlifReader rd_blif;
-    if (!rd_blif.read_blif(blif_fn_)) {
+    check_blif_ok_ = false;
+    if (!rd_blif.read_blif(blif_fn_, check_blif_ok_)) {
       flush_out(true);
       err_puts();
       CERROR << err_lookup("PORT_INFO_PARSE_ERROR") << endl;
@@ -1080,10 +1081,11 @@ string PinPlacer::translatePinName(const string& pinName, bool is_input) const n
   }
 }
 
-bool PinPlacer::BlifReader::read_blif(const string& blif_fn) {
+bool PinPlacer::BlifReader::read_blif(const string& blif_fn, bool& checked_ok) noexcept {
   flush_out(true);
   inputs_.clear();
   outputs_.clear();
+  checked_ok = false;
 
   CStr cfn = blif_fn.c_str();
   uint16_t tr = ltrace();
@@ -1111,13 +1113,13 @@ bool PinPlacer::BlifReader::read_blif(const string& blif_fn) {
     return false;
   }
 
-  if (::getenv("pinc_check_blif")) {
-    flush_out(true);
+  if (0 /* not ::getenv("pinc_dont_check_blif") */ ) {
     lprintf("____ BEGIN pinc_check_blif:  %s\n", cfn);
-    bool check_blif_ok = do_check_blif(cfn);
+    flush_out(true);
+    checked_ok = do_check_blif(cfn);
     flush_out(true);
     lprintf("           pinc_check_blif STATUS = %s\n\n",
-            check_blif_ok ? "PASS" : "FAIL");
+            checked_ok ? "PASS" : "FAIL");
     lprintf("------ END pinc_check_blif:  %s\n", cfn);
     flush_out(true);
   }

planning/src/util/nw/Nw_io.cpp

@@ -326,10 +326,16 @@ static void be_dot_friendly(char* buf) noexcept {
     }
   }
 
+  // shorten too long names
+  size_t len = ::strlen(buf);
+  if (len > 32) {
+    size_t H = str::hashf(buf);
+    ::sprintf(buf + 28, "_%zX", H);
+  }
+
   // if buf has . then quote:
   if (::strpbrk(buf, ".:/!")) {
-   lputs1();
-    size_t len = ::strlen(buf);
+    len = ::strlen(buf);
     buf[len + 1] = 0;
     buf[len + 2] = 0;
     buf[len + 3] = 0;
@@ -384,7 +390,7 @@ void NW::Node::nprint_dot(ostream& os) const noexcept {
 
 void NW::Edge::eprint_dot(ostream& os, char arrow, const NW& g) const noexcept {
   assert(arrow == '>' or arrow == '-');
-  char buf[2048] = {};
+  char buf[4100] = {};
   const Node& nd1 = g.nodeRef(n1_);
   nd1.getName(buf);
   be_dot_friendly(buf);