Merge pull request #802 from os-fpga/pinc_moved_blif_to_pin_loc

pin_c: moved read_blif() to pin_loc

Author: serge-dsa

planning/src/file_io/blif_reader.cpp

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

planning/src/file_io/blif_reader.h

@@ -1,6 +1,4 @@
 #include "pin_loc/pin_placer.h"
-
-#include "file_io/blif_reader.h"
 #include "file_io/pln_csv_reader.h"
 #include "file_io/pln_Fio.h"
 #include "util/cmd_line.h"

planning/src/main.cpp

@@ -87,6 +87,18 @@ struct PinPlacer {
     };
   };
 
+  struct BlifReader {
+    vector<string> inputs_;
+    vector<string> outputs_;
+
+    BlifReader() noexcept = default;
+    BlifReader(const string& f) { read_blif(f); }
+    bool read_blif(const string& f);
+
+    const vector<string>& get_inputs() const noexcept { return inputs_; }
+    const vector<string>& get_outputs() const noexcept { return outputs_; }
+  };
+
 private:
 
   cmd_line cl_;

planning/src/pin_loc/pin_placer.cpp

@@ -1,8 +1,6 @@
 #include "pin_loc/pin_placer.h"
-#include "file_io/blif_reader.h"
-#include "file_io/pln_Fio.h"
+#include "file_io/pln_blif_file.h"
 #include "file_io/nlohmann3_11_2_json.h"
-#include "util/cmd_line.h"
 #include <filesystem>
 
 namespace pln {
@@ -1081,5 +1079,73 @@ string PinPlacer::translatePinName(const string& pinName, bool is_input) const n
   }
 }
 
+bool PinPlacer::BlifReader::read_blif(const string& blif_fn) {
+  flush_out(true);
+  inputs_.clear();
+  outputs_.clear();
+
+  CStr cfn = blif_fn.c_str();
+  uint16_t tr = ltrace();
+  auto& ls = lout();
+
+  BLIF_file bfile(blif_fn);
+
+  if (tr >= 4)
+    bfile.setTrace(3);
+
+  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); 
+    err_puts(); flush_out(true);
+    return false;
+  }
+
+  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;
+  }
+
+  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); 
+    err_puts(); flush_out(true);
+    return false;
+  }
+
+  lprintf("  (blif_file)   #inputs= %u  #outputs= %u  topModel= %s\n",
+          bfile.numInputs(), bfile.numOutputs(), bfile.topModel_.c_str());
+
+  if (tr >= 5) {
+    flush_out(true);
+    bfile.printInputs(ls);
+    flush_out(true);
+    bfile.printOutputs(ls);
+  }
+
+  std::swap(inputs_, bfile.inputs_);
+  std::swap(outputs_, bfile.outputs_);
+  if (tr >= 3) {
+    flush_out(true);
+    lprintf("pin_c: finished read_blif().  #inputs= %zu  #outputs= %zu\n",
+             inputs_.size(), outputs_.size());
+  }
+
+  flush_out(true);
+
+  return true;
+}
+
 }