Merge pull request #831 from os-fpga/checker_improved_report_and_stats

checker: improved report and stats

Author: serge-dsa

planning/src/RS/rsCheck.cpp

@@ -69,7 +69,12 @@ bool do_check_blif(CStr cfn) {
   ls << "-----   #outputs= " << numOut << endl;
   ls << "-----      #LUTs= " << bfile.countLUTs() << endl;
   ls << "-----       #FFs= " << bfile.countFFs() << endl;
-  ls << "-----  #CLK_BUFs= " << bfile.countCBUFs() << 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;
   ls << "-----   PinGraph: " << bfile.pinGraphFile_ << endl;
   if (bfile.num_MOGs_ and tr >= 5) {
     ls << ">>>>> [NOTE] num_MOGs_ =  " << bfile.num_MOGs_ << endl;

planning/src/file_io/pln_blif_file.cpp

@@ -25,6 +25,9 @@ void BLIF_file::reset(CStr nm, uint16_t tr) noexcept {
   err_msg_.clear();
   pg_.clear();
   pg2blif_.clear();
+
+  for (uint t = 0; t < Prim_MAX_ID; t++)
+    typeHistogram_[t] = 0;
 }
 
 // "model "
@@ -186,6 +189,9 @@ bool BLIF_file::readBlif() noexcept {
   topModel_.clear();
   pinGraphFile_.clear();
 
+  for (uint t = 0; t < prim::Prim_MAX_ID; t++)
+    typeHistogram_[t] = 0;
+
   rd_ok_ = chk_ok_ = false;
   err_msg_.clear();
   trace_ = 0;
@@ -370,6 +376,8 @@ bool BLIF_file::checkBlif() noexcept {
   // 4. create and link nodes
   createNodes();
 
+  typeHistogram_ = countTypes();
+
   if (trace_ >= 4) {
     printPrimitives(ls, false);
     if (trace_ >= 5) {
@@ -709,6 +717,28 @@ uint BLIF_file::countCBUFs() const noexcept {
   return cnt;
 }
 
+void BLIF_file::countBUFs(uint& nIBUF, uint& nOBUF, uint& nCBUF) const noexcept {
+  nIBUF = nOBUF = nCBUF = 0;
+  uint nn = numNodes();
+  if (nn == 0)
+    return;
+
+  for (uint i = 1; i <= nn; i++) {
+    const BNode& nd = nodePool_[i];
+    if (nd.is_IBUF()) {
+      nIBUF++;
+      continue;
+    }
+    if (nd.is_OBUF()) {
+      nOBUF++;
+      continue;
+    }
+    if (nd.is_CLK_BUF()) {
+      nCBUF++;
+    }
+  }
+}
+
 uint BLIF_file::countCarryNodes() const noexcept {
   uint nn = numNodes();
   if (nn == 0)
@@ -1999,6 +2029,7 @@ bool BLIF_file::createPinGraph() noexcept {
             flush_out(true); err_puts();
             lprintf2("[Error] no driver for clock-buf node #%u %s  line:%u\n",
                      dn.id_, dn.cPrimType(), dn.lnum_);
+            err_lnum_ = dn.lnum_;
             err_puts(); flush_out(true);
             return false;
           }
@@ -2012,9 +2043,11 @@ bool BLIF_file::createPinGraph() noexcept {
 
           if (not drv_drv->is_CLK_BUF() and not drv_drv->isTopInput()) {
             flush_out(true); err_puts();
-            lprintf2("[Error] bad drv_drv for clock-buf node #%u line:%u  must be CLK_BUF or iport\n",
-                      dn.id_, dn.lnum_);
+            lprintf2("[Error] bad driver (%s) for clock-buf node #%u line:%u  must be CLK_BUF or iport\n",
+                      drv_drv->cPrimType(), dn.id_, dn.lnum_);
             err_puts(); flush_out(true);
+            err_lnum_ = dn.lnum_;
+            err_lnum2_ = drv_drv->lnum_;
             return false;
           }
 

planning/src/file_io/pln_blif_file.h

@@ -234,6 +234,8 @@ struct BLIF_file : public fio::MMapReader
   bool chk_ok_ = false;
   uint num_MOGs_ = 0;
 
+  std::array<uint, prim::Prim_MAX_ID> typeHistogram_;
+
 public:
   BLIF_file() noexcept = default;
   BLIF_file(CStr nm) noexcept : fio::MMapReader(nm) {}
@@ -252,6 +254,9 @@ struct BLIF_file : public fio::MMapReader
   uint countLUTs() const noexcept;
   uint countFFs() const noexcept;
   uint countCBUFs() const noexcept;
+  void countBUFs(uint& nIBUF, uint& nOBUF, uint& nCBUF) const noexcept;
+
+  uint typeHist(prim::Prim_t t) const noexcept { return typeHistogram_[t]; }
 
   void collectClockedNodes(vector<const BNode*>& V) noexcept;
   std::array<uint, prim::Prim_MAX_ID> countTypes() const noexcept;

planning/src/main.cpp

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