Merge pull request #734 from os-fpga/better_handling_of_internal_pin

pin_c: better handling of internal_pin

Author: serge-dsa

planning/src/file_readers/pln_csv_reader.cpp

@@ -1734,6 +1734,26 @@ bool PcCsvReader::has_io_pin(const string& pin_name_or_ID) const noexcept {
   return false;
 }
 
+vector<uint> PcCsvReader::get_gbox_rows(const string& device_gbox_name) const noexcept {
+  assert(!bcd_.empty());
+  assert(!device_gbox_name.empty());
+  if (device_gbox_name.empty())
+    return {};
+
+  vector<uint> result;
+
+  // tmp linear search
+  uint num_rows = numRows();
+  for (uint i = 0; i < num_rows; i++) {
+    const BCD& bcd = *bcd_[i];
+    if (bcd.match(device_gbox_name)) {
+      result.push_back(i);
+    }
+  }
+
+  return result;
+}
+
 bool PcCsvReader::hasCustomerInternalName(const string& nm) const noexcept {
   assert(!bcd_.empty());
   assert(!nm.empty());

planning/src/file_readers/pln_csv_reader.h

@@ -252,6 +252,7 @@ class PcCsvReader {
   }
 
   bool has_io_pin(const string& pin_name_or_ID) const noexcept;
+  vector<uint> get_gbox_rows(const string& device_gbox_name) const noexcept;
 
   bool hasCustomerInternalName(const string& nm) const noexcept;
 

planning/src/file_readers/pln_pcf_reader.h

@@ -26,6 +26,11 @@ struct PcfReader {
     void clearInternalPin() noexcept { internalPin_.clear(); }
   };
 
+  static inline bool is_internal_cmd(const Cmd* p) noexcept {
+    assert(p);
+    return p->hasInternalPin();
+  }
+
   vector<Cmd> commands_;
 
   PcfReader() noexcept = default;

planning/src/main.cpp

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

planning/src/pin_loc/pcf_place.cpp

@@ -535,8 +535,10 @@ void PinPlacer::translate_pcf_cmds() {
   flush_out(false);
 }
 
-void PinPlacer::get_pcf_directions( vector<string>& inps, vector<string>& outs,
-                          vector<string>& undefs, vector<string>& internals ) const noexcept {
+void PinPlacer::get_pcf_directions(
+                          vector<string>& inps, vector<string>& outs,
+                          vector<string>& undefs,
+                          vector<string>& internals ) const noexcept {
   inps.clear();
   outs.clear();
   undefs.clear();
@@ -568,6 +570,9 @@ void PinPlacer::get_pcf_directions( vector<string>& inps, vector<string>& outs,
     else
       undefs.push_back(pin);
     //
+    if (cmdObj.hasInternalPin()) {
+      internals.push_back(cmdObj.internalPin_);
+    }
   }
 }
 
@@ -598,6 +603,8 @@ bool PinPlacer::write_dot_place(const PcCsvReader& csv) {
       logVec(outs, "  [pcf_outputs] ");
       lprintf("  ___\n");
       if (not internals.empty()) {
+        logVec(internals, "  [pcf_internals] ");
+        lprintf("  ___\n");
       }
     }
   }
@@ -626,24 +633,49 @@ bool PinPlacer::write_dot_place(const PcCsvReader& csv) {
     flush_out(true);
   }
 
+  //lputs9();
+  // -- do lines with -internal_pin first
+  vector<const PcfReader::Cmd*> P;
+  size_t num_cmds = pcf_pin_cmds_.size();
+  P.reserve(num_cmds + 1);
+  const PcfReader::Cmd* cmdA = pcf_pin_cmds_.data();
+  uint cnt_internals = 0;
+  for (uint i = 0; i < num_cmds; i++) {
+    P.push_back(cmdA + i);
+    if (P.back()->hasInternalPin())
+      cnt_internals++;
+  }
+  if (tr >= 4) {
+    lprintf("cnt_internals= %u  num_cmds= %zu\n", cnt_internals, num_cmds);
+    flush_out(true);
+  }
+  if (cnt_internals > 0 and cnt_internals < num_cmds) {
+    if (tr >= 4) {
+      lprintf("separating internals (%u) ..\n", cnt_internals);
+      flush_out(true);
+    }
+    std::stable_partition(P.begin(), P.end(), PcfReader::is_internal_cmd);
+  }
+
   string internalPin;
+  vector<uint> gbox_rows;
+
   string udes_pn2; // translated according to --edits <config.json>
 
   string row_str;
   int row_num = -1;
 
   min_pt_row_ = UINT_MAX; max_pt_row_ = 0;
 
-  for (uint cmd_i = 0; cmd_i < pcf_pin_cmds_.size(); cmd_i++) {
+  assert(P.size() == num_cmds);
+  for (uint cmd_i = 0; cmd_i < num_cmds; cmd_i++) {
 
-    const PcfReader::Cmd& cmdObj = pcf_pin_cmds_[cmd_i];
+    const PcfReader::Cmd& cmdObj = *P[cmd_i];
     const vector<string>& pcf_cmd = cmdObj.cmd_;
 
     // only support io and clock for now
     if (pcf_cmd[0] != "set_io" && pcf_cmd[0] != "set_clk") continue;
 
-    internalPin.clear();
-
     const string& udes_pn1 = pcf_cmd[1];
 
     bool is_in_pin = (find_udes_input(udes_pn1) >= 0);
@@ -669,13 +701,6 @@ bool PinPlacer::write_dot_place(const PcCsvReader& csv) {
       logVec(pcf_cmd, "    cur pcf_cmd: ");
     }
 
-    for (size_t i = 1; i < pcf_cmd.size(); i++) {
-      if (pcf_cmd[i] == "-internal_pin") {
-        internalPin = pcf_cmd[++i];
-        break;
-      }
-    }
-
     row_str.clear();
     row_num = -1;
     for (size_t i = 1; i < pcf_cmd.size() - 1; i++) {
@@ -719,6 +744,15 @@ bool PinPlacer::write_dot_place(const PcCsvReader& csv) {
       return false;
     }
 
+    internalPin.clear();
+    if (cmdObj.hasInternalPin()) {
+      internalPin = cmdObj.internalPin_;
+      // gbox_rows = csv.get_gbox_rows(device_pin_name);
+      // if (not gbox_rows.empty()) {
+      //  // search internalPin among gbox_rows
+      // }
+    }
+
     const char* direction = "INPUT";
 
     // lookup and write XYZ for 'udes_pin_name'
@@ -764,7 +798,7 @@ bool PinPlacer::write_dot_place(const PcCsvReader& csv) {
             vector<uint> enabledRows = csv.get_enabled_rows_for_mode(mode);
             lprintf("  ---- BEGIN DEBUG_NOTE ----  mode %s (#%u %s)  is enabled for %zu rows:\n",
                     mode.c_str(), col_idx, col_label.c_str(), enabledRows.size());
-            lputs9();
+            //lputs9();
             for (uint r : enabledRows) {
               uint row = r + 2;
               const PcCsvReader::BCD& b = csv.getBCD(r);
@@ -821,7 +855,7 @@ bool PinPlacer::write_dot_place(const PcCsvReader& csv) {
             vector<uint> enabledRows = csv.get_enabled_rows_for_mode(mode);
             lprintf("  ---- BEGIN DEBUG_NOTE ----  mode %s (#%u %s)  is enabled for %zu rows:\n",
                     mode.c_str(), col_idx, col_label.c_str(), enabledRows.size());
-            lputs9();
+            //lputs9();
             for (uint r : enabledRows) {
               uint row = r + 2;
               const PcCsvReader::BCD& b = csv.getBCD(r);