Merge pull request #768 from os-fpga/pinc_dont_translate_topOut_to_inp_EDA3040

pin_c: dont translate top-output to input EDA-3040

Author: serge-dsa

planning/src/main.cpp

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

planning/src/pin_loc/map_clocks.cpp

@@ -201,11 +201,15 @@ int PinPlacer::write_clocks_logical_to_physical() {
     ls << "   in_fn (--read_repack): " << in_fn << endl;
     lprintf("pin_c:  current directory= %s\n", cur_dir.c_str());
   }
-  if (not Fio::regularFileExists(in_fn)) {
-    CERROR << " no such file (--read_repack): " << in_fn << endl;
-    ls << " no such file (--read_repack): " << in_fn << endl;
+  CStr in_fnc = in_fn.c_str();
+  if (not Fio::regularFileExists(in_fnc)) {
+    flush_out(true); err_puts();
+    CStr m = "specified fpga_repack_constraints.xml (--read_repack) file does not exist";
+    lprintf2("[Error] %s: %s\n", m, in_fnc);
+    err_puts(); flush_out(true);
     return -1;
   }
+
   fio::MMapReader reReader(in_fn);
   rd_ok = reReader.read();
   if (not rd_ok) {

planning/src/pin_loc/pcf_place.cpp

@@ -509,19 +509,57 @@ uint PinPlacer::translate_PCF_names() noexcept {
       continue;
     string& pinName = cmd.cmd_[1];
     was = pinName;
+    bool topInp1 = isTopDesInput(was), topInp2 = false;
+    bool topOut1 = isTopDesOutput(was), topOut2 = false;
+
+    if (tr >= 7) {
+      flush_out((tr >= 8));
+      lprintf("\t  translating PCF pin '%s'\n", was.c_str());
+      lprintf("\t\t topInp:%i  topOut:%i  (%s)\n",
+          topInp1, topOut1, (topInp1 or topOut1) ? "TOP" : "n");
+    }
+
     if (findIbufByOldPin(was)) {
       // input
       pinName = translatePinName(was, true);
-      if (pinName != was) numInpTr++;
+      if (pinName != was) {
+        topInp2 = isTopDesInput(pinName);
+        topOut2 = isTopDesOutput(pinName);
+        bool changedSide = (topOut1 and topInp2) or (topInp1 and topOut2);
+        if (tr >= 7) {
+          lprintf("\t\t    became '%s'  topInp:%i  topOut:%i  (%s)\n",
+            pinName.c_str(),
+            topInp2, topOut2, (topInp2 or topOut2) ? "TOP" : "n");
+            if (changedSide)
+              lprintf("\t\t\t  !!!  CHANGED_SIDE  !!!\n");
+        }
+        numInpTr++;
+      }
     } else if (findObufByOldPin(was)) {
       // output
       pinName = translatePinName(was, false);
-      if (pinName != was) numOutTr++;
+      if (pinName != was) {
+        topInp2 = isTopDesInput(pinName);
+        topOut2 = isTopDesOutput(pinName);
+        bool changedSide = (topOut1 and topInp2) or (topInp1 and topOut2);
+        if (tr >= 7) {
+          lprintf("\t\t    became '%s'  topInp:%i  topOut:%i  (%s)\n",
+            pinName.c_str(),
+            topInp2, topOut2, (topInp2 or topOut2) ? "TOP" : "n");
+            if (changedSide)
+              lprintf("\t\t\t  !!!  CHANGED_SIDE  !!!\n");
+        }
+        if (changedSide) {
+          pinName = was; // cancel translation
+          continue;
+        }
+        numOutTr++;
+      }
     }
   }
 
-  flush_out(tr >= 6);
   if (tr >= 3) {
+    flush_out((tr >= 6));
     lprintf("PCF command translation:  #input translations= %u  #output translations= %u\n",
             numInpTr, numOutTr);
   }
@@ -664,8 +702,6 @@ bool PinPlacer::write_dot_place(const PcCsvReader& csv) {
   string internalPin;
   vector<uint> gbox_rows;
 
-  string udes_pn2; // translated according to --edits <config.json>
-
   string row_str;
   int row_num = -1;
 
@@ -676,24 +712,33 @@ bool PinPlacer::write_dot_place(const PcCsvReader& csv) {
 
     const PcfReader::Cmd& cmdObj = *P[cmd_i];
     const vector<string>& pcf_cmd = cmdObj.cmd_;
+    const string& op_code = pcf_cmd[0];
 
     // only support io and clock for now
-    if (pcf_cmd[0] != "set_io" && pcf_cmd[0] != "set_clk") continue;
+    if (op_code != "set_io" && op_code != "set_clk") {
+      if (tr >= 4) {
+        lprintf("\t  ignoring PCF cmd op_code= %s  only {set_io, set_clk} are used\n",
+                op_code.c_str());
+      }
+      continue;
+    }
 
     const string& udes_pn1 = pcf_cmd[1];
+    const string& udes_pn2 = udes_pn1;
 
     bool is_in_pin = (find_udes_input(udes_pn1) >= 0);
 
     bool is_out_pin =
         is_in_pin ? false : (find_udes_output(udes_pn1) >= 0);
 
-    udes_pn2 = translatePinName(udes_pn1, is_in_pin);
-    if (udes_pn2 != udes_pn1) {
-      if (tr >= 3) {
-        lprintf("  %s pin TRANSLATED: %s --> %s\n",
-                is_in_pin ? "input" : "output", udes_pn1.c_str(), udes_pn2.c_str());
-      }
-    }
+    ////// OBSOLETE CODE: translation is done in translate_PCF_names()
+    // udes_pn2 = translatePinName(udes_pn1, is_in_pin);
+    // if (udes_pn2 != udes_pn1) {
+    //  if (tr >= 3) {
+    //    lprintf("  %s pin TRANSLATED: %s --> %s\n",
+    //            is_in_pin ? "input" : "output", udes_pn1.c_str(), udes_pn2.c_str());
+    //  }
+    // }
 
     const string& udes_pin_name = udes_pn2;
     const string& device_pin_name = pcf_cmd[2];  // bump or ball
@@ -721,9 +766,16 @@ bool PinPlacer::write_dot_place(const PcCsvReader& csv) {
 
       flush_out(true);
       flush_out(true);
+      err_puts();
       CERROR << err_lookup("CONSTRAINED_PORT_NOT_FOUND") << ": <"
              << udes_pin_name << ">" << endl;
+      err_puts();
+      flush_out(true);
+      lprintf("[Error] === user-design top-port not found: %s\n", udes_pin_name.c_str());
       flush_out(true);
+      // if (tr >= 6) { // dump all design ports for diagnostics
+      //   flush_out(true);
+      // }
 
       out_file << "\n=== Error happened, .place file is incomplete\n"
                << "=== ERROR:" << err_lookup("CONSTRAINED_PORT_NOT_FOUND")

planning/src/pin_loc/pin_placer.h

@@ -16,6 +16,7 @@ class PcCsvReader;
 
 using std::string;
 using std::vector;
+using std::unordered_set;
 using StringPair = std::pair<std::string, std::string>;
 
 struct PinPlacer {
@@ -96,6 +97,7 @@ struct PinPlacer {
 
   vector<string> raw_design_inputs_;
   vector<string> raw_design_outputs_;
+  unordered_set<string> raw_inputSet_, raw_outputSet_;
 
   vector<Pin> user_design_inputs_;
   vector<Pin> user_design_outputs_;
@@ -112,7 +114,7 @@ struct PinPlacer {
   std::set<XY>     used_XYs_;
   std::set<XYZ>    used_oxyz_; // used output XYZ
   std::set<XYZ>    used_ixyz_; // used input XYZ
-  std::unordered_set<uint> used_tiles_;
+  unordered_set<uint> used_tiles_;
 
   uint otile_overlap_level_ = 1, itile_overlap_level_ = 1;
 
@@ -210,6 +212,17 @@ struct PinPlacer {
     return -1;
   }
 
+  bool isTopDesInput(const string& pinName) const noexcept {
+    assert(!pinName.empty());
+    assert(raw_inputSet_.size() == raw_design_inputs_.size());
+    return raw_inputSet_.count(pinName);
+  }
+  bool isTopDesOutput(const string& pinName) const noexcept {
+    assert(!pinName.empty());
+    assert(raw_outputSet_.size() == raw_design_outputs_.size());
+    return raw_outputSet_.count(pinName);
+  }
+
   bool read_PT_CSV(PcCsvReader&);
   bool read_design_ports();
   string read_edits();

planning/src/pin_loc/read_ports.cpp

@@ -136,14 +136,22 @@ bool PinPlacer::read_design_ports() {
   size_t sz = raw_design_inputs_.size();
   user_design_inputs_.clear();
   user_design_inputs_.resize(sz);
-  for (size_t i = 0; i < sz; i++)
+  raw_inputSet_.clear();
+  raw_inputSet_.reserve(2*sz + 1);
+  for (size_t i = 0; i < sz; i++) {
     user_design_inputs_[i].set_udes_pin_name(raw_design_inputs_[i]);
+  }
+  raw_inputSet_.insert( raw_design_inputs_.cbegin(), raw_design_inputs_.cend() );
 
   sz = raw_design_outputs_.size();
   user_design_outputs_.clear();
   user_design_outputs_.resize(sz);
-  for (size_t i = 0; i < sz; i++)
+  raw_outputSet_.clear();
+  raw_outputSet_.reserve(2*sz + 1);
+  for (size_t i = 0; i < sz; i++) {
     user_design_outputs_[i].set_udes_pin_name(raw_design_outputs_[i]);
+  }
+  raw_outputSet_.insert( raw_design_outputs_.cbegin(), raw_design_outputs_.cend() );
 
   if (tr >= 3) {
     flush_out(tr >= 5);
@@ -1042,6 +1050,7 @@ PinPlacer::EditItem* PinPlacer::findIbufByOldPin(const string& old_pin) const no
 
 string PinPlacer::translatePinName(const string& pinName, bool is_input) const noexcept {
   assert(not pinName.empty());
+
   if (is_input) {
     EditItem* buf = findIbufByOldPin(pinName);
     if (buf) {
@@ -1061,6 +1070,10 @@ string PinPlacer::translatePinName(const string& pinName, bool is_input) const n
       EditItem* root = buf->getRoot();
       assert(root);
       assert(not root->newPin_.empty());
+      if (isTopDesInput(root->newPin_)) {
+        // never translate an output to top-input. EDA-3040
+        return pinName;
+      }
       return root->newPin_;
     } else {
       return pinName;