pin_c: don't translate topInput-2-topInput EDA-3270

Author: serge-rs

planning/src/main.cpp

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

planning/src/pin_loc/pcf_place.cpp

@@ -362,6 +362,15 @@ void PinPlacer::print_summary(const string& csv_name) const {
 
   CStr editsVal = has_edits_.empty() ? "FALSE" : has_edits_.c_str();
   lprintf("     has edits (config.json) : %s\n", editsVal);
+  if (not has_edits_.empty()) {
+    if (tr >= 4) {
+      lprintf("       pin_names_translated_ : %s\n",
+               pin_names_translated_ ? "TRUE" : "FALSE");
+    }
+    uint icnt = transCnt_.first, ocnt = transCnt_.second;
+    lprintf("     number of translated pins = %u  (input: %u  output: %u)\n",
+            icnt + ocnt, icnt, ocnt);
+  }
 
   CStr cmapVal = clk_map_file_.empty() ? "(NONE)" : clk_map_file_.c_str();
   lprintf("                clk_map_file : %s\n", cmapVal);
@@ -748,15 +757,6 @@ bool PinPlacer::write_dot_place(const PcCsvReader& csv) {
     bool is_out_pin =
         is_in_pin ? false : (find_udes_output(udes_pn1) >= 0);
 
-    ////// 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
 

planning/src/pin_loc/pin_placer.cpp

@@ -159,8 +159,9 @@ void PinPlacer::resetState() noexcept {
   max_pt_row_ = 0;
   no_more_inp_bumps_ = false;
   no_more_out_bumps_ = false;
-  is_fabric_eblif_ = false;
+  is_fabric_blif_ = false;
   pin_names_translated_ = false;
+  transCnt_ = {0u, 0u};
   num_warnings_ = 0;
   num_critical_warnings_ = 0;
   user_pcf_.clear();
@@ -318,11 +319,12 @@ bool PinPlacer::read_and_write() {
   if (usage_requirement_2 || (usage_requirement_0 && user_pcf_ == "")) {
     flush_out(true);
     if (has_edits_.size()) {
+
       // if auto-PCF and has_edits_, translate and de-duplicate
       // user-design ports now, since edits.json could remove some design ports.
       if (not pin_names_translated_)
-        translatePinNames("(auto-PCF)");
-      //
+        transCnt_ = translatePinNames("(auto-PCF)");
+
       // de-duplicate inputs
       vector<string> dups;
       if (user_design_inputs_.size() > 1) {
@@ -489,9 +491,9 @@ bool PinPlacer::read_and_write() {
   return true;
 }
 
-uint PinPlacer::translatePinNames(CStr memo) noexcept {
+upair PinPlacer::translatePinNames(CStr memo) noexcept {
   uint16_t tr = ltrace();
-  uint cnt = 0;
+  uint icnt = 0, ocnt = 0;
   CStr mem = memo ? memo : "";
 
   flush_out((tr >= 5));
@@ -511,7 +513,7 @@ uint PinPlacer::translatePinNames(CStr memo) noexcept {
                pin.udes_pin_name_.c_str(), pin.trans_pin_name_.c_str());
     }
     pin.udes_pin_name_ = pin.trans_pin_name_;
-    cnt++;
+    icnt++;
   }
 
   flush_out(true);
@@ -527,16 +529,17 @@ uint PinPlacer::translatePinNames(CStr memo) noexcept {
                pin.udes_pin_name_.c_str(), pin.trans_pin_name_.c_str());
     }
     pin.udes_pin_name_ = pin.trans_pin_name_;
-    cnt++;
+    ocnt++;
   }
 
   if (tr >= 3) {
     lprintf("DONE translatePinNames() @ %s\n", mem);
-    lprintf("     number of translated pins = %u\n", cnt);
+    lprintf("     number of translated pins = %u  (inp:%u out:%u)\n",
+            icnt + ocnt, icnt, ocnt);
   }
 
   pin_names_translated_ = true;
-  return cnt;
+  return {icnt, ocnt};
 }
 
 } // namespace pln

planning/src/pin_loc/pin_placer.h

@@ -268,8 +268,10 @@ 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;
+  bool is_fabric_blif_ = false;
+
   bool pin_names_translated_ = false;
+  upair transCnt_ = {0u, 0u};
 
   mutable uint num_warnings_ = 0, num_critical_warnings_ = 0;
   void incrCriticalWarnings() const noexcept { num_critical_warnings_++; }
@@ -304,7 +306,7 @@ struct PinPlacer {
 
   string translatePinName(const string& pinName, bool is_input) const noexcept;
 
-  uint translatePinNames(CStr memo) noexcept;
+  upair translatePinNames(CStr memo) noexcept;
   uint translate_PCF_names() noexcept;
 
   const EditItem* findTerminalLink(const string& pinName) const noexcept;

planning/src/pin_loc/read_ports.cpp

@@ -12,7 +12,7 @@ using fio::Fio;
 #define CERROR std::cerr << "[Error] "
 #define OUT_ERROR lout() << "[Error] "
 
-static bool s_is_fabric_eblif(const string& fn) noexcept {
+static bool s_is_fabric_blif(const string& fn) noexcept {
   size_t len = fn.length();
   if (len < 12 or len > 5000)
     return false;
@@ -130,7 +130,7 @@ bool PinPlacer::read_design_ports() {
       return false;
     }
 
-    is_fabric_eblif_ = s_is_fabric_eblif(blif_fn_);
+    is_fabric_blif_ = s_is_fabric_blif(blif_fn_);
   }
 
   size_t sz = raw_design_inputs_.size();
@@ -159,7 +159,7 @@ bool PinPlacer::read_design_ports() {
       "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");
+      lprintf("is_fabric_BLIF: %s\n", is_fabric_blif_ ? "TRUE" : "FALSE");
   }
 
   if (tr >= 5) {
@@ -988,7 +988,7 @@ void PinPlacer::finalize_edits() noexcept {
     dump_edits("final");
   }
 
-  translatePinNames("(finalize_edits)");
+  transCnt_ = translatePinNames("(finalize_edits)");
 
   if (tr >= 5) {
     flush_out(true);
@@ -1058,6 +1058,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 a top-input to another top-input. EDA-3270
+        return pinName;
+      }
       return root->newPin_;
     } else {
       return pinName;

planning/src/util/geo/xyz.h

@@ -11,8 +11,6 @@
 
 namespace pln {
 
-using ipair = std::pair<int, int>;
-
 struct XY {
   int x_ = INT_MIN, y_ = INT_MIN;
 

planning/src/util/nw/Nw.h

@@ -24,9 +24,6 @@ using std::string;
 using std::ostream;
 using veci = std::vector<int>;
 using vecu = std::vector<uint>;
-using ipair = std::pair<int, int>;
-using upair = std::pair<uint, uint>;
-using uspair = std::pair<uint, string>;
 
 struct NW {
   struct Node;

planning/src/util/pln_log.h

@@ -50,6 +50,10 @@
 namespace pln {
 
 using CStr = const char*;
+using ipair = std::pair<int, int>;
+using upair = std::pair<uint, uint>;
+using uspair = std::pair<uint, std::string>;
+
 struct LOut;
 
 // log-trace value (debug print verbosity)