Merge pull request #803 from os-fpga/pinc_optional_check_blif

pln: option to call blif-checker from pin_c

Author: serge-dsa

planning/src/RS/rsCheck.cpp

@@ -1,24 +1,17 @@
 #include "RS/rsCheck.h"
 #include "file_io/pln_blif_file.h"
 #include "file_io/pln_csv_reader.h"
-#include "util/nw/Nw.h"
 
 namespace pln {
 
 using std::string;
 using std::endl;
 
-static void nw_test_01();
-
-static bool do_check_blif(CStr cfn) {
+bool do_check_blif(CStr cfn) {
   assert(cfn);
   uint16_t tr = ltrace();
   auto& ls = lout();
 
-  if (::getenv("pln_nw_test_01")) {
-    nw_test_01();
-  }
-
   BLIF_file bfile(string{cfn});
 
   if (tr >= 4)
@@ -171,56 +164,5 @@ bool do_check(const rsOpts& opts, bool blif_vs_csv) {
   return status;
 }
 
-// DEBUG new NW code:
-static void nw_test_01() {
-  flush_out(true);
-  pln::NW g;
-  uint64_t key_cnt = 100;
-  uint nid = g.insP(XY{0, 0}, key_cnt++);
-  assert(nid > 0);
-  assert(g.hasNode(nid));
-
-  g.addRoot(nid);
-  g.insP(XY{200, 0}, key_cnt++);
-  g.insP(XY{200, 200}, key_cnt++);
-  g.insP(XY{0, 200}, key_cnt++);
-
-  g.beComplete();
-
-  g.dump("\t  g is a complete graph");
-  lprintf("\t  g. numN()= %u   numE()= %u\n", g.numN(), g.numE());
-  assert(g.numE() == 6);
-
-  pln::vecu topo;
-  g.getTopo(topo);
-
-  flush_out(true);
-  lputs("==== **** DOT ****");
-
-  g.dumpDot("g");
-  std::ofstream fos("g.dot");
-  if (fos.is_open()) {
-    g.printDot(fos, nullptr, false, false);
-    lputs(" written g.dot");
-    fos.close();
-  } else {
-    flush_out(true);
-    lprintf2("[Error] NOT fos.is_open()\n");
-    flush_out(true);
-  }
-
-  flush_out(true);
-  lputs("==== **** METIS ****");
-
-  g.dumpMetis(true);
-
-  flush_out(true);
-
-  bool wr_ok = g.writeMetis("g.met", true);
-  lprintf("wr_ok:%i\n", wr_ok);
-  if (wr_ok)
-    lputs(" written g.met");
-}
-
 }
 

planning/src/RS/rsCheck.h

@@ -9,6 +9,8 @@ namespace pln {
 
 bool do_check(const rsOpts& opts, bool blif_vs_csv);
 
+bool do_check_blif(CStr cfn);
+
 }
 
 #endif

planning/src/main.cpp

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

planning/src/pin_loc/read_ports.cpp

@@ -1,3 +1,4 @@
+#include "RS/rsCheck.h"
 #include "pin_loc/pin_placer.h"
 #include "file_io/pln_blif_file.h"
 #include "file_io/nlohmann3_11_2_json.h"
@@ -1095,8 +1096,6 @@ bool PinPlacer::BlifReader::read_blif(const string& blif_fn) {
 
   bool exi = false;
   exi = bfile.fileExists();
-  if (tr >= 8)
-    ls << int(exi) << endl;
   if (not exi) {
     flush_out(true); err_puts();
     lprintf2("[Error] BLIF file '%s' does not exist\n", cfn); 
@@ -1105,18 +1104,25 @@ bool PinPlacer::BlifReader::read_blif(const string& blif_fn) {
   }
 
   exi = bfile.fileAccessible();
-  if (tr >= 8)
-    ls << int(exi) << endl;
   if (not exi) {
     flush_out(true); err_puts();
     lprintf2("[Error] BLIF file '%s' is not accessible\n", cfn); 
     err_puts(); flush_out(true);
     return false;
   }
 
+  if (::getenv("pinc_check_blif")) {
+    flush_out(true);
+    lprintf("____ BEGIN pinc_check_blif:  %s\n", cfn);
+    bool check_blif_ok = do_check_blif(cfn);
+    flush_out(true);
+    lprintf("           pinc_check_blif STATUS = %s\n\n",
+            check_blif_ok ? "PASS" : "FAIL");
+    lprintf("------ END pinc_check_blif:  %s\n", cfn);
+    flush_out(true);
+  }
+
   bool rd_ok = bfile.readBlif();
-  if (tr >= 8)
-    ls << int(rd_ok) << endl;
   if (not rd_ok) {
     flush_out(true); err_puts();
     lprintf2("[Error] failed reading BLIF file '%s'\n", cfn);