pin_c: finalize edits after PCF EDA-2821

Author: serge-rs

stars/src/file_readers/pinc_Fio.cpp

@@ -9,6 +9,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <libgen.h>
 #include <filesystem>
 
 namespace fio {
@@ -58,6 +59,53 @@ void Info::init() noexcept {
   }
 }
 
+string Info::get_abs_name(const string& nm) noexcept {
+  namespace fs = std::filesystem;
+  if (nm.empty()) return {};
+  try {
+    fs::path p{nm};
+    p = p.lexically_normal();
+    p = fs::absolute(p);
+    return p.string();
+  } catch (...) {
+    // noexcept
+  }
+  return {};
+}
+
+string Info::get_realpath(const string& nm) noexcept {
+  string abs_nm = get_abs_name(nm);
+  if (abs_nm.empty())
+    return {};
+
+  char buf[8192];
+  buf[0] = 0;
+  buf[1] = 0;
+  buf[8190] = 0;
+  buf[8191] = 0;
+
+  if (::realpath(abs_nm.c_str(), buf)) {
+    return buf;
+  } else {
+    ::perror("realpath()");
+    return abs_nm;
+  }
+}
+
+string Info::get_basename(const string& nm) noexcept {
+  size_t len = nm.length();
+  if (!len or len > 8192)
+    return {};
+
+  char buf[len + 2] = {};
+
+  ::strncpy(buf, nm.c_str(), len);
+
+  CStr bn = ::basename(buf);
+  if (!bn) bn = "";
+  return bn;
+}
+
 void Fio::setTrace(int t) noexcept {
   if (t <= 0) {
     trace_ = 0;
@@ -506,7 +554,7 @@ int64_t MMapReader::printWC(std::ostream& os) const noexcept {
   return numLines;
 }
 
-int64_t MMapReader::printLines(std::ostream& os) noexcept {
+size_t MMapReader::printLines(std::ostream& os) noexcept {
   if (!fsz_ || !sz_ || !buf_ || fnm_.empty()) return 0;
   bool hasl = hasLines();
   if (!hasl) {
@@ -524,6 +572,64 @@ int64_t MMapReader::printLines(std::ostream& os) noexcept {
   return cnt;
 }
 
+int64_t MMapReader::writeFile(const string& nm) noexcept {
+  if (nm.empty())
+    return -1;
+  if (!fsz_ || !sz_ || !buf_ || fnm_.empty())
+    return -1;
+  if (nm == fnm_)
+    return -1;
+
+  auto tr = trace();
+  CStr cnm = nm.c_str();
+  FILE* f = ::fopen(cnm, "w");
+  if (!f) {
+    if (tr >= 3) {
+      flush_out(true);
+      lprintf("ERROR writeFile() could not open file for writing: %s\n", cnm);
+      flush_out(true);
+    }
+    return -1;
+  }
+
+  if (hasLines()) {
+    // write line-by-line
+    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 (tr >= 3) {
+          flush_out(true);
+          lprintf("ERROR writeFile() error during writing: %s\n", cnm);
+          flush_out(true);
+        }
+        break;
+      }
+      cnt++;
+    }
+    ::fclose(f);
+    return cnt;
+  }
+
+  // no lines, write raw buffer
+  int64_t ret = sz_;
+  ::fwrite(buf_, sz_, 1, f);
+  if (::ferror(f)) {
+    if (tr >= 3) {
+      flush_out(true);
+      lprintf("ERROR writeFile() error during writing: %s\n", cnm);
+      flush_out(true);
+    }
+    ret = -1;
+  }
+
+  ::fclose(f);
+  return ret;
+}
+
 uint64_t MMapReader::hashSum() const noexcept {
   assert(fsz_ == sz_);
   if (!fsz_ || !sz_ || !buf_) return 0;

stars/src/file_readers/pinc_Fio.h

@@ -38,10 +38,8 @@ inline char* p_strdup(CStr p) noexcept {
   return ::strdup(p);
 }
 
-struct Info
-{
+struct Info {
   string name_, absName_;
-
   size_t size_ = 0;
   bool exists_ = false;
   bool accessible_ = false;
@@ -53,6 +51,10 @@ struct Info
   Info(CStr nm) noexcept;
   Info(const string& nm) noexcept;
   void init() noexcept;
+
+  static string get_abs_name(const string& nm) noexcept;
+  static string get_realpath(const string& nm) noexcept;
+  static string get_basename(const string& nm) noexcept;
 };
 
 class Fio {
@@ -243,7 +245,8 @@ class MMapReader : public Fio
   int64_t countWC(int64_t& numWords) const noexcept;  // ~ wc command
   int64_t printWC(std::ostream& os) const noexcept;   // ~ wc command
 
-  int64_t printLines(std::ostream& os) noexcept;
+  size_t printLines(std::ostream& os) noexcept;
+  int64_t writeFile(const string& nm) noexcept;
 
   char* skipLine(char* curL) noexcept;
   bool advanceLine(char*& curL) noexcept;

stars/src/file_readers/pinc_csv_reader.cpp

@@ -55,13 +55,13 @@ static inline bool ends_with_tx_rx(const char* z, size_t len) noexcept {
          z[len - 3] == '_';
 }
 
-static inline bool ends_with_rx(const char* z, size_t len) noexcept {
+bool RapidCsvReader::ends_with_rx(const char* z, size_t len) noexcept {
   assert(z);
   if (len < 4) return false;
   return z[len - 1] == 'x' and z[len - 2] == 'r' and z[len - 3] == '_';
 }
 
-static inline bool ends_with_tx(const char* z, size_t len) noexcept {
+bool RapidCsvReader::ends_with_tx(const char* z, size_t len) noexcept {
   assert(z);
   if (len < 4) return false;
   return z[len - 1] == 'x' and z[len - 2] == 't' and z[len - 3] == '_';
@@ -263,7 +263,7 @@ struct RX_TX_val {
 
   bool enabled() const noexcept { return val_ == "Y"; }
   bool is_rx() const noexcept {
-    return ends_with_rx(hdr_.c_str(), hdr_.length());
+    return RapidCsvReader::ends_with_rx(hdr_.c_str(), hdr_.length());
   }
 };
 
@@ -1236,6 +1236,9 @@ bool RapidCsvReader::read_csv(const string& fn, uint num_udes_pins) {
 
   bool always_print = ::getenv("pinc_always_print_csv");
   bool write_debug = (tr >= 8 or ::getenv("pinc_write_debug_csv"));
+  bool copy_to_CWD = always_print or write_debug;
+  if (!copy_to_CWD)
+    copy_to_CWD = ::getenv("pinc_copy_input");
 
   if (tr >= 6) {
     flush_out(false);
@@ -1253,6 +1256,31 @@ bool RapidCsvReader::read_csv(const string& fn, uint num_udes_pins) {
   if (write_debug)
     write_debug_csv();
 
+  if (copy_to_CWD) {
+    string cwd = get_CWD();
+    string bn = fio::Info::get_basename(fn);
+    string cn = str::concat("cp_", bn); 
+
+    if (tr >= 4) {
+      flush_out(true);
+      lprintf("read_csv: copy_to_CWD in work_dir = %s\n", cwd.c_str());
+      lprintf("  input csv: %s\n", fn.c_str());
+      lprintf("   basename: %s\n", bn.c_str());
+      lprintf("   copyname: %s\n", cn.c_str());
+      flush_out(true);
+    }
+
+    int64_t wr_status = crd.writeFile(cn);
+    if (wr_status > 0) {
+      if(tr >= 4)
+        lprintf("read_csv: copy_to_CWD OK  wr_status= %zu\n", size_t(wr_status));
+    } else {
+      if(tr >= 3)
+        lprintf("read_csv: copy_to_CWD FAILED\n");
+    }
+    flush_out(true);
+  }
+
   flush_out(false);
   return true;
 }

stars/src/file_readers/pinc_csv_reader.h

@@ -313,6 +313,9 @@ class RapidCsvReader {
 
   static string label_of_column(int i) noexcept;
 
+  static bool ends_with_rx(const char* z, size_t len) noexcept;
+  static bool ends_with_tx(const char* z, size_t len) noexcept;
+
 private:
 
   bool initCols(const fio::CSV_Reader& crd);

stars/src/main.cpp

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

stars/src/pin_loc/pcf_place.cpp

@@ -445,9 +445,22 @@ bool PinPlacer::read_pcf(const RapidCsvReader& csv) {
 
   pcf_pin_cmds_ = std::move(rd_pcf.commands_);
 
-  // translate pin-references in cmds_
-  if (pcf_pin_cmds_.size() and
-      pin_names_translated_ and is_fabric_eblif_ and all_edits_.size()) {
+  if (tr >= 3) {
+    flush_out(true);
+    lputs("\t  ***  pin_c  read_pcf  SUCCEEDED  ***");
+  }
+
+  return true;
+}
+
+void PinPlacer::translate_pcf_cmds() {
+  if (pcf_pin_cmds_.empty() or all_edits_.empty())
+    return;
+
+  uint16_t tr = ltrace();
+  flush_out(tr >= 6);
+
+  if (1) {
 
     if (tr >= 6) {
       lprintf("  ---- pcf_pin_cmds_ before translation (%zu):\n",
@@ -475,6 +488,7 @@ bool PinPlacer::read_pcf(const RapidCsvReader& csv) {
       }
     }
 
+    flush_out(tr >= 6);
     if (tr >= 3) {
       lprintf("PCF command translation:  #input translations= %u  #output translations= %u\n",
               numInpTr, numOutTr);
@@ -486,15 +500,44 @@ bool PinPlacer::read_pcf(const RapidCsvReader& csv) {
       for (const auto& cmd : pcf_pin_cmds_)
         logVec(cmd, " ");
       lprintf("  ++++ \n");
+      flush_out(true);
     }
   }
 
-  if (tr >= 3) {
-    flush_out(true);
-    lputs("\t  ***  pin_c  read_pcf  SUCCEEDED  ***");
-  }
+  flush_out(false);
+}
 
-  return true;
+void PinPlacer::get_pcf_directions( vector<string>& inps, vector<string>& outs,
+                          vector<string>& undefs ) const noexcept {
+  inps.clear();
+  outs.clear();
+  undefs.clear();
+
+  if (pcf_pin_cmds_.empty())
+    return;
+
+  size_t n = pcf_pin_cmds_.size();
+  inps.reserve(n/2 + 2);
+  outs.reserve(n/2 + 2);
+
+  string mod;
+  for (const vector<string>& cmd : pcf_pin_cmds_) {
+    if (cmd.size() < 5)
+      continue;
+    const string& pin = cmd[1];
+    assert(!pin.empty());
+    if (pin.empty())
+      continue;
+    mod = str::s2lower(cmd[4]);
+    CStr cmod = mod.c_str();
+    size_t len = mod.length();
+    if (RapidCsvReader::ends_with_rx(cmod, len))
+      inps.push_back(pin);
+    else if (RapidCsvReader::ends_with_tx(cmod, len))
+      outs.push_back(pin);
+    else
+      undefs.push_back(pin);
+  }
 }
 
 bool PinPlacer::write_dot_place(const RapidCsvReader& csv) {
@@ -516,6 +559,13 @@ bool PinPlacer::write_dot_place(const RapidCsvReader& csv) {
         logVec(cmd, " ");
       }
       lprintf("  ___\n");
+      vector<string> inps, outs, undefs;
+      get_pcf_directions(inps, outs, undefs);
+      lprintf("  ___\n");
+      logVec(inps, "   [pcf_inputs] ");
+      lprintf("  ___\n");
+      logVec(outs, "  [pcf_outputs] ");
+      lprintf("  ___\n");
     }
   }
 

stars/src/pin_loc/pin_placer.cpp

@@ -304,14 +304,14 @@ bool PinPlacer::read_and_write() {
     return false;
   }
 
-  // --4 optionally, read netlist edits (--edits option)
+  // --4. read netlist edits (--edits option)
   bool has_edits = read_edits();
   flush_out(false);
   if (tr >= 3)
     lprintf("\t  has_edits : %i\n", has_edits);
 
 
-  // usage 2: if no user pcf is provided, created a temp one
+  // if no user pcf is provided, created a temp one
   if (usage_requirement_2 || (usage_requirement_0 && user_pcf_ == "")) {
     flush_out(true);
     if (has_edits) {
@@ -445,7 +445,10 @@ bool PinPlacer::read_and_write() {
     return false;
   }
 
-  // --6. create .place file
+  // --6. adjust edits based on PCF pin-lists
+  finalize_edits();
+
+  // --7. create .place file
   if (!write_dot_place(csv_rd)) {
     // error messages will be issued in callee
     if (tr) {
@@ -458,7 +461,7 @@ bool PinPlacer::read_and_write() {
     return false;
   }
 
-  // --7. optionally, map logical clocks to physical clocks
+  // --8. optionally, map logical clocks to physical clocks
   //      status = 0 if NOP, -1 if error
   int map_clk_status = map_clocks();
   if (map_clk_status < 0) {