Merge pull request #683 from os-fpga/pln_pinc_prep_to_read_fabric_eblif_1

pln/pinc: prepare to read fabric_.eblif

Author: serge-dsa

stars/src/main.cpp

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

stars/src/pin_loc/pin.h

@@ -16,7 +16,8 @@ struct Pin {
 
   static constexpr uint MAX_PT_COLS = 128;
 
-  string udes_pin_name_;
+  string orig_pin_name_;  // never translated
+  string udes_pin_name_;  // maybe translated
   string trans_pin_name_; // translated due to netlist edits
 
   string device_pin_name_;
@@ -42,13 +43,19 @@ struct Pin {
   }
 
   Pin(const string& u, const string& d, const XYZ& xyz, uint r) noexcept
-    : udes_pin_name_(u), device_pin_name_(d),
+    : orig_pin_name_(u), udes_pin_name_(u),
+      device_pin_name_(d),
       xyz_(xyz), pt_row_(r) {
     rx_modes_.reset();
     tx_modes_.reset();
     all_modes_.reset();
   }
 
+  void set_udes_pin_name(const string& pn) noexcept {
+    orig_pin_name_ = pn;
+    udes_pin_name_ = pn;
+  }
+
   bool is_translated() const noexcept {
     if (trans_pin_name_.empty())
       return false;
@@ -59,6 +66,7 @@ struct Pin {
     rx_modes_.reset();
     tx_modes_.reset();
     all_modes_.reset();
+    orig_pin_name_.clear();
     udes_pin_name_.clear();
     trans_pin_name_.clear();
     device_pin_name_.clear();

stars/src/pin_loc/pin_placer.cpp

@@ -227,7 +227,7 @@ bool PinPlacer::read_and_write() {
       !(csv_name.empty() || no_b_json || output_name.empty()) &&
       user_pcf_.empty();
 
-  if (tr >= 2) {
+  if (tr >= 4) {
     ls << "\t usage_requirement_1 : " << boolalpha << usage_requirement_1 << endl;
     ls << "\t usage_requirement_2 : " << boolalpha << usage_requirement_2 << endl;
   }

stars/src/pin_loc/pin_placer.h

@@ -206,6 +206,8 @@ struct PinPlacer {
   bool no_more_inp_bumps_ = false; // state for get_available_device_pin()
   bool no_more_out_bumps_ = false; //
 
+  bool is_fabric_eblif_ = false;
+
   mutable uint num_warnings_ = 0, num_critical_warnings_ = 0;
   void incrCriticalWarnings() const noexcept { num_critical_warnings_++; }
 

stars/src/pin_loc/read_ports.cpp

@@ -11,7 +11,36 @@ using namespace std;
 using fio::Fio;
 
 #define CERROR std::cerr << "[Error] "
-#define OUT_ERROR std::cout << "[Error] "
+#define OUT_ERROR lout() << "[Error] "
+
+bool s_is_fabric_eblif(const string& fn) noexcept {
+  size_t len = fn.length();
+  if (len < 12 or len > 5000)
+    return false;
+  char buf[len + 2] = {};
+  ::strcpy(buf, fn.c_str());
+
+  // replace '/' and '.' by spaces to use space-based tokenizer
+  for (char* p = buf; *p; p++) {
+    if (*p == '/' or *p == '.')
+      *p = ' ';
+  }
+
+  vector<string> W;
+  Fio::split_spa(buf, W);
+  if (W.size() < 2)
+    return false;
+  if (W.back() != "eblif")
+    return false;
+
+  const string& f = W[W.size() - 2];
+  if (f.length() < 7)
+    return false;
+  CStr s = f.c_str();
+
+  return s[0] == 'f' and s[1] == 'a' and s[2] == 'b' and
+         s[3] == 'r' and s[4] == 'i' and s[5] == 'c' and s[6] == '_';
+}
 
 bool PinPlacer::read_design_ports() {
   uint16_t tr = ltrace();
@@ -48,7 +77,7 @@ bool PinPlacer::read_design_ports() {
       }
     }
   } else {
-    if (tr >= 1) lprintf("port_info cmd option not specified => using blif\n");
+    if (tr >= 4) lprintf("port_info cmd option not specified => using blif\n");
   }
 
   if (json_ifs.is_open()) {
@@ -80,7 +109,11 @@ bool PinPlacer::read_design_ports() {
     }
     BlifReader rd_blif;
     if (!rd_blif.read_blif(blif_fn)) {
+      flush_out(true);
+      err_puts();
       CERROR << err_lookup("PORT_INFO_PARSE_ERROR") << endl;
+      OUT_ERROR << err_lookup("PORT_INFO_PARSE_ERROR") << endl;
+      flush_out(true);
       return false;
     }
     raw_design_inputs_ = rd_blif.get_inputs();
@@ -95,25 +128,29 @@ bool PinPlacer::read_design_ports() {
       err_puts();
       return false;
     }
+
+    is_fabric_eblif_ = s_is_fabric_eblif(blif_fn);
   }
 
   size_t sz = raw_design_inputs_.size();
   user_design_inputs_.clear();
   user_design_inputs_.resize(sz);
   for (size_t i = 0; i < sz; i++)
-    user_design_inputs_[i].udes_pin_name_ = raw_design_inputs_[i];
+    user_design_inputs_[i].set_udes_pin_name(raw_design_inputs_[i]);
 
   sz = raw_design_outputs_.size();
   user_design_outputs_.clear();
   user_design_outputs_.resize(sz);
   for (size_t i = 0; i < sz; i++)
-    user_design_outputs_[i].udes_pin_name_ = raw_design_outputs_[i];
+    user_design_outputs_[i].set_udes_pin_name(raw_design_outputs_[i]);
 
   if (tr >= 3) {
     flush_out(tr >= 5);
     lprintf(
       "DONE read_design_ports()  #udes_inputs= %zu  #udes_outputs= %zu\n",
       raw_design_inputs_.size(), raw_design_outputs_.size());
+    if (tr >= 4)
+      lprintf("is_fabric_eblif_: %s\n", is_fabric_eblif_ ? "TRUE" : "FALSE");
   }
 
   if (tr >= 5) {