Merge pull request #766 from os-fpga/pinc_impr_debug_print_4_translations

pin_c: improved debug print for name translations

Author: serge-dsa

planning/src/file_readers/blif_reader.cpp

@@ -5,7 +5,6 @@ namespace pln {
 
 using std::vector;
 using std::string;
-using std::cerr;
 using std::endl;
 
 bool BlifReader::read_blif(const string& blif_fn) {
@@ -77,132 +76,5 @@ bool BlifReader::read_blif(const string& blif_fn) {
   return true;
 }
 
-// ========================= OLD ONE:
-#ifdef _PLN_OLD_BLIF_READER_MODE
-
-using namespace blifparse;
-
-struct PlnBlifParserCB : public blifparse::Callback {
-  int lineno_ = -1;
-  e_circuit_format circuit_format = e_circuit_format::BLIF;
-
-public:
-  PlnBlifParserCB(e_circuit_format circuit_format_) : circuit_format(circuit_format_) {}
-  void start_parse() override {}
-
-  void filename(string /*fname*/) override {}
-  void lineno(int /*line_num*/) override {}
-
-  void begin_model(string /*model_name*/) override {}
-  void inputs(vector<string> input_ports) override {
-    for (auto input_port : input_ports) {
-      inputs_.push_back(input_port);
-    }
-  }
-  void outputs(vector<string> output_ports) override {
-    for (auto output_port : output_ports) {
-      outputs_.push_back(output_port);
-    }
-  }
-
-  void names(vector<string> /*nets*/, vector<vector<LogicValue>> /*so_cover*/) override {}
-  void latch(string /*input*/,
-             string /*output*/,
-             LatchType /*        type*/,
-             string /*control*/,
-             LogicValue /*init*/) override {}
-  void subckt(string /*model*/,
-              vector<string> /*ports*/,
-              vector<string> /*nets*/) override {}
-  void blackbox() override {}
-
-  //BLIF Extensions
-  void conn(string src, string dst) override {
-    if (circuit_format != e_circuit_format::EBLIF) {
-      parse_error(lineno_, ".conn", "Supported only in extended BLIF format");
-    }
-  }
-
-  void cname(string cell_name) override {
-    if (circuit_format != e_circuit_format::EBLIF) {
-      parse_error(lineno_, ".cname", "Supported only in extended BLIF format");
-    }
-  }
-
-  void attr(string name, string value) override {
-    if (circuit_format != e_circuit_format::EBLIF) {
-      parse_error(lineno_, ".attr", "Supported only in extended BLIF format");
-    }
-  }
-
-  void param(string name, string value) override {
-    if (circuit_format != e_circuit_format::EBLIF) {
-      parse_error(lineno_, ".param", "Supported only in extended BLIF format");
-    }
-  }
-
-  void end_model() override {}
-
-  void finish_parse() override {}
-
-  void parse_error(const int curr_lineno, const string& near_text, const string& msg) override {
-    fprintf(stderr, "pin_c read_blif: Error at line %d near '%s': %s\n", curr_lineno,
-            near_text.c_str(), msg.c_str());
-    lprintf("pin_c read_blif: Error at line %d near '%s': %s\n", curr_lineno,
-            near_text.c_str(), msg.c_str());
-    had_error_ = true;
-  }
-
-public:
-  bool had_error_ = false;
-  vector<string> inputs_;
-  vector<string> outputs_;
-};
-
-// read port info from blif file
-bool BlifReader::read_blif(const string& blif_fn) {
-  using namespace fio;
-  e_circuit_format circuit_format;
-  auto name_ext = vtr::split_ext(blif_fn);
-  if (name_ext[1] == ".blif") {
-    circuit_format = e_circuit_format::BLIF;
-  } else if (name_ext[1] == ".eblif") {
-    circuit_format = e_circuit_format::EBLIF;
-  } else {
-    lputs("\n[Error] pin_c read_blif: blif-file must have either .blif or .eblif extension");
-    lprintf("    pin_c read_blif file_name= %s\n", blif_fn.c_str());
-    cerr << "[Error] pin_c read_blif: blif-file must have either .blif or .eblif extension" << endl;
-    return false;
-  }
-
-  const char* fn = blif_fn.c_str();
-  if (not Fio::regularFileExists(fn)) {
-    lprintf("\n[Error] specified BLIF file %s does not exist\n", fn);
-    cerr << "[Error] specified BLIF file does not exist: " << fn << endl;
-    return false;
-  }
-  if (not Fio::nonEmptyFileExists(fn)) {
-    lprintf("\n[Error] specified BLIF file %s is empty\n", fn);
-    cerr << "[Error] specified BLIF file is empty: " << fn << endl;
-    return false;
-  }
-
-  PlnBlifParserCB callback(circuit_format);
-  blif_parse_filename(blif_fn, callback);
-  if (callback.had_error_) {
-    return false;
-  }
-
-  std::swap(inputs_, callback.inputs_);
-  std::swap(outputs_, callback.outputs_);
-  if (ltrace() >= 4) {
-    lprintf("pin_c: finished read_blif().  #inputs= %zu  #outputs= %zu\n",
-             inputs_.size(), outputs_.size());
-  }
-  return true;
-}
-
-#endif // _PLN_OLD_BLIF_READER_MODE
-
 }
 

planning/src/file_readers/pln_pcf_reader.cpp

@@ -6,10 +6,11 @@ namespace pln {
 using namespace std;
 using fio::Fio;
 
-bool PcfReader::read_pcf(const string& f) {
+bool PcfReader::read_pcf_file(const string& f) {
   uint16_t tr = ltrace();
   auto& ls = lout();
-  if (tr >= 2) ls << "PcfReader::read_pcf( " << f << " )" << endl;
+  flush_out(false);
+  if (tr >= 2) ls << "PcfReader::read_pcf_file( " << f << " )" << endl;
 
   assert(!f.empty());
 
@@ -135,13 +136,13 @@ bool PcfReader::read_pcf(const string& f) {
   }
 
   if (tr >= 4) {
-    lprintf("done  PcfReader::read_pcf().  commands_.size()= %zu  has_error:%i\n",
+    lprintf("done  PcfReader::read_pcf_file().  commands_.size()= %zu  has_error:%i\n",
             commands_.size(), has_error);
   }
   if (tr >= 1 && has_error) {
     flush_out(true);
     err_puts();
-    lprintf2("[Error] in PcfReader::read_pcf()\n");
+    lprintf2("[Error] in PcfReader::read_pcf_file()\n");
     flush_out(true);
   }
   flush_out(false);

planning/src/file_readers/pln_pcf_reader.h

@@ -35,9 +35,9 @@ struct PcfReader {
 
   PcfReader() noexcept = default;
 
-  PcfReader(const string& f) { read_pcf(f); }
+  PcfReader(const string& f) { read_pcf_file(f); }
 
-  bool read_pcf(const string& f);
+  bool read_pcf_file(const string& f);
 };
 
 }

planning/src/main.cpp

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

planning/src/pin_loc/pcf_place.cpp

@@ -379,13 +379,13 @@ void PinPlacer::printTileUsage(const PcCsvReader& csv) const {
      << "  used_tiles_.size()= " << used_tiles_.size() << endl;
 }
 
-bool PinPlacer::read_pcf(const PcCsvReader& csv) {
+bool PinPlacer::read_PCF(const PcCsvReader& csv) {
   flush_out(true);
   uint16_t tr = ltrace();
   auto& ls = lout();
   string cur_dir = get_CWD();
   if (tr >= 4) {
-    lputs("pin_c:  PinPlacer::read_pcf()");
+    lputs("pin_c:  PinPlacer::read_PCF()");
     lprintf("pin_c:  current directory= %s\n", cur_dir.c_str());
   }
 
@@ -407,7 +407,7 @@ bool PinPlacer::read_pcf(const PcCsvReader& csv) {
   }
 
   PcfReader rd_pcf;
-  if (!rd_pcf.read_pcf(pcf_name)) {
+  if (!rd_pcf.read_pcf_file(pcf_name)) {
     flush_out(true);
     OUT_ERROR << err_lookup("PIN_CONSTRAINT_PARSE_ERROR") << endl;
     CERROR << err_lookup("PIN_CONSTRAINT_PARSE_ERROR") << endl;
@@ -481,64 +481,62 @@ bool PinPlacer::read_pcf(const PcCsvReader& csv) {
 
   if (tr >= 3) {
     flush_out(true);
-    lputs("\t  ***  pin_c  read_pcf  SUCCEEDED  ***");
+    lputs("\t  ***  pin_c  read_PCF  SUCCEEDED  ***");
   }
 
   return true;
 }
 
-void PinPlacer::translate_pcf_cmds() {
+uint PinPlacer::translate_PCF_names() noexcept {
   if (pcf_pin_cmds_.empty() or all_edits_.empty())
-    return;
+    return 0;
 
   uint16_t tr = ltrace();
   flush_out(tr >= 6);
 
-  if (1) {
-
-    if (tr >= 6) {
-      lprintf("  ---- pcf_pin_cmds_ before translation (%zu):\n",
-              pcf_pin_cmds_.size());
-      for (const auto& cmd : pcf_pin_cmds_)
-        logVec(cmd.cmd_, " ");
-      lprintf("  ---- \n");
-    }
+  if (tr >= 6) {
+    lprintf("  ---- pcf_pin_cmds_ before translation (%zu):\n",
+            pcf_pin_cmds_.size());
+    for (const auto& cmd : pcf_pin_cmds_)
+      logVec(cmd.cmd_, " ");
+    lprintf("  ---- \n");
+  }
 
-    uint numInpTr = 0, numOutTr = 0;
-    string was;
-    for (auto& cmd : pcf_pin_cmds_) {
-      if (cmd.size() < 2)
-        continue;
-      string& pinName = cmd.cmd_[1];
-      was = pinName;
-      if (findIbufByOldPin(was)) {
-        // input
-        pinName = translatePinName(was, true);
-        if (pinName != was) numInpTr++;
-      } else if (findObufByOldPin(was)) {
-        // output
-        pinName = translatePinName(was, false);
-        if (pinName != was) numOutTr++;
-      }
+  uint numInpTr = 0, numOutTr = 0;
+  string was;
+  for (auto& cmd : pcf_pin_cmds_) {
+    if (cmd.size() < 2)
+      continue;
+    string& pinName = cmd.cmd_[1];
+    was = pinName;
+    if (findIbufByOldPin(was)) {
+      // input
+      pinName = translatePinName(was, true);
+      if (pinName != was) numInpTr++;
+    } else if (findObufByOldPin(was)) {
+      // output
+      pinName = translatePinName(was, false);
+      if (pinName != was) numOutTr++;
     }
+  }
 
-    flush_out(tr >= 6);
-    if (tr >= 3) {
-      lprintf("PCF command translation:  #input translations= %u  #output translations= %u\n",
-              numInpTr, numOutTr);
-    }
+  flush_out(tr >= 6);
+  if (tr >= 3) {
+    lprintf("PCF command translation:  #input translations= %u  #output translations= %u\n",
+            numInpTr, numOutTr);
+  }
 
-    if (tr >= 6) {
-      lprintf("  ++++ pcf_pin_cmds_ after translation (%zu):\n",
-              pcf_pin_cmds_.size());
-      for (const auto& cmd : pcf_pin_cmds_)
-        logVec(cmd.cmd_, " ");
-      lprintf("  ++++ \n");
-      flush_out(true);
-    }
+  if (tr >= 6) {
+    lprintf("  ++++ pcf_pin_cmds_ after translation (%zu):\n",
+            pcf_pin_cmds_.size());
+    for (const auto& cmd : pcf_pin_cmds_)
+      logVec(cmd.cmd_, " ");
+    lprintf("  ++++ \n");
+    flush_out(true);
   }
 
   flush_out(false);
+  return numInpTr + numOutTr;
 }
 
 void PinPlacer::get_pcf_directions(
@@ -1023,10 +1021,12 @@ static bool try_open_csv_file(const string& csv_name) {
   return true;
 }
 
-bool PinPlacer::read_csv_file(PcCsvReader& csv) {
-  flush_out(false);
+bool PinPlacer::read_PT_CSV(PcCsvReader& csv) {
   uint16_t tr = ltrace();
-  if (tr >= 2) lputs("\nread_csv_file() __ Reading csv");
+  if (tr >= 2) {
+    flush_out(true);
+    lputs("read_PT_CSV() __ Reading csv");
+  }
 
   string csv_name;
   if (temp_csv_file_name_.size()) {
@@ -1061,7 +1061,7 @@ bool PinPlacer::read_csv_file(PcCsvReader& csv) {
 
   if (tr >= 2) {
     flush_out(true);
-    lputs("\t  ***  pin_c  read_csv_file  SUCCEEDED  ***\n");
+    lputs("\t  ***  pin_c  read_PT_CSV  SUCCEEDED  ***\n");
   }
 
   flush_out(false);
@@ -1127,7 +1127,7 @@ DevPin PinPlacer::get_available_axi_ipin(vector<string>& Q) {
   result.set_first(Q.back());
   Q.pop_back();
 
-  // need to pick a mode, othewise PcfReader::read_pcf() will not tokenize pcf line properly
+  // need to pick a mode, othewise PcfReader will not tokenize pcf line properly
   result.mode_ = "MODE_GPIO";
 
   return result;
@@ -1148,7 +1148,7 @@ DevPin PinPlacer::get_available_axi_opin(vector<string>& Q) {
   result.set_first(Q.back());
   Q.pop_back();
 
-  // need to pick a mode, othewise PcfReader::read_pcf() will not tokenize pcf line properly
+  // need to pick a mode, othewise PcfReader will not tokenize pcf line properly
   result.mode_ = "MODE_GPIO";
 
   return result;