Merge pull request #840 from os-fpga/checker_recogn_DSP_output_EDA3235

checker: recognize DSP MOGs EDA-3235

Author: serge-dsa

planning/src/RS/rsCheck.cpp

@@ -69,14 +69,22 @@ bool do_check_blif(CStr cfn) {
   ls << "-----   #outputs= " << numOut << endl;
   ls << "-----      #LUTs= " << bfile.countLUTs() << endl;
   ls << "-----       #FFs= " << bfile.countFFs() << endl;
+  {
   uint nIBUF = 0, nOBUF = 0, nCBUF = 0;
   bfile.countBUFs(nIBUF, nOBUF, nCBUF);
   ls << "-----    #I_BUFs= " << nIBUF << endl;
   ls << "-----    #O_BUFs= " << nOBUF << endl;
   ls << "-----  #CLK_BUFs= " << nCBUF << endl;
-  ls << "-----  #I_SERDES= " << bfile.typeHist(prim::I_SERDES) << endl;
+  }
+  {
+  uint nISERD = 0, nDSP38 = 0, nDSP19X = 0;
+  bfile.countMOGs(nISERD, nDSP38, nDSP19X);
+  ls << "-----  #I_SERDES= " << nISERD << endl;
+  ls << "-----    #DSP19X= " << nDSP19X << endl;
+  ls << "-----     #DSP38= " << nDSP38 << endl;
+  }
   ls << "-----   PinGraph: " << bfile.pinGraphFile_ << endl;
-  if (bfile.num_MOGs_ and tr >= 5) {
+  if (bfile.num_MOGs_ and tr >= 6) {
     ls << ">>>>> [NOTE] num_MOGs_ =  " << bfile.num_MOGs_ << endl;
   }
   lprintf("=====   passed: %s\n", chk_ok ? "YES" : "NO");

planning/src/file_io/pln_blif_file.cpp

@@ -725,6 +725,8 @@ void BLIF_file::countBUFs(uint& nIBUF, uint& nOBUF, uint& nCBUF) const noexcept
 
   for (uint i = 1; i <= nn; i++) {
     const BNode& nd = nodePool_[i];
+    if (nd.isTopPort())
+      continue;
     if (nd.is_IBUF()) {
       nIBUF++;
       continue;
@@ -739,6 +741,31 @@ void BLIF_file::countBUFs(uint& nIBUF, uint& nOBUF, uint& nCBUF) const noexcept
   }
 }
 
+void BLIF_file::countMOGs(uint& nISERD, uint& nDSP38, uint& nDSP19X) const noexcept {
+  nISERD = nDSP38 = nDSP19X = 0;
+  uint nn = numNodes();
+  if (nn == 0)
+    return;
+
+  for (uint i = 1; i <= nn; i++) {
+    const BNode& nd = nodePool_[i];
+    if (nd.isTopPort() or nd.isVirtualMog())
+      continue;
+    Prim_t pt = nd.ptype_;
+    if (pt == I_SERDES) {
+      nISERD++;
+      continue;
+    }
+    if (pt == DSP38) {
+      nDSP38++;
+      continue;
+    }
+    if (pt == DSP19X2) {
+      nDSP19X++;
+    }
+  }
+}
+
 uint BLIF_file::countCarryNodes() const noexcept {
   uint nn = numNodes();
   if (nn == 0)
@@ -846,6 +873,20 @@ static bool s_is_MOG(const BLIF_file::BNode& nd,
     }
     return true;
   }
+  if (nd.ptype_ == DSP38) {
+    for (const string& t : data) {
+      if (is_DSP38_output_term(t))
+        terms.push_back(t);
+    }
+    return true;
+  }
+  if (nd.ptype_ == DSP19X2) {
+    for (const string& t : data) {
+      if (is_DSP19X2_output_term(t))
+        terms.push_back(t);
+    }
+    return true;
+  }
 
   bool has_O = false, has_Y = false, has_Q = false,
        has_COUT = false;

planning/src/file_io/pln_blif_file.h

@@ -265,6 +265,7 @@ struct BLIF_file : public fio::MMapReader
   uint countFFs() const noexcept;
   uint countCBUFs() const noexcept;
   void countBUFs(uint& nIBUF, uint& nOBUF, uint& nCBUF) const noexcept;
+  void countMOGs(uint& nISERD, uint& nDSP38, uint& nDSP19X) const noexcept;
 
   uint typeHist(prim::Prim_t t) const noexcept { return typeHistogram_[t]; }
 

planning/src/file_io/pln_primitives.cpp

@@ -593,7 +593,7 @@ bool is_I_SERDES_output_term(const string& term) noexcept {
 
   static std::regex re_iserdes_out{
       R"(CLK_OUT=|Q=|DATA_VALID=|DPA_LOCK=|DPA_ERROR=|Q\[\d+\]=)" };
-  
+
   std::cmatch m;
   bool b = false;
 
@@ -711,6 +711,52 @@ R"(CLK_OUT=|CLK_OUT_DIV2=|CLK_OUT_DIV3=|CLK_OUT_DIV4=|SERDES_FAST_CLK=|LOCK=)";
   return b;
 }
 
+bool is_DSP38_output_term(const string& term) noexcept {
+  assert(!term.empty());
+  if (term.empty()) return false;
+
+  static std::regex re_dsp38_out{
+      R"(Z\[\d+\]=|DLY_B\[\d+\]=)" };
+
+  std::cmatch m;
+  bool b = false;
+
+  try {
+    b = std::regex_search(term.c_str(), m, re_dsp38_out);
+  } catch (...) {
+    assert(0);
+    b = false;
+  }
+
+  //if (b)
+  //  lprintf("__DSP38_output REGEX matched: %s\n", term.c_str());
+
+  return b;
+}
+
+bool is_DSP19X2_output_term(const string& term) noexcept {
+  assert(!term.empty());
+  if (term.empty()) return false;
+
+  static std::regex re_dsp19_out{
+      R"(Z1\[\d+\]=|DLY_B1\[\d+\]=|Z2\[\d+\]=|DLY_B2\[\d+\]=)" };
+
+  std::cmatch m;
+  bool b = false;
+
+  try {
+    b = std::regex_search(term.c_str(), m, re_dsp19_out);
+  } catch (...) {
+    assert(0);
+    b = false;
+  }
+
+  //if (b)
+  //  lprintf("__DSP19X2_output REGEX matched: %s\n", term.c_str());
+
+  return b;
+}
+
 // string -> enum, returns A_ZERO on error
 Prim_t pr_str2enum(CStr name) noexcept {
   if (!name or !name[0])

planning/src/file_io/pln_primitives.h

@@ -108,6 +108,9 @@ bool is_TDP_RAM18KX_output_term(const std::string& term) noexcept;
 
 bool is_PLL_output_term(const std::string& term) noexcept;
 
+bool is_DSP38_output_term(const std::string& term) noexcept;
+bool is_DSP19X2_output_term(const std::string& term) noexcept;
+
 // DEBUG:
 std::string pr_write_yaml(Prim_t pt) noexcept;
 

planning/src/main.cpp

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